qmake: use real tabs for all .pri files

subsurface.pro already useses that.

For consistency with the app, we use swap 4 spaces with
a tab character for indentation.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2013-12-03 23:00:22 +02:00 committed by Dirk Hohndel
parent 639f12cc42
commit 1f7f5e18e2
3 changed files with 169 additions and 169 deletions

View file

@ -34,41 +34,41 @@ equals($$QMAKE_HOST.os, "Windows"):NUL=NUL
else:NUL=/dev/null else:NUL=/dev/null
PKG_CONFIG_OUT = $$system($$PKG_CONFIG --version 2> $$NUL) PKG_CONFIG_OUT = $$system($$PKG_CONFIG --version 2> $$NUL)
!isEmpty(PKG_CONFIG_OUT) { !isEmpty(PKG_CONFIG_OUT) {
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
} else { } else {
message("pkg-config not found, no detection performed. See README for details") message("pkg-config not found, no detection performed. See README for details")
} }
# #
# Find libdivecomputer # Find libdivecomputer
# #
!isEmpty(LIBDCDEVEL) { !isEmpty(LIBDCDEVEL) {
# find it next to our sources # find it next to our sources
INCLUDEPATH += ../libdivecomputer/include INCLUDEPATH += ../libdivecomputer/include
LIBS += ../libdivecomputer/src/.libs/libdivecomputer.a LIBS += ../libdivecomputer/src/.libs/libdivecomputer.a
LIBDC_LA = ../libdivecomputer/src/libdivecomputer.la LIBDC_LA = ../libdivecomputer/src/libdivecomputer.la
} else:!isEmpty(CROSS_PATH):exists($${CROSS_PATH}"/lib/libdivecomputer.a"):exists($${CROSS_PATH}"/lib/libusb-1.0.a") { } else:!isEmpty(CROSS_PATH):exists($${CROSS_PATH}"/lib/libdivecomputer.a"):exists($${CROSS_PATH}"/lib/libusb-1.0.a") {
LIBS += $${CROSS_PATH}"/lib/libdivecomputer.a" $${CROSS_PATH}"/lib/libusb-1.0.a" LIBS += $${CROSS_PATH}"/lib/libdivecomputer.a" $${CROSS_PATH}"/lib/libusb-1.0.a"
} else:exists(/usr/local/lib/libdivecomputer.a) { } else:exists(/usr/local/lib/libdivecomputer.a) {
LIBS += /usr/local/lib/libdivecomputer.a LIBS += /usr/local/lib/libdivecomputer.a
LIBDC_LA = /usr/local/lib/libdivecomputer.la LIBDC_LA = /usr/local/lib/libdivecomputer.la
} else:exists(/usr/local/lib64/libdivecomputer.a) { } else:exists(/usr/local/lib64/libdivecomputer.a) {
LIBS += /usr/local/lib64/libdivecomputer.a LIBS += /usr/local/lib64/libdivecomputer.a
LIBDC_LA = /usr/local/lib64/libdivecomputer.la LIBDC_LA = /usr/local/lib64/libdivecomputer.la
} else:link_pkgconfig { } else:link_pkgconfig {
# find it via pkg-config, but we need to pass the --static flag, # find it via pkg-config, but we need to pass the --static flag,
# so we can't use the PKGCONFIG variable. # so we can't use the PKGCONFIG variable.
LIBS += $$system($$PKG_CONFIG --static --libs libdivecomputer) LIBS += $$system($$PKG_CONFIG --static --libs libdivecomputer)
LIBDC_CFLAGS = $$system($$PKG_CONFIG --static --cflags libdivecomputer) LIBDC_CFLAGS = $$system($$PKG_CONFIG --static --cflags libdivecomputer)
QMAKE_CFLAGS += $$LIBDC_CFLAGS QMAKE_CFLAGS += $$LIBDC_CFLAGS
QMAKE_CXXFLAGS += $$LIBDC_CFLAGS QMAKE_CXXFLAGS += $$LIBDC_CFLAGS
unset(LIBDC_CFLAGS) unset(LIBDC_CFLAGS)
} }
!isEmpty(LIBDC_LA):exists($$LIBDC_LA) { !isEmpty(LIBDC_LA):exists($$LIBDC_LA) {
# Source the libtool .la file to get the dependent libs # Source the libtool .la file to get the dependent libs
LIBS += $$system(". $$LIBDC_LA && echo \$dependency_libs") LIBS += $$system(". $$LIBDC_LA && echo \$dependency_libs")
unset(LIBDC_LA) unset(LIBDC_LA)
} }
# #
@ -84,18 +84,18 @@ XML2_LIBS = $$system(xml2-config --libs 2>$$NUL)
XSLT_LIBS = $$system(xslt-config --libs 2>$$NUL) XSLT_LIBS = $$system(xslt-config --libs 2>$$NUL)
link_pkgconfig { link_pkgconfig {
isEmpty(XML2_CFLAGS)|isEmpty(XML2_LIBS) { isEmpty(XML2_CFLAGS)|isEmpty(XML2_LIBS) {
XML2_CFLAGS = $$system($$PKG_CONFIG --cflags libxml2 2> $$NUL) XML2_CFLAGS = $$system($$PKG_CONFIG --cflags libxml2 2> $$NUL)
XML2_LIBS = $$system($$PKG_CONFIG --libs libxml2 2> $$NUL) XML2_LIBS = $$system($$PKG_CONFIG --libs libxml2 2> $$NUL)
} }
isEmpty(XSLT_CFLAGS)|isEmpty(XSLT_LIBS) { isEmpty(XSLT_CFLAGS)|isEmpty(XSLT_LIBS) {
XSLT_CFLAGS = $$system($$PKG_CONFIG --cflags libxslt 2> $$NUL) XSLT_CFLAGS = $$system($$PKG_CONFIG --cflags libxslt 2> $$NUL)
XSLT_LIBS = $$system($$PKG_CONFIG --libs libxslt 2> $$NUL) XSLT_LIBS = $$system($$PKG_CONFIG --libs libxslt 2> $$NUL)
} }
isEmpty(XML2_CFLAGS)|isEmpty(XML2_LIBS): \ isEmpty(XML2_CFLAGS)|isEmpty(XML2_LIBS): \
error("Could not find libxml2. Did you forget to install it?") error("Could not find libxml2. Did you forget to install it?")
isEmpty(XSLT_CFLAGS)|isEmpty(XSLT_LIBS): \ isEmpty(XSLT_CFLAGS)|isEmpty(XSLT_LIBS): \
error("Could not find libxslt. Did you forget to install it?") error("Could not find libxslt. Did you forget to install it?")
} }
QMAKE_CFLAGS *= $$XML2_CFLAGS $$XSLT_CFLAGS QMAKE_CFLAGS *= $$XML2_CFLAGS $$XSLT_CFLAGS
@ -125,8 +125,8 @@ else: LIBS += -lmarblewidget
# Platform-specific changes # Platform-specific changes
# #
win32 { win32 {
LIBS += -lwsock32 LIBS += -lwsock32
DEFINES -= UNICODE DEFINES -= UNICODE
} }
# #

