diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-09-01 20:13:29 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-09-03 10:01:08 +0000 |
| commit | be3766be2f1b8f865557d18a0a6decf1d866ae87 (patch) | |
| tree | f9300945444e1bcb15e71d9ad298fe66d8afb561 /src | |
| parent | 45b128030f29efb026b8b2464dcbd5d8da97cf3b (diff) | |
Use qbs archive for packaging
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/packages/archive/archive.qbs | 4 | ||||
| -rw-r--r-- | src/packages/packages.qbs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/packages/archive/archive.qbs b/src/packages/archive/archive.qbs index 9a9b09ba7..430f1ff15 100644 --- a/src/packages/archive/archive.qbs +++ b/src/packages/archive/archive.qbs @@ -15,13 +15,15 @@ QbsProduct { condition: qbs.targetOS.contains("unix") && project.withDocumentation } Depends { productTypes: ["qbsapplication", "qbsplugin"] } + Depends { productTypes: ["autotest"]; condition: includeTests } Depends { name: "archiver" } property bool includeTopLevelDir: false + property bool includeTests: false builtByDefault: false - name: "qbs archive" + name: "qbs_archive" type: ["archiver.archive"] targetName: "qbs-" + qbs.targetOS[0] + "-" + qbs.architecture + "-" + qbsversion.version destinationDirectory: project.buildDirectory diff --git a/src/packages/packages.qbs b/src/packages/packages.qbs index 12ca8b041..aa740aafe 100644 --- a/src/packages/packages.qbs +++ b/src/packages/packages.qbs @@ -8,7 +8,7 @@ Project { // Virtual product for building all possible packagings Product { - Depends { name: "qbs archive"; required: false } + Depends { name: "qbs_archive"; required: false } Depends { name: "qbs chocolatey"; required: false } name: "dist" builtByDefault: false |