| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
We forgot to adapt the static library rule back when we implemented
smart relinking.
Change-Id: Iea952c868ca7b5c0bda89690865d554be4893bb5
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
| |
Change-Id: I42a01e549c15c91428d0f8bd9be03ea59c773032
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This module generates .pc files for products, optionally attempting to
derive some of the entries from the contents of the Export item.
[ChangeLog] Added new module "Exporter.pkgconfig" for creating pkg-
config metadata files.
Task-number: QBS-1232
Change-Id: Ic41e645e4462e8f85ad6c2025fb967e88d3438f9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
| |
If products that come in via auxiliaryInputs are also applications,
then these would get run as well, which is wrong. Prevent that from
happening.
Change-Id: I9580fa4e5198f8a9ab2a0a36ef221c52e3881df8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
| |
... for the case of an installed test.
Change-Id: Ib064da968cb7aae4531c0b7177c044ee6d97bcde
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
| |
This was forgotten in 2bda52aa3d. Also added autotest.
Change-Id: Iba8c7c7aa6629f321017315b03964ce20809ac23
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
The output of the repoState property contains additional whitespace
for subversion case on macOS.
Make sure to trim the output of any whitespace.
Change-Id: Idb17361dc4e7fb95a18c3e789877347e789e5575
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
... and choose the highest entry. This enables different modules to
specify their requirements without introducing conflicts.
Same for cpp.cLanguageVersion.
Task-number: QBS-1225
Change-Id: I96ed6c370eb190023fdb69274dcb080d967f512d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|\
| |
| |
| | |
Change-Id: I407596d75413e43aa61e7d1fe8591f4a0f388340
|
| |
| |
| |
| |
| |
| |
| |
| | |
A simple string comparison is not always enough, because of soft links.
Change-Id: Id1889fa70d5948a1db66d8e6a69b8a2fbb0e34dd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is a set of file tags representing run-time dependencies of the
test executables.
[ChangeLog] Added the AutotestRunner.auxiliaryInputs property for
specifying run-time dependencies of test executables
Change-Id: If1ac6256d83f535b8be859a096062f07b0070729
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The user can specify the outputs of lex/yacc via
%option prefix="foo"
in the .l file and
%output "parser.cpp"
in the .y file.
Also, introduce the following properties to specify the outputs:
lexOutputFilePath, yaccOutputFilePath.
Scan the lex/yacc inputs for those specifications and adjust the output
artifacts accordingly.
[ChangeLog] Added support for %option outfile and %output to the
lex_yacc module.
Change-Id: I5437c737ae8da54dc7eda81ac7384727f00f9d1f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This helps with converting projects, as "make check" is also run from
the executable's location and the executable may depend on that.
The user can override the working directory.
[ChangeLog] The AutotestRunner item now has a workingDirectory property.
By default, the test executable's location is used.
Change-Id: I7349a41960f7b637c3b1dd4c3bc10252d136526a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Modernize the syntax, and read properties from inputs instead of the
product to allow different settings per input.
Change-Id: I38b018edbd9dfa85b7321ca1b665d756e681936a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This makes things more convenient for project authors, and a small
header file getting generated once does not slow down the build
unnecessarily.
Task-number: QBS-1337
Change-Id: I3f48106898418eba8236aad0c3f808d4c027e24b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
[ChangeLog] For MSVC static libraries, compiler-generated PDB files are
now tagged as debuginfo_cl to make them installable.
Change-Id: I8431dbffbbc31c48f1bc7aea96332e0b2408c743
Task-number: QBS-1106
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Also change the style of checking for the rest of the inputs.
Amends regression introduced by
74e518ef6f6b89dd783ec8ffc8cf1d0c713cf14a .
Change-Id: Iddd9b4f1d1688f09e10add41a55e4b4ae6ca7bbc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The input artifacts can have a lot inherited module properties, which
would cause any copy operation to take a very long time as well as
exhaust memory.
Instead directly use the inputs variable.
Change-Id: I829b0f9296bde125fa36e750a503c499e9912c78
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
It was not used anywhere anymore.
Change-Id: I420c40f562634159e838a805aeedbefb89185c75
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I1c1a31a76ea9458f4207ae26c7b57f2e1f37663d
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Otherwise products that appear more than once in the dependencies tree
(directly and indirectly) will be processed over and over again.
Task-number: QTCREATORBUG-20175
Change-Id: I1c67ecc45aa3203c10d35c5822ad8055111331d3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This property did not only exclude auxiliary inputs, but all kinds of
inputs ("inputs", "auxiliaryInputs", "explicitlyDependsOn"), which
happens to be what we want, as it does not appear to make any sense to
exclude only tags from one of the relevant "input-like" properties.
But the behavior was inconsistent: When building the (product-local)
rule graph, the property was considered, but not when collecting
artifacts from other products during rule application. This is now
fixed.
[ChangeLog] The excludedAuxiliaryInputs property of the Rule item has
been renamed to excludedInputs. The old name is deprecated.
Change-Id: Id7eae3461a6e85f53b3d47750d296c3e47a18a95
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
|
|\|
| |
| |
| | |
Change-Id: I15cdc5c73a13c36cf073d01aff0406e539bb507b
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We did not set any environment *PATH variables if any rpaths were
present, which breaks the functionality if some libraries are found via
rpaths and others are not. So let's ignore the presence of rpaths.
Change-Id: I41d690159a51bb8e38acd83667bff53ad86c3714
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
git rev-parse --git-dir prints a relative or an absolute path, depending
on whether you call it from the repository base directory or not. Our
code now accounts for that.
Change-Id: Iac5eeb0fc55fe83d6c588efbcf97cab6786a4f89
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Ola Røer Thorsen <ola@silentwings.no>
|
| |
| |
| |
| |
| |
| |
| |
| | |
The right-hand side of variant properties potentially needs to be
parenthesized.
Change-Id: I7ea9d94b3aea379259fb9e73372791ef3ea71e15
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This module generates qbs modules from products, providing an interface
to them for use by external projects.
[ChangeLog] Added new module "Exporter.qbs" for creating qbs modules
from products.
Task-number: QBS-1231
Change-Id: I9f0cf04b441aaf279cf19a84fd94d97a8cea9de8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The pure file name that the description usually contains does not always
provide enough context: It's not necessarily clear from a file name
which product it belongs to, and some files can be built as part of more
than one product.
Because we print the full product name, including the multiplexing
information if necessary, we also remove the JS code that provided this
kind of disambiguation for GCC compiler and linker rules only.
[ChangeLog] Command descriptions now also contain the product name.
Change-Id: I9702a6cff3faffb086e5c93e02fffa6e65fb1043
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
| |
... when setting the "aggregate" property. This property is evaluated
internally very early in the product setup process, and thus its RHS
should be as unintrusive as possible.
Change-Id: Iba8313566aac37dcff028e8fb313c6dfe7a0b777
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
- We must activate these rules only on the product that is the actual
aggregator.
- The lipo command must only consider artifacts of the multiplexed
variants of the same product.
Change-Id: I25dc42cb53d84d85786b2d7ff96297b7fd58a90d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
|
| |
Both compiler and linker of this toolchain can considerably lengthen the
command line when forwarding it to internal helper tools. Adapt the
response file threshold accordingly.
Change-Id: Iac071163375f276203a83d9ec503f4a3345f6b40
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Instead of always using the fallback value, we instead always use the
standard value unless we know we're running an older toolchain
which does not support it. This alleviates the potential for differing
behavior in newer versions of compilers which may attempt to remain
compatible with earlier drafts of corresponding standards.
[ChangeLog] Always use standard values for -std= when possible
Change-Id: I61ff3ecd863caa24cb8fb54500e62dc310a2af02
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
|
|
|
|
| |
Change-Id: Ie5283adaaa8c55fad57276651a6312f0cfb93dbc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
| |
As first attempted in 7f6ec1cc27.
Change-Id: Ib76dbdfc0a60b27d38d93a22c9556d54f07a3dac
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
| |
The standard is out now.
Task-number: QBS-1020
Change-Id: Ie8249e1c860d5ebc2f9dadf02551544ddaaf2868
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
| |
Was removed in 6655d563c3, but the mingw compiler needs it to locate
some libraries.
Change-Id: I8b7d9ddb69a719c6a6ef590a680c89327cb360d5
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- tools.jar and rt.jar are gone
- The -bootclasspath option is not allowed when targeting Java 9
- JavaCompiler.isSupportedOption() (erroneously?) returns 1 instead of 0
for -Xlint
- version number related changes:
- major version has jumped to 9
- javac prints the version number to stdout rather than stderr
- version number no longer contains a forth component
- The -source and -target options take only the major version
Change-Id: I0b23c8868db7aeaa06785ee43c1efd9fcb1bc9d2
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QBS-1290
Change-Id: I47d89ac2bd1cd88a0f38f51c1ce81517a276725b
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|\
| |
| |
| | |
Change-Id: Ib49f863008a9c4a3b8956686de019e2f133c244f
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QBS-1282
Change-Id: If15e1ad616c6ffcdc03f62d872c512fd52c844d3
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Users now get more friendly error messages when the SDK and/or NDK are
not installed.
Change-Id: Icfc438ed16b88aea190bf766ddc58b26b0512121
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Of our existing backends, only QCC has that requirement.
The old code caused enormous slowness on Darwin, because the build
environment there contains product-specific values.
Task-number: QBS-1277
Change-Id: Ie26c148ff49030eb2626324d6a9f658a794dda23
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/lib/qtprofilesetup/qtprofilesetup.cpp
src/lib/qtprofilesetup/templates/QtModule.qbs
src/lib/qtprofilesetup/templates/core.qbs
Change-Id: I342608a47f1a90b53eb12cc14fc3ff116063d15f
|
| |
| |
| |
| |
| |
| |
| |
| | |
Prefix headers should follow precompiled headers on the gcc command
line. Testcase added.
Change-Id: I3dfba8cae9c894932acce5c0a67f16d7d072c94b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Module properties must be accessed via product.
This amends 2ff14a89.
Change-Id: Icab99041377c82cbe0ea75786075baff05da9aca
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On Windows, we typically link against an import library rather than the
actual dll. The dll location is not known to us, but the file is often
in a "bin" directory alongside a "lib" directory that contains the
import library. In such a case, add the "bin" directory to the PATH.
Change-Id: I21103a7ca6267d1d80c2911a19144e583c2eba95
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
|\|
| |
| |
| | |
Change-Id: Iecddc2722d22d7c15d4b32efd676fa8e7c00e99f
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
...rather than leaving them undefined. This way, the string "undefined"
will not end up in file names.
It's safer to do it this way compared to checking for "undefined" in all
the places that could make use of the properties. Due to the semantics
of these properties, there is also no value in treating "undefined" in a
special way.
Task-number: QBS-1265
Change-Id: I6ce7626485baa284a6c782b513740f9d150e18c3
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: I1af7bfa2583417245235363ccc7a7a5fe5f25304
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
|
| |
| |
| |
| |
| |
| | |
Task-number: QBS-1247
Change-Id: I604ba374378197a6a76cc0367f2511422c345791
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
|