mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the Windwos installer

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2013-12-06 21:42:18 -08:00
parent 4f4b83ccbf
commit 9cb9dba7b6
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packaging/windows/subsurface.nsi.in
View file

@ -104,6 +104,7 @@ Section
File /r images File /r images
File /r icons File /r icons
File /r plugins File /r plugins
File /r Documentation
File /r translations File /r translations
File iconv.dll File iconv.dll
File libdivecomputer-0.dll File libdivecomputer-0.dll
@ -160,8 +161,16 @@ Section "Uninstall"
Delete "$INSTDIR\subsurface.exe" Delete "$INSTDIR\subsurface.exe"
Delete "$INSTDIR\subsurface.ico" Delete "$INSTDIR\subsurface.ico"
Delete "$INSTDIR\Uninstall.exe" Delete "$INSTDIR\Uninstall.exe"
Delete "$INSTDIR\qt.conf"
RMDir /r "$INSTDIR\share" RMDir /r "$INSTDIR\share"
RMDir /r "$INSTDIR\xslt" 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" RMDir "$INSTDIR"
# Remove shortcuts # Remove shortcuts

5
subsurface-install.pri
View file

@ -53,13 +53,14 @@ mac {
NSIINPUTFILE = $$PWD/$$WINDOWSSTAGING/subsurface.nsi.in NSIINPUTFILE = $$PWD/$$WINDOWSSTAGING/subsurface.nsi.in
MAKENSIS = /usr/bin/makensis MAKENSIS = /usr/bin/makensis
doc.path = $$WINDOWSSTAGING/Documentation
CONFIG -= copy_dir_files CONFIG -= copy_dir_files
deploy.path = $$WINDOWSSTAGING deploy.path = $$WINDOWSSTAGING
deploy.files += $$xslt.files $$doc.files $$icons.files deploy.files += $$xslt.files $$icons.files
deploy.CONFIG += no_check_exist deploy.CONFIG += no_check_exist
target.path = $$WINDOWSSTAGING target.path = $$WINDOWSSTAGING
marbledir.path = $$WINDOWSSTAGING/data marbledir.path = $$WINDOWSSTAGING/data
INSTALLS += deploy marbledir target INSTALLS += deploy marbledir target doc
translation.path = $$WINDOWSSTAGING/translations translation.path = $$WINDOWSSTAGING/translations
qttranslation.path = $$WINDOWSSTAGING/translations qttranslation.path = $$WINDOWSSTAGING/translations