aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove executable bit from non-executable files.v1.2.21.2Jake Petroules2014-06-165-0/+0
| | | | | | Task-number: QBS-622 Change-Id: I080cff88ffa91fcb55ff8340847b684901ada44b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix scope chain of conditions of Properties itemsJoerg Bornemann2014-06-163-21/+88
| | | | | | | | | Conditions of Properties items that were used to set non-module properties were evaluated in the wrong scope. Task-number: QBS-613 Change-Id: Ia28070c4352bcca4c153f3cdfb3b66586ea5f3e5 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* fix isEmpty checkJoerg Bornemann2014-06-161-1/+1
| | | | | | Task-number: QBS-620 Change-Id: I86d220d10b6158db63e2f81d92feaeada0dc86a0 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* fix graph traversal of ArtifactVisitorJoerg Bornemann2014-06-132-0/+7
| | | | | | | | | We must return false in all visit methods to indicate that we don't want to traverse children. Task-number: QBS-617 Change-Id: I24226b2b83a5deee394ef1e2fd8dee84dbabf28e Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* sanitize stdout/stderr output in blackbox testJoerg Bornemann2014-06-132-0/+9
| | | | | | | | | | On Windows the CR characters that were in stdout/stderr led to very unclean output on the console and in Qt Creator. We're removing those in the runQbs method now. Change-Id: I4bef7bb7221bd6f656e5e7480c7a3e0e7ddb44fb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* allow Probe items within Module itemsJoerg Bornemann2014-06-131-0/+1
| | | | | | | This fixes tests/manual/configure. Change-Id: I79c82182d776958c2bb4599f89456221c6318033 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* fix TestBlackbox::erroneousFiles on *nixJoerg Bornemann2014-06-131-2/+3
| | | | | | | | The error message will contain '/bin/ls' and not just 'ls' unlike on Windows. The test now understands regular expressions. Change-Id: Ib37201744d192d6cd53c350107985532c3633532 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* yield error if Command.workingDirectory doesn't existJoerg Bornemann2014-06-104-0/+52
| | | | | | | | | Otherwise some command might clutter the user's current working dir. Task-number: QBS-607 Change-Id: Id263481d1a615b9c66753e11b271441d4bd004b1 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* fix linking of static Qt libsJoerg Bornemann2014-06-051-3/+10
| | | | | | | Task-number: QBS-608 Change-Id: I71235675508a5a5d8e651ef6d025e4ef844b5cfc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix lib name for static Qt libs on OS XJoerg Bornemann2014-06-041-1/+1
| | | | | | Change-Id: Ia43b7e59de5a802c72c844250e7331b6be2c31d9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* read QtModuleInfo.isStaticLibrary from module_configJoerg Bornemann2014-06-041-1/+6
| | | | | | Change-Id: Ia37b245cac5479e2c846b7079f51f548b04f82b7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* initialize QtModuleInfo::isStaticLibraryJoerg Bornemann2014-06-041-1/+3
| | | | | | Change-Id: If90fd697cbcfcd1eda6f24cb7ac7ad2985e4df68 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix messages.Takumi Asaki2014-06-022-3/+3
| | | | | | Change-Id: Ie06e48637ea0bb10e2383f75c6a33488c275a29a Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* setup-qt: mark ActiveQt libs as static for Qt4Joerg Bornemann2014-05-261-1/+9
| | | | | | Task-number: QBS-598 Change-Id: I2c453da06b927b120bcdfbecc369bb8063d27fe6 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* setup-qt: fix module prefix for ActiveQtJoerg Bornemann2014-05-261-2/+15
| | | | | | Task-number: QBS-598 Change-Id: I3c722239bf51317e55a028680c03c31629f5ed0b Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* fix getQtLibraryName for static Qt4 modulesJoerg Bornemann2014-05-263-9/+12
| | | | | | | | Static Qt4 modules don't have the major version in their name. Task-number: QBS-598 Change-Id: I279b4c36fb13d863d2490537cfb12692fb6cb655 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* setup-qt: fix module name for ActiveQtJoerg Bornemann2014-05-261-1/+11
| | | | | | | Preparation for fixing QBS-598. Change-Id: I039d3276eddf0eaf047b1b50f72d5b1976a47152 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix repeated emission of the finished() signal in JsCommandExecutor.Christian Kandeler2014-05-261-4/+4
| | | | | | | | This currently happens always if the command fails, resulting in an assertion. Change-Id: If3de00a2f0e7d89bd052a6ab74bf4237be82e913 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix app linker rule for MinGWJoerg Bornemann2014-05-261-0/+1
| | | | | | | | This fixes a regression introduced in 7f5d5445. Task-number: QBS-597 Change-Id: Ifa453e1de8f4d1857fd4c247bd359c6c605e4f79 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Add missing header file to installation targets.Christian Kandeler2014-05-232-2/+7
| | | | | Change-Id: I44bf57b4cded1a283f4d62deac21d2f7b686d971 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Bump version number.Christian Kandeler2014-05-232-2/+2
| | | | | Change-Id: I98cc3aff3a84d1d2b2a6a77c27d8881fee98f01e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove trailing whitespaceOrgad Shaneh2014-05-213-6/+6
| | | | | Change-Id: Id4a8bbc1d7656f3367e43f16fb8ee5a930d78d39 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* pass file dependencies to recursive dependency scannersJoerg Bornemann2014-05-212-8/+11
| | | | | | | | | Recursive dependency scanners, like the C include file scanner, must be fed with file dependencies they've found. Task-number: QBS-566 Change-Id: I68a8e4a5cbb771ed2785ca69412a3b4c4e280eb2 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* let scanners operate on FileResourceBase objectsJoerg Bornemann2014-05-204-26/+34
| | | | | | | File dependencies should be scannable for dependencies too. Change-Id: I7223ba65ee6ca02f70c8e48165652550007e91f6 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* move scanner determination to separate functionJoerg Bornemann2014-05-202-26/+32
| | | | | | | Preparation for fixing QBS-566. Change-Id: I2acdb648dc9fe247458aff76caa716c79058fa84 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* streamline trace output of the dependency scannerJoerg Bornemann2014-05-201-20/+29
| | | | | Change-Id: I0fa8cfc90c647596ddfbae04823bb870fae81012 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* extend TestBlackBox::fileDependenciesJoerg Bornemann2014-05-193-1/+16
| | | | | | | | | | | narf.cpp includes awesome.h awesome.h includes magnificent.h awesome.h and magnificent.h are not listed in the project. Changing magnificent.h must trigger a rebuild of narf.cpp. Task-number: QBS-566 Change-Id: Ib2df45ac550951b550ce4ba0e7519268d9123eda Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* MSVC: do not use deprecated input.fileName propertyJoerg Bornemann2014-05-161-1/+1
| | | | | Change-Id: I3b8528765295dcb38fc651a83bf7b093dc2c6a53 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fixed handling of Qt4 Phonon submodule in qtprofilesetup.Thomas Epting2014-05-165-4/+16
| | | | | | | | | Considered the different naming conventions of the Phonon module and associated paths and libraries (Phonon vs. QtXxxx). Change-Id: Iedf7501b35685f30379a8145440fc751a6cde91d Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* use PathProbe in dynamicRuleOutputs testJoerg Bornemann2014-05-121-2/+7
| | | | | | | | That's more generic and adds a Probe usage to the test suite. Change-Id: I022022f9c1d77d5508fbbe848ce56a73eb115185 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* fix PathProbeJoerg Bornemann2014-05-121-1/+1
| | | | | | | | | We must push the probe's scope last, because otherwise the file scope would shadow property names like fileName and filePath. Task-number: QBS-383 Change-Id: I4c78b6ad65c2f3e9af5c5c4dda721f6bb6475324 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Autotests: Increase timeout for "infinite loop" tests.Christian Kandeler2014-05-091-2/+2
| | | | | | | | This is a bit of a shot in the dark to fix a non-reproducible test failure on our build machine. Change-Id: I8923c8744e3f5febb55a508a88c46f0fc9543da5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix crash on Properties block in Export itemv1.2.1Joerg Bornemann2014-05-082-0/+8
| | | | | | | | | | | The merged Export item was lacking a file context. Added a QBS_CHECK in instantiateModule to ensure a valid file context of the module instance scope. Task-number: QBS-550 Change-Id: I04368ba2e290a9af70f22e9c4c07324e295da4f0 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Executor: Record only the first failing job's error message.Christian Kandeler2014-05-071-1/+2
| | | | | | | | Otherwise we end up with irrelevant "Transformer canceled" messages, while the actual error gets lost. Change-Id: I81de84d75cdd94471c13012f23bca5bfd663ab96 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: fix copy-paste error.Jake Petroules2014-05-061-1/+1
| | | | | Change-Id: I7baa14d5b14a19b0240476584f91a47030f781a7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix crash on product disabling.Christian Kandeler2014-04-304-1/+22
| | | | | | Task-number: QBS-561 Change-Id: Ia56280cb26241c7fb9debd0d4ce1349b041405a6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make the "clean" operation interruptible.Christian Kandeler2014-04-281-2/+8
| | | | | Change-Id: I60f221a0dfcc2786dfaa6b655cbce7f899a2027b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove invalid assertion.Christian Kandeler2014-04-241-1/+2
| | | | | | | The asserted condition is actually not required to be true. Change-Id: I7609a8551e0c0906ebbb6649c5966ff1a90272fb Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* add missing loadFile call from msvc.jsJoerg Bornemann2014-04-231-0/+2
| | | | | Change-Id: I9eba26d3b66056b21ca78ccb6eb9406cc43a7288 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* qbs build: Fix type of project.libRPaths.Christian Kandeler2014-04-231-1/+1
| | | | | | | This must be the same as cpp.rpaths, which is a string list. Change-Id: I61f18e4dbb0c81d093c22e7d0ecb62e6381030a5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix XcodeProbe::compareVersionsJoerg Bornemann2014-04-231-3/+3
| | | | | | Task-number: QBS-556 Change-Id: I1f38394a8b60aae3185901176dce9439d6ad111a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fuzzy tester: Print error message also for clean build failures.Christian Kandeler2014-04-222-6/+8
| | | | | | | This will help us find false positives (e.g. "disk full"). Change-Id: I5db9d333809f7067dc5dff81544e9e5f0206ee8c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* API: Do not present all root artifacts as target artifacts.Christian Kandeler2014-04-178-6/+18
| | | | | | | | E.g. Transformer outputs are roots, but not target artifacts. Task-number: QBS-557 Change-Id: Ia2ab5567344911b0751deed465722deb182e4aaf Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Allow to set the archive format in packaging script.Christian Kandeler2014-04-161-3/+4
| | | | | | | For Windows, we use zip. Change-Id: I0e28a284d2be0b071106a3e124fba9c187305887 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add script for creating a source package for a release.Christian Kandeler2014-04-162-0/+9
| | | | | | | It's only a one-liner, but tedious and error-prone anyway. Change-Id: I2fd71f393e49737bf002f0ca93ed157be3fc1438 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Increase timeout in tests.Christian Kandeler2014-04-161-2/+2
| | | | | | | Some build machines take a bit longer. Change-Id: I65fba2c024e95350c427286b5bcfa0feb2a7ee04 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Prevent user code from hanging qbs during resolving.Christian Kandeler2014-04-169-9/+64
| | | | | | | | | Long-running commands are handled already, but badly written project files could still hang qbs with e.g. infinite JS loops on the right hand side of a binding. Such code can now also be interrupted. Change-Id: Ie0d114bd37d540e764d5ec5bb323c91bfd64a67a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove left-over function declaration.Christian Kandeler2014-04-161-1/+0
| | | | | Change-Id: I9c7be07b195eee08736394801f6b0aabc0f24231 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Bump version number to 1.2.1.Christian Kandeler2014-04-162-2/+2
| | | | | | | Better late than never. Change-Id: Ie222ea5d0535f5d28e6dd0f1bc97e5b25b61770b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* setup-qt: fix help textJoerg Bornemann2014-04-161-1/+1
| | | | | | Change-Id: I15341377851a0ccfc8377f381192b9f6a9e51f5d Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 06:59:41 +0000