!if${global} killed the block ignore code

!ifdef a
!if${something}
!endif # this will close the first !if, because ${something} is invalid
!endif


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4910 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-01-27 16:01:48 +00:00
parent 910ed492ab
commit e8f7406c59

View file

@ -144,41 +144,41 @@ SectionEnd
# test scopes # test scopes
!macro TEST_SCOPES scope global section function pageex uninstall !macro TEST_SCOPE scope def should_exist
!if${global} __GLOBAL__ !if ${should_exist} == y
!error "__GLOBAL__ error in ${scope} scope" !ifndef ${def}
!endif !error "${def} not defined in ${scope} scope"
!endif
!if${section} __SECTION__ !else
!error "__SECTION__ error in ${scope} scope" !ifdef ${def}
!endif !error "${def} defined in ${scope} scope"
!endif
!if${function} __FUNCTION__
!error "__FUNCTION__ error in ${scope} scope"
!endif
!if${uninstall} __UNINSTALL__
!error "__UNINSTALL__ error in ${scope} scope"
!endif
!if${pageex} __PAGEEX__
!error "__PAGEEX__ error in ${scope} scope"
!endif !endif
!macroend !macroend
!insertmacro TEST_SCOPES "global" ndef def def def def !macro TEST_SCOPES scope global section function pageex uninstall
!insertmacro TEST_SCOPE "${scope}" __GLOBAL__ ${global}
!insertmacro TEST_SCOPE "${scope}" __SECTION__ ${section}
!insertmacro TEST_SCOPE "${scope}" __FUNCTION__ ${function}
!insertmacro TEST_SCOPE "${scope}" __PAGEEX__ ${pageex}
!insertmacro TEST_SCOPE "${scope}" __UNINSTALL__ ${uninstall}
!macroend
!insertmacro TEST_SCOPES "global" y n n n n
Section test Section test
!insertmacro TEST_SCOPES "section" def ndef def def def !insertmacro TEST_SCOPES "section" n y n n n
!if ${__SECTION__} != test !if ${__SECTION__} != test
!error "invalid __SECTION__ value" !error "invalid __SECTION__ value"
!endif !endif
SectionEnd SectionEnd
Section un.test Section un.test
!insertmacro TEST_SCOPES "uninstall section" def ndef def def ndef !insertmacro TEST_SCOPES "uninstall section" n y n n y
!if ${__SECTION__} != test !if ${__SECTION__} != test
!error "invalid __SECTION__ value" !error "invalid __SECTION__ value"
!endif !endif
@ -186,7 +186,7 @@ SectionEnd
Function test Function test
Call test # avoid warning Call test # avoid warning
!insertmacro TEST_SCOPES "function" def def ndef def def !insertmacro TEST_SCOPES "function" n n y n n
!if ${__FUNCTION__} != test !if ${__FUNCTION__} != test
!error "invalid __FUNCTION__ value" !error "invalid __FUNCTION__ value"
!endif !endif
@ -194,21 +194,21 @@ FunctionEnd
Function un.test Function un.test
Call un.test # avoid warning Call un.test # avoid warning
!insertmacro TEST_SCOPES "uninstall function" def def ndef def ndef !insertmacro TEST_SCOPES "uninstall function" n n y n y
!if ${__FUNCTION__} != test !if ${__FUNCTION__} != test
!error "invalid __FUNCTION__ value" !error "invalid __FUNCTION__ value"
!endif !endif
FunctionEnd FunctionEnd
PageEx instfiles PageEx instfiles
!insertmacro TEST_SCOPES "pageex" def def def ndef def !insertmacro TEST_SCOPES "pageex" n n n y n
PageExEnd PageExEnd
PageEx un.instfiles PageEx un.instfiles
!insertmacro TEST_SCOPES "uninstall pageex" def def def ndef ndef !insertmacro TEST_SCOPES "uninstall pageex" n n n y y
PageExEnd PageExEnd
!insertmacro TEST_SCOPES "global" ndef def def def def !insertmacro TEST_SCOPES "global" y n n n n
!else !else