1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

employ return() inside qt_example_installs.prf gainfully

Browse Source 
reduces the indentation level.

Change-Id: I7851ffc5e9ecaaa3ae375d14fd245ea3747f61b2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Oswald Buddenhagen 2017-06-28 16:07:19 +02:00 committed by Simon Hausmann
parent 4e5af88a8c
commit 1480066592
1 changed files with 94 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
mkspecs/features/qt_example_installs.prf
View File

@ -31,52 +31,54 @@ defineTest(addInstallFiles) {
} }
probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
!isEmpty(probase):!contains(probase, ^\\..*):!isEmpty(_QMAKE_CACHE_) { isEmpty(probase)|contains(probase, ^\\..*)|isEmpty(_QMAKE_CACHE_): \
for(ex, EXAMPLE_FILES): \ return()
for(ex, EXAMPLE_FILES): \
sourcefiles += $$files($$absolute_path($$ex, $$_PRO_FILE_PWD_)) sourcefiles += $$files($$absolute_path($$ex, $$_PRO_FILE_PWD_))
for(res, RESOURCES) { for(res, RESOURCES) {
rfile = $$cat($$absolute_path($$res, $$_PRO_FILE_PWD_), lines) rfile = $$cat($$absolute_path($$res, $$_PRO_FILE_PWD_), lines)
for(rline, rfile) { for(rline, rfile) {
resrc = $$replace(rline, ^[ \\t]*<file[^>]*>([^<]+)</file>[ \\t]*$, \\1) resrc = $$replace(rline, ^[ \\t]*<file[^>]*>([^<]+)</file>[ \\t]*$, \\1)
!equals(resrc, $$rline): \ !equals(resrc, $$rline): \
sourcefiles += $$resrc sourcefiles += $$resrc
} }
} }
for(res, RC_FILE) { for(res, RC_FILE) {
rfile = $$cat($$absolute_path($$res, $$_PRO_FILE_PWD_), lines) rfile = $$cat($$absolute_path($$res, $$_PRO_FILE_PWD_), lines)
for(rline, rfile) { for(rline, rfile) {
resrc = $$replace(rline, "^\\d+\\s+ICON\\s+[^\"]*\"([^\"]+)\"\$", \\1) resrc = $$replace(rline, "^\\d+\\s+ICON\\s+[^\"]*\"([^\"]+)\"\$", \\1)
!equals(resrc, $$rline): \ !equals(resrc, $$rline): \
sourcefiles += $$resrc sourcefiles += $$resrc
} }
} }
sourcefiles += \ sourcefiles += \
$$ANDROID_PACKAGE_SOURCE_DIR \ $$ANDROID_PACKAGE_SOURCE_DIR \
$$QMAKE_INFO_PLIST \ $$QMAKE_INFO_PLIST \
$$DISTFILES $$DISTFILES
extras = \ extras = \
$$_PRO_FILE_PWD_/README \ $$_PRO_FILE_PWD_/README \
$$_PRO_FILE_PWD_/README.TXT \ $$_PRO_FILE_PWD_/README.TXT \
$$files($$_PRO_FILE_PWD_/*.pri) \ $$files($$_PRO_FILE_PWD_/*.pri) \
$$replace(_PRO_FILE_, \\.pro$, .qmlproject) \ $$replace(_PRO_FILE_, \\.pro$, .qmlproject) \
$$replace(_PRO_FILE_, \\.pro$, .json) \ $$replace(_PRO_FILE_, \\.pro$, .json) \
$$replace(_PRO_FILE_, \\.pro$, .inf) $$replace(_PRO_FILE_, \\.pro$, .inf)
for(extra, extras): \ for(extra, extras): \
exists($$extra): \ exists($$extra): \
sourcefiles += $$extra sourcefiles += $$extra
# Just for Qt Creator # Just for Qt Creator
OTHER_FILES += $$sourcefiles OTHER_FILES += $$sourcefiles
sourcefiles += \ sourcefiles += \
$$_PRO_FILE_ $$RC_FILE $$DEF_FILE \ $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \
$$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \
$$DBUS_ADAPTORS $$DBUS_INTERFACES $$DBUS_ADAPTORS $$DBUS_INTERFACES
addInstallFiles(sources.files, $$sourcefiles) addInstallFiles(sources.files, $$sourcefiles)
sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase
INSTALLS += sources INSTALLS += sources
check_examples { check_examples {
srcfiles = $$sources.files srcfiles = $$sources.files
for(inst, INSTALLS): \ for(inst, INSTALLS): \
!equals(inst, target):!contains($${inst}.CONFIG, no_check_exist): \ !equals(inst, target):!contains($${inst}.CONFIG, no_check_exist): \
@ -101,9 +103,9 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
} }
allfiles -= doc allfiles -= doc
!isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles")
} }
equals(TEMPLATE, app)|equals(TEMPLATE, lib) { equals(TEMPLATE, app)|equals(TEMPLATE, lib) {
!contains(INSTALLS, target) { !contains(INSTALLS, target) {
!install_ok: \ !install_ok: \
error("$$_PRO_FILE_ is lacking an install target.") error("$$_PRO_FILE_ is lacking an install target.")
@ -115,15 +117,14 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
else: check_examples: \ else: check_examples: \
warning("$$_PRO_FILE_ installs target to unexpected location.") warning("$$_PRO_FILE_ installs target to unexpected location.")
} }
} }
!equals(TEMPLATE, subdirs):!compile_examples { !equals(TEMPLATE, subdirs):!compile_examples {
TEMPLATE = aux TEMPLATE = aux
CONFIG -= have_target qt staticlib dll CONFIG -= have_target qt staticlib dll
SOURCES = SOURCES =
OBJECTIVE_SOURCES = OBJECTIVE_SOURCES =
INSTALLS -= target INSTALLS -= target
} else { } else {
CONFIG += relative_qt_rpath # Examples built as part of Qt should be relocatable CONFIG += relative_qt_rpath # Examples built as part of Qt should be relocatable
}
} }