View file

@ -4,23 +4,23 @@ macx: VER_OS = darwin
unix: !macx: VER_OS = linux unix: !macx: VER_OS = linux
win32: VER_OS = win win32: VER_OS = win
exists(.git/HEAD): { exists(.git/HEAD): {
win32: SET_GIT_DIR = set GIT_DIR win32: SET_GIT_DIR = set GIT_DIR
else: SET_GIT_DIR = GIT_DIR else: SET_GIT_DIR = GIT_DIR
GIT_HEAD = .git/HEAD GIT_HEAD = .git/HEAD
VERSION_SCRIPT = $$PWD/scripts/get-version VERSION_SCRIPT = $$PWD/scripts/get-version
# always use linux here -------------------vvv so we get the true full version # always use linux here -------------------vvv so we get the true full version
FULL_VERSION = "`$$VERSION_SCRIPT linux`" FULL_VERSION = "`$$VERSION_SCRIPT linux`"
PRODVERSION_STRING = $$system("sh scripts/get-version win $$FULL_VERSION || $${VERSION}.0.0") PRODVERSION_STRING = $$system("sh scripts/get-version win $$FULL_VERSION || $${VERSION}.0.0")
VERSION_STRING = $$system("sh scripts/get-version linux $$FULL_VERSION || $${VERSION}") VERSION_STRING = $$system("sh scripts/get-version linux $$FULL_VERSION || $${VERSION}")
version_h.depends = $$VERSION_SCRIPT $$PWD/.git/$$system("$$SET_GIT_DIR=$$PWD/.git git rev-parse --symbolic-full-name HEAD") version_h.depends = $$VERSION_SCRIPT $$PWD/.git/$$system("$$SET_GIT_DIR=$$PWD/.git git rev-parse --symbolic-full-name HEAD")
version_h.commands = echo \\$${LITERAL_HASH}define VERSION_STRING \\\"`GIT_DIR=$$PWD/.git $$VERSION_SCRIPT $$VER_OS`\\\" > ${QMAKE_FILE_OUT} version_h.commands = echo \\$${LITERAL_HASH}define VERSION_STRING \\\"`GIT_DIR=$$PWD/.git $$VERSION_SCRIPT $$VER_OS`\\\" > ${QMAKE_FILE_OUT}
version_h.input = GIT_HEAD version_h.input = GIT_HEAD
version_h.output = $$VERSION_FILE version_h.output = $$VERSION_FILE
version_h.variable_out = GENERATED_FILES version_h.variable_out = GENERATED_FILES
version_h.CONFIG = ignore_no_exist version_h.CONFIG = ignore_no_exist
QMAKE_EXTRA_COMPILERS += version_h QMAKE_EXTRA_COMPILERS += version_h
} else { } else {
# This is probably a package # This is probably a package
FULL_VERSION = $$VERSION FULL_VERSION = $$VERSION
system(echo \\$${LITERAL_HASH}define VERSION_STRING \\\"$$VERSION\\\" > $$VERSION_FILE) system(echo \\$${LITERAL_HASH}define VERSION_STRING \\\"$$VERSION\\\" > $$VERSION_FILE)
} }

View file

@ -1,4 +1,4 @@
marbledir.files = $$MARBLEDIR marbledirh.files = $$MARBLEDIR
xslt.files = $$XSLT_FILES xslt.files = $$XSLT_FILES
icons.files = $$ICONS_FILES icons.files = $$ICONS_FILES
doc.files = $$DOC_FILES doc.files = $$DOC_FILES
@ -8,115 +8,115 @@ qttranslation.files = $$join(QTTRANSLATIONS," "$$[QT_INSTALL_TRANSLATIONS]/,$$[Q
nltab = $$escape_expand(\\n\\t) nltab = $$escape_expand(\\n\\t)
mac { mac {
# OS X bundling rules # OS X bundling rules
# "make mac-deploy" deploys the external libs (Qt, libdivecomputer, libusb, etc.) into the bundle # "make mac-deploy" deploys the external libs (Qt, libdivecomputer, libusb, etc.) into the bundle
# "make install" installs the bundle to /Applications # "make install" installs the bundle to /Applications
# "make mac-create-dmg" creates Subsurface.dmg # "make mac-create-dmg" creates Subsurface.dmg
mac_bundle.path = /Applications mac_bundle.path = /Applications
mac_bundle.files = Subsurface.app mac_bundle.files = Subsurface.app
mac_bundle.CONFIG += no_check_exist directory mac_bundle.CONFIG += no_check_exist directory
INSTALLS += mac_bundle INSTALLS += mac_bundle
install.depends += mac-deploy install.depends += mac-deploy
datadir = Contents/Resources/share datadir = Contents/Resources/share
marbledir.path = Contents/Resources/data marbledir.path = Contents/Resources/data
xslt.path = $$datadir xslt.path = $$datadir
doc.path = $$datadir/doc doc.path = $$datadir/doc
translation.path = Contents/Resources/translations translation.path = Contents/Resources/translations
qttranslation.path = Contents/Resources/translations qttranslation.path = Contents/Resources/translations
doc.files = $$files($$doc.files) doc.files = $$files($$doc.files)
QMAKE_BUNDLE_DATA += marbledir xslt doc translation qttranslation QMAKE_BUNDLE_DATA += marbledir xslt doc translation qttranslation
mac_deploy.target = mac-deploy mac_deploy.target = mac-deploy
mac_deploy.commands += $$[QT_INSTALL_BINS]/macdeployqt $${TARGET}.app mac_deploy.commands += $$[QT_INSTALL_BINS]/macdeployqt $${TARGET}.app
!isEmpty(V):mac_deploy.commands += -verbose=1 !isEmpty(V):mac_deploy.commands += -verbose=1
mac_dmg.target = mac-create-dmg mac_dmg.target = mac-create-dmg
mac_dmg.commands = $$mac_deploy.commands -dmg mac_dmg.commands = $$mac_deploy.commands -dmg
mac_dmg.commands += $${nltab}$(MOVE) $${TARGET}.dmg $${TARGET}-$${FULL_VERSION}.dmg mac_dmg.commands += $${nltab}$(MOVE) $${TARGET}.dmg $${TARGET}-$${FULL_VERSION}.dmg
QMAKE_EXTRA_TARGETS += mac_deploy mac_dmg QMAKE_EXTRA_TARGETS += mac_deploy mac_dmg
} else: win32 { } else: win32 {
# Windows bundling rules # Windows bundling rules
# We don't have a helpful tool like macdeployqt for Windows, so we hardcode # We don't have a helpful tool like macdeployqt for Windows, so we hardcode
# which libs we need. # which libs we need.
# The only target is "make install", which copies everything into packaging/windows # The only target is "make install", which copies everything into packaging/windows
WINDOWSSTAGING = packaging/windows WINDOWSSTAGING = packaging/windows
NSIFILE = $$PWD/$$WINDOWSSTAGING/subsurface.nsi NSIFILE = $$PWD/$$WINDOWSSTAGING/subsurface.nsi
NSIINPUTFILE = $$PWD/$$WINDOWSSTAGING/subsurface.nsi.in NSIINPUTFILE = $$PWD/$$WINDOWSSTAGING/subsurface.nsi.in
MAKENSIS = /usr/bin/makensis MAKENSIS = /usr/bin/makensis
deploy.path = $$WINDOWSSTAGING deploy.path = $$WINDOWSSTAGING
deploy.files += $$xslt.files $$doc.files $$icons.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
INSTALLS += deploy marbledir target INSTALLS += deploy marbledir target
qt_conf.commands = echo \'[Paths]\' > $@ qt_conf.commands = echo \'[Paths]\' > $@
qt_conf.commands += $${nltab}echo \'Prefix=.\' >> $@ qt_conf.commands += $${nltab}echo \'Prefix=.\' >> $@
qt_conf.target = $$PWD/packaging/windows/qt.conf qt_conf.target = $$PWD/packaging/windows/qt.conf
install.depends += qt_conf install.depends += qt_conf
# Plugin code # Plugin code
defineTest(deployPlugin) { defineTest(deployPlugin) {
plugin = $$1 plugin = $$1
plugintype = $$dirname(1) plugintype = $$dirname(1)
CONFIG(debug, debug|release): plugin = $${plugin}d4.dll CONFIG(debug, debug|release): plugin = $${plugin}d4.dll
else: plugin = $${plugin}4.dll else: plugin = $${plugin}4.dll
abs_plugin = $$[QT_INSTALL_PLUGINS]/$$plugin abs_plugin = $$[QT_INSTALL_PLUGINS]/$$plugin
ABS_DEPLOYMENT_PLUGIN += $$abs_plugin ABS_DEPLOYMENT_PLUGIN += $$abs_plugin
export(ABS_DEPLOYMENT_PLUGIN) export(ABS_DEPLOYMENT_PLUGIN)
safe_name = $$replace(1, /, _) safe_name = $$replace(1, /, _)
INSTALLS += $$safe_name INSTALLS += $$safe_name
# Work around qmake bug in Qt4 that it can't handle $${xx}.yy properly # Work around qmake bug in Qt4 that it can't handle $${xx}.yy properly
eval(safe_name_files = $${safe_name}.files) eval(safe_name_files = $${safe_name}.files)
eval(safe_name_path = $${safe_name}.path) eval(safe_name_path = $${safe_name}.path)
$$safe_name_files = $$abs_plugin $$safe_name_files = $$abs_plugin
$$safe_name_path = $$WINDOWSSTAGING/plugins/$$plugintype $$safe_name_path = $$WINDOWSSTAGING/plugins/$$plugintype
export($$safe_name_files) export($$safe_name_files)
export($$safe_name_path) export($$safe_name_path)
export(INSTALLS) export(INSTALLS)
} }
# Convert plugin names to the relative DLL path # Convert plugin names to the relative DLL path
for(plugin, $$list($$DEPLOYMENT_PLUGIN)) { for(plugin, $$list($$DEPLOYMENT_PLUGIN)) {
deployPlugin($$plugin) deployPlugin($$plugin)
} }
!win32-msvc* { !win32-msvc* {
#!equals($$QMAKE_HOST.os, "Windows"): dlls.commands += OBJDUMP=`$$QMAKE_CC -dumpmachine`-objdump #!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 += 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 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 EXE_SUFFIX = .exe
CONFIG(debug, debug|release): dlls.commands += $$OUT_PWD/debug/subsurface$$EXE_SUFFIX CONFIG(debug, debug|release): dlls.commands += $$OUT_PWD/debug/subsurface$$EXE_SUFFIX
else: dlls.commands += $$OUT_PWD/release/$$TARGET$$EXE_SUFFIX else: dlls.commands += $$OUT_PWD/release/$$TARGET$$EXE_SUFFIX
dlls.commands += $$ABS_DEPLOYMENT_PLUGIN $$LIBS dlls.commands += $$ABS_DEPLOYMENT_PLUGIN $$LIBS
dlls.commands += | while read name; do $(INSTALL_FILE) \$\$name $$PWD/$$WINDOWSSTAGING; done dlls.commands += | while read name; do $(INSTALL_FILE) \$\$name $$PWD/$$WINDOWSSTAGING; done
dlls.depends += $(DESTDIR_TARGET) dlls.depends += $(DESTDIR_TARGET)
nsis.commands += cat $$NSIINPUTFILE | sed -e \'s/VERSIONTOKEN/$$VERSION_STRING/;s/PRODVTOKEN/$${PRODVERSION_STRING}/\' > $$NSIFILE nsis.commands += cat $$NSIINPUTFILE | sed -e \'s/VERSIONTOKEN/$$VERSION_STRING/;s/PRODVTOKEN/$${PRODVERSION_STRING}/\' > $$NSIFILE
nsis.depends += $$NSIINPUTFILE nsis.depends += $$NSIINPUTFILE
nsis.target = $$NSISFILE nsis.target = $$NSISFILE
installer.commands += $$MAKENSIS $$NSIFILE installer.commands += $$MAKENSIS $$NSIFILE
installer.target = installer installer.target = installer
installer.depends = nsis install installer.depends = nsis install
QMAKE_EXTRA_TARGETS = installer nsis QMAKE_EXTRA_TARGETS = installer nsis
install.depends += dlls install.depends += dlls
} }
} else { } else {
# Linux install rules # Linux install rules
# On Linux, we can count on packagers doing the right thing # On Linux, we can count on packagers doing the right thing
# We just need to drop a few files here and there # We just need to drop a few files here and there
# This is a fake rule just to create some rules in the target file # This is a fake rule just to create some rules in the target file
nl = $$escape_expand(\\n) nl = $$escape_expand(\\n)
dummy.target = dummy-only-for-var-expansion dummy.target = dummy-only-for-var-expansion
dummy.commands = $${nl}prefix = /usr$${nl}\ dummy.commands = $${nl}prefix = /usr$${nl}\
BINDIR = $(prefix)/bin$${nl}\ BINDIR = $(prefix)/bin$${nl}\
DATADIR = $(prefix)/share$${nl}\ DATADIR = $(prefix)/share$${nl}\
DOCDIR = $(DATADIR)/doc/subsurface$${nl}\ DOCDIR = $(DATADIR)/doc/subsurface$${nl}\
@ -125,36 +125,36 @@ ICONPATH = $(DATADIR)/icons/hicolor$${nl}\
ICONDIR = $(ICONPATH)/scalable/apps$${nl}\ ICONDIR = $(ICONPATH)/scalable/apps$${nl}\
MANDIR = $(DATADIR)/man/man1$${nl}\ MANDIR = $(DATADIR)/man/man1$${nl}\
XSLTDIR = $(DATADIR)/subsurface XSLTDIR = $(DATADIR)/subsurface
QMAKE_EXTRA_TARGETS += dummy QMAKE_EXTRA_TARGETS += dummy
WINDOWSSTAGING = ./packaging/windows WINDOWSSTAGING = ./packaging/windows
target.path = /$(BINDIR) target.path = /$(BINDIR)
target.files = $$TARGET target.files = $$TARGET
desktop.path = /$(DESKTOPDIR) desktop.path = /$(DESKTOPDIR)
desktop.files = $$DESKTOP_FILE desktop.files = $$DESKTOP_FILE
manpage.path = /$(MANDIR) manpage.path = /$(MANDIR)
manpage.files = $$MANPAGE manpage.files = $$MANPAGE
icon.path = /$(ICONDIR) icon.path = /$(ICONDIR)
icon.files = $$ICON icon.files = $$ICON
xslt.path = /$(XSLTDIR) xslt.path = /$(XSLTDIR)
marbledir.path = /$(DATADIR)/subsurface/data marbledir.path = /$(DATADIR)/subsurface/data
doc.path = /$(DOCDIR) doc.path = /$(DOCDIR)
doc.CONFIG += no_check_exist doc.CONFIG += no_check_exist
# FIXME: Linguist translations # FIXME: Linguist translations
#l10n_install.commands = for LOC in $$files(share/locale/*/LC_MESSAGES); do \ #l10n_install.commands = for LOC in $$files(share/locale/*/LC_MESSAGES); do \
# $(INSTALL_PROGRAM) -d $(INSTALL_ROOT)/$(prefix)/$$LOC; \ # $(INSTALL_PROGRAM) -d $(INSTALL_ROOT)/$(prefix)/$$LOC; \
# $(INSTALL_FILE) $$LOC/subsurface.mo $(INSTALL_ROOT)/$(prefix)/$$LOC/subsurface.mo; \ # $(INSTALL_FILE) $$LOC/subsurface.mo $(INSTALL_ROOT)/$(prefix)/$$LOC/subsurface.mo; \
# done #done
#install.depends += l10n_install #install.depends += l10n_install
INSTALLS += target desktop icon manpage xslt doc marbledir INSTALLS += target desktop icon manpage xslt doc marbledir
install.target = install install.target = install
} }
!isEmpty(TRANSLATIONS) { !isEmpty(TRANSLATIONS) {
isEmpty(QMAKE_LRELEASE) { isEmpty(QMAKE_LRELEASE) {