applied part of patch #1248335 for greater portability

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4222 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-08-14 11:17:19 +00:00
parent 2a8231fbdb
commit 41d6460c4f
3 changed files with 11 additions and 11 deletions

View file

@ -16,7 +16,7 @@ SetCompress off
Name "BigNSISTest" Name "BigNSISTest"
Caption "NSIS Big Test" Caption "NSIS Big Test"
Icon "..\Contrib\Graphics\Icons\nsis1-install.ico" Icon "${NSISDIR}\Contrib\Graphics\Icons\nsis1-install.ico"
OutFile "bigtest.exe" OutFile "bigtest.exe"
SetDateSave on SetDateSave on
@ -30,7 +30,7 @@ XPStyle on
InstallDir "$PROGRAMFILES\NSISCrap\BigNSISTest" InstallDir "$PROGRAMFILES\NSISCrap\BigNSISTest"
InstallDirRegKey HKLM "Software\NSISCrap\BigNSISTest" "" InstallDirRegKey HKLM "Software\NSISCrap\BigNSISTest" ""
CheckBitmap "..\Contrib\Graphics\Checks\classic-cross.bmp" CheckBitmap "${NSISDIR}\Contrib\Graphics\Checks\classic-cross.bmp"
LicenseText "A test text, make sure it's all there" LicenseText "A test text, make sure it's all there"
LicenseData "bigtest.nsi" LicenseData "bigtest.nsi"
@ -277,7 +277,7 @@ FunctionEnd
; Uninstaller ; Uninstaller
UninstallText "This will uninstall example2. Hit next to continue." UninstallText "This will uninstall example2. Hit next to continue."
UninstallIcon "..\Contrib\Graphics\Icons\nsis1-uninstall.ico" UninstallIcon "${NSISDIR}\Contrib\Graphics\Icons\nsis1-uninstall.ico"
Section "Uninstall" Section "Uninstall"

View file

@ -2,7 +2,7 @@
; ;
; This script is perhaps one of the simplest NSIs you can make. All of the ; This script is perhaps one of the simplest NSIs you can make. All of the
; optional settings are left to their default settings. The installer simply ; optional settings are left to their default settings. The installer simply
; prompts the user asking them where to install, and drops a copy of makensisw.exe ; prompts the user asking them where to install, and drops a copy of example1.nsi
; there. ; there.
;-------------------------------- ;--------------------------------
@ -32,6 +32,6 @@ Section "" ;No components page, name is not important
SetOutPath $INSTDIR SetOutPath $INSTDIR
; Put file there ; Put file there
File ..\makensisw.exe File example1.nsi
SectionEnd ; end the section SectionEnd ; end the section

View file

@ -3,7 +3,7 @@
; This script is based on example1.nsi, but it remember the directory, ; This script is based on example1.nsi, but it remember the directory,
; has uninstall support and (optionally) installs start menu shortcuts. ; has uninstall support and (optionally) installs start menu shortcuts.
; ;
; It will install makensisw.exe into a directory that the user selects, ; It will install example2.nsi into a directory that the user selects,
;-------------------------------- ;--------------------------------
@ -42,7 +42,7 @@ Section "Example2 (required)"
SetOutPath $INSTDIR SetOutPath $INSTDIR
; Put file there ; Put file there
File "..\makensisw.exe" File "example2.nsi"
; Write the installation path into the registry ; Write the installation path into the registry
WriteRegStr HKLM SOFTWARE\NSIS_Example2 "Install_Dir" "$INSTDIR" WriteRegStr HKLM SOFTWARE\NSIS_Example2 "Install_Dir" "$INSTDIR"
@ -61,7 +61,7 @@ Section "Start Menu Shortcuts"
CreateDirectory "$SMPROGRAMS\Example2" CreateDirectory "$SMPROGRAMS\Example2"
CreateShortCut "$SMPROGRAMS\Example2\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0 CreateShortCut "$SMPROGRAMS\Example2\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
CreateShortCut "$SMPROGRAMS\Example2\Example2 (MakeNSISW).lnk" "$INSTDIR\makensisw.exe" "" "$INSTDIR\makensisw.exe" 0 CreateShortCut "$SMPROGRAMS\Example2\Example2 (MakeNSISW).lnk" "$INSTDIR\example2.nsi" "" "$INSTDIR\example2.nsi" 0
SectionEnd SectionEnd
@ -76,7 +76,7 @@ Section "Uninstall"
DeleteRegKey HKLM SOFTWARE\NSIS_Example2 DeleteRegKey HKLM SOFTWARE\NSIS_Example2
; Remove files and uninstaller ; Remove files and uninstaller
Delete $INSTDIR\makensisw.exe Delete $INSTDIR\example2.nsi
Delete $INSTDIR\uninstall.exe Delete $INSTDIR\uninstall.exe
; Remove shortcuts, if any ; Remove shortcuts, if any
@ -86,4 +86,4 @@ Section "Uninstall"
RMDir "$SMPROGRAMS\Example2" RMDir "$SMPROGRAMS\Example2"
RMDir "$INSTDIR" RMDir "$INSTDIR"
SectionEnd SectionEnd