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

!insertmacro allows macro recursion (RFE #497)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6511 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-07-04 23:27:04 +00:00
parent 7ee1a114a9
commit 0a8c72c950
4 changed files with 38 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Include/Util.nsh
View file

@ -8,46 +8,38 @@
!ifndef ___UTIL__NSH___
!define ___UTIL__NSH___
# see WinVer.nsh and *Func.nsh for usage examples
!macro CallArtificialFunction NAME
!ifndef __UNINSTALL__
!define CallArtificialFunction_TYPE inst
!else
!define CallArtificialFunction_TYPE uninst
!endif
Call :.${NAME}${CallArtificialFunction_TYPE}
!ifndef ${NAME}${CallArtificialFunction_TYPE}_DEFINED
Goto ${NAME}${CallArtificialFunction_TYPE}_DONE
!define ${NAME}${CallArtificialFunction_TYPE}_DEFINED
.${NAME}${CallArtificialFunction_TYPE}:
# CallArtificialFunction, see WinVer.nsh and *Func.nsh for usage examples
!macro CallArtificialFunctionHelper TYPE NAME
!verbose pop
Call :.${NAME}${TYPE}
!ifndef ${NAME}${TYPE}_DEFINED
!verbose push 2
Goto ${NAME}${TYPE}_DONE
!define ${NAME}${TYPE}_DEFINED
!verbose pop
.${NAME}${TYPE}:
!insertmacro ${NAME}
Return
${NAME}${CallArtificialFunction_TYPE}_DONE:
Return
${NAME}${TYPE}_DONE:
!endif
!undef CallArtificialFunction_TYPE
!verbose push 2
!macroend
!macro CallArtificialFunction NAME
!verbose push 2
!ifdef __UNINSTALL__
!insertmacro CallArtificialFunctionHelper uninst ${NAME}
!else
!insertmacro CallArtificialFunctionHelper inst ${NAME}
!endif
!verbose pop
!macroend
!define CallArtificialFunction `!insertmacro CallArtificialFunction`
# for usage of artificial functions inside artificial functions
# macro recursion is prohibited
!macro CallArtificialFunction2 NAME
!ifndef __UNINSTALL__
!define CallArtificialFunction2_TYPE inst
!else
!define CallArtificialFunction2_TYPE uninst
!endif
Call :.${NAME}${CallArtificialFunction2_TYPE}
!ifndef ${NAME}${CallArtificialFunction2_TYPE}_DEFINED
Goto ${NAME}${CallArtificialFunction2_TYPE}_DONE
!define ${NAME}${CallArtificialFunction2_TYPE}_DEFINED
.${NAME}${CallArtificialFunction2_TYPE}:
!insertmacro ${NAME}
Return
${NAME}${CallArtificialFunction2_TYPE}_DONE:
!endif
!undef CallArtificialFunction2_TYPE
!macro CallArtificialFunction2 NAME ; Retained for v2.4x..v3.0b0 compatibility
${CallArtificialFunction} ${NAME}
!macroend
!define CallArtificialFunction2 `!insertmacro CallArtificialFunction2`
!define CallArtificialFunction2 `!insertmacro CallArtificialFunction`
!define Int32Op '!insertmacro Int32Op '