| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
This is now tested by TestBlackbox::build_project.
Change-Id: Ib64c06d10634aa2e6b5213cd9536e229cb5e3882
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QBS-294
Change-Id: Ie285cb98db052176a563f52a187279b5dae4c1bf
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
| |
Fix follows.
Change-Id: I79e34e460710c3ea17bef397eace6b65d004d0e9
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QBS-55
Change-Id: I53e9c0c2a784851244219dde9ffe752816e65d0a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: I33317c857a319e0fa25c9e0d0cc69abc4ad3fabb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
| |
Profile values will be converted to the type of their corresponding
property. Now it is possible to set string lists of length one or
boolean values in profiles.
Change-Id: I7fa8bee556376e683030cf02790597c56e6bf494
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QBS-310
Change-Id: I22139a8c537ded6553f9dc326bb202b1b871c0ee
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: Ia30766b91ef28d05bc1f6109d6dedbb7d18bcf3d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
| |
This is nice to have for grouping products and
a requirement for aggregating existing projects
into a bigger one.
Change-Id: I3394642e95ea57dbc6bf1603cfed6902a5906e4c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
| |
Autotest: TestBlackbox::missingQObjectHeader
Change-Id: I96127c47dfd3a2e38801dc1305ce7f9c528a94e3
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
| |
Change-Id: Ia0eaaf3c0711b4396fa68dfda373b0a91ba29a63
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It's now possible to read from existing Info.plist files. The data in
an external plist file will be aggregated with and overridden by the
object dictionary specified in the QBS file.
Postprocessing can also be disabled if desired.
Defaults handling has also been DRY'ed up significantly and made more
consistent across different bundle types and platforms.
Task-number: QBS-301
Change-Id: Id3ff3bbca1e02c467143513216ef66d38ec9aa6b
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
XIB files are now compiled into NIBs and placed in the bundle.
A manual test has been added for testing this functionality. Note that
the project was generated using one of the Xcode templates; this test
will therefore be useful for ensuring that QBS can generate an
identical application bundle to Xcode in general.
Task-number: QBS-202
Change-Id: Ie098327a65c5340dd554cb7d6f49415efd1def27
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: I7a389cb744c451cee435196fd65a8987199d3ed5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
| |
The fix breaks some existing test cases that used random strings as file
names, so adapt those.
Task-number: QBS-288
Change-Id: I63d6a75badd0114cdecfbcdb67128f457ddc61c7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
The overriding of project properties happened too late for
project.references. Now it has been moved from ProjectResolver to
ModuleLoader.
Task-number: QBS-281
Change-Id: I69845abc876bda033eb52d3b8313f82ded0abebb
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
| |
Now it will pass if helper_lib.qbs is referenced.
Change-Id: Ie5aa925430890d2d846d3db412c67315cd992e4c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
|
|
| |
While we do not promise a stable ABI at the moment,
this is conceptually correct and has to be done sooner or
later, with increasing effort the longer we delay it.
Change-Id: Icc98443974e54d377167480ace601db4981ed43c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QBS-281
Change-Id: Ia9f3c50ace67ef7ee65242f8c83475bcdc289cf2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
| |
On our Windows test machine a timeout of 30 s is not enough.
Set timeout to five minutes.
Change-Id: Icbc719390f57d33c86fe828a209f3c6fa3ca5f9e
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
| |
Change-Id: I6ed287f4e696d48d704f19b49ff9f9283f5e7084
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
| |
Blackbox autotest codegen enhanced.
Change-Id: Ibeda7204477d06973a4e343d57da757c0bf47899
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The name "Export" reflects the characteristics of this item better
than "ProductModule" and is also similar to what is used in other
build tools.
ProductModule is now deprecated.
Support for it will be removed in 0.5
Change-Id: I736d51f40e547ec38e3922c0793a7b57890ecd47
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
| |
Running just HelloWorld.exe fails.
Change-Id: Icf766bfdd3ec840fddd06edd925c465dc7a24cea
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: If33af0f7069983c7d403248bc4d979164dde0f4d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Override project properties on the command line via
qbs project.someProperty:foo
and override product properties with
qbs MyProduct.someProperty:bar
Task-number: QBS-237
Change-Id: I95b83749625e58a67b7f9fc54d8c77a0d9b514e4
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We don't want to expose the "modules" property in rules, because
module properties must be accessed via the moduleProperty functions.
This was achieved by filtering all associative array properties and thus
hid all user-defined associative arrays as well.
We now check for the property name "modules".
Codegen blackbox test extended.
Task-number: QBS-264
Change-Id: I6c9e0680bafa3801aa2626f3edacab6a06296358
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
|
|
| |
Also rename modules/qt to modules/Qt and use this form consequently.
Task-number: QBS-254
Change-Id: I2e994f2bc5f93d4f887e14ac224ab360c54ad029
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
| |
It checks that a disabled product is not being built.
Change-Id: Id89294915dcb9a6e978b8522e921fb415308d5ba
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Track in the build graph which variables have been requested
by a project and re-resolve a restored project if they have changed
in the meantime.
Task-number: QBS-259
Change-Id: I6fd08785e2e2ba97f42d0da983f3ea84859e6d20
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
| |
Fails currently, as the feature is not yet implemented.
Change-Id: Id052f756803b687aaf882e444f076b1c7d6e4d86
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Both MSVC and MinGW now only pass their respective subsystem flags if
product.consoleApplication is not undefined - the linkers use console by
default.
MSVC: as an exception to the above, a subsystem flag must be passed
regardless of the value of product.consoleApplication if a minimum
system version was specified - in this case subsystem will be set to
console.
MinGW now correctly handles setting the minimum subsystem/OS version; it
was previously using totally nonexistent flags due to poor assumptions
about its MSVC compatibility.
The test case which tests this functionality was also broken, and is now
fixed as well.
Task-number: QBS-244
Change-Id: Ibca29ce673a81f1231d364d5b6e6875a462b379c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
| |
We want runQbs() to be more flexible while not adding even more function
parameters, so aggregate the possible parameters in a new data
structure.
Change-Id: Ia2f47b7555c8ec5e4ad85ce6b69861e32c764478
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
| |
There currently is no "--show-progress" option on that OS.
Change-Id: I56150eadb69ac05d342d3a050c87e66bc79bd63f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: Ic67e930d9d5dc531c18ef3a82d80b31e1916ba8d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
| |
Was broken due to a bug in command line parsing.
Change-Id: Ice6f5ce057a157f3d740a069ac567d75cfd38ba0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Instead of throwing away the whole build graph, we detect
changed properties in products and invalidate only those.
Also, adding products does not cause a full rebuild anymore.
Task-number: QBS-6
Task-number: QBS-235
Change-Id: I3ab1ca84eaeaf28bb083da4e6926e7b1ebbd7694
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
| |
Fails currently.
Change-Id: Idfed174ec48663b5dee232775229049dc8c5d1dd
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
| |
Now it's possible to turn rules on/off dependent on module properties
set by the product.
Change-Id: Ie11b31f416bd95a8a764ce99d7d8ca190eff08b5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It is now possible to access the dependencies of a product or module.
Entry point for the tree of dependencies is product.dependencies which
returns a list of objects that represent products/modules the product
depends on.
Blackbox test added.
Change-Id: I0c2728da479e8cc45ca3994d7e4a9e7a41802aa1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
|
| |
It no longer depends on whether it is run in a terminal. See comments in
patch for details.
Change-Id: I3802112bdbfdb9f2e1221a4a86d29f422c437c81
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is an addendum to 55b848f530e18ae1f8294f05fb1971aa578dd956,
which was erroneously pushed without proper testing.
- Write timing data only if requested.
- Do not access progress observer if it's null.
- Add autotests.
Change-Id: I616dc050e69478d297abb6d5a3ae27a6ccff8503
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
| |
This resolves the project and applies the rules, but does not build it.
Saving the build graph can be switched off using the "--dry-run" option.
Change-Id: Ib917937a9aac1f3405d95adfd8a2fd5666a84af2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
| |
Product.destination in product context was visible as
product.destinationDirectory in rule context.
Now it's destinationDirectory in all contexts.
Change-Id: I20173a1543036221491467a3d0ca44f0cf017c83
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
| |
Change-Id: I589489a13fe6e44d0b0b8c2daba2c6bc882e9765
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: If09122d2beb678e075e40a967a1b9d4d7d24c67d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
|
|
| |
Do not copy the whole test data directory for every single test case.
It's enough to remove the build directories in the cases where a test
data subdir is used more than once.
Change-Id: I2c56b5be05cbc09fd33eda759ad77c8480d4d0e3
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
|
| |
We must wait before altering a file, not before calling qbs.
This fixes the random fails on our test servers.
Change-Id: I1e117d38cc5d8f79bcc52f4e59f86cb6f1359917
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
|
| |
This is nicer than copying the line around. As a bonus the test runs
a bit faster on Windows.
Change-Id: I10c76f7b34926343f8ea7a2f3d44bffa2961ca72
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QBS-226
Change-Id: I85c6e24ecfe6b90d33df17589f151e4082b53d58
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|