aboutsummaryrefslogtreecommitdiffstats
path: root/share
Commit message (Collapse)AuthorAgeFilesLines
* Fix App Extension builds on older versions of Xcode/macOSv1.7.2Jake Petroules2017-02-171-4/+6
| | | | | Change-Id: Ib25d942da9ba019ceb5b7a64e1fd703d6f4b9baa Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* cpp module: fixed output path for pch_copy file in JavaScriptCommandSergey Petrov2017-01-051-1/+1
| | | | | Change-Id: Icec903bef4cfccf3a1d1075b46bda57e1cfa5fad Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Use different tags for debug info created by different rulesChristian Kandeler2017-01-025-23/+28
| | | | | | | | | Otherwise, rule conflicts occur when users try to process the "debuginfo" artifacts further. Task-number: QBS-1089 Change-Id: I70141cfbf2a966ab0414cbabab5e4785fd4a96c6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Do not create bundle-related artifacts for non-Darwin targetsChristian Kandeler2017-01-021-1/+3
| | | | | | | | This is erroneously done at the moment when separate debug information is enabled. Change-Id: I97474d8d08e31de9db20f738f21e0c753d929c4d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Prevent undefined values from getting into listsJake Petroules2016-12-232-3/+3
| | | | | Change-Id: I8979a11ce27ffb363fa6bd696b132a9710300fa5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix javaDependencyTracking autotest with Java 6 on Windows and LinuxJake Petroules2016-12-192-7/+21
| | | | | | | | Both rt.jar *and* tools.jar are part of classes.jar in Apple Java 6, not only the former. tools.jar is present in all other versions of the JDK. Change-Id: Ia045d17c768963fd454f0ed81d95940c4a33d2b7 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix deploymentTarget autotest with older versions of XcodeJake Petroules2016-12-141-5/+7
| | | | | | | | As a consequence, Xcode SDKs which Qbs recognizes but which do not exist on disk will now produce a much more readable error message. Change-Id: Ib847fca85ed02cadb33d3a3e944b41fa52a1c6f0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* MSVC: Add "WIN32" to the list of platform definesChristian Kandeler2016-12-141-0/+1
| | | | | | | | | This macro is set when building with Visual Studio and is often used interchangeably with the compiler define "_WIN32" by developers when testing for the platform. Change-Id: I4e14ffae162793bd8559796b449e26a3899d8cc8 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Turn process execution errors in GccProbe into fatal errorsJake Petroules2016-12-091-2/+2
| | | | | | | | | | | | | There is absolutely no point continuining from here, and ignoring errors from executing the compiler will simply result in a more cryptic error message for the user. For example, the bug fixed by the previous patch set resulting in an "unknown arch armv7" error message from Clang was actually displayed as missing compiler version properties, seemingly unrelated. Change-Id: I7ddf4a8f7b82a71355065074aae5401e7292bae1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix passing -arch x86_64h or -arch armv7 to Clang for Apple targetsJake Petroules2016-12-093-2/+7
| | | | | | | | | | This fixes a regression `clang: error: invalid arch name '-arch armv7a'` when building for iOS armv7, which affects Qt Creator in particular. Expand the scope of the deploymentTarget autotest to verify it does not happen again. Change-Id: Ic2689ec4474f74642d3de641b57a52854d2a8bdc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix some issues in the WiX module causing the autotest to failJake Petroules2016-12-091-10/+20
| | | | | | | | | | | | | | | | This allows qbs.architecture to be undefined for WiX, in which case the WiX default architecture of x86 will be used. The autotest would fail if there was no architecture set in the profile (which is allowed). This also corrects the registry key name for finding WiX, leading to incorrect autotest failures if WiX tools were in not in the PATH or WiX properties were not set in a profile. Lastly, this fixes a wrong concatenation of product.buildDirectory and improves the output and error reporting for the autotest. Change-Id: I227924b681131c13fcb09d2d5010b372ff44b241 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Downgrade error message from JavaCompilerScanner to a warningJake Petroules2016-12-072-4/+13
| | | | | | | | | | | | | This is not actually fatal, as Qbs collects dependency information both from the TreePathScanner API *and* the output files the compilation process writes to. Instead, downgrade it to a warning and also point users to the bug report. This fixes a regression from 1.5.x. Adds an XFAIL'ing autotest. Task-number: QBS-1069 Change-Id: I30e5f5d0d1554bf5078509768fdad12f20922319 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add support for building Inno Setup packagesJake Petroules2016-12-053-0/+230
| | | | | | | | [ChangeLog] Add support for building Inno Setup packages Task-number: QBS-936 Change-Id: I4cc8e2b39ad93a7aa307a38d88e3f61687c8d364 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Android.ndk: Fix wrong name in PropertyOptionChristian Kandeler2016-12-021-1/+1
| | | | | | Task-number: QBS-1065 Change-Id: I77cdd3397cb918a4f77188e1464bc0f96449b009 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Add possibility to specify the base name of the generated qrc fileDenis Klychkov2016-12-021-0/+7
| | | | | | | Task-number: QBS-1043 Change-Id: I5f537f148792b0e2647d08d6e8004d79ae402f07 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* cpp module: Use libc++ for Darwin targets when C++ >= 11 is enabledChristian Kandeler2016-11-251-0/+2
| | | | | | | The libstdc++ shipped on these platforms does not support C++11. Change-Id: I147643a2684eb75604289491ed4f32e807f92425 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Cpp module: Don't set the C++ standard library explicitlyChristian Kandeler2016-11-241-6/+0
| | | | | | | | | | At the time this code was introduced, we observed problems on Linux when using clang to build C++11 code against libstdc++. I am no longer able to reproduce that problem on any distribution, so let's go back to using the platform default. Change-Id: If477b47c674696a0973a16924c2c0d5e91d6c1ea Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* GCC module: Do not add assume libc++abi with libc++ on LinuxChristian Kandeler2016-11-241-4/+0
| | | | | | | | | | | | | We hardcoded the respective flag because it was observed that linking failed without it. However, this requirement seems to be a (questionable) peculiarity of one specific Linux distribution (namely ArchLinux). In general, one should not need to add the low-level ABI library. Where it is required, the user can add it to the list of libraries (possibly via a profile). Task-number: QBS-878 Change-Id: Iece8e1af566b0696419b84c82d076841e1cb9c66 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* MSVC: Do not overwrite build environment with result from ProbeChristian Kandeler2016-11-231-2/+2
| | | | | | | | | We want to amend it instead. Task-number: QBS-1038 Change-Id: Ib1b87b654d92911473cd03f9c32243a54fb98635 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Cpp Module: Remove default rpath entry for LinuxChristian Kandeler2016-11-221-1/+0
| | | | | | | | | | It is unclear why that was added in the first place; there is no apparent reason why every Linux application should have "$ORIGIN" in its rpath. Task-number: QBS-1035 Change-Id: Ibdf631f394bda4df4461d47aaa4ee13fe0a2f00c Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Android NDK module: Move I/O operation into ProbeChristian Kandeler2016-11-182-3/+4
| | | | | Change-Id: If6884dc0c6625932ca50d7b035357b2df660e9dc Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Use product.targetName for APK name instead of product.nameJake Petroules2016-11-171-2/+2
| | | | | Change-Id: I45a94280a65744ebf967eef78277d35204246585 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Use a Probe in the ib moduleChristian Kandeler2016-11-101-1/+11
| | | | | | Task-number: QBS-1033 Change-Id: Ie37a15c884c1573ae69fda2aa256286c31f611e2 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Xcode: move SDK enumeration into a ProbeJake Petroules2016-11-101-1/+12
| | | | | | | | This should significantly speed up performance in the Xcode module. Task-number: QBS-1033 Change-Id: I723683dc42e3ea7a3ace0bdae15749bd06592d2a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ModUtils: Deal sensibly with undefined valuesChristian Kandeler2016-11-031-3/+8
| | | | | Change-Id: Id51424820249b05e327f8a709ab716359529131d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge 1.6 into masterChristian Kandeler2016-10-282-51/+78
|\ | | | | | | Change-Id: I7ae9ebf1bd9ff2f4062a20dbd50333d055f8f6c3
| * Fix x86_64 > x86 cross compiling when -arch is not availableJake Petroules2016-10-251-29/+26
| | | | | | | | | | | | Task-number: QBS-1028 Change-Id: Icd174d72958bbde4b4f360a968e0fb9092ccb2e0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Add module instance as scope to cloned module prototypeChristian Kandeler2016-10-241-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | ... when evaluating the "prototype part" of list properties. This is necessary so that other properties appearing on the right-hand-side of the property use the value from the instance instead of the one from the prototype. Task-number: QBS-845 Task-number: QBS-966 Change-Id: I7b6c7d068e45f4805422c887239ec81b5c661880 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Update specs from Xcode 8 using update-specs.shJake Petroules2016-10-191-12/+52
| | | | | | | | | | Change-Id: I44f6698bd114bbc5fd88231b9fa3c7b1ece11880 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Modules: Adapt to introduction of built-in "version" propertyChristian Kandeler2016-10-196-3/+6
| | | | | | | | | | | | | | | | - Remove redefinitions of the property. - Set the property, where applicable. Change-Id: Ie3f4bd3c4cc9b809667287045c10b22ff6b71e21 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge 1.6 into masterChristian Kandeler2016-10-175-28/+24
|\| | | | | | | Change-Id: Ie98233d955f3695da0b20069fb2317931e353e4e
| * Introduce property cpp.linkerWrapperThomas Epting2016-10-103-3/+23
| | | | | | | | | | | | | | | | | | | | This allows integration with tools like Bullseye Coverage. Task-number: QBS-1000 Change-Id: I318599a9df0f082a096fb72db7a8878b15e571cc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Remove ResourceRules handlingJake Petroules2016-10-072-25/+1
| | | | | | | | | | | | | | | | | | These have been obsoleted by Apple, and breaks iOS builds in Xcode 8. https://developer.apple.com/library/mac/technotes/tn2206/_index.html Change-Id: I46a86ae80641d760c8f061b7f76769f8ff99d3db Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Cpp Module: Add soVersion propertyChristian Kandeler2016-09-302-10/+14
| | | | | | | | | | | | | | | | | | | | | | People must be able to set the version part of their shared library's soname. So far, we hardcode it to the major part of the product version, but that's not always right. [ChangeLog] Introduced cpp.soVersion. Change-Id: Ie06d5b88d0b3ee62f5924d58407e2a88e9e6f90d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge 1.6 into masterChristian Kandeler2016-09-302-10/+13
|\| | | | | | | Change-Id: I5a0de1ab1c38080d6061045d28fa9220a88ef4ba
| * Fix the InstallPackage itemChristian Kandeler2016-09-291-8/+11
| | | | | | | | | | | | | | | | | | It failed to take qbs.installPrefix and qbs.installSourceBase into account. Task-number: QBS-1019 Change-Id: I243cfaaf9f83b818d5ab1210b96a107a4e22380f Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * Fix order of includePaths and systemIncludePathsJake Petroules2016-09-051-2/+2
| | | | | | | | | | | | | | | | | | Was like this since introduction. Does not use -isystem for systemIncludePaths because not all assemblers support that (for example nasm, which the original patch intended to introduce support for). Change-Id: I12623c760d529336df41883f02ffef74d67dbc3f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Remove executable flag from qbs and js filesEike Ziller2016-09-054-0/+0
| | | | | | | | | | Change-Id: I8597f6d245c8be227d8b9f4d88c9a38dfad19673 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge 1.6 into masterChristian Kandeler2016-09-053-5/+5
|\| | | | | | | Change-Id: Ica9e01e8dc03fe0d36568a270bbad9b85919c952
| * Fix the input values of some ProbesChristian Kandeler2016-08-312-3/+3
| | | | | | | | | | | | | | The value "undefined" could get into input arrays. Change-Id: I4f2fb6b076b0d11cd56717d16f9dc6be41bed252 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * Fix property types in GccProbeChristian Kandeler2016-08-311-2/+2
| | | | | | | | | | Change-Id: Iba3619071913027a33393435a138f2fddd16045b Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | GccProbe: Explicitly convert strings when assiging to int propertiesChristian Kandeler2016-09-011-6/+6
| | | | | | | | | | | | | | We want to get rid of implicit conversions. Change-Id: I1dcee4bbed3bf120e2a942105b1daaa5e5d2e7a7 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Merge "Merge 1.6 into master"Christian Kandeler2016-08-291-1/+1
|\ \
| * | Merge 1.6 into masterChristian Kandeler2016-08-291-1/+1
| |\| | | | | | | | | | Change-Id: If4ec894bc327311eeb41609a5d340a884161fda7
| | * MSVC: Escape the percent sign in definesChristian Kandeler2016-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The percent sign is special to cl.exe in mysterious ways. It has to be escaped with another one. This is indepent of whether the defined value is a string or not. Change-Id: I7bf4a46cea33c29007894566cf38b41d526fd94a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Update license headersIikka Eklund2016-08-291-0/+40
|/ / | | | | | | | | | | | | | | | | | | Patch-set 3 includes rest of the files. Every source file needs to have up-to-date license headers in order to pass ci. Change-Id: I55ed96910b5cb13513f80eb118feafcdaa32e8b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge 1.6 into masterChristian Kandeler2016-08-197-12/+61
|\| | | | | | | Change-Id: Id711e244f207d6c4f08e240ef4c033f344b530fc
| * Give debug info output file a proper path when using mingwChristian Kandeler2016-08-171-0/+1
| | | | | | | | | | | | | | The file name ended in "undefined". Change-Id: If3a081e166f5952a3028e05832b3fd628b9235cc Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * Automatically escape arguments in cpp.linkerFlags/platformLinkerFlagsJake Petroules2016-08-164-9/+40
| | | | | | | | | | | | | | | | | | | | [ChangeLog] Added automatic escaping of arguments passed to the cpp.linkerFlags and cpp.platformLinkerFlags properties using the -Wl or -Xlinker syntaxes. To revert to the old behavior, Project.minimumQbsVersion can be set to a version lower than 1.6. Change-Id: Ibe9d0fa3c9acf5062428ce1c3bc4d840e1cec4b3 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * Introduce cpp.driverFlagsJake Petroules2016-08-154-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | This property allows specifying a set of flags to pass to the compiler driver. Effectively this is similar to specifying flags in both *compilerFlags and linkerFlags, except driverFlags will never be passed to the system linker. [ChangeLog] Introduced cpp.driverFlags, which allows specifying flags to be passed to the compiler driver (in any mode), but never the system linker. Change-Id: I2171246f3b20cbaca74114cf4fa0b6d38c23c621 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 05:12:10 +0000