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

extract CallArtificialFunction to Util.nsh

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5780 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2008-11-21 00:04:05 +00:00
parent 8e06903fc9
commit 7c1a3aa639
3 changed files with 37 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Include/SConscript
View file

@ -11,6 +11,7 @@ includes = Split("""
StrFunc.nsh StrFunc.nsh
TextFunc.nsh TextFunc.nsh
UpgradeDLL.nsh UpgradeDLL.nsh
Util.nsh
VB6RunTime.nsh VB6RunTime.nsh
WinMessages.nsh WinMessages.nsh
WinVer.nsh WinVer.nsh

35
Include/Util.nsh Normal file
View file

@ -0,0 +1,35 @@
; ---------------------
; Util.nsh
; ---------------------
;
; Voodoo macros to make end-user usage easier. This may be documented someday.
!verbose push
!verbose 3
!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}:
!insertmacro ${NAME}
Return
${NAME}${CallArtificialFunction_TYPE}_DONE:
!endif
!undef CallArtificialFunction_TYPE
!macroend
!define CallArtificialFunction `!insertmacro CallArtificialFunction`
!endif # !___UTIL__NSH___
!verbose pop

20
Include/WinVer.nsh
View file

@ -83,6 +83,7 @@
!define ___WINVER__NSH___ !define ___WINVER__NSH___
!include LogicLib.nsh !include LogicLib.nsh
!include Util.nsh
!define WINVER_95 0x400 !define WINVER_95 0x400
!define WINVER_98 0x40A ;4.10 !define WINVER_98 0x40A ;4.10
@ -94,25 +95,6 @@
!define WINVER_2003 0x502 !define WINVER_2003 0x502
!define WINVER_VISTA 0x600 !define WINVER_VISTA 0x600
!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}:
!insertmacro ${NAME}
Return
${NAME}${CallArtificialFunction_TYPE}_DONE:
!endif
!undef CallArtificialFunction_TYPE
!macroend
!define CallArtificialFunction `!insertmacro CallArtificialFunction`
!macro __GetWinVer !macro __GetWinVer
!insertmacro _LOGICLIB_TEMP !insertmacro _LOGICLIB_TEMP
System::Call kernel32::GetVersion()i.s System::Call kernel32::GetVersion()i.s