diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-07-13 21:03:05 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-07-18 17:06:34 +0000 |
| commit | 74616c4690b4f638314aae53de7de7f8ac1998f9 (patch) | |
| tree | a71f98f4b86a8db718774791b035e4f8209ad3aa | |
| parent | 1c03efbc4427d59092c50ce0746ec8a07052102c (diff) | |
Organize the 'dist' release package into a new file structure
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>
| -rw-r--r-- | dist/.gitignore | 1 | ||||
| -rw-r--r-- | qbs.qbs | 1 | ||||
| -rw-r--r-- | scripts/make-release-archives.bat | 2 | ||||
| -rw-r--r-- | src/packages/archive/archive.qbs (renamed from dist/dist.qbs) | 1 | ||||
| -rw-r--r-- | src/packages/packages.qbs | 22 | ||||
| -rw-r--r-- | src/src.qbs | 1 |
6 files changed, 26 insertions, 2 deletions
diff --git a/dist/.gitignore b/dist/.gitignore new file mode 100644 index 000000000..72e8ffc0d --- /dev/null +++ b/dist/.gitignore @@ -0,0 +1 @@ +* @@ -8,7 +8,6 @@ Project { property stringList autotestWrapper: [] references: [ - "dist/dist.qbs", "doc/doc.qbs", "share/share.qbs", "src/src.qbs", diff --git a/scripts/make-release-archives.bat b/scripts/make-release-archives.bat index 6f3140805..21d364855 100644 --- a/scripts/make-release-archives.bat +++ b/scripts/make-release-archives.bat @@ -67,7 +67,7 @@ REM where the current directory is a symlink qbs build --settings-dir "%builddir%\.settings"^ -f "%builddir%\source" -d "%builddir%\build"^ - -p dist qbs.buildVariant:release products.dist.includeTopLevelDir:true^ + -p dist qbs.buildVariant:release "products.qbs archive.includeTopLevelDir:true"^ release "qbs.installRoot:%builddir%\qbs-windows-x86-%version%" profile:qt^ release-64 "qbs.installRoot:%builddir%\qbs-windows-x86_64-%version%" profile:qt64 || exit /b diff --git a/dist/dist.qbs b/src/packages/archive/archive.qbs index 11d5fe4d3..589f39875 100644 --- a/dist/dist.qbs +++ b/src/packages/archive/archive.qbs @@ -49,6 +49,7 @@ Product { condition: qbs.targetOS.contains("windows") builtByDefault: false + name: "qbs archive" type: ["archiver.archive"] targetName: "qbs-windows-" + qbs.architecture + "-" + qbsversion.version destinationDirectory: project.buildDirectory diff --git a/src/packages/packages.qbs b/src/packages/packages.qbs new file mode 100644 index 000000000..e4870cf31 --- /dev/null +++ b/src/packages/packages.qbs @@ -0,0 +1,22 @@ +import qbs + +Project { + references: [ + "archive/archive.qbs", + ] + + // Virtual product for building all possible packagings + Product { + Depends { name: "qbs archive"; required: false } + name: "dist" + + Group { + name: "Scripts" + prefix: "../../scripts/" + files: [ + "make-release-archive.sh", + "make-release-archives.bat", + ] + } + } +} diff --git a/src/src.qbs b/src/src.qbs index c501cb437..411238d1f 100644 --- a/src/src.qbs +++ b/src/src.qbs @@ -5,6 +5,7 @@ Project { "app/apps.qbs", "lib/libs.qbs", "libexec/libexec.qbs", + "packages/packages.qbs", "plugins/plugins.qbs" ] } |