mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-01 06:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Include icons in the Windows installer

Browse source 
Also fix the dependency / ordering issue with running makensis

Fixes #252

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-11-15 15:02:45 -08:00
parent 0c833ef03b
commit 06bf0e1849
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,6 +102,7 @@ Section
File /r xslt File /r xslt
File /r data File /r data
File /r images File /r images
File /r icons
File dll\iconv.dll File dll\iconv.dll
File dll\libdivecomputer-0.dll File dll\libdivecomputer-0.dll
File dll\libintl-8.dll File dll\libintl-8.dll

8
subsurface-install.pri
View file

@ -1,5 +1,6 @@
marbledir.files = $$MARBLEDIR marbledir.files = $$MARBLEDIR
xslt.files = $$XSLT_FILES xslt.files = $$XSLT_FILES
icons.files = $$ICONS_FILES
doc.files = $$DOC_FILES doc.files = $$DOC_FILES
translation.files = $$replace(TRANSLATIONS, .ts, .qm) translation.files = $$replace(TRANSLATIONS, .ts, .qm)
qttranslation.files = $$join(QTTRANSLATIONS," "$$[QT_INSTALL_TRANSLATIONS]/,$$[QT_INSTALL_TRANSLATIONS]/) qttranslation.files = $$join(QTTRANSLATIONS," "$$[QT_INSTALL_TRANSLATIONS]/,$$[QT_INSTALL_TRANSLATIONS]/)
@ -46,7 +47,7 @@ mac {
MAKENSIS = /usr/bin/makensis MAKENSIS = /usr/bin/makensis
deploy.path = $$WINDOWSSTAGING deploy.path = $$WINDOWSSTAGING
deploy.files += $$xslt.files $$doc.files deploy.files += $$xslt.files $$doc.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
@ -81,8 +82,9 @@ mac {
nsis.target = $$NSISFILE nsis.target = $$NSISFILE
installer.commands += $$MAKENSIS $$NSIFILE installer.commands += $$MAKENSIS $$NSIFILE
installer.target = installer installer.target = installer
installer.depends = nsis installer.depends = nsis install
install.depends += dlls nsis installer QMAKE_EXTRA_TARGETS = installer nsis
install.depends += dlls
} }
} else { } else {
# Linux install rules # Linux install rules

1
subsurface.pro
View file

@ -171,6 +171,7 @@ mac: ICON = packaging/macosx/Subsurface.icns
else: ICON = subsurface-icon.svg else: ICON = subsurface-icon.svg
MANPAGE = subsurface.1 MANPAGE = subsurface.1
XSLT_FILES = xslt XSLT_FILES = xslt
ICONS_FILES = icons
DOC_FILES = $$OUT_PWD/Documentation/user-manual.html Documentation/images DOC_FILES = $$OUT_PWD/Documentation/user-manual.html Documentation/images
MARBLEDIR = marbledata/maps marbledata/bitmaps MARBLEDIR = marbledata/maps marbledata/bitmaps
DEPLOYMENT_PLUGIN += imageformats/qjpeg DEPLOYMENT_PLUGIN += imageformats/qjpeg