From 99d886f57f56e4b9c39d92a88b08cb7e2c299865 Mon Sep 17 00:00:00 2001 From: Gehad elrobey Date: Sun, 1 Jun 2014 07:48:26 +0300 Subject: [PATCH] Update install script: copy HTML theme directory to usr/share Updating the qmake file to check and copy the theme directory under usr/share. THIS needs to work on windows and mac. Signed-off-by: Gehad elrobey Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- subsurface-install.pri | 4 +++- subsurface.pro | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/subsurface-install.pri b/subsurface-install.pri index c53f91123..f4e0e96a5 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -1,5 +1,6 @@ marbledir.files = $$MARBLEDIR doc.files = $$DOC_FILES +theme.files = $$THEME_FILES translation.files = $$replace(TRANSLATIONS, .ts, .qm) exists($$[QT_INSTALL_TRANSLATIONS]) { qt_translation_dir = $$[QT_INSTALL_TRANSLATIONS] @@ -160,13 +161,14 @@ mac { marbledir.path = /$(EXPORT_DATADIR)/subsurface/data doc.path = /$(EXPORT_DOCDIR) + theme.path = /$(EXPORT_DATADIR)/subsurface doc.CONFIG += no_check_exist translation.path = /$(EXPORT_DATADIR)/subsurface/translations translation.CONFIG += no_check_exist - INSTALLS += target desktop manpage doc marbledir translation icon + INSTALLS += target desktop manpage doc marbledir translation icon theme install.target = install } !isEmpty(TRANSLATIONS) { diff --git a/subsurface.pro b/subsurface.pro index a0891f4d7..53decf8f6 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -244,6 +244,10 @@ marbledata.commands += $(CHK_DIR_EXISTS) $$OUT_PWD/marbledata || $(COPY_DIR) $$P all.depends += marbledata QMAKE_EXTRA_TARGETS += marbledata +theme.commands += $(CHK_DIR_EXISTS) $$OUT_PWD/theme || $(COPY_DIR) $$PWD/theme $$OUT_PWD +all.depends += theme +QMAKE_EXTRA_TARGETS += theme + DESKTOP_FILE = subsurface.desktop mac: ICON = packaging/macosx/Subsurface.icns else: ICON = subsurface-icon.svg @@ -251,6 +255,7 @@ MANPAGE = subsurface.1 XSLT_FILES = xslt ICONS_FILES = icons DOC_FILES = $$OUT_PWD/Documentation/user-manual.html Documentation/images +THEME_FILES = $$OUT_PWD/theme MARBLEDIR = marbledata/maps marbledata/bitmaps #DEPLOYMENT_PLUGIN += bearer/qnativewifibearer