From: <sv...@op...> - 2025-06-10 15:39:09
|
Author: manx Date: Tue Jun 10 17:38:56 2025 New Revision: 23452 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23452 Log: [Fix] build: Legacy 32bit ARM portable packages should included the legacy builds of x86 and amd64 PluginBridge. The modern versions have higher system requirements than the 32bit ARM build itself. Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py ============================================================================== --- trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py Mon Jun 9 18:59:37 2025 (r23451) +++ trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py Tue Jun 10 17:38:56 2025 (r23452) @@ -202,12 +202,14 @@ copy_pluginbridge(sourcePathModern, "arm64", openmpt_zip_x86_path) copy_pluginbridge(sourcePathModern, "arm64ec", openmpt_zip_x86_path) Path(openmpt_zip_x86_path + "OpenMPT.portable").touch() + print("Copying x86 legacy binaries...") shutil.rmtree(openmpt_zip_x86_legacy_basepath, ignore_errors=True) copy_binaries(sourcePathLegacy + "x86/", openmpt_zip_x86_legacy_path) copy_pluginbridge(sourcePathLegacy, "x86", openmpt_zip_x86_legacy_path) copy_pluginbridge(sourcePathLegacy, "amd64", openmpt_zip_x86_legacy_path) Path(openmpt_zip_x86_legacy_path + "OpenMPT.portable").touch() + print("Copying amd64 binaries...") shutil.rmtree(openmpt_zip_amd64_basepath, ignore_errors=True) copy_binaries(sourcePathModern + "amd64/", openmpt_zip_amd64_path) @@ -217,21 +219,22 @@ copy_pluginbridge(sourcePathModern, "arm64", openmpt_zip_amd64_path) copy_pluginbridge(sourcePathModern, "arm64ec", openmpt_zip_amd64_path) Path(openmpt_zip_amd64_path + "OpenMPT.portable").touch() + print("Copying amd64 legacy binaries...") shutil.rmtree(openmpt_zip_amd64_legacy_basepath, ignore_errors=True) copy_binaries(sourcePathLegacy + "amd64/", openmpt_zip_amd64_legacy_path) copy_pluginbridge(sourcePathLegacy, "x86", openmpt_zip_amd64_legacy_path) copy_pluginbridge(sourcePathLegacy, "amd64", openmpt_zip_amd64_legacy_path) Path(openmpt_zip_amd64_legacy_path + "OpenMPT.portable").touch() -print("Copying arm binaries...") + +print("Copying arm legacy binaries...") 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(sourcePathLegacy, "x86", openmpt_zip_arm_legacy_path) +copy_pluginbridge(sourcePathLegacy, "amd64", openmpt_zip_arm_legacy_path) copy_pluginbridge(sourcePathLegacyARM, "arm", openmpt_zip_arm_legacy_path) -copy_pluginbridge(sourcePathModern, "arm64", openmpt_zip_arm_legacy_path) -copy_pluginbridge(sourcePathModern, "arm64ec", 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) @@ -241,6 +244,7 @@ copy_pluginbridge(sourcePathModern, "arm64", openmpt_zip_arm64_path) copy_pluginbridge(sourcePathModern, "arm64ec", openmpt_zip_arm64_path) Path(openmpt_zip_arm64_path + "OpenMPT.portable").touch() + print("Copying arm64ec binaries...") shutil.rmtree(openmpt_zip_arm64_basepath, ignore_errors=True) copy_binaries(sourcePathModern + "arm64ec/", openmpt_zip_arm64ec_path) Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py ============================================================================== --- trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py Mon Jun 9 18:59:37 2025 (r23451) +++ trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py Tue Jun 10 17:38:56 2025 (r23452) @@ -169,6 +169,7 @@ copy_pluginbridge(sourcePathModern, "x86", openmpt_zip_x86_path) copy_pluginbridge(sourcePathModern, "amd64", openmpt_zip_x86_path) Path(openmpt_zip_x86_path + "OpenMPT.portable").touch() + print("Copying amd64 binaries...") shutil.rmtree(openmpt_zip_amd64_basepath, ignore_errors=True) copy_binaries(sourcePathModern + "amd64/", openmpt_zip_amd64_path) |