diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-11-05 13:01:47 +0900 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-11-05 13:05:14 +0900 |
| commit | 9383693928b4393fd28bb52761c9cae4257e3829 (patch) | |
| tree | b953c4d0cf30e6849d8e439be9ccb1213a321999 /subsurface-install.pri | |
| parent | 7966f72fb78ef56a447ea6f33490dfec96c9d034 (diff) | |
| download | subsurface-9383693928b4393fd28bb52761c9cae4257e3829.tar.gz | |
Create installer with qmake
This is seriously flawed. makensis is run twice for some reason. I also
noticed that the data and xslt directories under packaging/windows aren't
created when running make install. Running
make -f Makefile.Release install_marbledir install_deploy
works, but obviously this should be taken care of by the dependency.
The installed binary under Windows is not finding its icon, the
translations are missing... lots of work left to do here.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-install.pri')
| -rw-r--r-- | subsurface-install.pri | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/subsurface-install.pri b/subsurface-install.pri index 26bffaca7..4a41bfcf2 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -41,6 +41,9 @@ mac { # which libs we need. # The only target is "make install", which copies everything into packaging/windows WINDOWSSTAGING = packaging/windows + NSIFILE = $$WINDOWSSTAGING/subsurface.nsi + NSIINPUTFILE = $$WINDOWSSTAGING/subsurface.nsi.in + MAKENSIS = /usr/bin/makensis deploy.path = $$WINDOWSSTAGING deploy.files += $$xslt.files $$doc.files @@ -58,7 +61,8 @@ mac { #!equals($$QMAKE_HOST.os, "Windows"): dlls.commands += OBJDUMP=`$$QMAKE_CC -dumpmachine`-objdump dlls.commands += PATH=\$\$PATH:`$$QMAKE_CC -print-search-dirs | sed -nE \'/^libraries: =/{s///;s,/lib/?(:|\$\$),/bin\\1,g;p;q;}\'` dlls.commands += perl $$PWD/scripts/win-ldd.pl - equals(QMAKE_HOST.os, "Windows"): EXE_SUFFIX = .exe + # equals(QMAKE_HOST.os, "Windows"): EXE_SUFFIX = .exe + EXE_SUFFIX = .exe CONFIG(debug, debug|release): dlls.commands += $$PWD/debug/subsurface$$EXE_SUFFIX else: dlls.commands += $$PWD/release/$$TARGET$$EXE_SUFFIX @@ -70,7 +74,14 @@ mac { dlls.commands += $$LIBS dlls.commands += | while read name; do $(INSTALL_FILE) \$\$name $$PWD/$$WINDOWSSTAGING; done dlls.depends += $(DESTDIR_TARGET) - install.depends += dlls + + nsis.commands += cat $$NSIINPUTFILE | sed -e \'s/VERSIONTOKEN/$$VERSION_STRING/;s/PRODVTOKEN/$${PRODVERSION_STRING}/\' > $$NSIFILE + nsis.depends += $$NSIINPUTFILE + nsis.target = $$NSISFILE + installer.commands += $$MAKENSIS $$NSIFILE + installer.target = installer + installer.depends = nsis + install.depends += dlls nsis installer } } else { # Linux install rules |