diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-09-05 16:54:41 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-09-07 14:01:43 +0000 |
| commit | fd43b7b92143c7f47b57c54fe79da37fe20155ee (patch) | |
| tree | ab5fd77796efadad8db9036384075a025963c959 | |
| parent | bd2c6175c81d77c07441b1da55c808f7696b67db (diff) | |
Fix deployment of dmgbuild
Specifically, this fixes use of the module within Qt Creator. It
happened to go unnoticed with the command line version of Qbs.
Task-number: QBS-1182
Change-Id: I449099c1063595612dac621c735050c46ff866e5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | share/qbs/modules/dmg/DMGModule.qbs | 3 | ||||
| -rw-r--r-- | share/qbs/modules/dmg/dmg.js | 2 | ||||
| -rw-r--r-- | static.pro | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/share/qbs/modules/dmg/DMGModule.qbs b/share/qbs/modules/dmg/DMGModule.qbs index b45f9d548..09e31f696 100644 --- a/share/qbs/modules/dmg/DMGModule.qbs +++ b/share/qbs/modules/dmg/DMGModule.qbs @@ -76,9 +76,6 @@ Module { readonly property string pythonPath: File.canonicalFilePath(FileInfo.joinPaths(path, "..", "..", "python")) - readonly property string libexecPath: File.canonicalFilePath(FileInfo.joinPaths(path, - "..", "..", "..", "..", - "libexec", "qbs")) property string backgroundColor property int iconSize: 128 diff --git a/share/qbs/modules/dmg/dmg.js b/share/qbs/modules/dmg/dmg.js index 82b701434..4d972db9b 100644 --- a/share/qbs/modules/dmg/dmg.js +++ b/share/qbs/modules/dmg/dmg.js @@ -199,7 +199,7 @@ function prepareDmg(project, product, inputs, outputs, input, output) { cmds.push(cmd); // Create the actual DMG via dmgbuild - cmd = new Command(FileInfo.joinPaths(product.dmg.libexecPath, "dmgbuild"), + cmd = new Command(FileInfo.joinPaths(product.qbs.libexecPath, "dmgbuild"), [product.dmg.volumeName, output.filePath, "--no-hidpi", // qbs handles this by itself diff --git a/static.pro b/static.pro index 562b68303..39ffb387f 100644 --- a/static.pro +++ b/static.pro @@ -54,7 +54,10 @@ OTHER_FILES += $$FILES $$LIBEXEC_FILES !isEqual(PWD, $$OUT_PWD) { libexec_copy.input = LIBEXEC_FILES - libexec_copy.output = libexec/qbs/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} + !isEmpty(QBS_LIBEXEC_DESTDIR): \ + libexec_copy.output = $${QBS_LIBEXEC_DESTDIR}/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} + else: \ + libexec_copy.output = libexec/qbs/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} libexec_copy.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} libexec_copy.name = COPY ${QMAKE_FILE_IN} libexec_copy.CONFIG += no_link target_predeps |