Mercurial > trustbridge > trustbridge
diff 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 |
line wrap: on
line diff
--- a/packaging/trustbridge.nsi Mon Sep 22 15:36:57 2014 +0200 +++ b/packaging/trustbridge.nsi Mon Sep 22 15:37:32 2014 +0200 @@ -28,6 +28,7 @@ !define MULTIUSER_INSTALLMODE_INSTDIR "${productname_short}" !addplugindir "${plugin_dir}" +!addincludedir "${plugin_dir}" !include "MultiUser.nsh" !include "MUI2.nsh" @@ -207,7 +208,8 @@ continue: ; The actual installation SetOutPath "$INSTDIR" - !include "filelist.nsh" + !include "filelist_in.nsh" + SetOutPath "$INSTDIR" ;Create uninstaller !ifndef WRITE_UNINSTALLER @@ -273,10 +275,9 @@ ExpandEnvStrings $0 %LOCALAPPDATA% nsExec::ExecToLog '"$INSTDIR\trustbridge-certificate-installer.exe" "list=$0\BSI\TrustBridge\list-installed.txt" "choices=uninstall"' skip_certs: - RMDir /r "$INSTDIR" ; TODO (issue137) include uninstall files -; !include "filelist-un.nsh" -; Delete "$INSTDIR\Uninstall.exe" -; RMDir "$INSTDIR" + !include "filelist_un.nsh" + Delete "$INSTDIR\Uninstall.exe" + RMDir "$INSTDIR" !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder