Mercurial > trustbridge
comparison packaging/trustbridge.nsi @ 1188:eb77ddd7e1ab
(issue137) Generate and include install / uninstall file lists
author | Andre Heinecke <andre.heinecke@intevation.de> |
---|---|
date | Mon, 22 Sep 2014 15:37:32 +0200 |
parents | c8f698ca6355 |
children | c072dda0b541 |
comparison
equal
deleted
inserted
replaced
1187:913867a8bf40 | 1188:eb77ddd7e1ab |
---|---|
26 !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "Software\${productname_short}" | 26 !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "Software\${productname_short}" |
27 !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME "" | 27 !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME "" |
28 !define MULTIUSER_INSTALLMODE_INSTDIR "${productname_short}" | 28 !define MULTIUSER_INSTALLMODE_INSTDIR "${productname_short}" |
29 | 29 |
30 !addplugindir "${plugin_dir}" | 30 !addplugindir "${plugin_dir}" |
31 !addincludedir "${plugin_dir}" | |
31 | 32 |
32 !include "MultiUser.nsh" | 33 !include "MultiUser.nsh" |
33 !include "MUI2.nsh" | 34 !include "MUI2.nsh" |
34 !include "FileFunc.nsh" | 35 !include "FileFunc.nsh" |
35 !include "WinVer.nsh" | 36 !include "WinVer.nsh" |
205 ; lets give it a chance to avoid failing to overwrite it | 206 ; lets give it a chance to avoid failing to overwrite it |
206 Sleep 1000 | 207 Sleep 1000 |
207 continue: | 208 continue: |
208 ; The actual installation | 209 ; The actual installation |
209 SetOutPath "$INSTDIR" | 210 SetOutPath "$INSTDIR" |
210 !include "filelist.nsh" | 211 !include "filelist_in.nsh" |
212 SetOutPath "$INSTDIR" | |
211 | 213 |
212 ;Create uninstaller | 214 ;Create uninstaller |
213 !ifndef WRITE_UNINSTALLER | 215 !ifndef WRITE_UNINSTALLER |
214 File "${files_dir}${path_sep}Uninstall.exe" | 216 File "${files_dir}${path_sep}Uninstall.exe" |
215 !endif | 217 !endif |
271 Section "Uninstall" | 273 Section "Uninstall" |
272 StrCmp "$douninstcertificates" "TRUE" 0 skip_certs | 274 StrCmp "$douninstcertificates" "TRUE" 0 skip_certs |
273 ExpandEnvStrings $0 %LOCALAPPDATA% | 275 ExpandEnvStrings $0 %LOCALAPPDATA% |
274 nsExec::ExecToLog '"$INSTDIR\trustbridge-certificate-installer.exe" "list=$0\BSI\TrustBridge\list-installed.txt" "choices=uninstall"' | 276 nsExec::ExecToLog '"$INSTDIR\trustbridge-certificate-installer.exe" "list=$0\BSI\TrustBridge\list-installed.txt" "choices=uninstall"' |
275 skip_certs: | 277 skip_certs: |
276 RMDir /r "$INSTDIR" ; TODO (issue137) include uninstall files | 278 !include "filelist_un.nsh" |
277 ; !include "filelist-un.nsh" | 279 Delete "$INSTDIR\Uninstall.exe" |
278 ; Delete "$INSTDIR\Uninstall.exe" | 280 RMDir "$INSTDIR" |
279 ; RMDir "$INSTDIR" | |
280 | 281 |
281 !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder | 282 !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder |
282 | 283 |
283 DeleteRegValue SHCTX "Software\${productname_short}" "Start Menu Folder" | 284 DeleteRegValue SHCTX "Software\${productname_short}" "Start Menu Folder" |
284 | 285 |