updated reserve file macros

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3003 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
joostverburg 2003-10-08 15:28:44 +00:00
parent 5eff3bd5da
commit aaf63af9f6
9 changed files with 47 additions and 107 deletions

View file

@ -21,7 +21,7 @@
InstallDirRegKey HKCU "Software\Modern UI Test" ""
;--------------------------------
;Modern UI Configuration
;Interface Settings
!define MUI_ABORTWARNING

View file

@ -42,14 +42,6 @@
!insertmacro MUI_LANGUAGE "English"
;--------------------------------
;Reserve Files
;Things that need to be extracted on first (keep these lines before any File command!)
;Only for BZIP2 compression
ReserveFile "${NSISDIR}\Contrib\Graphics\Header\nsis.bmp"
;--------------------------------
;Installer Sections

View file

@ -20,11 +20,6 @@
;Get install folder from registry if available
InstallDirRegKey HKCU "Software\Modern UI Test" ""
;--------------------------------
;Variables
Var MUI_TEMP
;--------------------------------
;Pages
@ -40,7 +35,7 @@
!insertmacro MUI_UNPAGE_INSTFILES
;--------------------------------
;Modern UI Configuration
;Interface Settings
!define MUI_ABORTWARNING
@ -52,14 +47,20 @@
;--------------------------------
;Reserve Files
;Things that need to be extracted on first (keep these lines before any File command!)
;Only for BZIP2 compression
;These files should be inserted before other files in the data block
;Keep these lines before any File command
;Only for BZIP2 (solid) compression
ReserveFile "ioA.ini"
ReserveFile "ioB.ini"
ReserveFile "ioC.ini"
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
;--------------------------------
;Variables
Var INI_VALUE
;--------------------------------
;Installer Sections
@ -76,10 +77,10 @@ Section "Dummy Section" SecDummy
WriteUninstaller "$INSTDIR\Uninstall.exe"
;Read a value from an InstallOptions INI file
!insertmacro MUI_INSTALLOPTIONS_READ $MUI_TEMP "ioC.ini" "Field 2" "State"
!insertmacro MUI_INSTALLOPTIONS_READ $INI_VALUE "ioC.ini" "Field 2" "State"
;Display a messagebox if check box was checked
StrCmp $MUI_TEMP "1" "" +2
StrCmp $INI_VALUE "1" "" +2
MessageBox MB_OK "You checked the check box, here is the MessageBox..."
SectionEnd

View file

@ -21,12 +21,7 @@
InstallDirRegKey HKCU "Software\Modern UI Test" ""
;--------------------------------
;Modern UI Configuration
;Remember the installer language
!define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
!define MUI_LANGDLL_REGISTRY_KEY "Software\Modern UI Test"
!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
;Interface Settings
!define MUI_ABORTWARNING
@ -78,8 +73,9 @@
;--------------------------------
;Reserve Files
;Things that need to be extracted on first (keep these lines before any File command!)
;Only for BZIP2 compression
;These files should be inserted before other files in the data block
;Keep these lines before any File command
;Only for BZIP2 (solid) compression
!insertmacro MUI_RESERVEFILE_LANGDLL
;--------------------------------
@ -104,6 +100,11 @@ SectionEnd
Function .onInit
;Remember the installer language
!define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
!define MUI_LANGDLL_REGISTRY_KEY "Software\Modern UI Test"
!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
!insertmacro MUI_LANGDLL_DISPLAY
FunctionEnd

View file

@ -26,7 +26,7 @@
Var MUI_TEMP
;--------------------------------
;Modern UI Configuration
;Interface Settings
!define MUI_ABORTWARNING
@ -54,13 +54,6 @@
!insertmacro MUI_LANGUAGE "English"
;--------------------------------
;Reserve Files
;Things that need to be extracted on first (keep these lines before any File command!)
;Only for BZIP2 compression
!insertmacro MUI_RESERVEFILE_STARTMENU
;--------------------------------
;Installer Sections

View file

@ -21,7 +21,7 @@
InstallDirRegKey HKCU "Software\Modern UI Test" ""
;--------------------------------
;Modern UI Configuration
;Interface Settings
!define MUI_ABORTWARNING
@ -43,15 +43,6 @@
!insertmacro MUI_LANGUAGE "English"
;--------------------------------
;Reserve Files
;Things that need to be extracted on first (keep these lines before any File command!)
;Only for BZIP2 compression
!insertmacro MUI_RESERVEFILE_WELCOMEFINISHPAGE
ReserveFile "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
;--------------------------------
;Installer Sections

View file

@ -72,13 +72,6 @@ Caption "NSIS ${VER_DISPLAY} Setup"
!insertmacro MUI_LANGUAGE "English"
;--------------------------------
;Reserve Files
!insertmacro MUI_RESERVEFILE_WELCOMEFINISHPAGE
ReserveFile "${NSISDIR}\Contrib\Graphics\Wizard\win.bmp"
ReserveFile "${NSISDIR}\Contrib\Graphics\Header\nsis.bmp"
;--------------------------------
;Installer Sections