2016-08-16 18:03:54 +00:00
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
QT_CONFIGURE_REPORT =
|
|
|
|
QT_CONFIGURE_NOTES =
|
|
|
|
QT_CONFIGURE_WARNINGS =
|
|
|
|
QT_CONFIGURE_ERRORS =
|
|
|
|
|
|
|
|
defineTest(qtConfAddReport) {
|
|
|
|
QT_CONFIGURE_REPORT += "$$join(1, $$escape_expand(\\n))"
|
|
|
|
export(QT_CONFIGURE_REPORT)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfAddNote) {
|
|
|
|
QT_CONFIGURE_NOTES += "Note: $$join(1, $$escape_expand(\\n))"
|
|
|
|
export(QT_CONFIGURE_NOTES)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfAddWarning) {
|
|
|
|
QT_CONFIGURE_WARNINGS += "WARNING: $$join(1, $$escape_expand(\\n))"
|
|
|
|
export(QT_CONFIGURE_WARNINGS)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfAddError) {
|
|
|
|
QT_CONFIGURE_ERRORS += "ERROR: $$join(1, $$escape_expand(\\n))"
|
|
|
|
export(QT_CONFIGURE_ERRORS)
|
2016-07-14 14:41:09 +00:00
|
|
|
equals(2, log) {
|
|
|
|
CONFIG += mention_config_log
|
|
|
|
export(CONFIG)
|
|
|
|
}
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfCommandlineSetInput) {
|
|
|
|
arg = $${1}
|
|
|
|
val = $${2}
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
!isEmpty($${currentConfig}.commandline.options.$${arg}.name): \
|
|
|
|
arg = $$eval($${currentConfig}.commandline.options.$${arg}.name)
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
config.input.$$arg = $$val
|
|
|
|
export(config.input.$$arg)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineReplace(qtConfGetNextCommandlineArg) {
|
|
|
|
c = $$take_first(QMAKE_EXTRA_ARGS)
|
|
|
|
export(QMAKE_EXTRA_ARGS)
|
|
|
|
return($$c)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineReplace(qtConfPeekNextCommandlineArg) {
|
|
|
|
return($$first(QMAKE_EXTRA_ARGS))
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfCommandline_boolean) {
|
|
|
|
opt = $${1}
|
|
|
|
val = $${2}
|
|
|
|
isEmpty(val): val = yes
|
|
|
|
|
|
|
|
!equals(val, yes):!equals(val, no) {
|
|
|
|
qtConfAddError("Invalid value given for boolean command line option '$$opt'.")
|
|
|
|
return()
|
|
|
|
}
|
|
|
|
|
|
|
|
qtConfCommandlineSetInput($$opt, $$val)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfCommandline_void) {
|
|
|
|
opt = $${1}
|
|
|
|
val = $${2}
|
|
|
|
!isEmpty(val) {
|
2016-07-14 14:30:19 +00:00
|
|
|
qtConfAddError("Command line option '$$opt' expects no argument ('$$val' given).")
|
2016-06-11 20:49:01 +00:00
|
|
|
return()
|
|
|
|
}
|
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
val = $$eval($${currentConfig}.commandline.options.$${opt}.value)
|
2016-06-11 20:49:01 +00:00
|
|
|
isEmpty(val): val = yes
|
|
|
|
|
|
|
|
qtConfCommandlineSetInput($$opt, $$val)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfCommandline_enum) {
|
|
|
|
opt = $${1}
|
|
|
|
val = $${2}
|
|
|
|
isEmpty(val): val = yes
|
|
|
|
|
|
|
|
# validate and map value
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
mapped = $$eval($${currentConfig}.commandline.options.$${opt}.values.$${val})
|
2016-06-11 20:49:01 +00:00
|
|
|
isEmpty(mapped) {
|
|
|
|
# just a list of allowed values
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
for (i, $${currentConfig}.commandline.options.$${opt}.values._KEYS_) {
|
|
|
|
equals($${currentConfig}.commandline.options.$${opt}.values.$${i}, $$val) {
|
2016-06-11 20:49:01 +00:00
|
|
|
mapped = $$val
|
|
|
|
break()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
isEmpty(mapped) {
|
|
|
|
qtConfAddError("Invalid value '$$val' supplied to command line option '$$opt'.")
|
|
|
|
return()
|
|
|
|
}
|
|
|
|
|
|
|
|
qtConfCommandlineSetInput($$opt, $$mapped)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfValidateValue) {
|
|
|
|
opt = $${1}
|
|
|
|
val = $${2}
|
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
validValues = $$eval($${currentConfig}.commandline.options.$${opt}.values._KEYS_)
|
2016-06-11 20:49:01 +00:00
|
|
|
isEmpty(validValues): \
|
|
|
|
return(true)
|
|
|
|
|
|
|
|
for (i, validValues) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
equals($${currentConfig}.commandline.options.$${opt}.values.$${i}, $$val): \
|
2016-06-11 20:49:01 +00:00
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
2016-07-14 14:30:19 +00:00
|
|
|
qtConfAddError("Invalid value '$$val' supplied to command line option '$$opt'.")
|
2016-06-11 20:49:01 +00:00
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfCommandline_string) {
|
|
|
|
opt = $${1}
|
|
|
|
val = $${2}
|
|
|
|
isEmpty(val): val = $$qtConfGetNextCommandlineArg()
|
|
|
|
|
2016-08-10 10:34:24 +00:00
|
|
|
# Note: Arguments which are variable assignments are legit here.
|
2016-06-11 20:49:01 +00:00
|
|
|
contains(val, "^-.*")|isEmpty(val) {
|
2016-07-14 14:30:19 +00:00
|
|
|
qtConfAddError("No value supplied to command line option '$$opt'.")
|
2016-06-11 20:49:01 +00:00
|
|
|
return()
|
|
|
|
}
|
|
|
|
|
|
|
|
!qtConfValidateValue($$opt, $$val): \
|
|
|
|
return()
|
|
|
|
|
|
|
|
qtConfCommandlineSetInput($$opt, $$val)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfCommandline_optionalString) {
|
|
|
|
opt = $${1}
|
|
|
|
val = $${2}
|
|
|
|
isEmpty(val) {
|
|
|
|
v = $$qtConfPeekNextCommandlineArg()
|
2016-08-10 10:34:24 +00:00
|
|
|
contains(v, "^-.*|[A-Z_]+=.*")|isEmpty(v): \
|
2016-06-11 20:49:01 +00:00
|
|
|
val = "yes"
|
|
|
|
else: \
|
|
|
|
val = $$qtConfGetNextCommandlineArg()
|
|
|
|
}
|
|
|
|
|
|
|
|
!qtConfValidateValue($$opt, $$val): \
|
|
|
|
return()
|
|
|
|
|
|
|
|
qtConfCommandlineSetInput($$opt, $$val)
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
defineTest(qtConfCommandline_addString) {
|
|
|
|
opt = $${1}
|
|
|
|
val = $${2}
|
|
|
|
isEmpty(val): val = $$qtConfGetNextCommandlineArg()
|
|
|
|
|
2016-08-10 10:34:24 +00:00
|
|
|
contains(val, "^-.*|[A-Z_]+=.*")|isEmpty(val) {
|
2016-07-14 14:30:19 +00:00
|
|
|
qtConfAddError("No value supplied to command line option '$$opt'.")
|
2016-06-11 20:49:01 +00:00
|
|
|
return()
|
|
|
|
}
|
|
|
|
|
|
|
|
!qtConfValidateValue($$opt, $$val): \
|
|
|
|
return()
|
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
!isEmpty($${currentConfig}.commandline.options.$${opt}.name): \
|
|
|
|
opt = $$eval($${currentConfig}.commandline.options.$${opt}.name)
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
config.input.$$opt += $$val
|
|
|
|
export(config.input.$$opt)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfParseCommandLine) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
customCalls =
|
|
|
|
for (cc, allConfigs) {
|
|
|
|
custom = $$eval($${cc}.commandline.custom)
|
|
|
|
|
|
|
|
!isEmpty(custom) {
|
|
|
|
customCall = qtConfCommandline_$$custom
|
|
|
|
!defined($$customCall, test): \
|
|
|
|
error("Custom command line callback '$$custom' is undefined.")
|
|
|
|
customCalls += $$customCall
|
|
|
|
}
|
replace mechanism to override variables from the mkspecs
it is sometimes desirable to override values from the mkspec without
modifying (or wrapping) the spec itself. linux distributors do this on a
regular basis.
so far, we'd pick up CFLAGS, etc. from the environment, in a somewhat
autoconf-like fashion. however, over time, this approach proved
problematic: the concept doesn't mix particularly well with mkspecs to
start with, is unexpected (and therefore causes frustration), and
doesn't mix well with cross-building (at least the way it was realized).
ironically, it was implemented this way (quite a while ago) upon my
explicit request ...
the new mechanism uses explicit variable manipulations on the configure
command line, just like qmake itself understands. as it happens, this is
again quite similar to autoconf-generated configure scripts. however,
this time around we don't pretend to be actually autoconf-like, so we
also don't try to map any variable names (some of which have different
semantics anyway).
this commit also eliminates the last use of the QMakeVar() function,
so delete it and the underlying infrastructure.
Task-number: QTBUG-32530
Task-number: QTBUG-42962
Change-Id: Id31a6b80e1add08ca21f5b178614bda530d12374
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-06 11:58:53 +00:00
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
for (ever) {
|
|
|
|
c = $$qtConfGetNextCommandlineArg()
|
|
|
|
isEmpty(c): break()
|
|
|
|
|
2016-06-29 13:02:35 +00:00
|
|
|
# handle options to turn on verbose logging
|
|
|
|
contains(c, "^-v")|contains(c, "^--?verbose") {
|
|
|
|
QMAKE_CONFIG_VERBOSE = true
|
|
|
|
export(QMAKE_CONFIG_VERBOSE)
|
|
|
|
next()
|
|
|
|
}
|
2016-07-06 14:08:13 +00:00
|
|
|
contains(c, "^-no-v")|contains(c, "^--?no-verbose") {
|
|
|
|
QMAKE_CONFIG_VERBOSE = false
|
|
|
|
export(QMAKE_CONFIG_VERBOSE)
|
|
|
|
next()
|
|
|
|
}
|
2016-06-29 13:02:35 +00:00
|
|
|
|
2016-08-16 18:03:54 +00:00
|
|
|
contains(c, "^--?recheck") {
|
|
|
|
QMAKE_CONFIG_CACHE_USE = positive
|
|
|
|
export(QMAKE_CONFIG_CACHE_USE)
|
|
|
|
next()
|
|
|
|
}
|
|
|
|
contains(c, "^--?recheck-all") {
|
|
|
|
QMAKE_CONFIG_CACHE_USE = none
|
|
|
|
export(QMAKE_CONFIG_CACHE_USE)
|
|
|
|
next()
|
|
|
|
}
|
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
didCustomCall = false
|
|
|
|
for (customCall, customCalls) {
|
|
|
|
$${customCall}($$c) {
|
|
|
|
didCustomCall = true
|
|
|
|
break()
|
|
|
|
}
|
replace mechanism to override variables from the mkspecs
it is sometimes desirable to override values from the mkspec without
modifying (or wrapping) the spec itself. linux distributors do this on a
regular basis.
so far, we'd pick up CFLAGS, etc. from the environment, in a somewhat
autoconf-like fashion. however, over time, this approach proved
problematic: the concept doesn't mix particularly well with mkspecs to
start with, is unexpected (and therefore causes frustration), and
doesn't mix well with cross-building (at least the way it was realized).
ironically, it was implemented this way (quite a while ago) upon my
explicit request ...
the new mechanism uses explicit variable manipulations on the configure
command line, just like qmake itself understands. as it happens, this is
again quite similar to autoconf-generated configure scripts. however,
this time around we don't pretend to be actually autoconf-like, so we
also don't try to map any variable names (some of which have different
semantics anyway).
this commit also eliminates the last use of the QMakeVar() function,
so delete it and the underlying infrastructure.
Task-number: QTBUG-32530
Task-number: QTBUG-42962
Change-Id: Id31a6b80e1add08ca21f5b178614bda530d12374
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-06 11:58:53 +00:00
|
|
|
}
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
$$didCustomCall: \
|
|
|
|
next()
|
replace mechanism to override variables from the mkspecs
it is sometimes desirable to override values from the mkspec without
modifying (or wrapping) the spec itself. linux distributors do this on a
regular basis.
so far, we'd pick up CFLAGS, etc. from the environment, in a somewhat
autoconf-like fashion. however, over time, this approach proved
problematic: the concept doesn't mix particularly well with mkspecs to
start with, is unexpected (and therefore causes frustration), and
doesn't mix well with cross-building (at least the way it was realized).
ironically, it was implemented this way (quite a while ago) upon my
explicit request ...
the new mechanism uses explicit variable manipulations on the configure
command line, just like qmake itself understands. as it happens, this is
again quite similar to autoconf-generated configure scripts. however,
this time around we don't pretend to be actually autoconf-like, so we
also don't try to map any variable names (some of which have different
semantics anyway).
this commit also eliminates the last use of the QMakeVar() function,
so delete it and the underlying infrastructure.
Task-number: QTBUG-32530
Task-number: QTBUG-42962
Change-Id: Id31a6b80e1add08ca21f5b178614bda530d12374
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-07-06 11:58:53 +00:00
|
|
|
|
2016-08-10 10:34:24 +00:00
|
|
|
contains(c, "([A-Z_]+)=(.*)") {
|
|
|
|
opt = $$replace(c, "^([A-Z_]+)=(.*)", "\\1")
|
|
|
|
val = $$replace(c, "^([A-Z_]+)=(.*)", "\\2")
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
for (cc, allConfigs) {
|
|
|
|
var = $$eval($${cc}.commandline.assignments.$${opt})
|
|
|
|
!isEmpty(var): \
|
|
|
|
break()
|
|
|
|
}
|
2016-08-10 10:34:24 +00:00
|
|
|
isEmpty(var) {
|
|
|
|
qtConfAddError("Assigning unknown variable '$$opt' on command line.")
|
|
|
|
return()
|
|
|
|
}
|
|
|
|
config.input.$$var = $$val
|
|
|
|
export(config.input.$$var)
|
|
|
|
next()
|
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
# parse out opt and val
|
|
|
|
contains(c, "^--?enable-(.*)") {
|
|
|
|
opt = $$replace(c, "^--?enable-(.*)", "\\1")
|
|
|
|
val = yes
|
|
|
|
} else: contains(c, "^--?(disable|no)-(.*)") {
|
|
|
|
opt = $$replace(c, "^--?(disable|no)-(.*)", "\\2")
|
|
|
|
val = no
|
2016-08-30 16:10:41 +00:00
|
|
|
} else: contains(c, "^--([^=]+)=(.*)") {
|
|
|
|
opt = $$replace(c, "^--?([^=]+)=(.*)", "\\1")
|
|
|
|
val = $$replace(c, "^--?([^=]+)=(.*)", "\\2")
|
|
|
|
} else: contains(c, "^--(.*)") {
|
|
|
|
opt = $$replace(c, "^--(.*)", "\\1")
|
|
|
|
val = yes
|
|
|
|
} else: contains(c, "^-qt-(.*)") {
|
|
|
|
opt = $$replace(c, "^-qt-(.*)", "\\1")
|
2016-06-11 20:49:01 +00:00
|
|
|
val = qt
|
2016-08-30 16:10:41 +00:00
|
|
|
} else: contains(c, "^-system-(.*)") {
|
|
|
|
opt = $$replace(c, "^-system-(.*)", "\\1")
|
2016-06-11 20:49:01 +00:00
|
|
|
val = system
|
2016-08-30 16:10:41 +00:00
|
|
|
} else: contains(c, "^-(.*)") {
|
|
|
|
opt = $$replace(c, "^-(.*)", "\\1")
|
2016-06-11 20:49:01 +00:00
|
|
|
val =
|
|
|
|
} else {
|
2016-07-14 14:40:23 +00:00
|
|
|
qtConfAddError("Invalid command line parameter '$$c'.")
|
|
|
|
return()
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
for (cc, allConfigs) {
|
|
|
|
type = $$eval($${cc}.commandline.options.$${opt})
|
|
|
|
isEmpty(type): \
|
|
|
|
type = $$eval($${cc}.commandline.options.$${opt}.type)
|
|
|
|
isEmpty(type) {
|
|
|
|
# no match in the regular options, try matching the prefixes
|
|
|
|
for (p, $${cc}.commandline.prefix._KEYS_) {
|
|
|
|
e = "^-$${p}(.*)"
|
|
|
|
contains(c, $$e) {
|
|
|
|
opt = $$eval($${cc}.commandline.prefix.$${p})
|
|
|
|
val = $$replace(c, $$e, "\\1")
|
|
|
|
type = "addString"
|
|
|
|
break()
|
|
|
|
}
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
}
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
!isEmpty(type) {
|
|
|
|
currentConfig = $$cc
|
|
|
|
break()
|
|
|
|
}
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
# handle builtin [-no]-feature-xxx
|
|
|
|
isEmpty(type):contains(opt, "feature-(.*)") {
|
2016-08-26 19:19:12 +00:00
|
|
|
opt ~= s,^feature-,,
|
|
|
|
found = false
|
|
|
|
for (cc, allConfigs) {
|
|
|
|
contains($${cc}.features._KEYS_, $$opt) {
|
|
|
|
found = true
|
|
|
|
break()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
!$$found {
|
|
|
|
qtConfAddError("Enabling/Disabling unknown feature '$$opt'.")
|
|
|
|
return()
|
|
|
|
}
|
|
|
|
# this is a boolean enabling/disabling the corresponding feature
|
|
|
|
type = boolean
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
2016-07-14 14:40:23 +00:00
|
|
|
isEmpty(type) {
|
|
|
|
qtConfAddError("Unknown command line option '$$c'.")
|
|
|
|
return()
|
|
|
|
}
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
call = "qtConfCommandline_$${type}"
|
|
|
|
!defined($$call, test): \
|
|
|
|
error("Command line option '$$c' has unknown type '$$type'.")
|
|
|
|
|
|
|
|
# now that we have opt and value, process it
|
|
|
|
$${call}($$opt, $$val)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
defineReplace(qtConfToolchainSupportsFlag) {
|
|
|
|
test_out_dir = $$shadowed($$QMAKE_CONFIG_TESTS_DIR)
|
|
|
|
test_cmd_base = "cd $$system_quote($$system_path($$test_out_dir)) &&"
|
|
|
|
|
|
|
|
conftest = "int main() { return 0; }"
|
2016-07-14 14:50:02 +00:00
|
|
|
write_file("$$test_out_dir/conftest.cpp", conftest)|error()
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
qtRunLoggedCommand("$$test_cmd_base $$QMAKE_CXX $${1} -o conftest-out conftest.cpp"): \
|
|
|
|
return(true)
|
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfTest_compilerSupportsFlag) {
|
|
|
|
flag = $$eval($${1}.flag)
|
|
|
|
|
|
|
|
return($$qtConfToolchainSupportsFlag($$flag))
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfTest_linkerSupportsFlag) {
|
|
|
|
flag = $$eval($${1}.flag)
|
|
|
|
|
|
|
|
use_gold_linker: \
|
|
|
|
LFLAGS = -fuse-ld=gold
|
|
|
|
|
2016-07-01 08:35:07 +00:00
|
|
|
return($$qtConfToolchainSupportsFlag($$LFLAGS "-Wl,$$flag"))
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
2016-08-05 15:54:26 +00:00
|
|
|
defineReplace(qtConfFindInPathList) {
|
|
|
|
for (dir, 2) {
|
2016-06-11 20:49:01 +00:00
|
|
|
exists("$$dir/$${1}"): \
|
|
|
|
return("$$dir/$${1}")
|
|
|
|
}
|
|
|
|
return()
|
|
|
|
}
|
|
|
|
|
2016-08-05 15:54:26 +00:00
|
|
|
defineReplace(qtConfFindInPath) {
|
|
|
|
ensurePathEnv()
|
2016-08-14 07:48:55 +00:00
|
|
|
return($$qtConfFindInPathList($$1, $$2 $$QMAKE_PATH_ENV))
|
2016-08-05 15:54:26 +00:00
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
defineReplace(qtConfPkgConfigEnv) {
|
|
|
|
env =
|
2016-06-28 14:22:34 +00:00
|
|
|
!isEmpty(PKG_CONFIG_SYSROOT_DIR): env = "$${SETENV_PFX}PKG_CONFIG_SYSROOT_DIR=$${PKG_CONFIG_SYSROOT_DIR}$${SETENV_SFX} "
|
|
|
|
!isEmpty(PKG_CONFIG_LIBDIR): env = "$$env$${SETENV_PFX}PKG_CONFIG_LIBDIR=$${PKG_CONFIG_LIBDIR}$${SETENV_SFX} "
|
2016-06-11 20:49:01 +00:00
|
|
|
return($$env)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineReplace(qtConfPkgConfig) {
|
|
|
|
host = $$1
|
|
|
|
isEmpty(host): host = false
|
|
|
|
|
|
|
|
$$host {
|
|
|
|
pkg_config = $$qtConfFindInPath("pkg-config")
|
|
|
|
} else {
|
2016-06-28 14:22:34 +00:00
|
|
|
pkg_config = "$$qtConfPkgConfigEnv()$$PKG_CONFIG"
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return($$pkg_config)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfPkgConfigPackageExists) {
|
|
|
|
isEmpty(1)|isEmpty(2): \
|
|
|
|
return(false)
|
|
|
|
|
|
|
|
!qtRunLoggedCommand("$${1} --exists --silence-errors $${2}"): \
|
|
|
|
return(false)
|
|
|
|
|
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineReplace(qtConfPrepareArgs) {
|
|
|
|
arglist = $$split(1)
|
|
|
|
args =
|
|
|
|
for (a, arglist): \
|
|
|
|
args += $$system_quote($$a)
|
|
|
|
return($$args)
|
|
|
|
}
|
|
|
|
|
2016-08-15 12:40:52 +00:00
|
|
|
defineTest(qtConfSetupLibraries) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
for (l, $${currentConfig}.libraries._KEYS_) {
|
|
|
|
lpfx = $${currentConfig}.libraries.$${l}
|
2016-08-15 12:40:52 +00:00
|
|
|
# 'export' may be omitted, in which case it falls back to the library's name
|
|
|
|
!defined($${lpfx}.export, var) {
|
|
|
|
$${lpfx}.export = $$l
|
|
|
|
export($${lpfx}.export)
|
|
|
|
}
|
|
|
|
isEmpty($${lpfx}.sources._KEYS_): \
|
|
|
|
error("Library $$l defines no sources")
|
|
|
|
for (s, $${lpfx}.sources._KEYS_) {
|
|
|
|
spfx = $${lpfx}.sources.$${s}
|
|
|
|
# link back to parent object
|
|
|
|
$${spfx}.library = $$l
|
|
|
|
export($${spfx}.library)
|
|
|
|
# a plain string is transformed into a structure
|
|
|
|
isEmpty($${spfx}._KEYS_) {
|
|
|
|
$${spfx}.libs = $$eval($${spfx})
|
|
|
|
export($${spfx}.libs)
|
|
|
|
}
|
|
|
|
# if the type is missing (implicitly in the case of plain strings), assume 'inline'
|
|
|
|
isEmpty($${spfx}.type) {
|
|
|
|
$${spfx}.type = inline
|
|
|
|
export($${spfx}.type)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-08-10 10:34:24 +00:00
|
|
|
|
|
|
|
# reverse mapping for assignments on command line.
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
for (a, $${currentConfig}.commandline.assignments._KEYS_) {
|
|
|
|
apfx = $${currentConfig}.commandline.assignments.$${a}
|
2016-08-10 10:34:24 +00:00
|
|
|
ra = config.commandline.rev_assignments.$$eval($$apfx)
|
|
|
|
$$ra = $$a
|
|
|
|
export($$ra)
|
|
|
|
}
|
2016-08-15 12:40:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
# the library is specified inline in a 'libs' field.
|
2016-08-10 10:34:24 +00:00
|
|
|
# overrides from the command line are accepted.
|
2016-08-15 12:40:52 +00:00
|
|
|
defineTest(qtConfLibrary_inline) {
|
|
|
|
lib = $$eval($${1}.library)
|
|
|
|
!defined($${1}.libs, var): \
|
|
|
|
error("'inline' source in library '$$lib' does not specify 'libs'.")
|
2016-08-10 10:34:24 +00:00
|
|
|
|
|
|
|
# direct libs. overwrites inline libs.
|
|
|
|
defined(config.input.$${lib}.libs, var) {
|
|
|
|
$${1}.libs = $$eval(config.input.$${lib}.libs)
|
|
|
|
export($${1}.libs)
|
|
|
|
}
|
|
|
|
|
|
|
|
# build-specific direct libs. overwrites inline libs.
|
|
|
|
vars =
|
|
|
|
any = false
|
|
|
|
all = true
|
|
|
|
for (b, $${1}.builds._KEYS_) {
|
|
|
|
iv = $${lib}.libs.$${b}
|
|
|
|
vars += $$eval(config.commandline.rev_assignments.$${iv})
|
|
|
|
defined(config.input.$${iv}, var) {
|
|
|
|
$${1}.builds.$${b}.libs = $$eval(config.input.$${iv})
|
|
|
|
export($${1}.builds.$${b}.libs)
|
|
|
|
any = true
|
|
|
|
} else {
|
|
|
|
all = false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$$any:!$$all {
|
|
|
|
qtConfAddError("Either none or all of $$join(vars, ", ", [, ]) must be specified.")
|
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
|
|
|
|
# prefix. prepends to (possibly overwritten) inline libs.
|
|
|
|
prefix = $$val_escape(config.input.$${lib}.prefix)
|
|
|
|
!isEmpty(prefix) {
|
|
|
|
$${1}.includedir = $$prefix/include
|
|
|
|
export($${1}.includedir)
|
|
|
|
$${1}.cflags = -I$$prefix/include
|
|
|
|
export($${1}.cflags)
|
|
|
|
$${1}.libs = "-L$$prefix/lib $$eval($${1}.libs)"
|
|
|
|
export($${1}.libs)
|
|
|
|
}
|
|
|
|
|
2016-08-15 12:40:52 +00:00
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
|
|
|
# the library is provided by the qmake spec.
|
|
|
|
# this source type cannot fail.
|
|
|
|
defineTest(qtConfLibrary_makeSpec) {
|
|
|
|
spec = $$eval($${1}.spec)
|
|
|
|
isEmpty(spec): \
|
|
|
|
error("makeSpec source in library '$$eval($${1}.library)' does not specify 'spec'.")
|
|
|
|
|
|
|
|
$${1}.includedir = "$$val_escape(QMAKE_INCDIR_$$spec)"
|
|
|
|
export($${1}.includedir)
|
|
|
|
$${1}.cflags = "$$val_escape(QMAKE_CFLAGS_$$spec)"
|
|
|
|
export($${1}.cflags)
|
|
|
|
libs =
|
|
|
|
for (l, QMAKE_LIBDIR_$$spec): \
|
|
|
|
libs += -L$$l
|
|
|
|
libs += $$eval(QMAKE_LIBS_$$spec)
|
|
|
|
$${1}.libs = "$$val_escape(libs)"
|
|
|
|
export($${1}.libs)
|
|
|
|
|
|
|
|
# the library definition is always in scope, so no point in exporting it.
|
|
|
|
$${1}.export = false
|
|
|
|
export($${1}.export)
|
|
|
|
|
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
|
|
|
# the library is found via pkg-config.
|
|
|
|
defineTest(qtConfLibrary_pkgConfig) {
|
2016-06-11 20:49:01 +00:00
|
|
|
pkg_config = $$qtConfPkgConfig($$eval($${1}.host))
|
2016-07-15 16:26:55 +00:00
|
|
|
isEmpty(pkg_config): \
|
|
|
|
return(false)
|
2016-08-15 12:40:52 +00:00
|
|
|
args = $$qtConfPrepareArgs($$eval($${1}.args))
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
!qtConfPkgConfigPackageExists($$pkg_config, $$args): \
|
|
|
|
return(false)
|
|
|
|
|
2016-08-01 11:04:24 +00:00
|
|
|
qtRunLoggedCommand("$$pkg_config --modversion $$args", version)|return(false)
|
2016-08-30 19:07:20 +00:00
|
|
|
qtRunLoggedCommand("$$pkg_config --libs-only-L --libs-only-l $$args", $${1}.libs)|return(false)
|
2016-08-01 11:04:24 +00:00
|
|
|
qtRunLoggedCommand("$$pkg_config --cflags $$args", $${1}.cflags)|return(false)
|
|
|
|
qtRunLoggedCommand("$$pkg_config --cflags-only-I $$args", includes)|return(false)
|
2016-07-20 18:22:50 +00:00
|
|
|
eval(includes = $$includes)
|
2016-06-11 20:49:01 +00:00
|
|
|
includes ~= s/^-I//g
|
2016-07-20 18:22:50 +00:00
|
|
|
$${1}.includedir = "$$val_escape(includes)"
|
2016-08-24 07:29:47 +00:00
|
|
|
version ~= s/[^0-9.].*$//
|
2016-06-11 20:49:01 +00:00
|
|
|
$${1}.version = $$first(version)
|
|
|
|
export($${1}.libs)
|
|
|
|
export($${1}.cflags)
|
|
|
|
export($${1}.includedir)
|
|
|
|
export($${1}.version)
|
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfTest_getPkgConfigVariable) {
|
|
|
|
pkg_config = $$qtConfPkgConfig($$eval($${1}.host))
|
2016-07-15 16:26:55 +00:00
|
|
|
isEmpty(pkg_config): \
|
|
|
|
return(false)
|
2016-06-11 20:49:01 +00:00
|
|
|
args = $$qtConfPrepareArgs($$eval($${1}.pkg-config-args))
|
|
|
|
|
|
|
|
!qtConfPkgConfigPackageExists($$pkg_config, $$args): \
|
|
|
|
return(false)
|
|
|
|
|
|
|
|
variable = $$eval($${1}.pkg-config-variable)
|
2016-08-01 11:04:24 +00:00
|
|
|
qtRunLoggedCommand("$$pkg_config --variable=$$variable $$args", $${1}.value)|return(false)
|
2016-06-11 20:49:01 +00:00
|
|
|
export($${1}.value)
|
2016-08-16 18:03:54 +00:00
|
|
|
$${1}.cache += value
|
|
|
|
export($${1}.cache)
|
2016-06-11 20:49:01 +00:00
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
2016-08-15 12:40:52 +00:00
|
|
|
defineReplace(qtConfLibraryArgs) {
|
|
|
|
qmake_args =
|
|
|
|
libs = $$eval($${1}.libs)
|
|
|
|
!isEmpty(libs): \
|
|
|
|
qmake_args += $$system_quote(LIBS += $$libs)
|
|
|
|
for (b, $${1}.builds._KEYS_): \
|
|
|
|
qmake_args += $$system_quote(LIBS_$$upper($$b) += $$eval($${1}.builds.$${b}))
|
|
|
|
includedir = $$eval($${1}.includedir)
|
|
|
|
!isEmpty(includedir): \
|
|
|
|
qmake_args += $$system_quote(INCLUDEPATH *= $$includedir)
|
|
|
|
return($$qmake_args)
|
|
|
|
}
|
|
|
|
|
2016-07-20 10:44:16 +00:00
|
|
|
defineReplace(qtConfGetHexVersion) {
|
|
|
|
version = $$split(1, '.')
|
|
|
|
number =
|
|
|
|
for(i, 0..2) {
|
|
|
|
n = $$member(version, $$i)
|
|
|
|
isEmpty(n): n = 0
|
|
|
|
number += $$format_number($$n, obase=16 zeropad width=2)
|
|
|
|
}
|
|
|
|
number = "0x$$join(number)"
|
|
|
|
return($$number)
|
|
|
|
}
|
|
|
|
|
2016-08-15 12:40:52 +00:00
|
|
|
defineTest(qtConfExportLibrary) {
|
|
|
|
isEmpty(2): return()
|
|
|
|
!$$qtConfEvaluate($$eval($${1}.export)): return()
|
|
|
|
|
|
|
|
output = privatePro
|
|
|
|
|
|
|
|
eval(libs = $$eval($${1}.libs))
|
|
|
|
eval(cflags = $$eval($${1}.cflags))
|
|
|
|
eval(includes = $$eval($${1}.includedir))
|
2016-07-20 10:44:16 +00:00
|
|
|
version = $$eval($${1}.version)
|
2016-08-15 12:40:52 +00:00
|
|
|
|
|
|
|
NAME = $$upper($$2)
|
|
|
|
!isEmpty(libs): qtConfOutputVar(assign, $$output, QMAKE_LIBS_$$NAME, $$libs)
|
|
|
|
for (b, $${1}.builds._KEYS_): \
|
|
|
|
qtConfOutputVar(assign, $$output, QMAKE_LIBS_$${NAME}_$$upper($$b), \
|
|
|
|
$$eval($${1}.builds.$${b}))
|
|
|
|
!isEmpty(cflags): qtConfOutputVar(assign, $$output, QMAKE_CFLAGS_$$NAME, $$cflags)
|
|
|
|
!isEmpty(includes): qtConfOutputVar(assign, $$output, QMAKE_INCDIR_$$NAME, $$includes)
|
|
|
|
!isEmpty(version) {
|
2016-07-20 10:44:16 +00:00
|
|
|
qtConfOutputVar(assign, $$output, QMAKE_$${NAME}_VERSION, $$version)
|
|
|
|
qtConfOutputSetDefine("privateHeader", "QT_LIBRARY_VERSION_$${2}", $$qtConfGetHexVersion($$version))
|
|
|
|
version = $$split(version, '.')
|
2016-08-15 12:40:52 +00:00
|
|
|
qtConfOutputVar(assign, $$output, QMAKE_$${NAME}_VERSION_MAJOR, $$member(version, 0))
|
|
|
|
qtConfOutputVar(assign, $$output, QMAKE_$${NAME}_VERSION_MINOR, $$member(version, 1))
|
|
|
|
qtConfOutputVar(assign, $$output, QMAKE_$${NAME}_VERSION_PATCH, $$member(version, 2))
|
|
|
|
}
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
!isEmpty($${currentConfig}.module): \
|
|
|
|
qtConfExtendVar($$output, "QT.$${currentModule}_private.libraries", $$2)
|
2016-08-15 12:40:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfHandleLibrary) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
lpfx = $${currentConfig}.libraries.$$1
|
2016-08-15 12:40:52 +00:00
|
|
|
defined($${lpfx}.result, var): return()
|
|
|
|
|
2016-08-12 08:14:51 +00:00
|
|
|
qtConfEnsureTestTypeDeps("library")
|
|
|
|
|
2016-08-16 18:03:54 +00:00
|
|
|
qtConfLoadResult($${lpfx}, $$1) {
|
2016-08-25 13:51:27 +00:00
|
|
|
$$eval($${lpfx}.result): \
|
|
|
|
qtConfExportLibrary($${lpfx}.sources.$$eval($${lpfx}.source), $$eval($${lpfx}.export))
|
2016-08-16 18:03:54 +00:00
|
|
|
return()
|
|
|
|
}
|
|
|
|
|
2016-08-15 12:40:52 +00:00
|
|
|
qtLogTestIntro($${lpfx})
|
|
|
|
msg = "looking for library $${1}"
|
|
|
|
write_file($$QMAKE_CONFIG_LOG, msg, append)
|
|
|
|
|
|
|
|
result = false
|
|
|
|
for (s, $${lpfx}.sources._KEYS_) {
|
|
|
|
qtLog("Trying source $$s of library $${1}.")
|
|
|
|
spfx = $${lpfx}.sources.$${s}
|
|
|
|
|
|
|
|
t = $$eval($${spfx}.type)
|
|
|
|
call = qtConfLibrary_$$t
|
|
|
|
!defined($$call, test): \
|
|
|
|
error("Library $${1} source $${s} has unknown type '$$t'")
|
|
|
|
|
|
|
|
!$$qtConfEvaluate($$eval($${spfx}.condition)) {
|
|
|
|
qtLog("Source $$s of library $$1 failed condition.")
|
|
|
|
next()
|
|
|
|
}
|
|
|
|
|
|
|
|
!$${call}($$spfx) {
|
|
|
|
qtLog("Source $$s of library $$1 produced no result.")
|
|
|
|
next()
|
|
|
|
}
|
|
|
|
|
|
|
|
# if the library defines a test, use it to verify the source.
|
|
|
|
!isEmpty($${lpfx}.test) {
|
|
|
|
$${lpfx}.literal_args = $$qtConfLibraryArgs($$spfx)
|
|
|
|
$${lpfx}.host = $$eval($${spfx}.host)
|
|
|
|
!qtConfTest_compile($$lpfx) {
|
|
|
|
qtLog("Source $$s of library $$1 failed verification.")
|
|
|
|
next()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-16 18:03:54 +00:00
|
|
|
$${lpfx}.cache += source
|
|
|
|
for (v, $$list(libs includes cflags version export)): \
|
|
|
|
$${lpfx}.cache += sources.$${s}.$${v}
|
|
|
|
for (b, $${spfx}.builds._KEYS_): \
|
|
|
|
$${lpfx}.cache += sources.$${s}.builds.$${b}
|
|
|
|
|
2016-08-15 12:40:52 +00:00
|
|
|
# immediately output the library as well.
|
|
|
|
qtConfExportLibrary($${spfx}, $$eval($${lpfx}.export))
|
|
|
|
|
|
|
|
$${lpfx}.source = $$s
|
|
|
|
export($${lpfx}.source)
|
|
|
|
result = true
|
|
|
|
break()
|
|
|
|
}
|
|
|
|
|
|
|
|
qtLogTestResult($${lpfx}, $$result)
|
|
|
|
|
|
|
|
$${lpfx}.result = $$result
|
|
|
|
export($${lpfx}.result)
|
2016-08-16 18:03:54 +00:00
|
|
|
qtConfSaveResult($${lpfx}, $$1)
|
2016-08-15 12:40:52 +00:00
|
|
|
}
|
|
|
|
|
2016-08-12 08:14:51 +00:00
|
|
|
# This is a fake test type for the test dependency system.
|
|
|
|
defineTest(qtConfTest_library) {
|
|
|
|
error("The test type 'library' may not be instantiated.")
|
|
|
|
}
|
|
|
|
|
2016-08-15 12:40:52 +00:00
|
|
|
defineTest(qtConfTestPrepare_compile) {
|
|
|
|
for (u, $$list($$eval($${1}.use))) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
!contains($${currentConfig}.libraries._KEYS_, $$u): \
|
2016-08-15 12:40:52 +00:00
|
|
|
error("Test $$1 tries to use undeclared library '$$u'")
|
|
|
|
qtConfHandleLibrary($$u)
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
lpfx = $${currentConfig}.libraries.$${u}
|
2016-08-15 12:40:52 +00:00
|
|
|
isEmpty($${lpfx}.source): \
|
|
|
|
return(false)
|
|
|
|
$${1}.literal_args += $$qtConfLibraryArgs($${lpfx}.sources.$$eval($${lpfx}.source))
|
|
|
|
}
|
|
|
|
export($${1}.literal_args)
|
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
defineTest(qtConfTest_compile) {
|
|
|
|
test = $$eval($${1}.test)
|
2016-06-29 09:39:27 +00:00
|
|
|
host = $$eval($${1}.host)
|
|
|
|
isEmpty(host): host = false
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
test_dir = $$QMAKE_CONFIG_TESTS_DIR/$$test
|
|
|
|
test_out_dir = $$shadowed($$test_dir)
|
2016-06-29 09:39:27 +00:00
|
|
|
!isEmpty($${1}.pro): \
|
|
|
|
test_dir = $$test_dir/$$eval($${1}.pro)
|
2016-06-11 20:49:01 +00:00
|
|
|
test_cmd_base = "cd $$system_quote($$system_path($$test_out_dir)) &&"
|
|
|
|
|
2016-07-15 13:57:43 +00:00
|
|
|
qmake_args = $$qtConfPkgConfigEnv()$$system_quote($$system_path($$QMAKE_QMAKE))
|
|
|
|
!isEmpty(QMAKE_QTCONF): \
|
|
|
|
qmake_args += -qtconf $$system_quote($$QMAKE_QTCONF)
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
# Disable qmake features which are typically counterproductive for tests
|
2016-07-15 13:57:43 +00:00
|
|
|
qmake_args += "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\""
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
# allow tests to behave differently depending on the type of library
|
|
|
|
# being built (shared/static). e.g. see config.tests/unix/icu
|
|
|
|
shared: \
|
2016-06-27 08:56:50 +00:00
|
|
|
qmake_configs = "shared"
|
2016-06-11 20:49:01 +00:00
|
|
|
else: \
|
2016-06-27 08:56:50 +00:00
|
|
|
qmake_configs = "static"
|
|
|
|
|
2016-07-29 17:58:33 +00:00
|
|
|
use_gold_linker: \
|
|
|
|
qmake_configs += "use_gold_linker"
|
|
|
|
|
2016-06-27 08:56:50 +00:00
|
|
|
# add console to the CONFIG variable when running the tests, so that they
|
|
|
|
# can work with a regular main() entry point on Windows.
|
|
|
|
qmake_configs += "console"
|
|
|
|
|
|
|
|
qmake_args += "\"CONFIG += $$qmake_configs\""
|
2016-06-11 20:49:01 +00:00
|
|
|
|
2016-06-29 09:39:27 +00:00
|
|
|
!$$host {
|
2016-07-05 12:45:24 +00:00
|
|
|
# On WinRT we need to change the entry point as we cannot create windows
|
|
|
|
# applications
|
|
|
|
winrt: \
|
|
|
|
qmake_args += " \"QMAKE_LFLAGS += /ENTRY:main\""
|
|
|
|
|
2016-06-29 09:39:27 +00:00
|
|
|
# add compiler flags, these are set for the target and should not be applied to host tests
|
|
|
|
!isEmpty(EXTRA_DEFINES): \
|
2016-07-14 19:13:11 +00:00
|
|
|
qmake_args += $$system_quote(DEFINES += $$val_escape(EXTRA_DEFINES))
|
2016-07-07 11:47:49 +00:00
|
|
|
!isEmpty(EXTRA_LIBDIR) \
|
2016-07-14 19:13:11 +00:00
|
|
|
qmake_args += $$system_quote(QMAKE_LIBDIR += $$val_escape(EXTRA_LIBDIR))
|
2016-07-07 11:47:49 +00:00
|
|
|
!isEmpty(EXTRA_FRAMEWORKPATH) \
|
2016-07-14 19:13:11 +00:00
|
|
|
qmake_args += $$system_quote(QMAKE_FRAMEWORKPATH += $$val_escape(EXTRA_FRAMEWORKPATH))
|
2016-06-29 09:39:27 +00:00
|
|
|
!isEmpty(EXTRA_INCLUDEPATH): \
|
2016-07-14 19:13:11 +00:00
|
|
|
qmake_args += $$system_quote(INCLUDEPATH += $$val_escape(EXTRA_INCLUDEPATH))
|
2016-06-27 08:56:50 +00:00
|
|
|
qmake_args += $$EXTRA_QMAKE_ARGS
|
2016-06-29 09:39:27 +00:00
|
|
|
}
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
# Clean up after previous run
|
2016-07-15 16:21:00 +00:00
|
|
|
exists($$test_out_dir/Makefile): \
|
|
|
|
QMAKE_MAKE = "$$QMAKE_MAKE clean && $$QMAKE_MAKE"
|
2016-06-11 20:49:01 +00:00
|
|
|
|
2016-07-14 14:50:02 +00:00
|
|
|
mkpath($$test_out_dir)|error()
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
# add possible command line args
|
2016-08-15 12:40:52 +00:00
|
|
|
qmake_args += $$qtConfPrepareArgs($$eval($${1}.args)) $$eval($${1}.literal_args)
|
2016-06-11 20:49:01 +00:00
|
|
|
|
2016-07-15 13:57:43 +00:00
|
|
|
qtRunLoggedCommand("$$test_cmd_base $$qmake_args $$system_quote($$test_dir)") {
|
2016-06-11 20:49:01 +00:00
|
|
|
qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE"): \
|
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
|
2016-08-03 10:32:48 +00:00
|
|
|
defineTest(qtConfTest_verifySpec) {
|
|
|
|
qtConfTest_compile($$1): return(true)
|
|
|
|
qtConfAddError("Cannot compile a minimal program. The toolchain or QMakeSpec is broken.", log)
|
|
|
|
qtConfPrintReport()
|
|
|
|
error()
|
|
|
|
}
|
|
|
|
|
2016-08-05 15:54:26 +00:00
|
|
|
defineTest(qtConfTest_files) {
|
|
|
|
for(i, $${1}.files._KEYS_) {
|
|
|
|
f = $$eval($${1}.files.$${i})
|
|
|
|
qtLog("Searching for file $${f}.")
|
|
|
|
contains(f, ".*\.h") {
|
|
|
|
file = $$qtConfFindInPathList($$f, $$EXTRA_INCLUDEPATH $$QMAKE_DEFAULT_INCDIRS)
|
|
|
|
} else: contains(f, ".*\.(lib|so|a)") {
|
|
|
|
file = $$qtConfFindInPathList($$f, $$EXTRA_LIBDIR $$QMAKE_DEFAULT_LIBDIRS)
|
|
|
|
} else {
|
|
|
|
# assume we're looking for an executable
|
2016-08-14 07:48:55 +00:00
|
|
|
file = $$qtConfFindInPath($$f, $$EXTRA_PATH)
|
2016-08-05 15:54:26 +00:00
|
|
|
}
|
|
|
|
isEmpty(file) {
|
|
|
|
qtLog(" Not found.");
|
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
qtLog(" Found at $${file}.")
|
|
|
|
}
|
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
defineTest(logn) {
|
|
|
|
log("$${1}$$escape_expand(\\n)")
|
|
|
|
}
|
|
|
|
|
2016-08-15 12:40:52 +00:00
|
|
|
defineTest(qtLogTestIntro) {
|
2016-08-26 19:10:56 +00:00
|
|
|
label = $$eval($${1}.label)
|
|
|
|
isEmpty(label): return()
|
2016-08-15 12:40:52 +00:00
|
|
|
|
2016-08-26 19:10:56 +00:00
|
|
|
msg = "Checking for $${label}... "
|
2016-08-15 12:40:52 +00:00
|
|
|
log($$msg)
|
|
|
|
$$QMAKE_CONFIG_VERBOSE: log("$$escape_expand(\\n)")
|
|
|
|
write_file($$QMAKE_CONFIG_LOG, msg, append)
|
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
defineTest(qtLogTestResult) {
|
2016-08-26 19:10:56 +00:00
|
|
|
isEmpty($${1}.label): return()
|
2016-08-15 12:40:52 +00:00
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
!isEmpty($${1}.log) {
|
|
|
|
field = $$eval($${1}.log)
|
|
|
|
log_msg = $$eval($${1}.$$field)
|
|
|
|
msg = "test $$1 gave result $$log_msg"
|
|
|
|
} else: $${2} {
|
|
|
|
log_msg = yes
|
|
|
|
msg = "test $$1 succeeded"
|
|
|
|
} else {
|
|
|
|
log_msg = no
|
|
|
|
msg = "test $$1 FAILED"
|
|
|
|
}
|
|
|
|
$$QMAKE_CONFIG_VERBOSE: log_msg = $$msg
|
|
|
|
logn("$$log_msg")
|
|
|
|
write_file($$QMAKE_CONFIG_LOG, msg, append)
|
|
|
|
}
|
|
|
|
|
2016-08-16 18:03:54 +00:00
|
|
|
defineTest(qtConfSaveResult) {
|
2016-08-24 11:39:15 +00:00
|
|
|
equals($${1}.cache, -): \
|
|
|
|
return()
|
2016-08-16 18:03:54 +00:00
|
|
|
keys = result $$eval($${1}.cache)
|
|
|
|
cont = "cache.$${2}._KEYS_ = $$keys"
|
|
|
|
for (k, keys): \
|
|
|
|
cont += "cache.$${2}.$${k} = $$val_escape($${1}.$${k})"
|
|
|
|
write_file($$QMAKE_CONFIG_CACHE, cont, append)|error()
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfLoadResult) {
|
|
|
|
equals(QMAKE_CONFIG_CACHE_USE, none): \
|
|
|
|
return(false)
|
|
|
|
isEmpty(cache.$${2}._KEYS_): \
|
|
|
|
return(false)
|
|
|
|
equals(QMAKE_CONFIG_CACHE_USE, positive):!$$eval(cache.$${2}.result): \
|
|
|
|
return(false)
|
|
|
|
for (k, cache.$${2}._KEYS_) {
|
|
|
|
$${1}.$${k} = $$eval(cache.$${2}.$${k})
|
|
|
|
export($${1}.$${k})
|
|
|
|
}
|
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
defineTest(qtConfIsBoolean) {
|
|
|
|
equals(1, "true")|equals(1, "false"): \
|
|
|
|
return(true)
|
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
|
2016-08-12 08:14:51 +00:00
|
|
|
defineTest(qtConfSetupTestTypeDeps) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
for (tt, $${currentConfig}.testTypeDependencies._KEYS_) {
|
2016-08-12 08:14:51 +00:00
|
|
|
!defined(qtConfTest_$${tt}, test): \
|
|
|
|
error("Declaring dependency for undefined test type '$$tt'.")
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
for (f, $${currentConfig}.testTypeDependencies.$${tt}._KEYS_) {
|
|
|
|
feature = $$eval($${currentConfig}.testTypeDependencies.$${tt}.$${f})
|
|
|
|
isEmpty($${currentConfig}.features.$${feature}._KEYS_): \
|
2016-08-12 08:14:51 +00:00
|
|
|
error("Test type '$$tt' depends on undefined feature '$$feature'.")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
# Test type aliasing means that one test type's callback is called by
|
|
|
|
# another test type's callback. Put differently, one callback forwards
|
|
|
|
# the call to another one. The former representation is more natural
|
|
|
|
# (and concise) to write, while the latter is more efficient to process.
|
|
|
|
# Hence, this function inverts the mapping.
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
for (tt, $${currentConfig}.testTypeAliases._KEYS_) {
|
2016-08-12 08:14:51 +00:00
|
|
|
!defined(qtConfTest_$${tt}, test): \
|
|
|
|
error("Aliasing undefined test type '$$tt'.")
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
for (tta, $${currentConfig}.testTypeAliases.$${tt}._KEYS_) {
|
|
|
|
type = $$eval($${currentConfig}.testTypeAliases.$${tt}.$${tta})
|
2016-08-12 08:14:51 +00:00
|
|
|
!defined(qtConfTest_$${type}, test): \
|
|
|
|
error("Aliasing '$$tt' to undefined test type '$$type'.")
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
$${currentConfig}.testTypeForwards.$${type} += $$tt
|
|
|
|
export($${currentConfig}.testTypeForwards.$${type})
|
2016-08-12 08:14:51 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfEnsureTestTypeDeps) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
depsn = $${currentConfig}.testTypeDependencies.$${1}._KEYS_
|
2016-08-12 08:14:51 +00:00
|
|
|
!isEmpty($$depsn) {
|
|
|
|
for (dep, $$depsn) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
feature = $$eval($${currentConfig}.testTypeDependencies.$${1}.$${dep})
|
2016-08-12 08:14:51 +00:00
|
|
|
!qtConfCheckFeature($$feature): \
|
|
|
|
error("Test type '$$1' depends on non-emitted feature $${feature}.")
|
|
|
|
}
|
|
|
|
$$depsn =
|
|
|
|
export($$depsn)
|
|
|
|
}
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
fwdsn = $${currentConfig}.testTypeForwards.$${1}
|
2016-08-12 08:14:51 +00:00
|
|
|
!isEmpty($$fwdsn) {
|
|
|
|
for (fwd, $$fwdsn): \
|
|
|
|
qtConfEnsureTestTypeDeps($$fwd)
|
|
|
|
$$fwdsn =
|
|
|
|
export($$fwdsn)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
defineTest(qtRunSingleTest) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
tpfx = $${currentConfig}.tests.$${1}
|
2016-06-11 20:49:01 +00:00
|
|
|
defined($${tpfx}.result, var): \
|
|
|
|
return()
|
|
|
|
|
|
|
|
type = $$eval($${tpfx}.type)
|
|
|
|
call = "qtConfTest_$$type"
|
|
|
|
!defined($$call, test): \
|
|
|
|
error("Configure test $${1} refers to nonexistent type $$type")
|
|
|
|
|
2016-08-12 08:14:51 +00:00
|
|
|
qtConfEnsureTestTypeDeps($$type)
|
|
|
|
|
2016-08-15 12:40:52 +00:00
|
|
|
preCall = "qtConfTestPrepare_$$type"
|
2016-08-24 12:02:58 +00:00
|
|
|
defined($$preCall, test):!$${preCall}($${tpfx}) {
|
|
|
|
$${tpfx}.result = false
|
|
|
|
export($${tpfx}.result)
|
|
|
|
# don't cache the result; the pre-deps have their own caches.
|
|
|
|
return()
|
|
|
|
}
|
|
|
|
|
|
|
|
# note: we do this only after resolving the dependencies and the
|
|
|
|
# preparation (which may resolve libraries), so that caching does
|
|
|
|
# not alter the execution order (and thus the output).
|
|
|
|
qtConfLoadResult($${tpfx}, $$1): \
|
|
|
|
return()
|
2016-08-16 18:03:54 +00:00
|
|
|
|
2016-08-24 12:02:58 +00:00
|
|
|
qtLogTestIntro($${tpfx})
|
|
|
|
msg = "executing config test $${1}"
|
|
|
|
write_file($$QMAKE_CONFIG_LOG, msg, append)
|
2016-06-11 20:49:01 +00:00
|
|
|
|
2016-08-24 12:02:58 +00:00
|
|
|
result = false
|
|
|
|
$${call}($${tpfx}): result = true
|
2016-06-11 20:49:01 +00:00
|
|
|
|
2016-08-24 12:02:58 +00:00
|
|
|
qtLogTestResult($${tpfx}, $$result)
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
$${tpfx}.result = $$result
|
|
|
|
export($${tpfx}.result)
|
2016-08-16 18:03:54 +00:00
|
|
|
qtConfSaveResult($${tpfx}, $$1)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineReplace(qtConfEvaluate) {
|
|
|
|
isEmpty(1): return(true)
|
|
|
|
|
2016-08-15 19:14:18 +00:00
|
|
|
1 ~= s/$$escape_expand(\\t)/ /g
|
|
|
|
1 ~= s/$$escape_expand(\\r)//g
|
2016-07-15 14:40:06 +00:00
|
|
|
1 ~= s/$$escape_expand(\\n) */ /g
|
2016-06-11 20:49:01 +00:00
|
|
|
expr = $${1}
|
|
|
|
expr ~= s/&&/ && /g
|
|
|
|
expr ~= s/\|\|/ || /g
|
|
|
|
expr ~= s/!/ ! /g
|
|
|
|
expr ~= s/\\(/ ( /g
|
|
|
|
expr ~= s/\\)/ ) /g
|
|
|
|
expr ~= s/ *== */==/g
|
|
|
|
expr ~= s/ *! = */!=/g
|
|
|
|
expr_list = $$eval($$list($$expr))
|
|
|
|
return($$qtConfEvaluateSubExpression($${1}, $$expr_list, 0))
|
|
|
|
}
|
|
|
|
|
|
|
|
defineReplace(qtConfEvaluateSingleExpression) {
|
|
|
|
e = $${2}
|
|
|
|
|
|
|
|
equals(e, true) {
|
|
|
|
result = true
|
|
|
|
} else: equals(e, false) {
|
|
|
|
result = false
|
|
|
|
} else: contains(e, "^[0-9]+$") {
|
|
|
|
# numbers
|
|
|
|
result = $$e
|
|
|
|
} else: contains(e, "^'.*'$") {
|
|
|
|
# quoted literals
|
|
|
|
result = $$replace(e, "^'(.*)'$", "\\1")
|
|
|
|
} else: contains(e, "^tests\..*") {
|
|
|
|
!qt_conf_tests_allowed: \
|
|
|
|
error("Expression '$${1}' refers to a test, which is not allowed at this stage of configuring.")
|
|
|
|
test = $$section(e, ".", 1, 1)
|
|
|
|
var = $$section(e, ".", 2, -1)
|
|
|
|
isEmpty(var): \
|
|
|
|
var = result
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
!contains($${currentConfig}.tests._KEYS_, $$test): \
|
2016-06-11 20:49:01 +00:00
|
|
|
error("Unknown test object $${test} in expression '$${1}'.")
|
|
|
|
qtRunSingleTest($$test)
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
result = $$eval($${currentConfig}.tests.$${test}.$${var})
|
2016-08-15 12:40:52 +00:00
|
|
|
} else: contains(e, "^libs\..*") {
|
|
|
|
!qt_conf_tests_allowed: \
|
|
|
|
error("Expression '$${1}' refers to a library, which is not allowed at this stage of configuring.")
|
|
|
|
lib = $$section(e, ".", 1, 1)
|
|
|
|
var = $$section(e, ".", 2, -1)
|
|
|
|
isEmpty(var): \
|
|
|
|
var = result
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
!contains($${currentConfig}.libraries._KEYS_, $$lib): \
|
2016-08-15 12:40:52 +00:00
|
|
|
error("Unknown library object $${lib} in expression '$${1}'.")
|
|
|
|
qtConfHandleLibrary($$lib)
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
!defined($${currentConfig}.libraries.$${lib}.$${var}, var): \
|
|
|
|
var = sources.$$eval($${currentConfig}.libraries.$${lib}.$${source}).$$var
|
|
|
|
result = $$eval($${currentConfig}.libraries.$${lib}.$${var})
|
2016-06-11 20:49:01 +00:00
|
|
|
} else: contains(e, "^features\..*") {
|
|
|
|
feature = $$section(e, ".", 1, 1)
|
|
|
|
var = $$section(e, ".", 2, -1)
|
|
|
|
isEmpty(var): \
|
|
|
|
var = available
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
!contains($${currentConfig}.features._KEYS_, $$feature) {
|
|
|
|
# this is basically a copy of what qtConfig() in qt_build_config.prf
|
|
|
|
# does, but we produce a nicer error message.
|
|
|
|
for (module, QMAKE_CONFIG_DEPS) {
|
|
|
|
contains(QT.$${module}.enabled_features, $$feature): \
|
|
|
|
result = true
|
|
|
|
else: contains(QT.$${module}.disabled_features, $$feature): \
|
|
|
|
result = false
|
|
|
|
else: \
|
|
|
|
next()
|
|
|
|
!equals(var, available): \
|
|
|
|
error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.")
|
|
|
|
return($$result)
|
|
|
|
}
|
2016-06-11 20:49:01 +00:00
|
|
|
error("Unknown feature object $${feature} in expression '$${1}'.")
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
}
|
2016-06-11 20:49:01 +00:00
|
|
|
!qtConfCheckFeature($$feature): \
|
|
|
|
error("Expression '$$1' is accessing non-emitted feature $${feature}.")
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
result = $$eval($${currentConfig}.features.$${feature}.$${var})
|
2016-06-11 20:49:01 +00:00
|
|
|
} else: contains(e, "^config\..*") {
|
|
|
|
var = $$replace(e, "^config\.", "")
|
|
|
|
result = false
|
|
|
|
contains(CONFIG, $$var): result = true
|
|
|
|
} else: contains(e, "^arch\..*") {
|
|
|
|
var = $$replace(e, "^arch\.", "")
|
|
|
|
result = false
|
2016-08-12 08:14:51 +00:00
|
|
|
isEmpty(QT_ARCH): \
|
|
|
|
qtConfCheckFeature(architecture)
|
2016-06-11 20:49:01 +00:00
|
|
|
contains(QT_ARCH, $$var): result = true
|
|
|
|
} else: contains(e, "^input\..*") {
|
|
|
|
result = $$eval(config.$$e)
|
|
|
|
} else: contains(e, "^var\..*") {
|
|
|
|
var = $$replace(e, "^var\.", "")
|
|
|
|
result = $$eval($$var)
|
|
|
|
} else: contains(e, "^call\..*") {
|
|
|
|
call = $$replace(e, "^call\.", "qtConfFunc_")
|
|
|
|
!defined($$call, replace): \
|
|
|
|
error("Call $$call referenced in expression '$${1}' does not exist")
|
|
|
|
eval(result = \$\$"$$call"())
|
|
|
|
} else {
|
|
|
|
error("Unrecognized token $$e in expression '$${1}'")
|
|
|
|
}
|
|
|
|
return($$result)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineReplace(qtConfEvaluateSubExpression) {
|
|
|
|
expr_list = $${2}
|
|
|
|
result = true
|
|
|
|
negate = false
|
|
|
|
runSubExpression = false
|
|
|
|
nesting_level = 0
|
|
|
|
for (n, $${3}..$$num_add($$size(expr_list), -1)) {
|
|
|
|
e = $$member(expr_list, $$n)
|
|
|
|
$$runSubExpression {
|
|
|
|
runSubExpression = false
|
|
|
|
result = $$qtConfEvaluateSubExpression($${1}, $$expr_list, $$n)
|
|
|
|
} else: isEqual(e, "(") {
|
|
|
|
isEqual(nesting_level, 0): runSubExpression = true
|
|
|
|
nesting_level = $$num_add($$nesting_level, 1)
|
|
|
|
next()
|
|
|
|
} else: isEqual(e, ")") {
|
|
|
|
nesting_level = $$num_add($$nesting_level, -1)
|
|
|
|
lessThan(nesting_level, 0): break()
|
|
|
|
next()
|
|
|
|
} else: greaterThan(nesting_level, 0) {
|
|
|
|
next()
|
|
|
|
} else: isEqual(e, "!") {
|
|
|
|
negate = true
|
|
|
|
next()
|
|
|
|
} else: isEqual(e, "&&") {
|
|
|
|
!qtConfIsBoolean($$result): \
|
|
|
|
error("Left hand side of && is non-boolean value '$$result' in expression '$${1}'")
|
|
|
|
!$$result: return(false)
|
|
|
|
} else: isEqual(e, "||") {
|
|
|
|
!qtConfIsBoolean($$result): \
|
|
|
|
error("Left hand side of || is non-boolean value '$$result' in expression '$${1}'")
|
|
|
|
$$result: return(true)
|
|
|
|
} else {
|
|
|
|
contains(e, ".*==.*") {
|
|
|
|
lhs = $$qtConfEvaluateSingleExpression($${1}, $$replace(e, "==.*", ""))
|
|
|
|
rhs = $$qtConfEvaluateSingleExpression($${1}, $$replace(e, ".*==", ""))
|
|
|
|
result = false
|
|
|
|
equals(lhs, $$rhs): result = true
|
|
|
|
} else: contains(e, ".*!=.*") {
|
|
|
|
lhs = $$qtConfEvaluateSingleExpression($${1}, $$replace(e, "!=.*", ""))
|
|
|
|
rhs = $$qtConfEvaluateSingleExpression($${1}, $$replace(e, ".*!=", ""))
|
|
|
|
result = false
|
|
|
|
!equals(lhs, $$rhs): result = true
|
|
|
|
} else {
|
|
|
|
result = $$qtConfEvaluateSingleExpression($${1}, $$e)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$$negate {
|
|
|
|
!qtConfIsBoolean($$result): \
|
|
|
|
error("Attempting to negate a non-boolean value '$$result' in expression '$${1}'")
|
|
|
|
$$result: \
|
|
|
|
result = false
|
|
|
|
else: \
|
|
|
|
result = true
|
|
|
|
negate = false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return($$result)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineReplace(qtIsFeatureEnabled) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
enable = $$eval($${currentConfig}.features.$${1}.enable)
|
2016-06-11 20:49:01 +00:00
|
|
|
!isEmpty(enable) {
|
|
|
|
$$qtConfEvaluate($$enable): \
|
|
|
|
return(true)
|
|
|
|
} else {
|
|
|
|
equals(config.input.$${1}, "yes"): \
|
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineReplace(qtIsFeatureDisabled) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
disable = $$eval($${currentConfig}.features.$${1}.disable)
|
2016-06-11 20:49:01 +00:00
|
|
|
!isEmpty(disable) {
|
|
|
|
$$qtConfEvaluate($$disable): \
|
|
|
|
return(true)
|
|
|
|
} else {
|
|
|
|
equals(config.input.$${1}, "no"): \
|
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineReplace(qtConfCheckSingleCondition) {
|
|
|
|
result = $$qtConfEvaluate($$2)
|
|
|
|
|
|
|
|
!qtConfIsBoolean($$result): \
|
|
|
|
error("Evaluation of condition '$$2' yielded non-boolean value '$$result' in feature '$${1}'.")
|
|
|
|
|
|
|
|
!$$result {
|
|
|
|
$${3} {
|
2016-07-14 14:41:09 +00:00
|
|
|
qtConfAddError("Feature '$${1}' was enabled, but the pre-condition '$$2' failed.", log)
|
2016-06-11 20:49:01 +00:00
|
|
|
$$result = true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return($$result)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfCheckFeature) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
fpfx = $${currentConfig}.features.$${1}
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
available = $$eval($${fpfx}.available)
|
|
|
|
!isEmpty(available): return(true)
|
|
|
|
|
|
|
|
# skip features that will not get emitted anyway
|
|
|
|
emitIf = $$qtConfEvaluate($$eval($${fpfx}.emitIf))
|
|
|
|
enabled = $$qtIsFeatureEnabled($$1)
|
|
|
|
disabled = $$qtIsFeatureDisabled($$1)
|
|
|
|
|
|
|
|
!$$emitIf {
|
|
|
|
$$enabled|$$disabled: \
|
|
|
|
qtConfAddWarning("Feature $${1} is insignificant in this configuration, ignoring related command line option(s).")
|
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
|
|
|
|
$$disabled {
|
|
|
|
result = false
|
|
|
|
} else: !$$enabled:!$$qtConfEvaluate($$eval($${fpfx}.autoDetect)) {
|
|
|
|
# feature not auto-detected and not explicitly enabled
|
|
|
|
result = false
|
|
|
|
} else {
|
|
|
|
condition = $$eval($${fpfx}.condition)
|
|
|
|
!isEmpty(condition) {
|
|
|
|
result = $$qtConfCheckSingleCondition($$1, $$condition, $$enabled)
|
|
|
|
} else {
|
|
|
|
result = true
|
|
|
|
# check whether we have an array of conditions
|
|
|
|
for (i, $${fpfx}.condition._KEYS_) {
|
|
|
|
condition = $$eval($${fpfx}.condition.$$i)
|
|
|
|
result = $$qtConfCheckSingleCondition($$1, $$condition, $$enabled)
|
|
|
|
!$$result: break()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$${fpfx}.available = $$result
|
|
|
|
export($${fpfx}.available)
|
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
for (i, $${currentConfig}.features.$${feature}.output._KEYS_): \
|
2016-06-11 20:49:01 +00:00
|
|
|
qtConfProcessOneOutput($$feature, $$i)
|
|
|
|
|
|
|
|
return(true)
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
defineTest(qtConfProcessFeatures) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
for (feature, $${currentConfig}.features._KEYS_): \
|
2016-08-12 08:14:51 +00:00
|
|
|
qtConfCheckFeature($$feature)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#
|
|
|
|
# reporting
|
|
|
|
#
|
|
|
|
|
|
|
|
QT_CONF_REPORT_PADDING = "........................................"
|
|
|
|
|
|
|
|
defineTest(qtConfReportPadded) {
|
|
|
|
pad = $$num_add($$str_size($$QT_CONF_REPORT_PADDING), -$$str_size($${1}))
|
|
|
|
lessThan(pad, 0): pad = 0
|
|
|
|
str = "$$1 $$str_member($$QT_CONF_REPORT_PADDING, 0, $$pad)"
|
|
|
|
|
|
|
|
qtConfAddReport("$$str $${2}")
|
|
|
|
}
|
|
|
|
|
|
|
|
defineReplace(qtConfCollectFeatures) {
|
|
|
|
l =
|
|
|
|
for (feature, $$list($${1})) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
$$eval($${currentConfig}.features.$${feature}.available): \
|
2016-08-26 19:10:56 +00:00
|
|
|
l += $$eval($${currentConfig}.features.$${feature}.label)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
isEmpty(l): return("<none>")
|
|
|
|
return($$join(l, ' '))
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfReport_featureList) {
|
|
|
|
qtConfReportPadded($${1}, $$qtConfCollectFeatures($${2}))
|
|
|
|
}
|
|
|
|
|
|
|
|
defineReplace(qtConfFindFirstAvailableFeature) {
|
|
|
|
for (feature, $$list($${1})) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
isEmpty($${currentConfig}.features.$${feature}._KEYS_): \
|
2016-06-11 20:49:01 +00:00
|
|
|
error("Asking for a report on undefined feature $${2}.")
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
$$eval($${currentConfig}.features.$${feature}.available): \
|
2016-08-26 19:10:56 +00:00
|
|
|
return($$eval($${currentConfig}.features.$${feature}.label))
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return("<none>")
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfReport_firstAvailableFeature) {
|
|
|
|
qtConfReportPadded($${1}, $$qtConfFindFirstAvailableFeature($${2}))
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfReport_feature) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
!contains($${currentConfig}.features._KEYS_, $$2): \
|
2016-06-11 20:49:01 +00:00
|
|
|
error("Asking for a report on undefined feature $${2}.")
|
|
|
|
|
|
|
|
# hide report for not emitted features
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
isEmpty($${currentConfig}.features.$${2}.available): \
|
2016-06-11 20:49:01 +00:00
|
|
|
return()
|
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
$$eval($${currentConfig}.features.$${2}.available) {
|
2016-06-11 20:49:01 +00:00
|
|
|
result = "yes"
|
|
|
|
!isEmpty(3): result = "$${3}"
|
|
|
|
} else {
|
|
|
|
result = "no"
|
|
|
|
!isEmpty(4): result = "$${4}"
|
|
|
|
}
|
|
|
|
|
2016-08-26 19:10:56 +00:00
|
|
|
text = $$eval($${currentConfig}.features.$${2}.label)
|
2016-07-14 15:40:41 +00:00
|
|
|
|
|
|
|
qtConfReportPadded($${1}$$text, $$result)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfReport_note) {
|
|
|
|
qtConfAddNote($${1})
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfReport_warning) {
|
|
|
|
qtConfAddWarning($${1})
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfReport_error) {
|
2016-07-14 14:41:09 +00:00
|
|
|
qtConfAddError($${1}, log)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfCreateReportRecurse) {
|
|
|
|
equals(2, false) {
|
|
|
|
indent = ""
|
|
|
|
recurse = false
|
|
|
|
} else {
|
|
|
|
indent = $${2}
|
|
|
|
recurse = true
|
|
|
|
}
|
|
|
|
|
|
|
|
keys = $$eval($${1}._KEYS_)
|
|
|
|
for (n, keys) {
|
|
|
|
entry = $${1}.$$n
|
|
|
|
subKeys = $$eval($${entry}._KEYS_)
|
|
|
|
contains(subKeys, condition) {
|
|
|
|
condition = $$eval($${entry}.condition)
|
|
|
|
r = $$qtConfEvaluate($$condition)
|
|
|
|
!qtConfIsBoolean($$r): \
|
|
|
|
error("Evaluation of condition '$$condition' in report entry $${entry} yielded non-boolean value '$$r'.")
|
|
|
|
!$$r: next()
|
|
|
|
}
|
|
|
|
contains(subKeys, "section") {
|
|
|
|
!$$recurse: \
|
|
|
|
error("Report type 'section' is not allowed in '$$1'.")
|
|
|
|
section = $$eval($${entry}.section)
|
|
|
|
qtConfAddReport("$$indent$$section:")
|
|
|
|
qtConfCreateReportRecurse("$${entry}.entries", "$$indent ")
|
|
|
|
} else: !isEmpty($${entry}) {
|
|
|
|
feature = $$eval($${entry})
|
2016-07-14 15:40:41 +00:00
|
|
|
qtConfReport_feature($$indent, $$feature)
|
2016-06-11 20:49:01 +00:00
|
|
|
} else {
|
|
|
|
text = $$eval($${entry}.message)
|
|
|
|
isEmpty($${entry}.type): \
|
|
|
|
error("Report entry $${entry} doesn't define a type.")
|
|
|
|
r = "qtConfReport_$$eval($${entry}.type)"
|
|
|
|
!defined($$r, test): \
|
|
|
|
error("Undefined report type $$eval($${entry}.type) used in report entry $${entry}.")
|
|
|
|
args = $$eval($${entry}.args)
|
|
|
|
$${r}($$indent$${text}, $$args)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfProcessEarlyChecks) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
qtConfCreateReportRecurse($${currentConfig}.earlyReport, false)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfCreateReport) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
qtConfCreateReportRecurse($${currentConfig}.report, false)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfCreateSummary) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
qtConfCreateReportRecurse($${currentConfig}.summary, "")
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfPrintReport) {
|
|
|
|
for (n, QT_CONFIGURE_REPORT): \
|
|
|
|
logn($$n)
|
2016-07-21 15:19:21 +00:00
|
|
|
logn()
|
2016-06-11 20:49:01 +00:00
|
|
|
|
2016-07-14 16:21:25 +00:00
|
|
|
for (n, QT_CONFIGURE_NOTES) {
|
|
|
|
logn($$n)
|
2016-07-21 15:19:21 +00:00
|
|
|
logn()
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
2016-07-14 16:21:25 +00:00
|
|
|
for (w, QT_CONFIGURE_WARNINGS) {
|
|
|
|
logn($$w)
|
2016-07-21 15:19:21 +00:00
|
|
|
logn()
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
!isEmpty(QT_CONFIGURE_ERRORS) {
|
2016-07-14 16:21:25 +00:00
|
|
|
for (e, QT_CONFIGURE_ERRORS) {
|
2016-06-11 20:49:01 +00:00
|
|
|
logn($$e)
|
2016-07-21 15:19:21 +00:00
|
|
|
logn()
|
2016-07-14 16:21:25 +00:00
|
|
|
}
|
|
|
|
mention_config_log:!$$QMAKE_CONFIG_VERBOSE {
|
|
|
|
logn("Check config.log for details.")
|
2016-07-21 15:19:21 +00:00
|
|
|
logn()
|
2016-07-14 16:21:25 +00:00
|
|
|
}
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
!equals(config.input.continue, yes): \
|
2016-07-14 14:50:02 +00:00
|
|
|
error()
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfCheckErrors) {
|
|
|
|
!isEmpty(QT_CONFIGURE_ERRORS):!equals(config.input.continue, yes): \
|
|
|
|
qtConfPrintReport()
|
|
|
|
}
|
|
|
|
|
|
|
|
#
|
|
|
|
# output generation
|
|
|
|
#
|
|
|
|
|
|
|
|
# qtConfOutputVar(modifier, output, name, value)
|
|
|
|
defineTest(qtConfOutputVar) {
|
|
|
|
modifier = $$1
|
|
|
|
output = $$2
|
|
|
|
name = $$3
|
|
|
|
value = $$val_escape(4)
|
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
defined($${currentConfig}.output.$${output}.assign.$${name}, var): \
|
2016-06-11 20:49:01 +00:00
|
|
|
error("Trying to overwrite assigned variable '$$name' in '$$output' using modifier '$$modifier'.")
|
|
|
|
|
|
|
|
equals(modifier, assign) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
!isEmpty($${currentConfig}.output.$${output}.append.$${name})|!isEmpty($${currentConfig}.output.$${output}.remove.$${name}): \
|
2016-06-11 20:49:01 +00:00
|
|
|
error("Trying to assign variable '$$name' in '$$output', which has already appended or removed parts.")
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
$${currentConfig}.output.$${output}.assign.$${name} = $$value
|
2016-06-11 20:49:01 +00:00
|
|
|
} else: equals(modifier, append) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
contains($${currentConfig}.output.$${output}.remove.$${name}, $$value): \
|
2016-06-11 20:49:01 +00:00
|
|
|
error("Trying to append removed '$$value' to variable '$$name' in '$$output'.")
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
$${currentConfig}.output.$${output}.append.$${name} += $$value
|
2016-06-11 20:49:01 +00:00
|
|
|
} else: equals(modifier, remove) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
contains($${currentConfig}.output.$${output}.append.$${name}, $$value): \
|
2016-06-11 20:49:01 +00:00
|
|
|
error("Trying to remove appended '$$value' to variable '$$name' in '$$output'.")
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
$${currentConfig}.output.$${output}.remove.$${name} += $$value
|
2016-06-11 20:49:01 +00:00
|
|
|
} else {
|
|
|
|
error("Invalid modifier '$$modifier' passed to qtConfOutputVar.")
|
|
|
|
}
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
$${currentConfig}.output.$${output}.$${modifier}._KEYS_ *= $${name}
|
|
|
|
export($${currentConfig}.output.$${output}.$${modifier}.$${name})
|
|
|
|
export($${currentConfig}.output.$${output}.$${modifier}._KEYS_)
|
|
|
|
}
|
|
|
|
|
|
|
|
# qtConfExtendVar(output, name, value)
|
|
|
|
defineTest(qtConfExtendVar) {
|
|
|
|
output = $$1
|
|
|
|
name = $$2
|
|
|
|
value = $$val_escape(3)
|
|
|
|
|
|
|
|
!defined($${currentConfig}.output.$${output}.assign.$${name}, var): \
|
|
|
|
error("Trying to extend undefined variable '$$name' in '$$output'.")
|
|
|
|
|
|
|
|
$${currentConfig}.output.$${output}.assign.$${name} += $$value
|
|
|
|
export($${currentConfig}.output.$${output}.assign.$${name})
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutputVarHelper) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
!isEmpty($${2}.public):$$eval($${2}.public) {
|
|
|
|
output = "publicPro"
|
|
|
|
} else {
|
|
|
|
output = "privatePro"
|
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
negative = $$eval($${2}.negative)
|
|
|
|
isEmpty(negative): negative = false
|
2016-08-26 16:38:39 +00:00
|
|
|
equals(3, $$negative): return()
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
name = $$eval($${2}.name)
|
|
|
|
isEmpty(name): \
|
|
|
|
error("Output type 'var$$title($$1)' used in feature '$$eval($${2}.feature)' without a 'name' entry.")
|
|
|
|
|
|
|
|
value = $$qtConfEvaluate($$eval($${2}.value))
|
2016-07-15 18:43:44 +00:00
|
|
|
!isEmpty($${2}.eval):$$qtConfEvaluate($$eval($${2}.eval)): \
|
|
|
|
eval(value = $$value)
|
2016-06-11 20:49:01 +00:00
|
|
|
qtConfOutputVar($$1, $$output, $$name, $$value)
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
equals(output, "publicPro"):!isEmpty($${currentConfig}.module): \
|
|
|
|
qtConfExtendVar($$output, "QT.$${currentModule}.exports", $$name)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutput_varAssign) {
|
|
|
|
qtConfOutputVarHelper(assign, $$1, $$2)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutput_varAppend) {
|
|
|
|
qtConfOutputVarHelper(append, $$1, $$2)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutput_varRemove) {
|
|
|
|
qtConfOutputVarHelper(remove, $$1, $$2)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutputConfigVar) {
|
|
|
|
pro = $$3
|
|
|
|
var = $$4
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
modular = $$5
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
negative = $$eval($${1}.negative)
|
|
|
|
isEmpty(negative): negative = false
|
2016-08-26 16:38:39 +00:00
|
|
|
equals(2, $$negative): return()
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
val = $$eval($${1}.name)
|
|
|
|
isEmpty(val) {
|
|
|
|
val = $$eval($${1}.feature)
|
|
|
|
$$negative: val = no-$$val
|
|
|
|
}
|
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
isEmpty($${currentConfig}.module)|!$$modular: \
|
|
|
|
qtConfOutputVar(append, $$pro, $$var, $$val)
|
|
|
|
else: \
|
|
|
|
qtConfExtendVar($$pro, "QT.$${currentModule}.$$var", $$val)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutput_publicQtConfig) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
qtConfOutputConfigVar($$1, $$2, "publicPro", "QT_CONFIG", true)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutput_publicConfig) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
!isEmpty($${currentConfig}.module): \
|
|
|
|
error("Cannot use output type 'publicConfig' in module-local feature '$$eval($${1}.feature)'.")
|
|
|
|
qtConfOutputConfigVar($$1, $$2, "publicPro", "CONFIG", false)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutput_privateConfig) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
qtConfOutputConfigVar($$1, $$2, "privatePro", "CONFIG", false)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutputSetDefine) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
$${currentConfig}.output.$${1}.$${2} = $${3}
|
|
|
|
$${currentConfig}.output.$${1}._KEYS_ *= $${2}
|
|
|
|
export($${currentConfig}.output.$${1}.$${2})
|
|
|
|
export($${currentConfig}.output.$${1}._KEYS_)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutput_define) {
|
|
|
|
output = publicHeader
|
|
|
|
define = $$eval($${1}.name)
|
|
|
|
value = $$qtConfEvaluate($$eval($${1}.value))
|
|
|
|
isEmpty(define): \
|
|
|
|
error("Output type 'define' used in feature '$$eval($${1}.feature)' without a 'name' entry.")
|
|
|
|
|
|
|
|
negative = $$eval($${1}.negative)
|
|
|
|
isEmpty(negative): negative = false
|
2016-08-26 16:38:39 +00:00
|
|
|
equals(2, $$negative): return()
|
2016-06-11 20:49:01 +00:00
|
|
|
|
2016-08-26 16:38:39 +00:00
|
|
|
qtConfOutputSetDefine($$output, $$define, $$value)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfOutput_feature) {
|
|
|
|
name = "$$eval($${1}.name)"
|
|
|
|
isEmpty(name): \
|
|
|
|
name = $$eval($${1}.feature)
|
|
|
|
|
|
|
|
$${2} {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
isEmpty($${currentConfig}.module): \
|
|
|
|
qtConfOutputVar(append, "publicPro", "QT_CONFIG", $$name)
|
|
|
|
else: \
|
|
|
|
qtConfExtendVar("publicPro", "QT.$${currentModule}.QT_CONFIG", $$name)
|
2016-06-11 20:49:01 +00:00
|
|
|
} else {
|
|
|
|
f = $$upper($$replace(name, -, _))
|
|
|
|
qtConfOutputSetDefine("publicHeader", "QT_NO_$$f")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
defineTest(qtConfSetModuleName) {
|
|
|
|
currentModule = $$eval($${currentConfig}.module)
|
|
|
|
isEmpty(currentModule): \
|
|
|
|
currentModule = global
|
|
|
|
export(currentModule)
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfSetupModuleOutputs) {
|
|
|
|
qtConfOutputVar(assign, "publicPro", "QT.$${currentModule}.enabled_features", )
|
|
|
|
qtConfOutputVar(assign, "publicPro", "QT.$${currentModule}.disabled_features", )
|
|
|
|
qtConfOutputVar(assign, "privatePro", "QT.$${currentModule}_private.enabled_features", )
|
|
|
|
qtConfOutputVar(assign, "privatePro", "QT.$${currentModule}_private.disabled_features", )
|
|
|
|
!isEmpty($${currentConfig}.module) {
|
|
|
|
qtConfOutputVar(assign, "publicPro", "QT.$${currentModule}.QT_CONFIG", )
|
|
|
|
qtConfOutputVar(assign, "publicPro", "QT.$${currentModule}.exports", )
|
|
|
|
qtConfOutputVar(assign, "privatePro", "QT.$${currentModule}_private.libraries", )
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-08-18 20:24:26 +00:00
|
|
|
defineTest(qtConfOutput_publicFeature) {
|
|
|
|
name = "$$eval($${1}.name)"
|
|
|
|
isEmpty(name): \
|
|
|
|
name = $$eval($${1}.feature)
|
|
|
|
feature = $$replace(name, [-+.], _)
|
|
|
|
|
|
|
|
$${2} {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
qtConfExtendVar("publicPro", "QT.$${currentModule}.enabled_features", $$name)
|
|
|
|
QT.$${currentModule}.enabled_features += $$name
|
|
|
|
export(QT.$${currentModule}.enabled_features)
|
2016-08-18 20:24:26 +00:00
|
|
|
qtConfOutputSetDefine("publicHeader", "QT_FEATURE_$$feature", 1)
|
|
|
|
} else {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
qtConfExtendVar("publicPro", "QT.$${currentModule}.disabled_features", $$name)
|
|
|
|
QT.$${currentModule}.disabled_features += $$name
|
|
|
|
export(QT.$${currentModule}.disabled_features)
|
2016-08-18 20:24:26 +00:00
|
|
|
qtConfOutputSetDefine("publicHeader", "QT_FEATURE_$$feature", -1)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
# currently this is somewhat inconsistent, as the feature is output to the public pro file,
|
|
|
|
# whereas the define is being added to the private pro file.
|
|
|
|
# This should get cleaned up to add to the private pro and header instead.
|
|
|
|
defineTest(qtConfOutput_privateFeature) {
|
|
|
|
name = "$$eval($${1}.name)"
|
|
|
|
isEmpty(name): \
|
|
|
|
name = $$eval($${1}.feature)
|
2016-08-18 20:25:08 +00:00
|
|
|
feature = $$replace(name, [-+.], _)
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
$${2} {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
qtConfExtendVar("privatePro", "QT.$${currentModule}_private.enabled_features", $$name)
|
|
|
|
QT.$${currentModule}_private.enabled_features += $$name
|
|
|
|
export(QT.$${currentModule}_private.enabled_features)
|
2016-08-18 20:25:08 +00:00
|
|
|
qtConfOutputSetDefine("privateHeader", "QT_FEATURE_$$feature", 1)
|
2016-06-11 20:49:01 +00:00
|
|
|
} else {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
qtConfExtendVar("privatePro", "QT.$${currentModule}_private.disabled_features", $$name)
|
|
|
|
QT.$${currentModule}_private.disabled_features += $$name
|
|
|
|
export(QT.$${currentModule}_private.disabled_features)
|
2016-08-18 20:25:08 +00:00
|
|
|
qtConfOutputSetDefine("privateHeader", "QT_FEATURE_$$feature", -1)
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfProcessOneOutput) {
|
|
|
|
feature = $${1}
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
fpfx = $${currentConfig}.features.$${feature}
|
2016-06-11 20:49:01 +00:00
|
|
|
opfx = $${fpfx}.output.$${2}
|
|
|
|
|
|
|
|
condition = $$eval($${opfx}.condition)
|
|
|
|
!isEmpty(condition):!$$qtConfEvaluate($$condition): \
|
|
|
|
return()
|
|
|
|
|
|
|
|
call = $$eval($${opfx}.type)
|
|
|
|
isEmpty(call) {
|
|
|
|
# output is just a string, not an object
|
|
|
|
call = $$eval($$opfx)
|
|
|
|
}
|
|
|
|
!defined("qtConfOutput_$$call", test): \
|
|
|
|
error("Undefined type '$$call' in output '$$2' of feature '$$feature'.")
|
|
|
|
|
|
|
|
condition = $$eval($${opfx}.condition)
|
|
|
|
!isEmpty(condition) {
|
|
|
|
!$$qtConfEvaluate($$condition): \
|
|
|
|
return(false)
|
|
|
|
}
|
|
|
|
|
2016-08-04 17:05:09 +00:00
|
|
|
$${opfx}.feature = $$feature
|
2016-06-11 20:49:01 +00:00
|
|
|
qtConfOutput_$${call}($$opfx, $$eval($${fpfx}.available))
|
|
|
|
}
|
|
|
|
|
|
|
|
defineTest(qtConfProcessOutput) {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
!contains($${currentConfig}._KEYS_, "features"): \
|
|
|
|
return()
|
|
|
|
|
|
|
|
basedir = $$shadowed($$eval($${currentConfig}.dir))
|
|
|
|
module = $$eval($${currentConfig}.module)
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
# write it to the output files
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
isEmpty($${currentConfig}.files._KEYS_) {
|
|
|
|
# set defaults that should work for most Qt modules
|
|
|
|
isEmpty(module): \
|
|
|
|
error("Neither module nor files section specified in configuration file.")
|
|
|
|
|
|
|
|
$${currentConfig}.files._KEYS_ = publicPro privatePro publicHeader privateHeader
|
|
|
|
$${currentConfig}.files.publicPro = qt$${module}-config.pri
|
|
|
|
$${currentConfig}.files.privatePro = qt$${module}-config.pri # sic!
|
|
|
|
$${currentConfig}.files.publicHeader = qt$${module}-config.h
|
|
|
|
$${currentConfig}.files.privateHeader = qt$${module}-config_p.h
|
|
|
|
}
|
|
|
|
|
|
|
|
for (type, $${currentConfig}.files._KEYS_) {
|
2016-06-11 20:49:01 +00:00
|
|
|
contains(type, ".*Pro") {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
for (k, $${currentConfig}.output.$${type}.assign._KEYS_): \
|
|
|
|
$${currentConfig}.output.$$type += "$$k = $$eval($${currentConfig}.output.$${type}.assign.$$k)"
|
|
|
|
for (k, $${currentConfig}.output.$${type}.remove._KEYS_): \
|
|
|
|
$${currentConfig}.output.$$type += "$$k -= $$eval($${currentConfig}.output.$${type}.remove.$$k)"
|
|
|
|
for (k, $${currentConfig}.output.$${type}.append._KEYS_): \
|
|
|
|
$${currentConfig}.output.$$type += "$$k += $$eval($${currentConfig}.output.$${type}.append.$$k)"
|
2016-06-11 20:49:01 +00:00
|
|
|
} else {
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
for (define, $${currentConfig}.output.$${type}._KEYS_) {
|
|
|
|
value = $$eval($${currentConfig}.output.$${type}.$${define})
|
|
|
|
$${currentConfig}.output.$$type += "$${LITERAL_HASH}define $$define $$value"
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
ppScope =
|
|
|
|
!isEmpty(module): ppScope = $${module}_
|
|
|
|
defined(qtConfOutputPostProcess_$${ppScope}$${type}, test): \
|
|
|
|
qtConfOutputPostProcess_$${ppScope}$${type}()
|
|
|
|
|
|
|
|
file = $$eval($${currentConfig}.files.$${type})
|
|
|
|
fileCont.$$file += $$eval($${currentConfig}.output.$${type})
|
|
|
|
fileCont._KEYS_ *= $$file
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
|
|
|
|
for (file, fileCont._KEYS_): \
|
|
|
|
write_file($$basedir/$$file, fileCont.$$file)|error()
|
2016-06-11 20:49:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#
|
|
|
|
# tie it all together
|
|
|
|
#
|
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
cfgs =
|
|
|
|
isEmpty(_QMAKE_SUPER_CACHE_)|equals(OUT_PWD, $$dirname(_QMAKE_SUPER_CACHE_)) {
|
|
|
|
c = $$basename(_PRO_FILE_PWD_)
|
|
|
|
config.$${c}.dir = $$_PRO_FILE_PWD_
|
|
|
|
cfgs += $$c
|
|
|
|
!isEmpty(_QMAKE_SUPER_CACHE_) {
|
|
|
|
for (s, SUBDIRS) {
|
|
|
|
config.$${s}.dir = $$_PRO_FILE_PWD_/$${s}
|
|
|
|
cfgs += $$s
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
configsToProcess =
|
|
|
|
for (c, cfgs) {
|
|
|
|
s = $$eval(config.$${c}.dir)
|
|
|
|
exists($$s/configure.json): \
|
|
|
|
configsToProcess += $$c
|
|
|
|
}
|
|
|
|
isEmpty(configsToProcess): \
|
|
|
|
return()
|
|
|
|
|
|
|
|
load(configure_base)
|
|
|
|
|
|
|
|
QMAKE_POST_CONFIGURE =
|
|
|
|
allConfigs =
|
|
|
|
for(ever) {
|
|
|
|
isEmpty(configsToProcess): \
|
|
|
|
break()
|
|
|
|
|
|
|
|
currentConfig = config.$$take_first(configsToProcess)
|
|
|
|
thisDir = $$eval($${currentConfig}.dir)
|
|
|
|
jsonFile = $$thisDir/configure.json
|
|
|
|
priFile = $$thisDir/configure.pri
|
|
|
|
|
|
|
|
allConfigs += $$currentConfig
|
|
|
|
|
2016-06-11 20:49:01 +00:00
|
|
|
# load configuration data
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
configure_data = $$cat($$jsonFile, blob)
|
|
|
|
!parseJson(configure_data, $$currentConfig): \
|
|
|
|
error("Invalid or non-existent file $${jsonFile}.")
|
|
|
|
exists($$priFile): \
|
|
|
|
!include($$priFile): error()
|
|
|
|
|
|
|
|
# prepend all subconfigs to files to keep a depth first search order
|
|
|
|
subconfigs =
|
|
|
|
for(n, $${currentConfig}.subconfigs._KEYS_) {
|
|
|
|
subconfig = $$eval($${currentConfig}.subconfigs.$${n})
|
|
|
|
name = $$basename(subconfig)
|
|
|
|
config.$${name}.dir = $$thisDir/$$subconfig
|
|
|
|
subconfigs += $$name
|
|
|
|
}
|
|
|
|
configsToProcess = $$subconfigs $$configsToProcess
|
|
|
|
}
|
2016-06-11 20:49:01 +00:00
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
for (currentConfig, allConfigs): \
|
2016-08-15 12:40:52 +00:00
|
|
|
qtConfSetupLibraries()
|
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
!isEmpty(_QMAKE_SUPER_CACHE_): \
|
|
|
|
QMAKE_CONFIG_CACHE = $$dirname(_QMAKE_SUPER_CACHE_)/config.cache
|
|
|
|
else: \
|
|
|
|
QMAKE_CONFIG_CACHE = $$dirname(_QMAKE_CACHE_)/config.cache
|
|
|
|
QMAKE_CONFIG_CACHE_USE = all
|
2016-06-11 20:49:01 +00:00
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
qtConfParseCommandLine()
|
|
|
|
|
|
|
|
!equals(QMAKE_CONFIG_CACHE_USE, none) {
|
|
|
|
include($$QMAKE_CONFIG_CACHE, , true)
|
|
|
|
# this crudely determines when to discard the cache. this also catches the case
|
|
|
|
# of no cache being there in the first place.
|
|
|
|
!equals(cache.platform, $$[QMAKE_SPEC])|!equals(cache.xplatform, $$[QMAKE_XSPEC]): \
|
|
|
|
QMAKE_CONFIG_CACHE_USE = none
|
|
|
|
}
|
|
|
|
equals(QMAKE_CONFIG_CACHE_USE, none) {
|
|
|
|
cont = \
|
|
|
|
"cache.platform = $$[QMAKE_SPEC]" \
|
|
|
|
"cache.xplatform = $$[QMAKE_XSPEC]"
|
|
|
|
write_file($$QMAKE_CONFIG_CACHE, cont)
|
|
|
|
}
|
2016-08-16 18:03:54 +00:00
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
for (currentConfig, allConfigs) {
|
|
|
|
qtConfSetModuleName()
|
|
|
|
qtConfSetupModuleOutputs()
|
2016-06-11 20:49:01 +00:00
|
|
|
# do early checks, mainly to validate the command line
|
|
|
|
qtConfProcessEarlyChecks()
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
}
|
|
|
|
qtConfCheckErrors()
|
2016-06-11 20:49:01 +00:00
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
CONFIG += qt_conf_tests_allowed
|
|
|
|
logn()
|
|
|
|
logn("Running configuration tests...")
|
|
|
|
|
|
|
|
for (currentConfig, allConfigs) {
|
|
|
|
tdir = $$eval($${currentConfig}.testDir)
|
|
|
|
isEmpty(tdir): tdir = config.tests
|
|
|
|
QMAKE_CONFIG_TESTS_DIR = $$absolute_path($$tdir, $$eval($${currentConfig}.dir))
|
|
|
|
|
|
|
|
qtConfSetModuleName()
|
|
|
|
|
|
|
|
qtConfSetupTestTypeDeps()
|
|
|
|
|
|
|
|
# correctly setup dependencies
|
|
|
|
QMAKE_CONFIG_DEPS = global global_private
|
|
|
|
!isEmpty($${currentConfig}.module) {
|
|
|
|
for (d, $${currentConfig}.depends._KEYS_) {
|
|
|
|
dep = $$replace($${currentConfig}.depends.$$d, -private$, _private)
|
|
|
|
dep *= $$replace(dep, _private$, )
|
|
|
|
QMAKE_CONFIG_DEPS += $$dep
|
|
|
|
}
|
|
|
|
}
|
2016-06-11 20:49:01 +00:00
|
|
|
|
|
|
|
# process all features
|
|
|
|
qtConfProcessFeatures()
|
|
|
|
|
|
|
|
# generate files and reports
|
|
|
|
qtConfProcessOutput()
|
|
|
|
qtConfCreateReport()
|
|
|
|
qtConfCreateSummary()
|
|
|
|
}
|
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
# these come from the pri files loaded above.
|
|
|
|
for (p, QMAKE_POST_CONFIGURE): \
|
|
|
|
eval($$p)
|
2016-06-11 20:49:01 +00:00
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
logn("Done running configuration tests.")
|
2016-07-21 15:19:21 +00:00
|
|
|
logn()
|
2016-06-11 20:49:01 +00:00
|
|
|
|
Modularize the new configure system (infrastructure part)
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>
2016-08-25 13:45:44 +00:00
|
|
|
logn("Configure summary:")
|
|
|
|
logn()
|
2016-06-11 20:49:01 +00:00
|
|
|
qtConfPrintReport()
|