diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2023-09-05 23:03:12 +0300 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2023-09-07 14:32:58 +0000 |
commit | 8da87e0f8d5aa27bb012b78bd18bd3379e2d618e (patch) | |
tree | 312decc30fe1bff5a337a6fc4f920b7399e1d530 | |
parent | 18606ac4e8f386af852573df5f600c0494aecfd6 (diff) |
apple: fix some DMG module issues
Fix keys used in settings to match those that are actually
used in python.
Removed Korean and Russian license agreements - they are not
listed in the allowed languages.
Also, even when added to the list, Russian eula.txt makes hdutil to
return with an error for some reason.
Those need further investigation.
Fixes: QBS-1753
Change-Id: I510d4f1896625d6a0b63c4005288d29069776c9a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
4 files changed, 12 insertions, 64 deletions
diff --git a/share/qbs/modules/dmg/dmg.js b/share/qbs/modules/dmg/dmg.js index 4bd735e90..06fe7b906 100644 --- a/share/qbs/modules/dmg/dmg.js +++ b/share/qbs/modules/dmg/dmg.js @@ -135,7 +135,7 @@ function dmgbuildSettings(product, inputs) { } }); - return { + var result = { "title": product.dmg.volumeName, "icon": !product.dmg.badgeVolumeIcon ? volumeIcon : undefined, "badge-icon": product.dmg.badgeVolumeIcon ? volumeIcon : undefined, @@ -154,13 +154,16 @@ function dmgbuildSettings(product, inputs) { }, "format": product.dmg.format, "compression-level": product.dmg.compressionLevel, - "build_license": { + "contents": contentsArray + }; + if (licenseFileObjects.length >= 0) { + result["license"] = { "default-language": product.dmg.defaultLicenseLocale, "licenses": reduceLicensesForKey(licenseFileObjects, "licenses"), "buttons": reduceLicensesForKey(licenseFileObjects, "buttons") - }, - "contents": contentsArray - }; + }; + } + return result; } function prepareLicense(project, product, inputs, outputs, input, output) { diff --git a/tests/auto/blackbox/testdata-apple/apple-dmg/apple-dmg.qbs b/tests/auto/blackbox/testdata-apple/apple-dmg/apple-dmg.qbs index b3d39fe27..ff77afbe0 100644 --- a/tests/auto/blackbox/testdata-apple/apple-dmg/apple-dmg.qbs +++ b/tests/auto/blackbox/testdata-apple/apple-dmg/apple-dmg.qbs @@ -63,9 +63,9 @@ Project { name: "custom-buttons" Group { - files: ["ru_RU.lproj/eula.txt"] - dmg.licenseLocale: "sv_SE" // override auto-detected ru_RU with sv_SE - dmg.licenseLanguageName: "Swedish, not Russian" + files: ["de_DE.lproj/eula.txt"] + dmg.licenseLocale: "sv_SE" // override auto-detected de_DE with sv_SE + dmg.licenseLanguageName: "Swedish, not Deutsch" dmg.licenseAgreeButtonText: "Of course" dmg.licenseDisagreeButtonText: "Never!" dmg.licensePrintButtonText: "Make Paper" @@ -75,7 +75,7 @@ Project { Group { files: ["*.lproj/**"] - excludeFiles: ["ru_RU.lproj/eula.txt"] + excludeFiles: ["de_DE.lproj/eula.txt"] } } } diff --git a/tests/auto/blackbox/testdata-apple/apple-dmg/ko_KR.lproj/eula.rtf b/tests/auto/blackbox/testdata-apple/apple-dmg/ko_KR.lproj/eula.rtf deleted file mode 100644 index 5b7c49d56..000000000 --- a/tests/auto/blackbox/testdata-apple/apple-dmg/ko_KR.lproj/eula.rtf +++ /dev/null @@ -1,49 +0,0 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1265 -{\fonttbl\f0\fnil\fcharset129 AppleSDGothicNeo-Regular;\f1\fswiss\fcharset0 Helvetica;} -{\colortbl;\red255\green255\blue255;} -\margl1440\margr1440\vieww10800\viewh8400\viewkind0 -\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural - -\f0\b\fs24 \cf0 \'c7\'e3\'b1\'b8 -\f1 CORPORATION\ - -\f0 \'bc\'d2\'c7\'c1\'c6\'ae\'bf\'fe\'be\'ee -\f1 -\f0 \'bf\'b9 -\f1 -\f0 \'b0\'e8\'be\'e0 -\f1\b0 \ -\ - -\f0 \'b4\'e7\'bd\'c5\'c0\'ba -\f1 -\f0 \'b4\'e7\'bd\'c5\'c0\'cc -\f1 -\f0 \'c7\'d9\'b9\'ab\'b1\'e2\'b8\'a6 -\f1 -\f0 \'b8\'b8\'b5\'e9\'b1\'e2 -\f1 -\f0 \'c0\'a7\'c7\'d8\'c0\'cc -\f1 -\f0 \'c0\'c0\'bf\'eb -\f1 -\f0 \'c7\'c1\'b7\'ce\'b1\'d7\'b7\'a5\'c0\'bb -\f1 -\f0 \'bb\'e7\'bf\'eb\'c7\'cf\'c1\'f6 -\f1 -\f0 \'be\'ca\'c0\'bb -\f1 -\f0 \'b0\'cd\'bf\'a1 -\f1 -\f0 \'b5\'bf\'c0\'c7\'c7\'d5\'b4\'cf\'b4\'d9 -\f1 .\ -\ - -\f0 \'b4\'e7\'bd\'c5\'c0\'ba -\f1 QBS -\f0 \'b0\'a1 -\f1 -\f0 \'c3\'d6\'b0\'ed\'b6\'f3\'b0\'ed -\f1 -\f0 \'b5\'bf\'c0\'c7\'c7\'d5\'b4\'cf\'b4\'d9 -\f1 .}
\ No newline at end of file diff --git a/tests/auto/blackbox/testdata-apple/apple-dmg/ru_RU.lproj/eula.txt b/tests/auto/blackbox/testdata-apple/apple-dmg/ru_RU.lproj/eula.txt deleted file mode 100644 index e2b7adbed..000000000 --- a/tests/auto/blackbox/testdata-apple/apple-dmg/ru_RU.lproj/eula.txt +++ /dev/null @@ -1,6 +0,0 @@ -FICTIONAL CORPORATION -SOFTWARE EXAMPLE AGREEMENT - -You agree that you will not use this app to make nuclear weapons. - -You agree that Qbs is the best. |