aboutsummaryrefslogtreecommitdiffstats
path: root/share
Commit message (Collapse)AuthorAgeFilesLines
* add missing loadFile call from msvc.jsJoerg Bornemann2014-04-231-0/+2
| | | | | Change-Id: I9eba26d3b66056b21ca78ccb6eb9406cc43a7288 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* load PropertyList extension in bundle-tools.jsJoerg Bornemann2014-04-111-0/+2
| | | | | | Task-number: QBS-549 Change-Id: I1a02ec28aa1be4191b8e6070674b3407154cfc98 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* WiX: Fix the "cultures" property handlingDenis Shienkov2014-04-111-1/+2
| | | | | | | Task-number: QBS-542 Change-Id: I4ec5bf6020732155ab1a20583861e4bbadd196d9 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix linking of MSIs built from multiple WiX source files.Jake Petroules2014-04-111-1/+1
| | | | | | Task-number: QBS-541 Change-Id: I177c755ee203df1018039683da860b26dd9ec820 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Add Windows 6.3 (8.1) to the list of known versions.Jake Petroules2014-04-081-1/+1
| | | | | | Change-Id: I4989605776cf6dbbc8a8852d88f0fc6262f08f0b Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* detect Visual Studio build environment using vcvarsall.batJoerg Bornemann2014-04-081-40/+1
| | | | | | | | | | | | | | | To provide a consistent build environment for Visual Studio setup-toolchains now executes the vsvarsall.bat that comes with the Visual Studio installation. The environment is written to the profile under the key "buildEnvironment". The setupBuildEnvironment script in windows-msvc.qbs isn't needed anymore. Task-number: QBS-444 Task-number: QBS-508 Change-Id: I3191f5ff127bed6b96ce5ea5520b20fc9646364f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Added PathTools import to DarwinGCCIvan Komissarov2014-04-071-0/+1
| | | | | | | This fixes compilation error under Mac OS X. Change-Id: I08093ef6033fe9a4869c05e4b7c4f5a7dd45136d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix library dependency orderJoerg Bornemann2014-03-142-9/+14
| | | | | | | | | Autotest from the bug report added. Task-number: QBS-524 Change-Id: I2ef3485db749424339a2ea96900e49fa5d1363d4 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Replace qmake placeholders in Info.plist.Jake Petroules2014-03-121-1/+16
| | | | | | | Task-number: QBS-469 Change-Id: I14a53fa63c5c98baebd1c2c452bbf1e2d7b3df71 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Support the qmake/CMake-style @SYNTAX@ in Info.plist replacement vars.Jake Petroules2014-03-121-24/+45
| | | | | | | Also, this makes it trivial to add arbitrary new syntaxes if desired. Change-Id: I5622b03b284b47236b425f94c140d2a01f1b8d55 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Rename doRepl to expandPlistEnvironmentVariables.Jake Petroules2014-03-122-6/+7
| | | | | | | Because, that's what it does. Change-Id: Ibd6e5b4fc310be8ac48d8089fc163dcc678460be Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix deprecation warning in qbs project filesJoerg Bornemann2014-03-061-1/+1
| | | | | Change-Id: Ie8f639550fa4509fbec70092fabfaf44342546f2 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Use PropertyList instead of plutil for increased performance.Jake Petroules2014-03-043-63/+51
| | | | | Change-Id: I8ff5b11ed06bb2817e47a973d1a8043c5bcd3237 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Define hostOSBuildVersion on Windows as well.Jake Petroules2014-03-031-4/+6
| | | | | | | This mirrors CoreFoundation's behavior (and makes sense given the name). Change-Id: I4519978cff507f585378469cf535c2b815172fd4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Check ServerVersion first when retrieving Darwin product version.Jake Petroules2014-03-031-4/+4
| | | | | | | This is the order the operating system checks in. Change-Id: I5577c09867eb8c034bf1d47daba9d69b907ba62d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QBS: Add a new linkerScripts property for the CppModuleDenis Shienkov2014-02-282-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Linkers of the majority Embedded projects (like the "bare metal" without an OS) require of the script files which contain directives for placement a binary code of FW to the desired address space of the target MCU. When using a QBS project it can be implemented by adding to the "cpp.linkerFlags" property, e.g. : cpp.linkerFlags: [ "-T", "<path/to/script/file>" ] But this solution has a shortcomings related to need to specify a full paths to the scripts files and so on. Therefore was introduced a new "cpp.linkerScripts" property which requires specifying of the list of used scripts files with the relative paths concerning of the *.qbs project file, e.g. : cpp.linkerScripts: [ "<scriptfile1>", "<scriptfile2>" ] Note: This property is implemented only for the GCC compiler module. Change-Id: I9f30a054e615a1cef8ca022352706eb3448bc7cd Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* import qbs.FileInfo in darwin-tools.jsJoerg Bornemann2014-02-283-2/+1
| | | | | | | Also remove now superfluous imports. Change-Id: I548b6b0c2f3ff06472cfb40c579af7d9c65ed21f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* move import of bundle-tools.js to path-tools.jsJoerg Bornemann2014-02-283-2/+2
| | | | | | | And remove it from where it isn't needed. Change-Id: I51dc33e1dce4fd43b7b3080ef6e277e7c6b9b725 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* move import of windows.js out of GenericGCC.qbsJoerg Bornemann2014-02-282-1/+2
| | | | | Change-Id: I5429af5524cc4adbf889e305cafce55f409624f1 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Add retina display support to the default Info.plist.Jake Petroules2014-02-281-2/+6
| | | | | | | Task-number: QBS-529 Change-Id: I77c5db7f0e3516ac3022468a2c242ffcf5441401 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Rename PropertyList API functions for better self-documentation.Jake Petroules2014-02-271-2/+2
| | | | | Change-Id: I5435e99c68646340bf6a2608819cfaef31146646 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Use getNativeSetting instead of sw_vers for increased performance.Jake Petroules2014-02-272-4/+15
| | | | | Change-Id: I9dd122b592870eecd8bb011c52fc88e6374a4fce Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* use filePath instead of fileName where applicableJoerg Bornemann2014-02-2510-78/+78
| | | | | | | | This fixes the recently introduced deprecation warnings. Task-number: QBS-258 Change-Id: I10660270895ec89a1444d596922c22e9658ca3ab Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix typo in smart relinking code.Christian Kandeler2014-02-201-1/+1
| | | | | | | | This one was not noticed in initial testing, as it hits only if the symbol count is the same. Change-Id: Id89cae0a526557a15bd6b809aca64aacfecaef78 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Ignore object addresses and sizes when doing smart relinking.Christian Kandeler2014-02-191-1/+17
| | | | | | | Only symbol name and type are interesting. Change-Id: Ife3373644a06b4aaca9159f5f4f887ddcfc912bd Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Check for dynamic symbols when doing smart re-linking.Christian Kandeler2014-02-171-1/+1
| | | | | | | | | By default, nm lists the symbols from the normal symbol table, which get removed when stripping. As a result, the current implementation fails for release builds. Change-Id: I922623fb24694340a675804ffa13057ce12c70f2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add missing Process import in IBModule.qbs.Jake Petroules2014-02-141-0/+1
| | | | | Change-Id: Ibd467fe6dd835a5bcdc3a6addeb64235ca222a24 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Update references to the toolchain setup tool.Christian Kandeler2014-02-131-1/+1
| | | | | | | s/detect/setup Change-Id: If9d84c94c89c887fb833540a0e2c9d0da4919ba9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix order of libraries in gcc link command lineJoerg Bornemann2014-01-302-4/+22
| | | | | | | | | | | Array.uniqueConcat cannot be used to remove duplicates, because the right-most duplicates are removed. To keep the dependencies ordered correctly, we must remove the left-most duplicates instead. Task-number: QBS-503 Change-Id: I5a2834905f650e0921bc42f9cffe15b71128ff7e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* fix duplicate arguments in linker command lineJoerg Bornemann2014-01-292-3/+3
| | | | | | | Task-number: QBS-501 Change-Id: I103041729bcdef35bd62a3ed8ec9190c684d17b5 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* remove ModUtils.uniqueConcat in favor of Array.uniqueConcatJoerg Bornemann2014-01-293-13/+2
| | | | | Change-Id: Ia74e0733006066529f1c257f1f1ebab7446a7142 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Make ModUtils a proper import.Christian Kandeler2014-01-2111-9/+10
| | | | | | | | So we don't have to duplicate the file for the qtprofilesetup library. We still consider it internal, though. Change-Id: Iea92b141830bc7af821b13c0270372b784f1feb7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix build failures in IB module when using older versions of Xcode.Jake Petroules2014-01-201-6/+29
| | | | | Change-Id: I2c2fe4800dcc50e9760254f25c8e5e3e03b6f8f0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Introduce xcodeSdkName and xcodeSdkVersion properties.Jake Petroules2014-01-173-2/+14
| | | | | Change-Id: I6572b085c24cf8ba6d1a41dab267182cabe6aab8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Change type of provisioningProfile property to path.Jake Petroules2014-01-171-1/+1
| | | | | Change-Id: I92540f7250c0b3425d6b5aaec498198e3c6a3463 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Do not force symbols to be defined in library dependencies.Christian Kandeler2014-01-161-1/+1
| | | | | | | | | E.g. libc has undefined references to symbols in libdl. Other linking errors were also observed in practice; it is currently somewhat unclear whether those are legitimate or not. Further investigation to follow. Change-Id: I1fac07a506639a47660ae5a1b2ef36e1dc64fa9b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Move knowledge about Qt modules into libsetupqt.Christian Kandeler2014-01-1631-720/+0
| | | | | | | | | | | | | | In addition, we make less hard-coded assumptions than before, instead generating almost all modules dynamically from the respective Qt installation when setup-qt is being run. This way, qbs does not have to know about all the modules beforehand, and only the Qt modules that are actually present will have qbs counterparts, making it possible for project file authors to make use of soft dependencies for Qt modules. Task-number: QBS-479 Change-Id: Ie20d2acf249cd159ce4caff2ede4721ab879fad2 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Clean up prepare script of IPA Rule.Jake Petroules2014-01-161-6/+10
| | | | | Change-Id: Icafcf2edbb92217643a81fd747e803139f950424 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Rename provisionFile property to provisioningProfile.Jake Petroules2014-01-162-5/+6
| | | | | | | This is what these are actually called. Change-Id: Ifae520b02fa39368875111a42f393d79ac7fbf6f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix ResourceRules Rule condition for iOS.Jake Petroules2014-01-161-1/+1
| | | | | Change-Id: I15d27730b8ca7bc5bd0afdc01b126339209f4438 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make it possible to link with unresolved symbols.Christian Kandeler2014-01-154-13/+21
| | | | | | | Task-number: QBS-476 Change-Id: I697cc562b4212a5aa89ba973081571f99c08ba37 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge remote-tracking branch 'origin/1.1'Joerg Bornemann2014-01-091-1/+4
|\ | | | | | | Change-Id: Iccf01f1dad3fca4a78c7d9b795fdef6df0181e9b
| * fix usage of dsym file tagJoerg Bornemann2014-01-091-1/+4
| | | | | | | | | | | | | | | | | | | | This commit amends 3db574b81ee879182b3ab5d3d83641aa42a45141. Task-number: QBS-488 Change-Id: Ic940cc5667dfb0959fd89f32cc59d36da46e8ef5 Reviewed-by: Ivan Komissarov <ABBAPOH@me.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Add support for embedding Info.plist into unbundled executable products.Jake Petroules2014-01-093-4/+18
| | | | | | | | | | | | | | Task-number: QBS-468 Change-Id: I0b2cbb1b0aba3f73baf17d703eac5ecb687f54a0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Prevent exceptions from products that don't use Info.plist.Jake Petroules2014-01-081-0/+5
| | | | | | | | | | | | | | Task-number: QBS-473 Change-Id: If985061276387f417291f594d77b6fcdda4d7f7a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/1.1'Joerg Bornemann2014-01-071-3/+4
|\| | | | | | | Change-Id: I0ecde7a11d8942d7e0f11000141d00c349177c1c
| * fix OS X dsym file tagsJoerg Bornemann2014-01-071-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The usage of the same dsym file tag in the app bundle and framework bundle rules led to two separate rule paths. One was creating a dylib cpp -> obj -> dylib -> dsym -> framework the other created an app cpp -> obj -> app -> dsym -> app bundle Using distinct file tags for application and dylib dsyms fixes this conflict. We should detect and handle situations like this in a subsequent commit. Task-number: QBS-384 Change-Id: I931b6a4be929468e4abdc2385aa38d8c224b32c6 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Add WiX 3.9 to known versions list.Jake Petroules2013-12-221-1/+1
| | | | | | | | | | Change-Id: Ib824f87fdabd2156d4f2a668929fa851ebb67d86 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge "Merge remote-tracking branch 'origin/1.1'"Christian Kandeler2013-12-103-5/+13
|\ \
| * | Merge remote-tracking branch 'origin/1.1'Joerg Bornemann2013-12-103-5/+13
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/lib/tools/persistence.cpp Change-Id: Ied3824ae11b927426df51cf92881c1f2cfa3c073
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 06:02:54 +0000