From: <sv...@op...> - 2024-08-04 08:38:33
|
Author: manx Date: Sun Aug 4 10:38:24 2024 New Revision: 21324 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21324 Log: [Mod/Imp] build: OpenMPT: Use Windows 8 builds for arm32, and rename directory and release flavour to arm-legacy. The latest Windows 11 SDK does not allow targeting 32bit ARM any more. [Mod] OpenMPT: Version is now 1.32.00.21 Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py trunk/OpenMPT/build/auto/package_openmpt_installer_multiarch_args.cmd trunk/OpenMPT/build/build_openmpt_release.cmd trunk/OpenMPT/common/versionNumber.h trunk/OpenMPT/installer/generate_update_json.py trunk/OpenMPT/installer/install-multi-arch.iss Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py ============================================================================== --- trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py Sat Aug 3 22:23:21 2024 (r21323) +++ trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py Sun Aug 4 10:38:24 2024 (r21324) @@ -70,14 +70,14 @@ openmpt_zip_x86_legacy_basepath = "installer/OpenMPT-" + openmpt_version + "-x86-legacy/" openmpt_zip_amd64_basepath = "installer/OpenMPT-" + openmpt_version + "-amd64/" openmpt_zip_amd64_legacy_basepath = "installer/OpenMPT-" + openmpt_version + "-amd64-legacy/" -openmpt_zip_arm_basepath = "installer/OpenMPT-" + openmpt_version + "-arm/" +openmpt_zip_arm_legacy_basepath = "installer/OpenMPT-" + openmpt_version + "-arm-legacy/" openmpt_zip_arm64_basepath = "installer/OpenMPT-" + openmpt_version + "-arm64/" openmpt_zip_symbols_basepath = "installer/OpenMPT-" + openmpt_version + "-symbols/" openmpt_zip_x86_path = openmpt_zip_x86_basepath openmpt_zip_x86_legacy_path = openmpt_zip_x86_legacy_basepath openmpt_zip_amd64_path = openmpt_zip_amd64_basepath openmpt_zip_amd64_legacy_path = openmpt_zip_amd64_legacy_basepath -openmpt_zip_arm_path = openmpt_zip_arm_basepath +openmpt_zip_arm_legacy_path = openmpt_zip_arm_legacy_basepath openmpt_zip_arm64_path = openmpt_zip_arm64_basepath openmpt_zip_symbols_path = openmpt_zip_symbols_basepath @@ -126,7 +126,7 @@ remove_dir(openmpt_zip_x86_basepath) remove_dir(openmpt_zip_amd64_basepath) -remove_dir(openmpt_zip_arm_basepath) +remove_dir(openmpt_zip_arm_legacy_basepath) remove_dir(openmpt_zip_arm64_basepath) remove_dir(openmpt_zip_symbols_basepath) @@ -140,8 +140,8 @@ remove_file("installer/" + openmpt_version_name + "-portable-amd64.update.json") remove_file("installer/" + openmpt_version_name + "-portable-amd64-legacy.zip") remove_file("installer/" + openmpt_version_name + "-portable-amd64-legacy.update.json") -remove_file("installer/" + openmpt_version_name + "-portable-arm.zip") -remove_file("installer/" + openmpt_version_name + "-portable-arm.update.json") +remove_file("installer/" + openmpt_version_name + "-portable-arm-legacy.zip") +remove_file("installer/" + openmpt_version_name + "-portable-arm-legacy.update.json") remove_file("installer/" + openmpt_version_name + "-portable-arm64.zip") remove_file("installer/" + openmpt_version_name + "-portable-arm64.update.json") remove_file("installer/" + openmpt_version_name + "-symbols.7z") @@ -150,7 +150,7 @@ remove_file("installer/" + openmpt_version_name + "-portable-x86-legacy.zip.digests") remove_file("installer/" + openmpt_version_name + "-portable-amd64.zip.digests") remove_file("installer/" + openmpt_version_name + "-portable-amd64-legacy.zip.digests") -remove_file("installer/" + openmpt_version_name + "-portable-arm.zip.digests") +remove_file("installer/" + openmpt_version_name + "-portable-arm-legacy.zip.digests") remove_file("installer/" + openmpt_version_name + "-portable-arm64.zip.digests") remove_file("installer/" + openmpt_version_name + "-symbols.7z.digests") remove_file("installer/" + openmpt_version_name + "-update.json") @@ -163,8 +163,9 @@ raise Exception("Something went wrong during manual creation!") -sourcePathModern = "bin/release/vs2022-win10-static/" -sourcePathLegacy = "bin/release/vs2022-win7-static/" +sourcePathModern = "bin/release/vs2022-win10-static/" +sourcePathLegacyARM = "bin/release/vs2022-win8-static/" +sourcePathLegacy = "bin/release/vs2022-win7-static/" signToolCmdLine = ["signtool", "sign", "/fd", "sha256", "/a", "/tr", "http://time.certum.pl", "/td", "sha256"] @@ -178,7 +179,7 @@ if(signBinaries): print("Signing binaries...") - signDirs = [sourcePathModern + "x86/", sourcePathLegacy + "x86/", sourcePathModern + "amd64/", sourcePathLegacy + "amd64/", sourcePathModern + "arm/", sourcePathModern + "arm64/"] + signDirs = [sourcePathModern + "x86/", sourcePathLegacy + "x86/", sourcePathModern + "amd64/", sourcePathLegacy + "amd64/", sourcePathLegacyARM + "arm/", sourcePathModern + "arm64/"] signFiles = [] for dir in signDirs: signFiles = signFiles + list_binaries(dir) @@ -193,7 +194,7 @@ copy_binaries(sourcePathModern + "x86/", openmpt_zip_x86_path) copy_pluginbridge(sourcePathModern, "x86", openmpt_zip_x86_path) copy_pluginbridge(sourcePathModern, "amd64", openmpt_zip_x86_path) -copy_pluginbridge(sourcePathModern, "arm", openmpt_zip_x86_path) +copy_pluginbridge(sourcePathLegacyARM, "arm", openmpt_zip_x86_path) copy_pluginbridge(sourcePathModern, "arm64", openmpt_zip_x86_path) Path(openmpt_zip_x86_path + "OpenMPT.portable").touch() print("Copying x86 legacy binaries...") @@ -207,7 +208,7 @@ copy_binaries(sourcePathModern + "amd64/", openmpt_zip_amd64_path) copy_pluginbridge(sourcePathModern, "x86", openmpt_zip_amd64_path) copy_pluginbridge(sourcePathModern, "amd64", openmpt_zip_amd64_path) -copy_pluginbridge(sourcePathModern, "arm", openmpt_zip_amd64_path) +copy_pluginbridge(sourcePathLegacyARM, "arm", openmpt_zip_amd64_path) copy_pluginbridge(sourcePathModern, "arm64", openmpt_zip_amd64_path) Path(openmpt_zip_amd64_path + "OpenMPT.portable").touch() print("Copying amd64 legacy binaries...") @@ -217,19 +218,19 @@ copy_pluginbridge(sourcePathLegacy, "amd64", openmpt_zip_amd64_legacy_path) Path(openmpt_zip_amd64_legacy_path + "OpenMPT.portable").touch() print("Copying arm binaries...") -shutil.rmtree(openmpt_zip_arm_basepath, ignore_errors=True) -copy_binaries(sourcePathModern + "arm/", openmpt_zip_arm_path) -copy_pluginbridge(sourcePathModern, "x86", openmpt_zip_arm_path) -copy_pluginbridge(sourcePathModern, "amd64", openmpt_zip_arm_path) -copy_pluginbridge(sourcePathModern, "arm", openmpt_zip_arm_path) -copy_pluginbridge(sourcePathModern, "arm64", openmpt_zip_arm_path) -Path(openmpt_zip_arm_path + "OpenMPT.portable").touch() +shutil.rmtree(openmpt_zip_arm_legacy_basepath, ignore_errors=True) +copy_binaries(sourcePathLegacyARM + "arm/", openmpt_zip_arm_legacy_path) +copy_pluginbridge(sourcePathModern, "x86", openmpt_zip_arm_legacy_path) +copy_pluginbridge(sourcePathModern, "amd64", openmpt_zip_arm_legacy_path) +copy_pluginbridge(sourcePathLegacyARM, "arm", openmpt_zip_arm_legacy_path) +copy_pluginbridge(sourcePathModern, "arm64", openmpt_zip_arm_legacy_path) +Path(openmpt_zip_arm_legacy_path + "OpenMPT.portable").touch() print("Copying arm64 binaries...") shutil.rmtree(openmpt_zip_arm64_basepath, ignore_errors=True) copy_binaries(sourcePathModern + "arm64/", openmpt_zip_arm64_path) copy_pluginbridge(sourcePathModern, "x86", openmpt_zip_arm64_path) copy_pluginbridge(sourcePathModern, "amd64", openmpt_zip_arm64_path) -copy_pluginbridge(sourcePathModern, "arm", openmpt_zip_arm64_path) +copy_pluginbridge(sourcePathLegacyARM, "arm", openmpt_zip_arm64_path) copy_pluginbridge(sourcePathModern, "arm64", openmpt_zip_arm64_path) Path(openmpt_zip_arm64_path + "OpenMPT.portable").touch() @@ -239,13 +240,13 @@ copy_symbols(sourcePathLegacy + "x86/", openmpt_zip_symbols_path + "x86-legacy/") copy_symbols(sourcePathModern + "amd64/", openmpt_zip_symbols_path + "amd64/") copy_symbols(sourcePathLegacy + "amd64/", openmpt_zip_symbols_path + "amd64-legacy/") -copy_symbols(sourcePathModern + "arm/", openmpt_zip_symbols_path + "arm/") +copy_symbols(sourcePathLegacyARM + "arm/", openmpt_zip_symbols_path + "arm-legacy/") copy_symbols(sourcePathModern + "arm64/", openmpt_zip_symbols_path + "arm64/") copy_symbols_pluginbridge(sourcePathModern + "x86/", openmpt_zip_symbols_path + "x86/", "x86") copy_symbols_pluginbridge(sourcePathLegacy + "x86/", openmpt_zip_symbols_path + "x86-legacy/", "x86") copy_symbols_pluginbridge(sourcePathModern + "amd64/", openmpt_zip_symbols_path + "amd64/", "amd64") copy_symbols_pluginbridge(sourcePathLegacy + "amd64/", openmpt_zip_symbols_path + "amd64-legacy/", "amd64") -copy_symbols_pluginbridge(sourcePathModern + "arm/", openmpt_zip_symbols_path + "arm/", "arm") +copy_symbols_pluginbridge(sourcePathLegacyARM + "arm/", openmpt_zip_symbols_path + "arm-legacy/", "arm") copy_symbols_pluginbridge(sourcePathModern + "arm64/", openmpt_zip_symbols_path + "arm64/", "arm64") if not singleThreaded: @@ -264,7 +265,7 @@ copy_other(openmpt_zip_x86_legacy_path, openmpt_version_short) copy_other(openmpt_zip_amd64_path, openmpt_version_short) copy_other(openmpt_zip_amd64_legacy_path, openmpt_version_short) -copy_other(openmpt_zip_arm_path, openmpt_version_short) +copy_other(openmpt_zip_arm_legacy_path, openmpt_version_short) copy_other(openmpt_zip_arm64_path, openmpt_version_short) print("Creating zip files and installers...") @@ -289,7 +290,7 @@ p7zamd64legacy = Popen([path7z, "a", "-tzip", "-mx=9", "../" + openmpt_version_name + "-portable-amd64-legacy.zip", "."], cwd=openmpt_zip_amd64_legacy_basepath) if singleThreaded: p7zamd64legacy.communicate() -p7zarm = Popen([path7z, "a", "-tzip", "-mx=9", "../" + openmpt_version_name + "-portable-arm.zip", "."], cwd=openmpt_zip_arm_basepath) +p7zarm = Popen([path7z, "a", "-tzip", "-mx=9", "../" + openmpt_version_name + "-portable-arm-legacy.zip", "."], cwd=openmpt_zip_arm_legacy_basepath) if singleThreaded: p7zarm.communicate() p7zarm64 = Popen([path7z, "a", "-tzip", "-mx=9", "../" + openmpt_version_name + "-portable-arm64.zip", "."], cwd=openmpt_zip_arm64_basepath) @@ -329,7 +330,7 @@ hash_file("installer/" + openmpt_version_name + "-portable-x86-legacy.zip") hash_file("installer/" + openmpt_version_name + "-portable-amd64.zip") hash_file("installer/" + openmpt_version_name + "-portable-amd64-legacy.zip") -hash_file("installer/" + openmpt_version_name + "-portable-arm.zip") +hash_file("installer/" + openmpt_version_name + "-portable-arm-legacy.zip") hash_file("installer/" + openmpt_version_name + "-portable-arm64.zip") hash_file("installer/" + openmpt_version_name + "-symbols.7z") @@ -337,7 +338,7 @@ shutil.rmtree(openmpt_zip_x86_legacy_basepath) shutil.rmtree(openmpt_zip_amd64_basepath) shutil.rmtree(openmpt_zip_amd64_legacy_basepath) -shutil.rmtree(openmpt_zip_arm_basepath) +shutil.rmtree(openmpt_zip_arm_legacy_basepath) shutil.rmtree(openmpt_zip_arm64_basepath) shutil.rmtree(openmpt_zip_symbols_basepath) Modified: trunk/OpenMPT/build/auto/package_openmpt_installer_multiarch_args.cmd ============================================================================== --- trunk/OpenMPT/build/auto/package_openmpt_installer_multiarch_args.cmd Sat Aug 3 22:23:21 2024 (r21323) +++ trunk/OpenMPT/build/auto/package_openmpt_installer_multiarch_args.cmd Sun Aug 4 10:38:24 2024 (r21324) @@ -46,10 +46,10 @@ copy /y ..\installer\OpenMPT-%OPENMPT_VERSION%-portable-amd64-legacy.zip.digests openmpt\pkg.win\%OPENMPT_VERSION_MAJORMAJOR%.%OPENMPT_VERSION_MAJOR%\OpenMPT-%MPT_REVISION%-portable-amd64-legacy.zip.digests copy /y ..\installer\OpenMPT-%OPENMPT_VERSION%-portable-amd64-legacy.update.json openmpt\pkg.win\%OPENMPT_VERSION_MAJORMAJOR%.%OPENMPT_VERSION_MAJOR%\OpenMPT-%MPT_REVISION%-portable-amd64-legacy.update.json copy /y ..\installer\OpenMPT-%OPENMPT_VERSION%-portable-amd64-legacy.update.json.jws.json openmpt\pkg.win\%OPENMPT_VERSION_MAJORMAJOR%.%OPENMPT_VERSION_MAJOR%\OpenMPT-%MPT_REVISION%-portable-amd64-legacy.update.json.jws.json -copy /y ..\installer\OpenMPT-%OPENMPT_VERSION%-portable-arm.zip openmpt\pkg.win\%OPENMPT_VERSION_MAJORMAJOR%.%OPENMPT_VERSION_MAJOR%\OpenMPT-%MPT_REVISION%-portable-arm.zip -copy /y ..\installer\OpenMPT-%OPENMPT_VERSION%-portable-arm.zip.digests openmpt\pkg.win\%OPENMPT_VERSION_MAJORMAJOR%.%OPENMPT_VERSION_MAJOR%\OpenMPT-%MPT_REVISION%-portable-arm.zip.digests -copy /y ..\installer\OpenMPT-%OPENMPT_VERSION%-portable-arm.update.json openmpt\pkg.win\%OPENMPT_VERSION_MAJORMAJOR%.%OPENMPT_VERSION_MAJOR%\OpenMPT-%MPT_REVISION%-portable-arm.update.json -copy /y ..\installer\OpenMPT-%OPENMPT_VERSION%-portable-arm.update.json.jws.json openmpt\pkg.win\%OPENMPT_VERSION_MAJORMAJOR%.%OPENMPT_VERSION_MAJOR%\OpenMPT-%MPT_REVISION%-portable-arm.update.json.jws.json +copy /y ..\installer\OpenMPT-%OPENMPT_VERSION%-portable-arm-legacy.zip openmpt\pkg.win\%OPENMPT_VERSION_MAJORMAJOR%.%OPENMPT_VERSION_MAJOR%\OpenMPT-%MPT_REVISION%-portable-arm-legacy.zip +copy /y ..\installer\OpenMPT-%OPENMPT_VERSION%-portable-arm-legacy.zip.digests openmpt\pkg.win\%OPENMPT_VERSION_MAJORMAJOR%.%OPENMPT_VERSION_MAJOR%\OpenMPT-%MPT_REVISION%-portable-arm-legacy.zip.digests +copy /y ..\installer\OpenMPT-%OPENMPT_VERSION%-portable-arm-legacy.update.json openmpt\pkg.win\%OPENMPT_VERSION_MAJORMAJOR%.%OPENMPT_VERSION_MAJOR%\OpenMPT-%MPT_REVISION%-portable-arm-legacy.update.json +copy /y ..\installer\OpenMPT-%OPENMPT_VERSION%-portable-arm-legacy.update.json.jws.json openmpt\pkg.win\%OPENMPT_VERSION_MAJORMAJOR%.%OPENMPT_VERSION_MAJOR%\OpenMPT-%MPT_REVISION%-portable-arm-legacy.update.json.jws.json copy /y ..\installer\OpenMPT-%OPENMPT_VERSION%-portable-arm64.zip openmpt\pkg.win\%OPENMPT_VERSION_MAJORMAJOR%.%OPENMPT_VERSION_MAJOR%\OpenMPT-%MPT_REVISION%-portable-arm64.zip copy /y ..\installer\OpenMPT-%OPENMPT_VERSION%-portable-arm64.zip.digests openmpt\pkg.win\%OPENMPT_VERSION_MAJORMAJOR%.%OPENMPT_VERSION_MAJOR%\OpenMPT-%MPT_REVISION%-portable-arm64.zip.digests copy /y ..\installer\OpenMPT-%OPENMPT_VERSION%-portable-arm64.update.json openmpt\pkg.win\%OPENMPT_VERSION_MAJORMAJOR%.%OPENMPT_VERSION_MAJOR%\OpenMPT-%MPT_REVISION%-portable-arm64.update.json Modified: trunk/OpenMPT/build/build_openmpt_release.cmd ============================================================================== --- trunk/OpenMPT/build/build_openmpt_release.cmd Sat Aug 3 22:23:21 2024 (r21323) +++ trunk/OpenMPT/build/build_openmpt_release.cmd Sun Aug 4 10:38:24 2024 (r21324) @@ -12,8 +12,8 @@ cmd /c build\auto\update_package_template.cmd || goto error cmd /c build\auto\build_openmpt_args.cmd vs2022 win10 Win32 Release 7z default || goto error cmd /c build\auto\build_openmpt_args.cmd vs2022 win10 x64 Release 7z default || goto error -cmd /c build\auto\build_openmpt_args.cmd vs2022 win10 ARM Release 7z default || goto error cmd /c build\auto\build_openmpt_args.cmd vs2022 win10 ARM64 Release 7z default || goto error +cmd /c build\auto\build_openmpt_args.cmd vs2022 win8 ARM Release 7z default || goto error cmd /c build\auto\build_openmpt_args.cmd vs2022 win7 Win32 Release 7z default || goto error cmd /c build\auto\build_openmpt_args.cmd vs2022 win7 x64 Release 7z default || goto error cmd /c build\auto\build_openmpt_release_packages_multiarch.cmd auto sign || goto error Modified: trunk/OpenMPT/common/versionNumber.h ============================================================================== --- trunk/OpenMPT/common/versionNumber.h Sat Aug 3 22:23:21 2024 (r21323) +++ trunk/OpenMPT/common/versionNumber.h Sun Aug 4 10:38:24 2024 (r21324) @@ -18,6 +18,6 @@ #define VER_MAJORMAJOR 1 #define VER_MAJOR 32 #define VER_MINOR 00 -#define VER_MINORMINOR 20 +#define VER_MINORMINOR 21 OPENMPT_NAMESPACE_END Modified: trunk/OpenMPT/installer/generate_update_json.py ============================================================================== --- trunk/OpenMPT/installer/generate_update_json.py Sat Aug 3 22:23:21 2024 (r21323) +++ trunk/OpenMPT/installer/generate_update_json.py Sun Aug 4 10:38:24 2024 (r21324) @@ -125,19 +125,19 @@ f.close() update = { - "url": download_base_url + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR + "/OpenMPT-" + version + "-portable-arm.zip", + "url": download_base_url + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR + "/OpenMPT-" + version + "-portable-arm-legacy.zip", "checksums": { - "SHA-512": hash_file_sha512("installer/OpenMPT-" + plainversion + "-portable-arm.zip"), - "SHA3-512": hash_file_sha3_512("installer/OpenMPT-" + plainversion + "-portable-arm.zip"), + "SHA-512": hash_file_sha512("installer/OpenMPT-" + plainversion + "-portable-arm-legacy.zip"), + "SHA3-512": hash_file_sha3_512("installer/OpenMPT-" + plainversion + "-portable-arm-legacy.zip"), }, - "filename": "OpenMPT-" + version + "-portable-arm.zip", + "filename": "OpenMPT-" + version + "-portable-arm-legacy.zip", "autoupdate_installer": None, "autoupdate_archive": { "subfolder": "", "restartbinary": "OpenMPT.exe" } } -with open("installer/" + "OpenMPT-" + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR + "." + OPENMPT_VERSION_MINOR + "." + OPENMPT_VERSION_MINORMINOR + "-portable-arm.update.json", "wb") as f: +with open("installer/" + "OpenMPT-" + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR + "." + OPENMPT_VERSION_MINOR + "." + OPENMPT_VERSION_MINORMINOR + "-portable-arm-legacy.update.json", "wb") as f: f.write((json.dumps(update, ensure_ascii=False, indent=1)).encode('utf-8')) f.close() @@ -227,14 +227,14 @@ "supported_architectures": { "amd64":True }, "required_processor_features": { "amd64":{"sse2":True} } }, - "portable-arm": { - "url": download_base_url + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR + "/OpenMPT-" + version + "-portable-arm.update.json", - "download_url": download_base_url + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR + "/OpenMPT-" + version + "-portable-arm.zip", + "portable-arm-legacy": { + "url": download_base_url + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR + "/OpenMPT-" + version + "-portable-arm-legacy.update.json", + "download_url": download_base_url + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR + "/OpenMPT-" + version + "-portable-arm-legacy.zip", "type": "archive", "can_autoupdate": True, "autoupdate_minversion": "1.30.00.08", "os": "windows", - "required_windows_version": { "version_major":10, "version_minor":0, "servicepack_major":0, "servicepack_minor":0, "build":19044, "wine_major":1, "wine_minor":8, "wine_update":0 }, + "required_windows_version": { "version_major":6, "version_minor":2, "servicepack_major":0, "servicepack_minor":0, "build":0, "wine_major":1, "wine_minor":8, "wine_update":0 }, "required_architectures": {}, "supported_architectures": { "arm":True }, "required_processor_features": { "arm":{} } @@ -268,7 +268,7 @@ sign_file("installer/" + "OpenMPT-" + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR + "." + OPENMPT_VERSION_MINOR + "." + OPENMPT_VERSION_MINORMINOR + "-portable-x86-legacy.update.json") sign_file("installer/" + "OpenMPT-" + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR + "." + OPENMPT_VERSION_MINOR + "." + OPENMPT_VERSION_MINORMINOR + "-portable-amd64.update.json") sign_file("installer/" + "OpenMPT-" + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR + "." + OPENMPT_VERSION_MINOR + "." + OPENMPT_VERSION_MINORMINOR + "-portable-amd64-legacy.update.json") -sign_file("installer/" + "OpenMPT-" + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR + "." + OPENMPT_VERSION_MINOR + "." + OPENMPT_VERSION_MINORMINOR + "-portable-arm.update.json") +sign_file("installer/" + "OpenMPT-" + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR + "." + OPENMPT_VERSION_MINOR + "." + OPENMPT_VERSION_MINORMINOR + "-portable-arm-legacy.update.json") sign_file("installer/" + "OpenMPT-" + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR + "." + OPENMPT_VERSION_MINOR + "." + OPENMPT_VERSION_MINORMINOR + "-portable-arm64.update.json") pdumpkey = Popen(["bin/release/vs2022-win7-static/amd64/updatesigntool.exe", "dumpkey", "auto", "installer/" + "OpenMPT-" + OPENMPT_VERSION_MAJORMAJOR + "." + OPENMPT_VERSION_MAJOR + "." + OPENMPT_VERSION_MINOR + "." + OPENMPT_VERSION_MINORMINOR + "-update-publickey.jwk.json"]) Modified: trunk/OpenMPT/installer/install-multi-arch.iss ============================================================================== --- trunk/OpenMPT/installer/install-multi-arch.iss Sat Aug 3 22:23:21 2024 (r21323) +++ trunk/OpenMPT/installer/install-multi-arch.iss Sun Aug 4 10:38:24 2024 (r21324) @@ -4,6 +4,7 @@ #define BuildFolder "release\vs2022-win10-static" +#define BuildFolderLegacyarm "release\vs2022-win8-static" #define BuildFolderLegacyx86 "release\vs2022-win7-static" #define BuildFolderLegacyamd64 "release\vs2022-win7-static" @@ -110,12 +111,12 @@ Source: ..\bin\{#BuildFolderLegacyamd64}\amd64\openmpt-mpg123.dll; DestDir: {app}\bin\amd64; Flags: ignoreversion; Components: archamd64; OnlyBelowVersion: 10.0.19044 Source: ..\bin\{#BuildFolderLegacyamd64}\amd64\openmpt-soundtouch.dll; DestDir: {app}\bin\amd64; Flags: ignoreversion; Components: archamd64; OnlyBelowVersion: 10.0.19044 -Source: ..\bin\{#BuildFolder}\arm\OpenMPT.exe; DestDir: {app}\bin\arm; Flags: ignoreversion; Components: archarm; MinVersion: 10.0.19044 -Source: ..\bin\{#BuildFolder}\arm\PluginBridge-arm.exe; DestDir: {app}\bin\arm; Flags: ignoreversion; Components: archarm; MinVersion: 10.0.19044 -Source: ..\bin\{#BuildFolder}\arm\PluginBridgeLegacy-arm.exe; DestDir: {app}\bin\arm; Flags: ignoreversion; Components: archarm; MinVersion: 10.0.19044 -Source: ..\bin\{#BuildFolder}\arm\openmpt-lame.dll; DestDir: {app}\bin\arm; Flags: ignoreversion; Components: archarm; MinVersion: 10.0.19044 -Source: ..\bin\{#BuildFolder}\arm\openmpt-mpg123.dll; DestDir: {app}\bin\arm; Flags: ignoreversion; Components: archarm; MinVersion: 10.0.19044 -Source: ..\bin\{#BuildFolder}\arm\openmpt-soundtouch.dll; DestDir: {app}\bin\arm; Flags: ignoreversion; Components: archarm; MinVersion: 10.0.19044 +Source: ..\bin\{#BuildFolderLegacyarm}\arm\OpenMPT.exe; DestDir: {app}\bin\arm; Flags: ignoreversion; Components: archarm; MinVersion: 6.2 +Source: ..\bin\{#BuildFolderLegacyarm}\arm\PluginBridge-arm.exe; DestDir: {app}\bin\arm; Flags: ignoreversion; Components: archarm; MinVersion: 6.2 +Source: ..\bin\{#BuildFolderLegacyarm}\arm\PluginBridgeLegacy-arm.exe; DestDir: {app}\bin\arm; Flags: ignoreversion; Components: archarm; MinVersion: 6.2 +Source: ..\bin\{#BuildFolderLegacyarm}\arm\openmpt-lame.dll; DestDir: {app}\bin\arm; Flags: ignoreversion; Components: archarm; MinVersion: 6.2 +Source: ..\bin\{#BuildFolderLegacyarm}\arm\openmpt-mpg123.dll; DestDir: {app}\bin\arm; Flags: ignoreversion; Components: archarm; MinVersion: 6.2 +Source: ..\bin\{#BuildFolderLegacyarm}\arm\openmpt-soundtouch.dll; DestDir: {app}\bin\arm; Flags: ignoreversion; Components: archarm; MinVersion: 6.2 Source: ..\bin\{#BuildFolder}\arm64\OpenMPT.exe; DestDir: {app}\bin\arm64; Flags: ignoreversion; Components: archarm64; MinVersion: 10.0.19044 Source: ..\bin\{#BuildFolder}\arm64\PluginBridge-arm64.exe; DestDir: {app}\bin\arm64; Flags: ignoreversion; Components: archarm64; MinVersion: 10.0.19044 |