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 /scripts | |
| 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 'scripts')
| -rwxr-xr-x | scripts/build-qbs-with-qbs.sh | 4 | ||||
| -rw-r--r-- | scripts/make-release-archives.bat | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build-qbs-with-qbs.sh b/scripts/build-qbs-with-qbs.sh index 68832036a..32241a3a2 100755 --- a/scripts/build-qbs-with-qbs.sh +++ b/scripts/build-qbs-with-qbs.sh @@ -78,9 +78,9 @@ if [ "$WITH_DOCS" -ne 0 ]; then qbs build -p "qbs documentation" ${BUILD_OPTIONS} fi -WITH_ARCHIVE=${WITH_ARCHIVE:-0} +WITH_ARCHIVE=${WITH_ARCHIVE:-1} if [ "$WITH_ARCHIVE" -ne 0 ]; then - qbs build -p dist ${BUILD_OPTIONS} "products.qbs archive.includeTopLevelDir:true" + qbs build -p "qbs_archive" ${BUILD_OPTIONS} fi WITH_TESTS=${WITH_TESTS:-1} diff --git a/scripts/make-release-archives.bat b/scripts/make-release-archives.bat index 0970d2702..ce889a9ca 100644 --- a/scripts/make-release-archives.bat +++ b/scripts/make-release-archives.bat @@ -67,7 +67,7 @@ subst Q: "%CD%" && Q: qbs build --settings-dir "%builddir%\.settings"^ -f qbs.qbs -d "%builddir%\build"^ - -p dist qbs.buildVariant:release project.withDocumentation:false "products.qbs archive.includeTopLevelDir:true"^ + -p dist qbs.buildVariant:release project.withDocumentation:false products.qbs_archive.includeTopLevelDir:true^ modules.qbsbuildconfig.enableBundledQt:true^ config:release "qbs.installRoot:%builddir%\qbs-windows-x86-%version%" profile:qt^ config:release-64 "qbs.installRoot:%builddir%\qbs-windows-x86_64-%version%" profile:qt64 || exit /b |