dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

LogicLib 2.5

Browse source 
- AndIf, AndUnless, OrIf, OrUnless added.
- Avoids unused variable warnings by requiring !defines before using certain features.


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3641 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
eccles 2004-08-23 13:35:47 +00:00
parent 03d49340dc
commit 3d4f901e5b
2 changed files with 277 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

189
Examples/LogicLib.nsi
View file

@ -1,8 +1,12 @@
!verbose 2
Name "NSIS LogicLib Example"
OutFile "LogicLib.exe"
ShowInstDetails show
!include "Sections.nsh"
!define LOGICLIB_STRCMP
!define LOGICLIB_INT64CMP
!define LOGICLIB_SECTIONCMP
!include "LogicLib.nsh"
;!undef LOGICLIB_VERBOSITY
@ -29,7 +33,6 @@ Section /o "Run tests" TESTS
FindClose $R1
${EndUnless}
StrCpy $R1 "example.xxx"
${If} ${FileExists} "${__FILE__}"
DetailPrint 'Source file "${__FILE__}" still exists'
${Else}
@ -126,11 +129,183 @@ Section /o "Run tests" TESTS
DetailPrint "FAILED If..ElseIf..Else..EndIf test"
${EndIf}
; if..andif..orif..endif
StrCpy $R2 ""
${If} 1 = 1
${AndIf} 2 = 2
StrCpy $R2 $R2A
${Else}
StrCpy $R2 $R2B
${EndIf}
${If} 1 = 1
${AndIf} 2 = 3
StrCpy $R2 $R2B
${Else}
StrCpy $R2 $R2A
${EndIf}
${If} 1 = 2
${AndIf} 2 = 2
StrCpy $R2 $R2B
${Else}
StrCpy $R2 $R2A
${EndIf}
${If} 1 = 2
${AndIf} 2 = 3
StrCpy $R2 $R2B
${Else}
StrCpy $R2 $R2A
${EndIf}
${If} 1 = 1
${OrIf} 2 = 2
StrCpy $R2 $R2A
${Else}
StrCpy $R2 $R2B
${EndIf}
${If} 1 = 1
${OrIf} 2 = 3
StrCpy $R2 $R2A
${Else}
StrCpy $R2 $R2B
${EndIf}
${If} 1 = 2
${OrIf} 2 = 2
StrCpy $R2 $R2A
${Else}
StrCpy $R2 $R2B
${EndIf}
${If} 1 = 2
${OrIf} 2 = 3
StrCpy $R2 $R2B
${Else}
StrCpy $R2 $R2A
${EndIf}
${If} 1 = 1
${AndIf} 2 = 2
${OrIf} 3 = 3
StrCpy $R2 $R2A
${Else}
StrCpy $R2 $R2B
${EndIf}
${If} 1 = 1
${AndIf} 2 = 3
${OrIf} 3 = 3
StrCpy $R2 $R2A
${Else}
StrCpy $R2 $R2B
${EndIf}
${If} 1 = 2
${AndIf} 2 = 2
${OrIf} 3 = 3
StrCpy $R2 $R2A
${Else}
StrCpy $R2 $R2B
${EndIf}
${If} 1 = 2
${AndIf} 2 = 3
${OrIf} 3 = 3
StrCpy $R2 $R2A
${Else}
StrCpy $R2 $R2B
${EndIf}
${If} 1 = 1
${AndIf} 2 = 2
${OrIf} 3 = 4
StrCpy $R2 $R2A
${Else}
StrCpy $R2 $R2B
${EndIf}
${If} 1 = 1
${AndIf} 2 = 3
${OrIf} 3 = 4
StrCpy $R2 $R2B
${Else}
StrCpy $R2 $R2A
${EndIf}
${If} 1 = 2
${AndIf} 2 = 2
${OrIf} 3 = 4
StrCpy $R2 $R2B
${Else}
StrCpy $R2 $R2A
${EndIf}
${If} 1 = 2
${AndIf} 2 = 3
${OrIf} 3 = 4
StrCpy $R2 $R2B
${Else}
StrCpy $R2 $R2A
${EndIf}
${If} 1 = 1
${OrIf} 2 = 2
${AndIf} 3 = 3
StrCpy $R2 $R2A
${Else}
StrCpy $R2 $R2B
${EndIf}
${If} 1 = 1
${OrIf} 2 = 3
${AndIf} 3 = 3
StrCpy $R2 $R2A
${Else}
StrCpy $R2 $R2B
${EndIf}
${If} 1 = 2
${OrIf} 2 = 2
${AndIf} 3 = 3
StrCpy $R2 $R2A
${Else}
StrCpy $R2 $R2B
${EndIf}
${If} 1 = 2
${OrIf} 2 = 3
${AndIf} 3 = 3
StrCpy $R2 $R2B
${Else}
StrCpy $R2 $R2A
${EndIf}
${If} 1 = 1
${OrIf} 2 = 2
${AndIf} 3 = 4
StrCpy $R2 $R2B
${Else}
StrCpy $R2 $R2A
${EndIf}
${If} 1 = 1
${OrIf} 2 = 3
${AndIf} 3 = 4
StrCpy $R2 $R2B
${Else}
StrCpy $R2 $R2A
${EndIf}
${If} 1 = 2
${OrIf} 2 = 2
${AndIf} 3 = 4
StrCpy $R2 $R2B
${Else}
StrCpy $R2 $R2A
${EndIf}
${If} 1 = 2
${OrIf} 2 = 3
${AndIf} 3 = 4
StrCpy $R2 $R2B
${Else}
StrCpy $R2 $R2A
${EndIf}
${If} $R2 == "AAAAAAAAAAAAAAAAAAAAAAAA"
DetailPrint "PASSED If..AndIf..OrIf..Else..EndIf test"
${Else}
DetailPrint "FAILED If..AndIf..OrIf..Else..EndIf test"
${EndIf}
; ifthen..|..|
StrCpy $R1 1
StrCpy $R2 ""
${ifthen} $R1 = 1 ${|} StrCpy $R2 $R2A ${|}
${ifthen} $R1 = 2 ${|} StrCpy $R2 $R2B ${|}
${IfThen} $R1 = 1 ${|} StrCpy $R2 $R2A ${|}
${IfThen} $R1 = 2 ${|} StrCpy $R2 $R2B ${|}
${If} $R2 == "A"
DetailPrint "PASSED IfThen test"
${Else}
@ -139,8 +314,8 @@ Section /o "Run tests" TESTS
; ifcmd..||..| and if/unless cmd
StrCpy $R2 ""
${ifcmd} MessageBox MB_YESNO "Please press Yes" IDYES ${||} StrCpy $R2 $R2A ${|}
${Unless} ${Cmd} `MessageBox MB_YESNO|MB_DEFBUTTON2 "Please press No" IDYES`
${IfCmd} MessageBox MB_YESNO "Please click Yes" IDYES ${||} StrCpy $R2 $R2A ${|}
${Unless} ${Cmd} `MessageBox MB_YESNO|MB_DEFBUTTON2 "Please click No" IDYES`
StrCpy $R2 $R2B
${EndUnless}
${If} $R2 == "AB"
@ -420,3 +595,5 @@ Function ComponentsLeave
Abort
${EndIf}
FunctionEnd
!verbose 3