aboutsummaryrefslogtreecommitdiffstats
path: root/src/packages
Commit message (Collapse)AuthorAgeFilesLines
* Fix descriptions for JS commandsDenis Shienkov2021-11-151-1/+1
| | | | | | | | | | | * All descriptions start with a small letter. * Trailing dots have been removed from all descriptions. * For all static library rules replaced 'linking' with 'creating' in descriptions. * Added 'ing' ending to all descriptions where it was missing. Change-Id: I2a4cb9dd53980d33628e097efaae53a68573af42 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix missing qbsscriptengine library in the archiveIvan Komissarov2021-10-291-0/+1
| | | | | Change-Id: I61b85ccd06022b12a9a90a80ff555258bc01588f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Remove `import qbs` from all project filesDenis Shienkov2021-08-043-4/+0
| | | | | | | | | | | | | | ... because we don't need in this inclusion at all. But for some cases it is impossible to remove that inclusions (and even to move on next lines) because then the some tests are failed by unknown reason. For those tests were added the following comments on the inclusion lines: `// FIXME: Don't remove this import because then the test fails!` Change-Id: I9153fd0e38b94af08168e499ee46a23889ee4d73 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge branch '1.17'Ivan Komissarov2020-10-052-1/+1
|\ | | | | | | Change-Id: Ia8ac795b55ba18fd6d855a1f880c5e3caa66b742
| * Add new icon to chocolatey packagev1.17.0Richard Weickelt2020-09-012-1/+1
| | | | | | | | | | | | | | Fixes also the broken link in the nuspec file. Change-Id: I0da24c19eb388a8377772fa3f1115a6afba31777 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Use qbs archive for packagingIvan Komissarov2020-09-032-2/+4
|/ | | | | | | | | | | | This changes the way how the archives are created by the github actions. Previously, the archive was created as a separate aaction, now "qbs archive" product is used. Also, rename the "qbs archive" product to qbs_archive since it is hard to deal with spaces in bash commands. Change-Id: Ia9d0f7004b503b4ce86243cad93dec7c57a9a212 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Remove deprecated usage of platformPaths in chocolatey.qbsIvan Komissarov2020-01-081-1/+1
| | | | | | | | Should be fine by now Change-Id: Ia19d2de5ffaf2fc952ec21771e31dccbab69768c Reviewed-by: Richard Weickelt <richard@weickelt.de> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Fix the "qbs archive" productChristian Kandeler2019-12-181-1/+1
| | | | | | | | The archiver input file must be opened in WriteOnly mode. Otherwise, repeated invocations of the rule can result in a corrupted file. Change-Id: I986a5c85322576c62273497507adf2d808c6f0c0 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Bundle Qt libraries on all platformsRichard Weickelt2019-10-101-111/+4
| | | | | | | | | | | | | | | | | | | | This patch allows us to deploy a self-containing Qbs package on all host platforms that are supported by the official Qt binary packages. Although not all (Linux) distributions make use of it, this will be helpful to - provide at least some binary convenience packages for the most important distributions, - perform building and testing in different environments, for instance build Qbs in one stage and then run autotests for desktop, iOS, android in parallel on multiple machines, - avoid windeployqt which does not work when cross-building for Windows on a Linux hosts. Change-Id: I63de4ea2240b37d8bd465cbbf4ddff3d01eeac7e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix project.withDocumentation:false buildIvan Komissarov2019-06-121-2/+5
| | | | | | | | Archive tries to locate those modules via pkg-config and fails; just ingore those if docs are not required. Change-Id: Ia8743810905f5f2e21687286b09d92d34744e327 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix windows archive creationChristian Kandeler2019-04-161-0/+7
| | | | | | | | | | Apparently, windeployqt copies all resources into the directory of the first binary it encounters on the command line. So make sure that binary is qbs.exe and not one of our plugins, as we want the libs to end up under bin/. Change-Id: Ib23f1b355a058ca1deec5e10535c68dc9170a2bf Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Adjust chocolatey.qbs to qbs 1.12Joerg Bornemann2019-04-161-1/+1
| | | | | Change-Id: I48e8efd18b026e2d8f58e2ae2ddc60b67c9acf68 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Detect Qt via a module providerChristian Kandeler2019-02-121-1/+0
| | | | | | | | | | | | | | | | | Creation of qbs modules for Qt is now done on demand during project resolving. The qmake executable(s) are looked up via PATH or taken from the Qt.qmakeFilePaths provider property. As a result, Qt projects can now be built without a profile. The qtprofilesetup library is gone; its code is now in the module provider. I kept the C++ -> JavaScript conversion as straightforward as possible and mostly resisted the temptation to "optimize". The setup-qt tool still exists and mainly sets Qt.qmakeFilePaths. [ChangeLog] It is no longer required to call setup-qt before building Qt projects. Change-Id: I5b7e4711ec47b996911c499f29d8129d90e4731e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Do not use the PathProbe.platformSearchPaths inside our project sourcesChristian Kandeler2019-01-091-1/+1
| | | | | | | | | The qbs project file must work with older qbs versions, so we can't use newly introduced properties right away. This partially reverts d6345df9d5. Change-Id: I3074aa1460e9f8897820be5b6f70b61636b14be5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Rename PathProbe.pathPrefixes and PathProbe.platformPaths propertiesIvan Komissarov2018-12-101-1/+1
| | | | | | | | | The naming was misleading - prefixes had the same logical meaning as platformPaths, despite the fact completely different PathProbe.pathSuffixes property exists. Change-Id: Ie593b5e03d27de4f8aafed821a3b37cc1b3b0b9e Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* archive product: Work around windeployqt bugChristian Kandeler2018-04-031-0/+5
| | | | | | | | The windeployqt output lists translation files that are not actually copied. Change-Id: Ic23fbacfdd7cf8f2931da55e0ec33c31e934aa7e Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Add LICENSE.GPL3-EXCEPTKai Koehne2018-03-121-0/+1
| | | | | | | This is used in the tests. Change-Id: I9c88c5cc47e4ea9dde88e726fe8dda997656a81f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Let the archive product simply depend on all Qbs applicationsJake Petroules2018-01-081-8/+1
| | | | | | | ...instead of listing each one explicitly. Change-Id: I14bac3372081b3a73855d78e3585fdfa77105751 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Move the Qt library installation out of the archive productJake Petroules2018-01-082-65/+1
| | | | | | | | | | | | | | | | | | | | | | This allows Qt to be installed as part of Qbs by default instead of only when the archive package is built. Currently, this is enabled by default only for installations of Qt on macOS which are relocatable (have rpath in QT_CONFIG). This way it will not interfere with package managers like Homebrew/MacPorts which do not use rpath - for example, when building against a version of Qt installed by a package manager (which is typically built with absolute sonames), you're assumed to be building software to be packaged by that package manager, and therefore you want to rely on Qt as a "system" package and not copy it locally. It can also be explicitly switched off on the command line using products.qbsqt.deployQt:false This also refactors the logic a bit. Change-Id: I70b46d8fac08d34520ceab18405fa8a672158711 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge 1.10 into masterChristian Kandeler2017-12-151-2/+2
|\ | | | | | | Change-Id: Iab942ed25d06038cf8c172eb70dcd8e9a720e1c8
| * Adapt chocolatey spec file to new repository URLChristian Kandeler2017-12-121-2/+2
| | | | | | | | | | Change-Id: If9d17164d623ff389b5b0a6b042f67dc70daf1ae Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Fix changelog order in generated Chocolatey packagesJake Petroules2017-12-121-7/+12
| | | | | | | | | | | | | | | | Version numbers were not being compared properly, leading 1.10.0 to be at the bottom of the list below 1.6.0. Change-Id: I62fcc63c5514ea461c3dadb10c5f17610e107709 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Remove qbs-qmltypes appJake Petroules2017-11-021-1/+0
|/ | | | | | | | Now that we generate the qbs.qmltypes file during the build, it is no longer needed. Change-Id: I3180f55074b291d645abad65437d0cba4c80df25 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add missing dependencies for the qbs archive packageJake Petroules2017-10-161-2/+3
| | | | | | | | | qbs-create-project, the generator plugins, and the man page (on Unix) will now be added to the archive packages. Task-number: QBS-1218 Change-Id: Idad9f71ef5c1f91ab1b5b620d95cac0c1b9a85e5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Merge remote-tracking branch 'origin/1.9'Joerg Bornemann2017-09-181-0/+1
|\ | | | | | | Change-Id: I962adbe6a7a805e9250807a31e87580a86b1d067
| * Add --limitoutput option when building Chocolatey packageJake Petroules2017-09-181-0/+1
| | | | | | | | | | | | | | This suppresses advertising messages from showing up in the build log. Change-Id: I5aa34b061d04d314b0ac6b83fb9c569dafca462d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Merge 1.9 into masterChristian Kandeler2017-08-281-1/+1
|\| | | | | | | Change-Id: I5320b7c62d6a80089df75c2caca79c15602c01e5
| * Chocolatey package: update owners list; qbs now has its own accountJake Petroules2017-08-281-1/+1
| | | | | | | | | | | | Change-Id: I0128f3dc7869efb5db2ac3dbb5a5aa140e5e8b98 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Organize development-time scripts in a single placeJake Petroules2017-08-161-9/+0
| | | | | | | | | | | | | | Adapt scripts as necessary. Change-Id: Ib5ad4d1b6bc0e47cb6b4994cfb924efc1c3ebdc4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Install license files into our tgz/zip binary packagesJake Petroules2017-08-161-0/+12
| | | | | | | | | | | | Change-Id: I1afd65616c4c4d717eb4b376402d60ad52b2cebb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Port the archive product to macOSJake Petroules2017-08-102-5/+71
| | | | | | | | | | | | | | | | | | Unlike Windows, we don't use the equivalent deployqt tool here, because it is designed to work only on application bundles and not loose collections of executables and libraries. Change-Id: I6da952a746b162d5c26d6a6642ceb9da6e9ecb14 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | Clean up the archive product a bitJake Petroules2017-08-091-10/+3
|/ | | | | | | Base it on QbsProduct, which handles some bits automatically. Change-Id: I280e6b31cddfa8f1551e7282e8d946d70f8fb60b Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Fix Windows buildChristian Kandeler2017-07-201-0/+1
| | | | | | | The dist product must not be built by default. Change-Id: I6126c29d3f9a7ea366974526d3b121dab147cdab Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Modify make-release-archive.sh to produce both archive types at onceJake Petroules2017-07-191-1/+1
| | | | | | | | | | This script is for OUR release process, and doesn't need to be more general than that especially when wrapping such a small git command. Also clean it up a bit make it properly exit on error. Change-Id: I117a01b344f3afe6360e58b2408f352e33dde356 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Add the creation of a Chocolatey package to our release processJake Petroules2017-07-194-0/+172
| | | | | | | | | | | | This is maintained by upstream developers and so should just be a part of the official release process to begin with. This has been tested with the Docker-based release instructions and provides the additional security property to Chocolatey users of having an authoritative source from which to obtain to the .nupkg which can then be installed without network access to packages.chocolatey.org. Change-Id: I6d20201451cd3a7f080a81c1dee6b515671e2105 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Organize the 'dist' release package into a new file structureJake Petroules2017-07-182-0/+200
This prepares for adding products for additional release packages. Change-Id: I38d8745764ee6044589ff6298b739dde17d573c1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 00:23:23 +0000