diff options
11 files changed, 297 insertions, 545 deletions
diff --git a/.github/actions/download-qt/action.yml b/.github/actions/download-qt/action.yml index ff1d31d60..039f29ca6 100644 --- a/.github/actions/download-qt/action.yml +++ b/.github/actions/download-qt/action.yml @@ -4,7 +4,7 @@ inputs: version: description: 'Qt version' required: false - default: '6.5.0' + default: '6.6.0' target: description: 'Qt target (desktop, ios, android)' required: false diff --git a/docker-compose.yml b/docker-compose.yml index cc0391faf..ffcaf6eee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -167,12 +167,12 @@ services: QTCREATOR_VERSION: 5.0.3 windows: - image: ${DOCKER_USER:-qbsbuild}/qbsdev:windowsservercore-6.5.0_1.24.0-0 + image: ${DOCKER_USER:-qbsbuild}/qbsdev:windowsservercore-6.6.0_1.24.0-0 build: dockerfile: docker/windowsservercore/Dockerfile context: . args: - QT_VERSION: 6.5.0 + QT_VERSION: 6.6.0 QTCREATOR_VERSION: 9.0.1 working_dir: 'C:/qbs' environment: diff --git a/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/__main__.py b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/__main__.py index 908d959f1..ca712a183 100755..100644 --- a/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/__main__.py +++ b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/__main__.py @@ -55,4 +55,4 @@ def main(): if __name__ == "__main__": - main()
\ No newline at end of file + main() diff --git a/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/badge.py b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/badge.py index 3408c30b9..f9764da01 100644 --- a/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/badge.py +++ b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/badge.py @@ -166,4 +166,4 @@ def badge_disk_icon(badge_file, output_file): CGImageDestinationAddImage(target, image, props) - CGImageDestinationFinalize(target)
\ No newline at end of file + CGImageDestinationFinalize(target) diff --git a/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/colors.py b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/colors.py index 70b295c2a..8cab342a7 100644 --- a/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/colors.py +++ b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/colors.py @@ -501,4 +501,4 @@ def isAColor(s): def parseColor(s): - return ColorParser(s).parseColor()
\ No newline at end of file + return ColorParser(s).parseColor() diff --git a/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/licensing.py b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/licensing.py index 1bd00b653..fb4254ee3 100644 --- a/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/licensing.py +++ b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/licensing.py @@ -1,169 +1,209 @@ import os -language_names_map = { - "da_DK": "Dansk", - "de_DE": "Deutsch", - "en_AU": "English", - "en_GB": "English", - "en_NZ": "English", - "en_US": "English", - "es_ES": "Español", - "fr_CA": "Français", - "fr_FR": "Français", - "it_IT": "Italiano", - "ja_JP": "Japanese", - "nb_NO": "Norsk", - "nl_BE": "Nederlands", - "nl_NL": "Nederlands", - "pt_BR": "Português", - "pt_PT": "Português", - "sv_SE": "Svensk", - "zh_CN": "Simplified Chinese", - "zh_TW": "Traditional Chinese", +# based on https://github.com/argv-minus-one/dmg-license/blob/master/language-info-generator/Languages.tsv +# note that this table specifies STR# Resource ID but it seems to have no effect +language_info_map = { + "da_DK": {"buttons": "Danish", "name": "Danish", "language_id": 9}, + "de_AT": {"buttons": "German", "name": "German (Austrian)", "language_id": 92}, + "de_CH": {"buttons": "German", "name": "German (Swiss)", "language_id": 19}, + "de_DE": {"buttons": "German", "name": "German", "language_id": 3}, + "en_AU": {"buttons": "English", "name": "English (Australian)", "language_id": 15}, + "en_GB": {"buttons": "English", "name": "English (UK)", "language_id": 2}, + "en_IE": {"buttons": "English", "name": "English (Ireland)", "language_id": 108}, + "en_SG": { + "buttons": "English", + "name": "English (Singaporean)", + "language_id": 100, + }, + "en_US": {"buttons": "English", "name": "English", "language_id": 0}, + "es_ES": {"buttons": "Spanish", "name": "Spanish", "language_id": 8}, + "fi_FI": {"buttons": "Finnish", "name": "Finnish", "language_id": 17}, + "fr_BE": {"buttons": "French", "name": "French (Belgian)", "language_id": 98}, + "fr_CA": {"buttons": "French", "name": "French (Canadian)", "language_id": 11}, + "fr_CH": {"buttons": "French", "name": "French (Swiss)", "language_id": 18}, + "fr_FR": {"buttons": "French", "name": "French", "language_id": 1}, + "it_IT": {"buttons": "Italian", "name": "Italian", "language_id": 4}, + "ja_JP": { + "buttons": "Japanese", + "name": "Japanese", + "language_id": 14, + "encoding": "shift_jis", # not sure if this is correct encoding, but seems to be working + "multibyte": True, + }, + "ko_KR": { + "buttons": "Korean", + "name": "Korean", + "language_id": 51, + "encoding": "ksx1001", + "multibyte": True, + }, + "nb_NO": {"buttons": "Norwegian", "name": "Norwegian", "language_id": 12}, + "nl_BE": {"buttons": "Dutch", "name": "Dutch", "language_id": 6}, + "nl_NL": {"buttons": "Dutch", "name": "Dutch", "language_id": 5}, + "pt_BR": { + "buttons": "Portuguese", + "name": "Portuguese (Brazilian)", + "language_id": 71, + }, + "pt_PT": {"buttons": "Portuguese", "name": "Portuguese", "language_id": 10}, + "ru_RU": { + "buttons": "Russian", + "name": "Russian", + "language_id": 49, + "encoding": "mac_cyrillic", + }, + "sv_SE": {"buttons": "Swedish", "name": "Swedish", "language_id": 7}, + "zh_CN": { + "buttons": "Simplified", + "name": "Simplified Chinese", + "language_id": 52, + "encoding": "gb2312", + "multibyte": True, + }, + "zh_TW": { + "buttons": "Traditional", + "name": "Traditional Chinese", + "language_id": 53, + "encoding": "big5", + "multibyte": True, + }, } # Buttons (these come from the SLAResources file which you can find in the SLA # SDK on developer.apple.com) default_buttons = { "English": ( - b"English", - b"Agree", - b"Disagree", - b"Print", - b"Save", - b'If you agree with the terms of this license, press "Agree" to install the software. If you do not agree, press "Disagree".', # noqa; E501 + "English", + "Agree", + "Disagree", + "Print", + "Save", + 'If you agree with the terms of this license, press "Agree" to install the software. If you do not agree, press "Disagree".', # noqa; E501 ), - "Deutsch": ( - b"Deutsch", - b"Akzeptieren", - b"Ablehnen", - b"Drucken", - b"Sichern...", - b"Klicken Sie in \xd2Akzeptieren\xd3, wenn Sie mit den Bestimmungen des Software-Lizenzvertrags einverstanden sind. Falls nicht, bitte \xd2Ablehnen\xd3 anklicken. Sie k\x9annen die Software nur installieren, wenn Sie \xd2Akzeptieren\xd3 angeklickt haben.", # noqa; E501 + "German": ( + "Deutsch", + "Akzeptieren", + "Ablehnen", + "Drucken", + "Sichern...", + 'Klicken Sie in "Akzeptieren", wenn Sie mit den Bestimmungen des Software-Lizenzvertrags einverstanden sind. Falls nicht, bitte "Ablehnen" anklicken. Sie können die Software nur installieren, wenn Sie "Akzeptieren" angeklickt haben.', # noqa; E501 ), - "Español": ( - b"Espa\x96ol", - b"Aceptar", - b"No aceptar", - b"Imprimir", - b"Guardar...", - b'Si est\x87 de acuerdo con los t\x8erminos de esta licencia, pulse "Aceptar" para instalar el software. En el supuesto de que no est\x8e de acuerdo con los t\x8erminos de esta licencia, pulse "No aceptar."', # noqa; E501 + "Spanish": ( + "Español", + "Aceptar", + "No aceptar", + "Imprimir", + "Guardar...", + 'Si está de acuerdo con los términos de esta licencia, pulse "Aceptar" para instalar el software. En el supuesto de que no esté de acuerdo con los términos de esta licencia, pulse "No aceptar."', # noqa; E501 ), - "Français": ( - b"Fran\x8dais", - b"Accepter", - b"Refuser", - b"Imprimer", - b"Enregistrer...", - b'Si vous acceptez les termes de la pr\x8esente licence, cliquez sur "Accepter" afin d\'installer le logiciel. Si vous n\'\x90tes pas d\'accord avec les termes de la licence, cliquez sur "Refuser".', # noqa; E501 + "French": ( + "Français", + "Accepter", + "Refuser", + "Imprimer", + "Enregistrer...", + 'Si vous acceptez les termes de la présente licence, cliquez sur "Accepter" afin d\'installer le logiciel. Si vous n\'êtes pas d\'accord avec les termes de la licence, cliquez sur "Refuser".', # noqa; E501 ), - "Italiano": ( - b"Italiano", - b"Accetto", - b"Rifiuto", - b"Stampa", - b"Registra...", - b'Se accetti le condizioni di questa licenza, fai clic su "Accetto" per installare il software. Altrimenti fai clic su "Rifiuto".', # noqa; E501 + "Italian": ( + "Italiano", + "Accetto", + "Rifiuto", + "Stampa", + "Registra...", + 'Se accetti le condizioni di questa licenza, fai clic su "Accetto" per installare il software. Altrimenti fai clic su "Rifiuto".', # noqa; E501 ), "Japanese": ( - b"Japanese", - b"\x93\xaf\x88\xd3\x82\xb5\x82\xdc\x82\xb7", - b"\x93\xaf\x88\xd3\x82\xb5\x82\xdc\x82\xb9\x82\xf1", - b"\x88\xf3\x8d\xfc\x82\xb7\x82\xe9", - b"\x95\xdb\x91\xb6...", - b"\x96{\x83\\\x83t\x83g\x83E\x83G\x83A\x8eg\x97p\x8b\x96\x91\xf8\x8c_\x96\xf1\x82\xcc\x8f\xf0\x8c\x8f\x82\xc9\x93\xaf\x88\xd3\x82\xb3\x82\xea\x82\xe9\x8f\xea\x8d\x87\x82\xc9\x82\xcd\x81A\x83\\\x83t\x83g\x83E\x83G\x83A\x82\xf0\x83C\x83\x93\x83X\x83g\x81[\x83\x8b\x82\xb7\x82\xe9\x82\xbd\x82\xdf\x82\xc9\x81u\x93\xaf\x88\xd3\x82\xb5\x82\xdc\x82\xb7\x81v\x82\xf0\x89\x9f\x82\xb5\x82\xc4\x82\xad\x82\xbe\x82\xb3\x82\xa2\x81B\x81@\x93\xaf\x88\xd3\x82\xb3\x82\xea\x82\xc8\x82\xa2\x8f\xea\x8d\x87\x82\xc9\x82\xcd\x81A\x81u\x93\xaf\x88\xd3\x82\xb5\x82\xdc\x82\xb9\x82\xf1\x81v\x82\xf0\x89\x9f\x82\xb5\x82\xc4\x82\xad\x82\xbe\x82\xb3\x82\xa2\x81B", # noqa; E501 + "日本語", + "同意します", + "同意しません", + "印刷する", + "保存...", + "本ソフトウエア使用許諾契約の条件に同意される場合には、ソフトウエアをインストールするために「同意します」を押してください。\u3000同意されない場合には、「同意しません」を押してください。", # noqa; E501 ), - "Nederlands": ( - b"Nederlands", - b"Ja", - b"Nee", - b"Print", - b"Bewaar...", - b"Indien u akkoord gaat met de voorwaarden van deze licentie, kunt u op 'Ja' klikken om de programmatuur te installeren. Indien u niet akkoord gaat, klikt u op 'Nee'.", # noqa; E501 + "Dutch": ( + "Nederlands", + "Ja", + "Nee", + "Print", + "Bewaar...", + "Indien u akkoord gaat met de voorwaarden van deze licentie, kunt u op 'Ja' klikken om de programmatuur te installeren. Indien u niet akkoord gaat, klikt u op 'Nee'.", # noqa; E501 ), - "Svensk": ( - b"Svensk", - b"Godk\x8anns", - b"Avb\x9ajs", - b"Skriv ut", - b"Spara...", - b'Om Du godk\x8anner licensvillkoren klicka p\x8c "Godk\x8anns" f\x9ar att installera programprodukten. Om Du inte godk\x8anner licensvillkoren, klicka p\x8c "Avb\x9ajs".', # noqa; E501 + "Russian": ( + "Русский", + "Согласен", + "Не согласен", + "Распечатать", + "Сохранить", + "Если вы согласны с условиями данной лицензии, нажмите «Согласен», чтобы установить программное обеспечение. Если вы не согласны, нажмите «Не согласен».", # noqa; E501 ), - "Português": ( - b"Portugu\x90s", - b"Concordar", - b"Discordar", - b"Imprimir", - b"Salvar...", - b'Se est\x87 de acordo com os termos desta licen\x8da, pressione "Concordar" para instalar o software. Se n\x8bo est\x87 de acordo, pressione "Discordar".', # noqa; E501 + "Swedish": ( + "Svensk", + "Godkänns", + "Avböjs", + "Skriv ut", + "Spara...", + 'Om Du godkänner licensvillkoren klicka på "Godkänns" för att installera programprodukten. Om Du inte godkänner licensvillkoren, klicka på "Avböjs".', # noqa; E501 + ), + "Portuguese": ( + "Português", + "Concordar", + "Discordar", + "Imprimir", + "Salvar...", + 'Se está de acordo com os termos desta licença, pressione "Concordar" para instalar o software. Se não está de acordo, pressione "Discordar".', # noqa; E501 ), "Simplified Chinese": ( - b"Simplified Chinese", - b"\xcd\xac\xd2\xe2", - b"\xb2\xbb\xcd\xac\xd2\xe2", - b"\xb4\xf2\xd3\xa1", - b"\xb4\xe6\xb4\xa2\xa1\xad", - b"\xc8\xe7\xb9\xfb\xc4\xfa\xcd\xac\xd2\xe2\xb1\xbe\xd0\xed\xbf\xc9\xd0\xad\xd2\xe9\xb5\xc4\xcc\xf5\xbf\xee\xa3\xac\xc7\xeb\xb0\xb4\xa1\xb0\xcd\xac\xd2\xe2\xa1\xb1\xc0\xb4\xb0\xb2\xd7\xb0\xb4\xcb\xc8\xed\xbc\xfe\xa1\xa3\xc8\xe7\xb9\xfb\xc4\xfa\xb2\xbb\xcd\xac\xd2\xe2\xa3\xac\xc7\xeb\xb0\xb4\xa1\xb0\xb2\xbb\xcd\xac\xd2\xe2\xa1\xb1\xa1\xa3", # noqa; E501 + "汉语", + "同意", + "不同意", + "打印", + "存储…", + "如果您同意本许可协议的条款，请按“同意”来安装此软件。如果您不同意，请按“不同意”。", # noqa; E501 ), "Traditional Chinese": ( - b"Traditional Chinese", - b"\xa6P\xb7N", - b"\xa4\xa3\xa6P\xb7N", - b"\xa6C\xa6L", - b"\xc0x\xa6s\xa1K", - b"\xa6p\xaaG\xb1z\xa6P\xb7N\xa5\xbb\xb3\\\xa5i\xc3\xd2\xb8\xcc\xaa\xba\xb1\xf8\xb4\xda\xa1A\xbd\xd0\xab\xf6\xa1\xa7\xa6P\xb7N\xa1\xa8\xa5H\xa6w\xb8\xcb\xb3n\xc5\xe9\xa1C\xa6p\xaaG\xa4\xa3\xa6P\xb7N\xa1A\xbd\xd0\xab\xf6\xa1\xa7\xa4\xa3\xa6P\xb7N\xa1\xa8\xa1C", # noqa; E501 + "漢語", + "同意", + "不同意", + "列印", + "儲存…", + "如果您同意本許可證裡的條款，請按“同意”以安裝軟體。如果不同意，請按“不同意”。", # noqa; E501 ), - "Dansk": ( - b"Dansk", - b"Enig", - b"Uenig", - b"Udskriv", - b"Arkiver...", - b"Hvis du accepterer betingelserne i licensaftalen, skal du klikke p\x8c \xd2Enig\xd3 for at installere softwaren. Klik p\x8c \xd2Uenig\xd3 for at annullere installeringen.", # noqa; E501 + "Danish": ( + "Dansk", + "Enig", + "Uenig", + "Udskriv", + "Arkiver...", + "Hvis du accepterer betingelserne i licensaftalen, skal du klikke på “Enig” for at installere softwaren. Klik på “Uenig” for at annullere installeringen.", # noqa; E501 ), - "Suomi": ( - b"Suomi", - b"Hyv\x8aksyn", - b"En hyv\x8aksy", - b"Tulosta", - b"Tallenna\xc9", - b"Hyv\x8aksy lisenssisopimuksen ehdot osoittamalla \xd5Hyv\x8aksy\xd5. Jos et hyv\x8aksy sopimuksen ehtoja, osoita \xd5En hyv\x8aksy\xd5.", # noqa; E501 + "Finnish": ( + "Suomi", + "Hyväksyn", + "En hyväksy", + "Tulosta", + "Tallenna…", + 'Hyväksy lisenssisopimuksen ehdot osoittamalla "Hyväksy". Jos et hyväksy sopimuksen ehtoja, osoita "En hyväksy".', # noqa; E501 ), "Korean": ( - b"Korean", - b"\xb5\xbf\xc0\xc7", - b"\xb5\xbf\xc0\xc7 \xbe\xc8\xc7\xd4", - b"\xc7\xc1\xb8\xb0\xc6\xae", - b"\xc0\xfa\xc0\xe5...", - b'\xbb\xe7\xbf\xeb \xb0\xe8\xbe\xe0\xbc\xad\xc0\xc7 \xb3\xbb\xbf\xeb\xbf\xa1 \xb5\xbf\xc0\xc7\xc7\xcf\xb8\xe9, "\xb5\xbf\xc0\xc7" \xb4\xdc\xc3\xdf\xb8\xa6 \xb4\xad\xb7\xaf \xbc\xd2\xc7\xc1\xc6\xae\xbf\xfe\xbe\xee\xb8\xa6 \xbc\xb3\xc4\xa1\xc7\xcf\xbd\xca\xbd\xc3\xbf\xc0. \xb5\xbf\xc0\xc7\xc7\xcf\xc1\xf6 \xbe\xca\xb4\xc2\xb4\xd9\xb8\xe9, "\xb5\xbf\xc0\xc7 \xbe\xc8\xc7\xd4" \xb4\xdc\xc3\xdf\xb8\xa6 \xb4\xa9\xb8\xa3\xbd\xca\xbd\xc3\xbf\xc0.', # noqa; E501 + "한국어", + "동의", + "동의 안함", + "프린트", + "저장...", + '사용 계약서의 내용에 동의하면, "동의" 단추를 눌러 소프트웨어를 설치하십시오. 동의하지 않는다면, "동의 안함" 단추를 누르십시오.', # noqa; E501 ), - "Norsk": ( - b"Norsk", - b"Enig", - b"Ikke enig", - b"Skriv ut", - b"Arkiver...", - b'Hvis De er enig i bestemmelsene i denne lisensavtalen, klikker De p\x8c "Enig"-knappen for \x8c installere programvaren. Hvis De ikke er enig, klikker De p\x8c "Ikke enig".', # noqa; E501 + "Norwegian": ( + "Norsk", + "Enig", + "Ikke enig", + "Skriv ut", + "Arkiver...", + 'Hvis De er enig i bestemmelsene i denne lisensavtalen, klikker De på "Enig"-knappen for å installere programvaren. Hvis De ikke er enig, klikker De på "Ikke enig".', # noqa; E501 ), } udifrezXMLtemplate = { - "LPic": [ - { - "Attributes": "0x0000", - "Data": b"\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00", - "ID": "5000", - "Name": "", - } - ], - "STR#": [ - { - "Attributes": "0x0000", - "Data": b'\x00\x06\x07English\x05Agree\x08Disagree\x05Print\x07Save...{If you agree with the terms of this license, press "Agree" to install the software. If you do not agree, press "Disagree".', # noqa; E501 - "ID": "5000", - "Name": "English", - }, - ], + "STR#": [], # ?? License text would be included in a block like this: # ?? 'TEXT': [ # ?? { @@ -181,21 +221,11 @@ udifrezXMLtemplate = { "Name": "LPic", } ], - "styl": [ - { - "Attributes": "0x0000", - "Data": b"\x00\x03\x00\x00\x00\x00\x00\x0c\x00\t\x00\x14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'\x00\x0c\x00\t\x00\x14\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00*\x00\x0c\x00\t\x00\x14\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00", # noqa: E501 - "ID": "5000", - "Name": "English", - } - ], } -def maybe_encode(s, encoding="mac_roman"): - if isinstance(s, bytes): - return s - return s.encode(encoding) +# Another implementation in TS: +# https://github.com/argv-minus-one/dmg-license/blob/4268f2e822944fd670c1e197596396f233d6484e/src/makeLicensePlist.ts def build_license(license_info): @@ -204,28 +234,48 @@ def build_license(license_info): # Copy the original template xml = dict(udifrezXMLtemplate) - for language, license_data in license_info["licenses"].items(): - if language not in language_names_map: + licenses = license_info.get( + "licenses", + {"en_US": default_buttons["English"][5].encode("utf-8")}, + ) + + lpic = b"" + # The first field is the default language ID. + lpic += int(5000).to_bytes(2, "big") + # The second field is the count of language ID to license resource mappings. + lpic += len(licenses.items()).to_bytes(2, "big") + + for language, license_data in licenses.items(): + if language not in language_info_map: raise Exception( "Unknown language '" + language + "'. Valid languages are: " - + ", ".join(sorted(language_names_map.keys())) + + ", ".join(sorted(language_info_map.keys())) ) - language_name = language_names_map[language] + language_info = language_info_map[language] + language_buttons = language_info["buttons"] + language_name = language_info["name"] + language_id = language_info["language_id"] + # for simplicity we use the same id for the resource as system language id + 5000 + resource_id = language_id + 5000 + language_encoding = language_info.get("encoding", "mac_roman") + multibyte_encoding = language_info.get("multibyte_encoding", False) if os.path.isfile(license_data): mode = "rb" if license_data.endswith(".rtf") else "r" with open(license_data, mode=mode) as f: license_data = f.read() - if type(license_data) == bytes and license_data.startswith(b"{\\rtf1"): - licenseDataFormat = "RTF " - + if isinstance(license_data, bytes): + if license_data.startswith(b"{\\rtf1"): + licenseDataFormat = "RTF " + else: + licenseDataFormat = "TEXT" else: licenseDataFormat = "TEXT" - license_data = maybe_encode(license_data) + license_data = license_data.encode(language_encoding) if licenseDataFormat not in xml: xml[licenseDataFormat] = [] @@ -234,13 +284,13 @@ def build_license(license_info): { "Attributes": "0x0000", "Data": license_data, - "ID": "5000", - "Name": language_name, + "ID": str(resource_id), + "Name": f"{language_name} SLA", } ) language_default_buttons = default_buttons.get( - language_name, default_buttons["English"] + language_buttons, default_buttons["English"] ) buttons = license_info.get("buttons", {}).get( language, language_default_buttons @@ -248,27 +298,32 @@ def build_license(license_info): assert len(buttons) == 6, "License buttons must have 6 entries." - buttons = [maybe_encode(b) for b in buttons] + buttons = [b.encode(language_encoding) for b in buttons] + buttons = [len(b).to_bytes(1, "big") + b for b in buttons] xml["STR#"].append( { "Attributes": "0x0000", - "Data": ( - b"\x00\x06\x07" - + buttons[0] - + b"\x05" - + buttons[1] - + b"\x08" - + buttons[2] - + b"\x05" - + buttons[3] - + b"\x07" - + buttons[4] - + b"{" - + buttons[5] - ), - "ID": "5002", + # \x06 is apparently the number of buttons which is always 6 + "Data": b"\x00\x06" + b"".join(buttons), + "ID": str(resource_id), "Name": language_name, } ) - return xml
\ No newline at end of file + # Finally, the list of resource ID mappings: + # Mapping field 1: system language ID + lpic += language_id.to_bytes(2, "big") + # Mapping field 2: local resource ID minus 5000 + lpic += int(resource_id - 5000).to_bytes(2, "big") + # Mapping field 3: 2-byte language? + lpic += int(1 if multibyte_encoding else 0).to_bytes(2, "big") + + xml["LPic"] = [ + { + "Attributes": "0x0000", + "Data": lpic, + "ID": "5000", + "Name": "", + } + ] + return xml diff --git a/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/resources.py b/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/resources.py deleted file mode 100644 index 03e2a43f3..000000000 --- a/src/3rdparty/python/lib/python3.9/site-packages/dmgbuild/resources.py +++ /dev/null @@ -1,359 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals -import struct - -class Resource (object): - def __init__(self, res_type, res_id, res_name, data=None, res_attrs=0): - self.res_type = res_type - self.res_id = res_id - self.res_name = res_name - self.res_attrs = res_attrs - if data is None: - self.data = None - self.data = data - - self.data_offset = None - self.name_offset = None - - def __repr__(self): - return 'Resource(%r, %r, %r, data=%r, res_attrs=%r)' % (self.res_type, - self.res_id, - self.res_name, - self.data, - self.res_attrs) - -class TMPLResource (Resource): - def __init__(self, res_id, res_name, tmpl, res_attrs=0): - data = [] - for name,typecode in tmpl: - data.append(struct.pack(b'B', len(name))) - data.append(name) - data.append(typecode) - super(TMPLResource, self).__init__(b'TMPL', res_id, res_name, - b''.join(data), res_attrs) - -class StringListResource (Resource): - def __init__(self, res_id, res_name, strings, res_attrs=0): - data = [] - data.append(struct.pack(b'>H', len(strings))) - for s in strings: - data.append(struct.pack(b'B', len(s))) - data.append(s) - - super(StringListResource, self).__init__(b'STR#', res_id, res_name, - b''.join(data), res_attrs) - -class TextResource (Resource): - def __init__(self, res_id, res_name, string, res_attrs=0): - super(TextResource, self).__init__(b'TEXT', res_id, res_name, - string, res_attrs) - -class Style (object): - # Fonts - NewYork = 2 - Geneva = 3 - Monaco = 4 - Venice = 5 - London = 6 - Athens = 7 - SanFrancisco = 8 - Toronto = 9 - Cairo = 11 - LosAngeles = 12 - Times = 20 - Helvetica = 21 - Courier = 22 - Symbol = 23 - Mobile = 24 - - # Styles - Bold = 0x0100 - Italic = 0x0200 - Underline = 0x0400 - Outline = 0x0800 - Shadow = 0x1000 - Condense = 0x2000 - Expand = 0x4000 - - def __init__(self, start_character, height, ascent, font_id, face, - size, color): - self.start_character = start_character - self.height = height - self.ascent = ascent - self.font_id = font_id - self.face = face - self.size = size - self.color = color - - def __repr__(self): - styles = [] - if self.face & Style.Bold: - styles.append('Style.Bold') - if self.face & Style.Italic: - styles.append('Style.Italic') - if self.face & Style.Underline: - styles.append('Style.Underline') - if self.face & Style.Outline: - styles.append('Style.Outline') - if self.face & Style.Shadow: - styles.append('Style.Shadow') - if self.face & Style.Condense: - styles.append('Style.Condense') - if self.face & Style.Expand: - styles.append('Style.Expand') - if self.face & ~0x4f00: - styles.append('%#06x' % (self.face & ~0x4f00)) - if styles: - styles = '|'.join(styles) - else: - styles = '0' - - font_revmap = { - 2: 'Style.NewYork', - 3: 'Style.Geneva', - 4: 'Style.Monaco', - 5: 'Style.Venice', - 6: 'Style.London', - 7: 'Style.Athens', - 8: 'Style.SanFrancisco', - 9: 'Style.Toronto', - 11: 'Style.Cairo', - 12: 'Style.LosAngeles', - 20: 'Style.Times', - 21: 'Style.Helvetica', - 22: 'Style.Courier', - 23: 'Style.Symbol', - 24: 'Style.Mobile' - } - - font = font_revmap.get(self.font_id, '%s' % self.font_id) - - return 'Style(%r, %r, %r, %s, %s, %r, %r)' % ( - self.start_character, - self.height, - self.ascent, - font, - styles, - self.size, - self.color) - -class StyleResource (Resource): - def __init__(self, res_id, res_name, styles, res_attrs=0): - data = [] - data.append(struct.pack(b'>H', len(styles))) - for style in styles: - data.append(struct.pack(b'>LHHHHHHHH', - style.start_character, - style.height, - style.ascent, - style.font_id, - style.face, - style.size, - style.color[0], - style.color[1], - style.color[2])) - super(StyleResource, self).__init__(b'styl', res_id, res_name, - b''.join(data), res_attrs) - -class ResourceFork (object): - def __init__(self, resources=None): - self.types = {} - self.attrs = 0 - if resources is not None: - for res in resources: - self.add(res) - - @classmethod - def from_data(clss, data): - if len(data) < 16: - raise ValueError('Bad resource data - data too short') - - # Read the header - data_start, map_start, data_len, map_len = struct.unpack(b'>LLLL', - data[0:16]) - - if data_start + data_len > len(data): - raise ValueError('Bad resource data - data out of range') - if map_start + map_len > len(data): - raise ValueError('Bad resource data - map out of range') - if map_len < 30: - raise ValueError('Bad resource data - map too short') - - # Read the map header - fork_attrs, type_offset, name_offset, max_type_ndx \ - = struct.unpack(b'>HHHH', data[map_start + 22:map_start + 30]) - num_types = max_type_ndx + 1 - - if type_offset + 8 * num_types > map_len: - raise ValueError('Bad resource data - type data outside map') - - if name_offset > map_len: - raise ValueError('Bad resource data - names outside map') - - type_offset += map_start - name_offset += map_start - - result = ResourceFork() - - # Now read the type list - for ntype in range(0, num_types): - type_pos = 2 + type_offset + 8 * ntype - res_type, max_item_ndx, ref_offset \ - = struct.unpack(b'>4sHH', data[type_pos:type_pos+8]) - num_items = max_item_ndx + 1 - - result.types[res_type] = [] - - ref_list_offset = type_offset + ref_offset - if ref_list_offset + 12 * num_items > map_start + map_len: - raise ValueError('Bad resource data - ref list outside map') - - for nitem in range(0, num_items): - ref_elt = ref_list_offset + 12 * nitem - res_id, res_name_offset, data_offset \ - = struct.unpack(b'>hHL', data[ref_elt:ref_elt+8]) - - res_attrs = data_offset >> 24 - data_offset &= 0xffffff - - if data_offset >= data_len: - raise ValueError('Bad resource data - item data out of range') - - data_offset += data_start - res_len = struct.unpack(b'>L', data[data_offset:data_offset+4])[0] - if data_offset + res_len >= data_start + data_len: - raise ValueError('Bad resource data - item data too large') - - res_data = data[data_offset + 4:data_offset + res_len + 4] - - if res_name_offset == 0xffff: - res_name = None - else: - res_name_offset += name_offset - if res_name_offset >= map_start + map_len: - raise ValueError('Bad resource data - name out of range') - try: - # python2 - res_name_len = struct.unpack(b'B', data[res_name_offset])[0] - except: - # python3 - res_name_len = data[res_name_offset] - - res_name = data[res_name_offset + 1:res_name_offset + res_name_len + 1] - - result.types[res_type].append(Resource(res_type, res_id, - res_name, - res_data, res_attrs)) - - return result - - @classmethod - def from_file(clss, filename): - with open(filename + '/..namedfork/rsrc', 'rb') as f: - data = f.read() - return clss.from_data(data) - - def to_data(self): - data = [] - data_len = 0 - names = [] - names_len = 0 - types_len = len(self.types) * 8 - types_data = [] - reflist_data = [] - reflist_len = 0 - - for res_type, items in self.types.items(): - types_data.append(struct.pack(b'>4sHH', - res_type, - len(items) - 1, - 2 + types_len + reflist_len)) - for item in items: - data_offset = data_len - - if item.res_name is None: - name_offset = 65535 - else: - name_offset = names_len - n = item.res_name - names.append(struct.pack(b'B', len(n)) + n) - names_len += 1 + len(n) - - if item.data is None: - data_len += 4 - else: - data_len += 4 + (len(item.data) + 3) & ~3 - - reflist_len += 12 - reflist_data.append(struct.pack(b'>hHLL', - item.res_id, - name_offset, - (item.res_attrs << 24) \ - | data_offset, - 0)) - - # Header - data.append(struct.pack(b'>LLLL240s', 256, 256 + data_len, data_len, - 30 + types_len + reflist_len + names_len, - b'')) - - # Resource data - for res_type, items in self.types.items(): - for item in items: - if item.data is None: - dlen = 0 - else: - dlen = len(item.data) - plen = (dlen + 3) & ~3 - data.append(struct.pack(b'>L', dlen)) - if item.data is not None: - data.append(item.data) - if plen != dlen: - data.append(b'\0' * (plen - dlen)) - - # Resource map header - data.append(struct.pack(b'>16sLHHHHH', - b'', 0, 0, - self.attrs, 28, 30 + types_len + reflist_len, - len(self.types) - 1)) - - # Type list - data.append(b''.join(types_data)) - - # Reference lists - data.append(b''.join(reflist_data)) - - # Name list - data.append(b''.join(names)) - - return b''.join(data) - - def write_to_file(self, filename): - with open(filename + '/..namedfork/rsrc', 'wb') as f: - f.write(self.to_data()) - - def __len__(self): - return len(self.types) - - def __getitem__(self, key): - return self.types[key] - - def __iter__(self): - for res_type, items in self.types.items(): - for item in items: - yield item - - def __repr__(self): - output = [] - for item in self: - output.append(repr(item)) - return 'ResourceFork([%s])' % ', '.join(output) - - def add(self, res): - if res.res_type in self.types: - self.types[res.res_type].append(res) - else: - self.types[res.res_type] = [res] - - def remove(self, res): - self.types[res.res_type].remove(res) diff --git a/src/lib/corelib/tools/msvcinfo.cpp b/src/lib/corelib/tools/msvcinfo.cpp index 973284b2b..77b83023a 100644 --- a/src/lib/corelib/tools/msvcinfo.cpp +++ b/src/lib/corelib/tools/msvcinfo.cpp @@ -176,6 +176,7 @@ static QVariantMap getMsvcDefines(const QString &compilerFilePath, << qEnvironmentVariable("COMSPEC") << QStringLiteral("/c") << languageSwitch + << QStringLiteral("/Zs") << QStringLiteral("NUL"), compilerEnv, true, commands)).split(QLatin1Char('\n')); 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 ff77afbe0..b3d39fe27 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: ["de_DE.lproj/eula.txt"] - dmg.licenseLocale: "sv_SE" // override auto-detected de_DE with sv_SE - dmg.licenseLanguageName: "Swedish, not Deutsch" + files: ["ru_RU.lproj/eula.txt"] + dmg.licenseLocale: "sv_SE" // override auto-detected ru_RU with sv_SE + dmg.licenseLanguageName: "Swedish, not Russian" dmg.licenseAgreeButtonText: "Of course" dmg.licenseDisagreeButtonText: "Never!" dmg.licensePrintButtonText: "Make Paper" @@ -75,7 +75,7 @@ Project { Group { files: ["*.lproj/**"] - excludeFiles: ["de_DE.lproj/eula.txt"] + excludeFiles: ["ru_RU.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 new file mode 100644 index 000000000..5b7c49d56 --- /dev/null +++ b/tests/auto/blackbox/testdata-apple/apple-dmg/ko_KR.lproj/eula.rtf @@ -0,0 +1,49 @@ +{\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 new file mode 100644 index 000000000..e2b7adbed --- /dev/null +++ b/tests/auto/blackbox/testdata-apple/apple-dmg/ru_RU.lproj/eula.txt @@ -0,0 +1,6 @@ +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. |