diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2013-12-16 09:09:41 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-12-16 16:20:52 -0800 |
| commit | ca8aee4701f95a758f93033eb88ca851d61b2008 (patch) | |
| tree | a5d0989a975791a6eea8f0bf610430490a47d7b6 /subsurface-install.pri | |
| parent | 5f12660870be4b1692eae28339785bc4b2d08550 (diff) | |
| download | subsurface-ca8aee4701f95a758f93033eb88ca851d61b2008.tar.gz | |
Move the XSLT files into a Qt resource
This means we no longer need to keep them on disk and worry about
installing / uninstalling them. They will always be kept in-memory
(compressed).
Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-install.pri')
| -rw-r--r-- | subsurface-install.pri | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/subsurface-install.pri b/subsurface-install.pri index 8e97ba3bf..1a29d0f3a 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -1,5 +1,4 @@ marbledir.files = $$MARBLEDIR -xslt.files = $$XSLT_FILES doc.files = $$DOC_FILES translation.files = $$replace(TRANSLATIONS, .ts, .qm) exists($$[QT_INSTALL_TRANSLATIONS]) { @@ -27,11 +26,10 @@ mac { datadir = Contents/Resources/share marbledir.path = Contents/Resources/data - xslt.path = $$datadir doc.path = $$datadir/Documentation translation.path = Contents/Resources/translations qttranslation.path = Contents/Resources/translations - QMAKE_BUNDLE_DATA += marbledir xslt doc translation qttranslation + QMAKE_BUNDLE_DATA += marbledir doc translation qttranslation mac_deploy.target = mac-deploy mac_deploy.commands += $$[QT_INSTALL_BINS]/macdeployqt $${TARGET}.app @@ -54,7 +52,6 @@ mac { doc.path = $$WINDOWSSTAGING/Documentation CONFIG -= copy_dir_files deploy.path = $$WINDOWSSTAGING - deploy.files += $$xslt.files deploy.CONFIG += no_check_exist target.path = $$WINDOWSSTAGING marbledir.path = $$WINDOWSSTAGING/data @@ -127,13 +124,12 @@ mac { # This is a fake rule just to create some rules in the target file nl = $$escape_expand(\\n) dummy.target = dummy-only-for-var-expansion - dummy.commands = $${nl}prefix = /usr$${nl}\ + dummy.commands = $${nl}prefix = /usr$${nl}\ BINDIR = $(prefix)/bin$${nl}\ DATADIR = $(prefix)/share$${nl}\ DOCDIR = $(DATADIR)/subsurface/Documentation$${nl}\ DESKTOPDIR = $(DATADIR)/applications$${nl}\ MANDIR = $(DATADIR)/man/man1$${nl}\ -XSLTDIR = $(DATADIR)/subsurface QMAKE_EXTRA_TARGETS += dummy WINDOWSSTAGING = ./packaging/windows @@ -146,7 +142,6 @@ XSLTDIR = $(DATADIR)/subsurface manpage.path = /$(MANDIR) manpage.files = $$MANPAGE - xslt.path = /$(XSLTDIR) marbledir.path = /$(DATADIR)/subsurface/data doc.path = /$(DOCDIR) @@ -155,7 +150,7 @@ XSLTDIR = $(DATADIR)/subsurface translation.path = /$(DATADIR)/subsurface/translations translation.CONFIG += no_check_exist - INSTALLS += target desktop manpage xslt doc marbledir translation + INSTALLS += target desktop manpage doc marbledir translation install.target = install } !isEmpty(TRANSLATIONS) { |