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

Reduce define spew from included files

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6264 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2012-09-17 12:37:03 +00:00
parent 2cf9ecc10e
commit b0c40ee3b5
5 changed files with 39 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Contrib/Modern UI 2/MUI2.nsh
View file

@ -5,23 +5,17 @@ Copyright 2002-2009 Joost Verburg
*/
!ifndef MUI_INCLUDED
!echo "NSIS Modern User Interface version 2.0 - Copyright 2002-2009 Joost Verburg"
;--------------------------------
!ifndef MUI_INCLUDED
!define MUI_INCLUDED
!define MUI_SYSVERSION "2.0"
!verbose push
!ifndef MUI_VERBOSE
!define MUI_VERBOSE 3
!endif
!verbose push 3
!define /IfNDef MUI_VERBOSE 3
!verbose ${MUI_VERBOSE}
!define MUI_INCLUDED
!define MUI_SYSVERSION "2.0"
!addincludedir "${NSISDIR}\Contrib\Modern UI 2"
;--------------------------------
@ -117,6 +111,5 @@ Copyright 2002-2009 Joost Verburg
!macroend
!endif
!verbose pop
!endif

16
Contrib/Modern UI/System.nsh
View file

@ -5,22 +5,17 @@ Copyright 2002-2009 Joost Verburg
*/
!ifndef MUI_INCLUDED
!echo "NSIS Modern User Interface version 1.8 - Copyright 2002-2009 Joost Verburg"
;--------------------------------
!verbose push 3
!define /IfNDef MUI_VERBOSE 3
!verbose ${MUI_VERBOSE}
!ifndef MUI_INCLUDED
!define MUI_INCLUDED
!define MUI_SYSVERSION "1.8"
!verbose push
!ifndef MUI_VERBOSE
!define MUI_VERBOSE 3
!endif
!verbose ${MUI_VERBOSE}
;--------------------------------
;HEADER FILES, DECLARATIONS
@ -2201,6 +2196,5 @@ Var MUI_TEMP2
;--------------------------------
;END
!endif
!verbose pop
!endif

21
Include/FileFunc.nsh
View file

@ -67,24 +67,20 @@ RefreshShellIcons
; ${FILEFUNC_VERBOSE} 3 # no script
!ifndef FILEFUNC_INCLUDED
!verbose push 3
!define /IfNDef _FILEFUNC_VERBOSE 3
!verbose ${_FILEFUNC_VERBOSE}
!define FILEFUNC_VERBOSE `!insertmacro FILEFUNC_VERBOSE`
!define FILEFUNC_INCLUDED
!include Util.nsh
!verbose push
!verbose 3
!ifndef _FILEFUNC_VERBOSE
!define _FILEFUNC_VERBOSE 3
!endif
!verbose ${_FILEFUNC_VERBOSE}
!define FILEFUNC_VERBOSE `!insertmacro FILEFUNC_VERBOSE`
!verbose pop
!macro FILEFUNC_VERBOSE _VERBOSE
!verbose push
!verbose 3
!undef _FILEFUNC_VERBOSE
!define _FILEFUNC_VERBOSE ${_VERBOSE}
!verbose push 3
!define /ReDef _FILEFUNC_VERBOSE ${_VERBOSE}
!verbose pop
!macroend
@ -2015,4 +2011,5 @@ RefreshShellIcons
!verbose pop
!macroend
!verbose pop
!endif

21
Include/TextFunc.nsh
View file

@ -54,25 +54,21 @@ TrimNewLines
; ${TEXTFUNC_VERBOSE} 3 # no script
!ifndef TEXTFUNC_INCLUDED
!verbose push 3
!define /IfNDef _TEXTFUNC_VERBOSE 3
!verbose ${_TEXTFUNC_VERBOSE}
!define TEXTFUNC_VERBOSE `!insertmacro TEXTFUNC_VERBOSE`
!define TEXTFUNC_INCLUDED
!include FileFunc.nsh
!include Util.nsh
!verbose push
!verbose 3
!ifndef _TEXTFUNC_VERBOSE
!define _TEXTFUNC_VERBOSE 3
!endif
!verbose ${_TEXTFUNC_VERBOSE}
!define TEXTFUNC_VERBOSE `!insertmacro TEXTFUNC_VERBOSE`
!verbose pop
!macro TEXTFUNC_VERBOSE _VERBOSE
!verbose push
!verbose 3
!undef _TEXTFUNC_VERBOSE
!define _TEXTFUNC_VERBOSE ${_VERBOSE}
!verbose push 3
!define /ReDef _TEXTFUNC_VERBOSE ${_VERBOSE}
!verbose pop
!macroend
@ -1211,4 +1207,5 @@ TrimNewLines
!verbose pop
!macroend
!verbose pop
!endif

21
Include/WordFunc.nsh
View file

@ -50,24 +50,20 @@ VersionConvert
; ${WORDFUNC_VERBOSE} 3 # no script
!ifndef WORDFUNC_INCLUDED
!verbose push 3
!define /IfNDef _WORDFUNC_VERBOSE 3
!verbose ${_WORDFUNC_VERBOSE}
!define WORDFUNC_VERBOSE `!insertmacro WORDFUNC_VERBOSE`
!define WORDFUNC_INCLUDED
!include Util.nsh
!verbose push
!verbose 3
!ifndef _WORDFUNC_VERBOSE
!define _WORDFUNC_VERBOSE 3
!endif
!verbose ${_WORDFUNC_VERBOSE}
!define WORDFUNC_VERBOSE `!insertmacro WORDFUNC_VERBOSE`
!verbose pop
!macro WORDFUNC_VERBOSE _VERBOSE
!verbose push
!verbose 3
!undef _WORDFUNC_VERBOSE
!define _WORDFUNC_VERBOSE ${_VERBOSE}
!verbose push 3
!define /ReDef _WORDFUNC_VERBOSE ${_VERBOSE}
!verbose pop
!macroend
@ -1800,4 +1796,5 @@ VersionConvert
!verbose pop
!macroend
!verbose pop
!endif