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

Renamed nsisconf.nsi to nsisconf.nsh since it is really a include file. The NSIS installer will rename the nsisconf.nsi file to nsh if present to prevent upgrade issues.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1259 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
rainwater 2002-10-01 23:03:34 +00:00
parent c9b3214463
commit 0257d4fbc5
5 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Docs/src/script.but
View file

@ -32,4 +32,4 @@ A NSIS Script File (.nsi) is just a text file with a series of commands.
\c you created that you want to keep, click No)" \ \c you created that you want to keep, click No)" \
\c IDNO NoRemoveLabel \c IDNO NoRemoveLabel
\b If a file named "nsisconf.nsi" in the same directory as makensis.exe exists, it will be included by default before any scripts (unless the /NOCONFIG command line parameter is used. \b If a file named "nsisconf.nsh" in the same directory as makensis.exe exists, it will be included by default before any scripts (unless the /NOCONFIG command line parameter is used.

2
Docs/src/usage.but
View file

@ -13,7 +13,7 @@ NSIS installers are generated by using the 'MakeNSIS' program to compile a NSIS
\b /PAUSE makes Makensis pause before quitting, which is useful when executing directly from Windows (the auto-installed shell extensions use it). \b /PAUSE makes Makensis pause before quitting, which is useful when executing directly from Windows (the auto-installed shell extensions use it).
\b /NOCONFIG disables inclusion of [path to makensis.exe]\\nsisconf.nsi . Without this parameter, installer defaults are set from nsisconf.nsi. See NSIS Configuration File. \b /NOCONFIG disables inclusion of [path to makensis.exe]\\nsisconf.nsh . Without this parameter, installer defaults are set from nsisconf.nsi. See NSIS Configuration File.
\b /CMDHELP prints basic usage information for command (if specified), or all commands (if command is not specified). \b /CMDHELP prints basic usage information for command (if specified), or all commands (if command is not specified).

6
Examples/makensis.nsi
View file

@ -47,8 +47,10 @@ Section "NSIS Development System (required)" SecCore
File ..\makensisw.exe File ..\makensisw.exe
File ..\makensis.htm File ..\makensis.htm
File ..\license.txt File ..\license.txt
IfFileExists $INSTDIR\nsisconf.nsi "" +2
Rename $INSTDIR\nsisconf.nsi $INSTDIR\nsisconf.nsh
SetOverwrite off SetOverwrite off
File ..\nsisconf.nsi File ..\nsisconf.nsh
SetOverwrite try SetOverwrite try
SetOutPath $INSTDIR\Docs SetOutPath $INSTDIR\Docs
@ -62,7 +64,6 @@ SectionEnd
Section "NSIS Examples (recommended)" SecExample Section "NSIS Examples (recommended)" SecExample
SectionIn 1 2 3 SectionIn 1 2 3
SetOutPath $INSTDIR\Examples SetOutPath $INSTDIR\Examples
Delete $INSTDIR\*.nsh
Delete $INSTDIR\viewhtml.nsi Delete $INSTDIR\viewhtml.nsi
Delete $INSTDIR\waplugin.nsi Delete $INSTDIR\waplugin.nsi
Delete $INSTDIR\example*.nsi Delete $INSTDIR\example*.nsi
@ -657,6 +658,7 @@ Section Uninstall
Delete $INSTDIR\license.txt Delete $INSTDIR\license.txt
Delete $INSTDIR\uninst-nsis.exe Delete $INSTDIR\uninst-nsis.exe
Delete $INSTDIR\nsisconf.nsi Delete $INSTDIR\nsisconf.nsi
Delete $INSTDIR\nsisconf.nsh
Delete $INSTDIR\Examples\makensis.nsi Delete $INSTDIR\Examples\makensis.nsi
Delete $INSTDIR\Examples\example1.nsi Delete $INSTDIR\Examples\example1.nsi
Delete $INSTDIR\Examples\example2.nsi Delete $INSTDIR\Examples\example2.nsi

4
Source/makenssi.cpp
View file

@ -247,7 +247,7 @@ int main(int argc, char **argv)
while (*p) p++; while (*p) p++;
while (p > exepath && *p != '\\') p=CharPrev(exepath,p); while (p > exepath && *p != '\\') p=CharPrev(exepath,p);
if (p>exepath) p++; if (p>exepath) p++;
strcpy(p,"nsisconf.nsi"); strcpy(p,"nsisconf.nsh");
FILE *cfg=fopen(exepath,"rt"); FILE *cfg=fopen(exepath,"rt");
if (cfg) if (cfg)
{ {
@ -370,7 +370,7 @@ int main(int argc, char **argv)
" /Vx verbosity where x is 4=all,3=no script,2=no info,1=no warnings,0=none\n" " /Vx verbosity where x is 4=all,3=no script,2=no info,1=no warnings,0=none\n"
" /Ofile specifies a text file to log compiler output (default is stdout)\n" " /Ofile specifies a text file to log compiler output (default is stdout)\n"
" /PAUSE pauses after execution\n" " /PAUSE pauses after execution\n"
" /NOCONFIG disables inclusion of <path to makensis.exe>\\nsisconf.nsi\n" " /NOCONFIG disables inclusion of <path to makensis.exe>\\nsisconf.nsh\n"
" /CD makes makensis change the current directory to that of the .nsi file\n" " /CD makes makensis change the current directory to that of the .nsi file\n"
" /Ddefine[=value] defines the symbol \"define\" for the script [to value]\n" " /Ddefine[=value] defines the symbol \"define\" for the script [to value]\n"
" /Xscriptcmd executes scriptcmd in script (i.e. \"/XOutFile poop.exe\")\n" " /Xscriptcmd executes scriptcmd in script (i.e. \"/XOutFile poop.exe\")\n"

21
nsisconf.nsh Normal file
View file

@ -0,0 +1,21 @@
; this file sets the defaults that will be used
; this file is treated as if it is in the directory
; that you are building from. i.e. the command
; File whatever.dat
; would need whatever.dat to be in your build directory
; (not necessarily the same directory as this file)
; if you want to change the default icon or bitmaps, you can do it here.
;Icon "${NSISDIR}\Contrib\Icons\setup.ico"
;CheckBitmap "${NSISDIR}\Contrib\Icons\checks4.bmp"
; if you want to define symbols, whatever, you can do that to.
;!define poo
;use one of these if you have upx or petite installed
;note that your exe packer should not pack the first icon :)
;and paths should ideally be absolute (since you could be
;building your installer anywhere)
;!packhdr tmp.dat "C:\program files\upx\upx -9 -q tmp.dat"
;!packhdr tmp.dat "C:\program files\petite\petite -9 -b0 -r** -p0 -y tmp.dat"