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

check whether function from StrFunc.nsh is already included

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5616 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2008-05-01 20:31:23 +00:00
parent 1a999b33e1
commit 71b46b45c3
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Contrib/MultiUser/MultiUser.nsh
View file

@ -36,9 +36,13 @@ Var MultiUser.InstallMode
!insertmacro un.GetParameters !insertmacro un.GetParameters
!endif !endif
!include StrFunc.nsh !include StrFunc.nsh
${StrStr} !ifndef StrStr_INCLUDED
${StrStr}
!endif
!ifndef MULTIUSER_NOUNINSTALL !ifndef MULTIUSER_NOUNINSTALL
${UnStrStr} !ifndef UnStrStr_INCLUDED
${UnStrStr}
!endif
!endif !endif
Var MultiUser.Parameters Var MultiUser.Parameters

2
Include/StrFunc.nsh
View file

@ -85,12 +85,14 @@ o-----------------------------------------------------------------------------o
!echo `${STRFUNC_FUNCMSGPRE}$ {Un${ShortName}} - © ${Credits}${STRFUNC_FUNCMSGPOST}` !echo `${STRFUNC_FUNCMSGPRE}$ {Un${ShortName}} - © ${Credits}${STRFUNC_FUNCMSGPOST}`
!verbose pop !verbose pop
!define `Un${ShortName}` `!insertmacro FUNCTION_STRING_Un${ShortName}_Call` !define `Un${ShortName}` `!insertmacro FUNCTION_STRING_Un${ShortName}_Call`
!define `Un${ShortName}_INCLUDED`
Function `un.${ShortName}` Function `un.${ShortName}`
!else !else
!echo `${STRFUNC_FUNCMSGPRE}$ {${ShortName}} - © ${Credits}${STRFUNC_FUNCMSGPOST}` !echo `${STRFUNC_FUNCMSGPRE}$ {${ShortName}} - © ${Credits}${STRFUNC_FUNCMSGPOST}`
!verbose pop !verbose pop
!undef `${ShortName}` !undef `${ShortName}`
!define `${ShortName}` `!insertmacro FUNCTION_STRING_${ShortName}_Call` !define `${ShortName}` `!insertmacro FUNCTION_STRING_${ShortName}_Call`
!define `${ShortName}_INCLUDED`
Function `${ShortName}` Function `${ShortName}`
!endif !endif
!macroend !macroend