60e5a1c8ef
This change implements the required infrastructure to modularize the new configuration system. This requires a hierarchy of configuration files, both for handling multiple repositories and for individual modules inside the same repository. When configuring, they all need to get loaded first, as command line processing needs to know about all possible command line options. When the command line has been processed, the individual configuration files need to get processed one after the other and independently from each other. Configure is now automatically invoked when building the a project tree's "root" project; this works with both modular and top-level builds of Qt (the latter with an according change in the super repo). As an immediate consequence, the -skip option moves to the super repo with a different implementation, as configuration is now done after the repo list is determined. The option belongs there anyway. This commit also adds an optional testDir entry to the json file. Like this, we can still have all configure tests in qtbase/config.tests and the configuration file in, e.g., corelib can reference those. The files section can now be left out as long as a 'module' entry is present, specifying the module name. The names of the files to generate can then be deduced from that name. We still need to be able to specify names directly for the global configuration files. qtConfig() now also queries features which are module-specific. As it is sometimes necessary to query the configuration of modules which should not be actually linked (and cannot in the case of subdirs projects), the new variable QT_FOR_CONFIG which allows specifying configuration-only dependencies is introduced. Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Change-Id: Id1b518a3aa34044748b87fb8fac14d79653f6b18 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
178 lines
5.8 KiB
Prolog
178 lines
5.8 KiB
Prolog
#####################################################################
|
|
# Main projectfile
|
|
#####################################################################
|
|
|
|
load(qt_parts)
|
|
|
|
SUBDIRS += qmake/qmake-aux.pro
|
|
|
|
cross_compile: CONFIG += nostrip
|
|
|
|
confclean.depends += distclean
|
|
confclean.commands = echo The confclean target is obsolete. Please use distclean instead.
|
|
QMAKE_EXTRA_TARGETS += confclean
|
|
|
|
qmake-clean.commands += (cd qmake && $(MAKE) clean)
|
|
QMAKE_EXTRA_TARGETS += qmake-clean
|
|
CLEAN_DEPS += qmake-clean
|
|
|
|
# We don't distclean qmake, as it may be needed for rebuilding Makefiles as a
|
|
# recursive distclean proceeds, including beyond qtbase.
|
|
DISTCLEAN_DEPS += qmake-clean
|
|
|
|
# Files created by configure.
|
|
# config.status (and configure.cache, which is the same for Windows)
|
|
# are omitted for convenience of rebuilds.
|
|
QMAKE_DISTCLEAN += \
|
|
config.summary \
|
|
config.tests/.qmake.cache \
|
|
mkspecs/qconfig.pri \
|
|
mkspecs/qdevice.pri \
|
|
mkspecs/qhost.pri \
|
|
mkspecs/qmodule.pri \
|
|
src/corelib/global/qconfig.h \
|
|
src/corelib/global/qconfig_p.h \
|
|
src/corelib/global/qconfig.cpp \
|
|
bin/qt.conf
|
|
|
|
CONFIG -= qt
|
|
|
|
### installations ####
|
|
|
|
#licheck
|
|
licheck.path = $$[QT_HOST_BINS]
|
|
licheck.files = $$PWD/bin/$$QT_LICHECK
|
|
!isEmpty(QT_LICHECK): INSTALLS += licheck
|
|
|
|
#fixqt4headers.pl
|
|
fixqt4headers.path = $$[QT_HOST_BINS]
|
|
fixqt4headers.files = $$PWD/bin/fixqt4headers.pl
|
|
INSTALLS += fixqt4headers
|
|
|
|
#syncqt
|
|
syncqt.path = $$[QT_HOST_BINS]
|
|
syncqt.files = $$PWD/bin/syncqt.pl
|
|
INSTALLS += syncqt
|
|
|
|
# If we are doing a prefix build, create a "module" pri which enables
|
|
# qtPrepareTool() to find the non-installed syncqt.
|
|
prefix_build|!equals(PWD, $$OUT_PWD) {
|
|
|
|
cmd = perl -w $$system_path($$PWD/bin/syncqt.pl)
|
|
|
|
TOOL_PRI = $$OUT_PWD/mkspecs/modules/qt_tool_syncqt.pri
|
|
|
|
TOOL_PRI_CONT = "QT_TOOL.syncqt.binary = $$val_escape(cmd)"
|
|
write_file($$TOOL_PRI, TOOL_PRI_CONT)|error("Aborting.")
|
|
|
|
# Then, inject the new tool into the current cache state
|
|
!contains(QMAKE_INTERNAL_INCLUDED_FILES, $$TOOL_PRI) { # before the actual include()!
|
|
added = $$TOOL_PRI
|
|
cache(QMAKE_INTERNAL_INCLUDED_FILES, add transient, added)
|
|
}
|
|
include($$TOOL_PRI)
|
|
cache(QT_TOOL.syncqt.binary, transient)
|
|
|
|
}
|
|
|
|
# Generate qfeatures.h
|
|
features =
|
|
lines = $$cat("src/corelib/global/qfeatures.txt", lines)
|
|
for (line, lines) {
|
|
t = $$replace(line, "^Feature: (\\S+)\\s*$", "\\1")
|
|
!isEqual(t, $$line) {
|
|
feature = $$t
|
|
features += $$t
|
|
} else {
|
|
t = $$replace(line, "^Requires: (.*)$", "\\1")
|
|
!isEqual(t, $$line) {
|
|
features.$${feature}.depends = $$replace(t, \\s+$, )
|
|
} else {
|
|
t = $$replace(line, "^Name: (.*)$", "\\1")
|
|
!isEqual(t, $$line) {
|
|
features.$${feature}.name = $$replace(t, \\s+$, )
|
|
}
|
|
}
|
|
}
|
|
}
|
|
features = $$sort_depends(features, features.)
|
|
features = $$reverse(features)
|
|
FEATURES_H = \
|
|
"/*" \
|
|
" * All feature dependencies." \
|
|
" *" \
|
|
" * This list is generated by qmake from <qtbase>/src/corelib/global/qfeatures.txt" \
|
|
" */"
|
|
FEATURES_PRI =
|
|
for (ft, features) {
|
|
!isEmpty(features.$${ft}.depends) {
|
|
FEATURES_H += \
|
|
"$${LITERAL_HASH}if !defined(QT_NO_$$ft) && ($$join($$list($$split(features.$${ft}.depends)), ") || defined(QT_NO_", "defined(QT_NO_", ")"))" \
|
|
"$${LITERAL_HASH} define QT_NO_$$ft" \
|
|
"$${LITERAL_HASH}endif"
|
|
FEATURES_PRI += \
|
|
"contains(QT_DISABLED_FEATURES, "$$lower($$join($$list($$replace(features.$${ft}.depends, _, -)), "|"))"): \\" \
|
|
" QT_DISABLED_FEATURES += $$lower($$replace(ft, _, -))"
|
|
}
|
|
}
|
|
write_file($$OUT_PWD/src/corelib/global/qfeatures.h, FEATURES_H)|error()
|
|
# Create forwarding header
|
|
FWD_FEATURES_H = \
|
|
'$${LITERAL_HASH}include "../../src/corelib/global/qfeatures.h"'
|
|
write_file($$OUT_PWD/include/QtCore/qfeatures.h, FWD_FEATURES_H)|error()
|
|
|
|
no_features =
|
|
lines = $$cat($$OUT_PWD/src/corelib/global/qconfig.h, lines)
|
|
for (line, lines) {
|
|
# We ignore all defines that don't follow the #ifndef + indent pattern.
|
|
# This makes it possible to have unchecked defines which are no features.
|
|
t = $$replace(line, "^$${LITERAL_HASH} define QT_NO_(\\S+)\\s*$", "\\1")
|
|
!isEqual(t, $$line) {
|
|
isEmpty(features.$${t}.name): \
|
|
error("qconfig.h disables unknown feature $$t")
|
|
no_features += $$t
|
|
}
|
|
}
|
|
for (def, QT_NO_DEFINES) {
|
|
!isEmpty(features.$${def}.name): \
|
|
no_features += $$def
|
|
}
|
|
no_features = $$unique(no_features)
|
|
|
|
# Don't simply add these to QT_CONFIG, as then one might expect them to be there without load(qfeatures).
|
|
# And we don't want to do that automatically, as the dynamic dependency resolution is somewhat expensive.
|
|
FEATURES_PRI = \
|
|
"$${LITERAL_HASH} Features disabled by configure:" \
|
|
"QT_DISABLED_FEATURES =$$lower($$join($$list($$replace(no_features, _, -)), " ", " "))" \
|
|
"$$escape_expand(\\n)$${LITERAL_HASH} Dependencies derived from <qtbase>/src/corelib/global/qfeatures.txt:" \
|
|
$$FEATURES_PRI \
|
|
"QT_DISABLED_FEATURES = \$\$unique(QT_DISABLED_FEATURES)"
|
|
write_file($$OUT_PWD/mkspecs/qfeatures.pri, FEATURES_PRI)|error()
|
|
|
|
# Files created by us
|
|
QMAKE_DISTCLEAN += \
|
|
src/corelib/global/qfeatures.h \
|
|
include/QtCore/qfeatures.h \
|
|
mkspecs/qfeatures.pri
|
|
|
|
#mkspecs
|
|
mkspecs.path = $$[QT_HOST_DATA]/mkspecs
|
|
mkspecs.files = \
|
|
$$OUT_PWD/mkspecs/qconfig.pri $$OUT_PWD/mkspecs/qmodule.pri $$OUT_PWD/mkspecs/qfeatures.pri \
|
|
$$OUT_PWD/mkspecs/qdevice.pri $$OUT_PWD/mkspecs/qhost.pri \
|
|
$$files($$PWD/mkspecs/*)
|
|
mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
|
|
INSTALLS += mkspecs
|
|
|
|
global_docs.files = $$PWD/doc/global
|
|
global_docs.path = $$[QT_INSTALL_DOCS]
|
|
INSTALLS += global_docs
|
|
|
|
OTHER_FILES += \
|
|
configure \
|
|
header.BSD \
|
|
header.FDL \
|
|
header.LGPL \
|
|
header.LGPL-ONLY \
|
|
sync.profile
|