LogicLib 2.5
- 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
parent
03d49340dc
commit
3d4f901e5b
2 changed files with 277 additions and 21 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
; NSIS LOGIC LIBRARY - logiclib.nsh
|
||||
; Version 2.4 - 12/13/2003
|
||||
; NSIS LOGIC LIBRARY - LogicLib.nsh
|
||||
; Version 2.5 - 23/08/2004
|
||||
; By dselkirk@hotmail.com
|
||||
; and eccles@users.sf.net
|
||||
;
|
||||
|
|
@ -14,6 +14,9 @@
|
|||
; If|Unless..{ElseIf|ElseUnless}..[Else]..EndIf|EndUnless
|
||||
; - Conditionally executes a block of statements, depending on the value
|
||||
; of an expression.
|
||||
; AndIf|AndUnless|OrIf|OrUnless
|
||||
; - Adds any number of extra conditions to If, Unless, ElseIf and
|
||||
; ElseUnless statements.
|
||||
; IfThen..|..|
|
||||
; - Conditionally executes an inline statement, depending on the value
|
||||
; of an expression.
|
||||
|
|
@ -39,14 +42,17 @@
|
|||
; a == b; a != b
|
||||
; Additional case-insensitive string tests (using System.dll):
|
||||
; a S< b; a S>= b; a S> b; a S<= b
|
||||
; - Requires a !define LOGICLIB_STRCMP above !include LogicLib.nsh
|
||||
; Case-sensitive string tests (using System.dll):
|
||||
; a S== b; a S!= b
|
||||
; - Requires a !define LOGICLIB_STRCMP above !include LogicLib.nsh
|
||||
; Standard (built-in) signed integer tests:
|
||||
; a = b; a <> b; a < b; a >= b; a > b; a <= b
|
||||
; Standard (built-in) unsigned integer tests:
|
||||
; a U< b; a U>= b; a U> b; a U<= b
|
||||
; 64-bit integer tests (using System.dll):
|
||||
; a L= b; a L<> b; a L< b; a L>= b; a L> b; a L<= b
|
||||
; - Requires a !define LOGICLIB_INT64CMP above !include LogicLib.nsh
|
||||
; Built-in NSIS flag tests:
|
||||
; ${Abort}; ${Errors}; ${RebootFlag}; ${Silent}
|
||||
; Built-in NSIS other tests:
|
||||
|
|
@ -58,6 +64,7 @@
|
|||
; ${SectionIsSubSectionEnd} a; ${SectionIsBold} a;
|
||||
; ${SectionIsReadOnly} a; ${SectionIsExpanded} a;
|
||||
; ${SectionIsPartiallySelected} a
|
||||
; - Requires a !define LOGICLIB_SECTIONCMP above !include LogicLib.nsh
|
||||
;
|
||||
; Examples:
|
||||
; See LogicLib.nsi in the Examples folder for lots of example usage.
|
||||
|
|
@ -76,7 +83,14 @@
|
|||
!define | "'"
|
||||
!define || "' '"
|
||||
|
||||
Var _LOGICLIB_TEMP ; Temporary variable to aid the more elaborate logic tests
|
||||
!ifdef LOGICLIB_SECTIONCMP
|
||||
!include Sections.nsh
|
||||
!endif
|
||||
|
||||
!ifdef LOGICLIB_STRCMP | LOGICLIB_INT64CMP | LOGICLIB_SECTIONCMP
|
||||
!define _LOGICLIB_TEMP
|
||||
Var _LOGICLIB_TEMP ; Temporary variable to aid the more elaborate logic tests
|
||||
!endif
|
||||
|
||||
!macro _PushLogic
|
||||
!insertmacro _PushScope Logic _${__LINE__}
|
||||
|
|
@ -124,9 +138,13 @@
|
|||
|
||||
; Case-sensitive string tests
|
||||
!macro _StrCmp _a _b _e _l _m
|
||||
System::Call `kernel32::lstrcmpA(ts, ts) i.s` `${_a}` `${_b}`
|
||||
Pop $_LOGICLIB_TEMP
|
||||
IntCmp $_LOGICLIB_TEMP 0 `${_e}` `${_l}` `${_m}`
|
||||
!ifdef _LOGICLIB_TEMP
|
||||
System::Call `kernel32::lstrcmpA(ts, ts) i.s` `${_a}` `${_b}`
|
||||
Pop $_LOGICLIB_TEMP
|
||||
IntCmp $_LOGICLIB_TEMP 0 `${_e}` `${_l}` `${_m}`
|
||||
!else
|
||||
!error "Please !define LOGICLIB_STRCMP above !include LogicLib.nsh and recompile"
|
||||
!endif
|
||||
!macroend
|
||||
|
||||
!macro _S== _a _b _t _f
|
||||
|
|
@ -139,9 +157,13 @@
|
|||
|
||||
; Extra string tests (cannot do these case-sensitively - I tried and lstrcmp still ignored the case)
|
||||
!macro _StrCmpI _a _b _e _l _m
|
||||
System::Call `kernel32::lstrcmpiA(ts, ts) i.s` `${_a}` `${_b}`
|
||||
Pop $_LOGICLIB_TEMP
|
||||
IntCmp $_LOGICLIB_TEMP 0 `${_e}` `${_l}` `${_m}`
|
||||
!ifdef _LOGICLIB_TEMP
|
||||
System::Call `kernel32::lstrcmpiA(ts, ts) i.s` `${_a}` `${_b}`
|
||||
Pop $_LOGICLIB_TEMP
|
||||
IntCmp $_LOGICLIB_TEMP 0 `${_e}` `${_l}` `${_m}`
|
||||
!else
|
||||
!error "Please !define LOGICLIB_STRCMP above !include LogicLib.nsh and recompile"
|
||||
!endif
|
||||
!macroend
|
||||
|
||||
!macro _S< _a _b _t _f
|
||||
|
|
@ -204,9 +226,13 @@
|
|||
|
||||
; Int64 tests
|
||||
!macro _Int64Cmp _a _o _b _t _f
|
||||
System::Int64Op `${_a}` `${_o}` `${_b}`
|
||||
Pop $_LOGICLIB_TEMP
|
||||
!insertmacro _= $_LOGICLIB_TEMP 0 `${_f}` `${_t}`
|
||||
!ifdef _LOGICLIB_TEMP
|
||||
System::Int64Op `${_a}` `${_o}` `${_b}`
|
||||
Pop $_LOGICLIB_TEMP
|
||||
!insertmacro _= $_LOGICLIB_TEMP 0 `${_f}` `${_t}`
|
||||
!else
|
||||
!error "Please !define LOGICLIB_INT64CMP above !include LogicLib.nsh and recompile"
|
||||
!endif
|
||||
!macroend
|
||||
|
||||
!macro _L= _a _b _t _f
|
||||
|
|
@ -283,9 +309,13 @@
|
|||
|
||||
; Section flag test
|
||||
!macro _SectionFlagIsSet _a _b _t _f
|
||||
SectionGetFlags `${_b}` $_LOGICLIB_TEMP
|
||||
IntOp $_LOGICLIB_TEMP $_LOGICLIB_TEMP & `${_a}`
|
||||
!insertmacro _= $_LOGICLIB_TEMP `${_a}` `${_t}` `${_f}`
|
||||
!ifdef _LOGICLIB_TEMP & SF_SELECTED
|
||||
SectionGetFlags `${_b}` $_LOGICLIB_TEMP
|
||||
IntOp $_LOGICLIB_TEMP $_LOGICLIB_TEMP & `${_a}`
|
||||
!insertmacro _= $_LOGICLIB_TEMP `${_a}` `${_t}` `${_f}`
|
||||
!else
|
||||
!error "Please !define LOGICLIB_SECTIONCMP above !include LogicLib.nsh and recompile"
|
||||
!endif
|
||||
!macroend
|
||||
!define SectionIsSelected `${SF_SELECTED} SectionFlagIsSet`
|
||||
!define SectionIsSubSection `${SF_SUBSEC} SectionFlagIsSet`
|
||||
|
|
@ -315,6 +345,55 @@
|
|||
!define If `!insertmacro _If true`
|
||||
!define Unless `!insertmacro _If false`
|
||||
|
||||
!macro _And _c _a _o _b
|
||||
!verbose push
|
||||
!verbose ${LOGICLIB_VERBOSITY}
|
||||
!ifndef _Logic | ${_Logic}If
|
||||
!error "Cannot use And without a preceding If or Unless"
|
||||
!endif
|
||||
!ifndef ${_Logic}Else
|
||||
!error "Cannot use And following an Else"
|
||||
!endif
|
||||
!define _c=${_c}
|
||||
!ifdef _c=true ; If is true
|
||||
!insertmacro _${_o} `${_a}` `${_b}` "" ${${_Logic}Else}
|
||||
!else ; If condition is false
|
||||
!insertmacro _${_o} `${_a}` `${_b}` ${${_Logic}Else} ""
|
||||
!endif
|
||||
!undef _c=${_c}
|
||||
!verbose pop
|
||||
!macroend
|
||||
!define AndIf `!insertmacro _And true`
|
||||
!define AndUnless `!insertmacro _And false`
|
||||
|
||||
!macro _Or _c _a _o _b
|
||||
!verbose push
|
||||
!verbose ${LOGICLIB_VERBOSITY}
|
||||
!ifndef _Logic | ${_Logic}If
|
||||
!error "Cannot use Or without a preceding If or Unless"
|
||||
!endif
|
||||
!ifndef ${_Logic}Else
|
||||
!error "Cannot use Or following an Else"
|
||||
!endif
|
||||
!define _label _${__LINE__} ; Skip this test as we already
|
||||
Goto ${_label} ; have a successful result
|
||||
${${_Logic}Else}: ; Place the Else label
|
||||
!undef ${_Logic}Else ; and remove it
|
||||
!define ${_Logic}Else _${__LINE__} ; Get a label for the next Else and perform the new If
|
||||
!define _c=${_c}
|
||||
!ifdef _c=true ; If is true
|
||||
!insertmacro _${_o} `${_a}` `${_b}` "" ${${_Logic}Else}
|
||||
!else ; If condition is false
|
||||
!insertmacro _${_o} `${_a}` `${_b}` ${${_Logic}Else} ""
|
||||
!endif
|
||||
!undef _c=${_c}
|
||||
${_label}:
|
||||
!undef _label
|
||||
!verbose pop
|
||||
!macroend
|
||||
!define OrIf `!insertmacro _Or true`
|
||||
!define OrUnless `!insertmacro _Or false`
|
||||
|
||||
!macro _Else
|
||||
!verbose push
|
||||
!verbose ${LOGICLIB_VERBOSITY}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue