diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-12-06 21:42:18 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-12-06 21:46:15 -0800 |
| commit | 9cb9dba7b6e927fec56ae87768520ee3f70082f0 (patch) | |
| tree | 79bdee9e47e8fffa643f69412c1499970b6d4056 | |
| parent | 4f4b83ccbf85574d4a062dad2e125c764831f0d2 (diff) | |
| download | subsurface-9cb9dba7b6e927fec56ae87768520ee3f70082f0.tar.gz | |
Fix the Windwos installer
Install the Documentation and include it in the installer.
Try and get all the directories and files removed in the uninstaller.
Where the heck does 'oldshare' come from?
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | packaging/windows/subsurface.nsi.in | 9 | ||||
| -rw-r--r-- | subsurface-install.pri | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in index 0d0471a20..272b53129 100644 --- a/packaging/windows/subsurface.nsi.in +++ b/packaging/windows/subsurface.nsi.in @@ -104,6 +104,7 @@ Section File /r images File /r icons File /r plugins + File /r Documentation File /r translations File iconv.dll File libdivecomputer-0.dll @@ -160,8 +161,16 @@ Section "Uninstall" Delete "$INSTDIR\subsurface.exe" Delete "$INSTDIR\subsurface.ico" Delete "$INSTDIR\Uninstall.exe" + Delete "$INSTDIR\qt.conf" RMDir /r "$INSTDIR\share" RMDir /r "$INSTDIR\xslt" + RMDir /r "$INSTDIR\data" + RMDir /r "$INSTDIR\icons" + RMDir /r "$INSTDIR\images" + RMDir /r "$INSTDIR\translations" + RMDir /r "$INSTDIR\oldshare" + RMDir /r "$INSTDIR\plugins" + RMDir /r "$INSTDIR\Documentation" RMDir "$INSTDIR" # Remove shortcuts diff --git a/subsurface-install.pri b/subsurface-install.pri index 3389dd104..d8ee34f80 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -53,13 +53,14 @@ mac { NSIINPUTFILE = $$PWD/$$WINDOWSSTAGING/subsurface.nsi.in MAKENSIS = /usr/bin/makensis + doc.path = $$WINDOWSSTAGING/Documentation CONFIG -= copy_dir_files deploy.path = $$WINDOWSSTAGING - deploy.files += $$xslt.files $$doc.files $$icons.files + deploy.files += $$xslt.files $$icons.files deploy.CONFIG += no_check_exist target.path = $$WINDOWSSTAGING marbledir.path = $$WINDOWSSTAGING/data - INSTALLS += deploy marbledir target + INSTALLS += deploy marbledir target doc translation.path = $$WINDOWSSTAGING/translations qttranslation.path = $$WINDOWSSTAGING/translations |