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

Move the XSLT files into a Qt resource

Browse source 
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>
This commit is contained in:
Thiago Macieira 2013-12-16 09:09:41 -08:00 • committed by Dirk Hohndel
parent 5f12660870
commit ca8aee4701
5 changed files with 52 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

11
subsurface-install.pri
View file

@ -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) {