Menu
▾
▴
[OMPT-svn-commit] OpenMPT r20891 - in branches/OpenMPT-1.31: . build build/auto
|
From: <sv...@op...> - 2024-06-01 07:21:23
|
Author: manx Date: Sat Jun 1 09:21:15 2024 New Revision: 20891 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20891 Log: Merged revision(s) 20482-20483 from trunk/OpenMPT: [Fix] build: Disable all file format filters when compressing 7z archives. Newer 7-zip versions introduce new filters all the time, making the resulting archives incompatible with earlier 7-zip versions. This introduced a slight regression in compression ratio but allows us updating 7-zip in return. See r19844. ........ [Var] 7-zip: Update to v23.01. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_multiarch.py branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_retro.py branches/OpenMPT-1.31/build/auto/package_libopenmpt_multi_args.cmd branches/OpenMPT-1.31/build/auto/package_libopenmpt_retro_winxp.cmd branches/OpenMPT-1.31/build/auto/setup_arguments.cmd branches/OpenMPT-1.31/build/download_externals.cmd Modified: branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_multiarch.py ============================================================================== --- branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_multiarch.py Sat Jun 1 00:14:34 2024 (r20890) +++ branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_multiarch.py Sat Jun 1 09:21:15 2024 (r20891) @@ -296,7 +296,7 @@ if singleThreaded: p7zarm64.communicate() -p7zsymbols = Popen([path7z, "a", "-t7z", "-mx=9", "../" + openmpt_version_name + "-symbols.7z", "."], cwd=openmpt_zip_symbols_basepath) +p7zsymbols = Popen([path7z, "a", "-t7z", "-mx=9", "-mf=off", "../" + openmpt_version_name + "-symbols.7z", "."], cwd=openmpt_zip_symbols_basepath) if singleThreaded: p7zsymbols.communicate() Modified: branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_retro.py ============================================================================== --- branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_retro.py Sat Jun 1 00:14:34 2024 (r20890) +++ branches/OpenMPT-1.31/build/auto/build_openmpt_release_packages_retro.py Sat Jun 1 09:21:15 2024 (r20891) @@ -217,7 +217,7 @@ if singleThreaded: p7zamd64.communicate() -p7zsymbols = Popen([path7z, "a", "-t7z", "-mx=9", "../" + openmpt_version_name + "-RETRO-symbols.7z", "."], cwd=openmpt_zip_symbols_basepath) +p7zsymbols = Popen([path7z, "a", "-t7z", "-mx=9", "-mf=off", "../" + openmpt_version_name + "-RETRO-symbols.7z", "."], cwd=openmpt_zip_symbols_basepath) if singleThreaded: p7zsymbols.communicate() Modified: branches/OpenMPT-1.31/build/auto/package_libopenmpt_multi_args.cmd ============================================================================== --- branches/OpenMPT-1.31/build/auto/package_libopenmpt_multi_args.cmd Sat Jun 1 00:14:34 2024 (r20890) +++ branches/OpenMPT-1.31/build/auto/package_libopenmpt_multi_args.cmd Sat Jun 1 09:21:15 2024 (r20891) @@ -103,7 +103,7 @@ copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\openmpt-mpg123.dll .\XMPlay-legacy\ || goto error copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\in_openmpt.dll .\Winamp-legacy\ || goto error copy /y ..\..\bin\release\%MPT_VS_VER%-win7-static\x86\openmpt-mpg123.dll .\Winamp-legacy\ || goto error -..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\bin.windows\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.windows.%MPT_PKG_FORMAT% ^ +..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 %MPT_PKG_FORMAT_OPTIONS% ..\libopenmpt\bin.windows\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.windows.%MPT_PKG_FORMAT% ^ LICENSE.txt ^ Licenses ^ changelog.md ^ @@ -248,7 +248,7 @@ copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-ogg.dll bin\amd64-legacy\ || goto error copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-vorbis.dll bin\amd64-legacy\ || goto error copy /y ..\..\bin\release\%MPT_VS_VER%-win7-shared\amd64\openmpt-zlib.dll bin\amd64-legacy\ || goto error -..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\dev.windows.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.windows.%MPT_VS_VER%.%MPT_PKG_FORMAT% ^ +..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 %MPT_PKG_FORMAT_OPTIONS% ..\libopenmpt\dev.windows.%MPT_VS_VER%\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.windows.%MPT_VS_VER%.%MPT_PKG_FORMAT% ^ LICENSE.txt ^ Licenses ^ changelog.md ^ Modified: branches/OpenMPT-1.31/build/auto/package_libopenmpt_retro_winxp.cmd ============================================================================== --- branches/OpenMPT-1.31/build/auto/package_libopenmpt_retro_winxp.cmd Sat Jun 1 00:14:34 2024 (r20890) +++ branches/OpenMPT-1.31/build/auto/package_libopenmpt_retro_winxp.cmd Sat Jun 1 09:21:15 2024 (r20891) @@ -83,7 +83,7 @@ copy /y ..\..\bin\release\vs2017-winxp-static\x86\openmpt-mpg123.dll .\XMPlay\ || goto error copy /y ..\..\bin\release\vs2017-winxp-static\x86\in_openmpt.dll .\Winamp\ || goto error copy /y ..\..\bin\release\vs2017-winxp-static\x86\openmpt-mpg123.dll .\Winamp\ || goto error -..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\bin.retro.winxp\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.retro.winxp.%MPT_PKG_FORMAT% ^ +..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 %MPT_PKG_FORMAT_OPTIONS% ..\libopenmpt\bin.retro.winxp\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.bin.retro.winxp.%MPT_PKG_FORMAT% ^ LICENSE.txt ^ Licenses ^ changelog.md ^ @@ -182,7 +182,7 @@ copy /y ..\..\bin\release\vs2017-winxp-shared\amd64\openmpt-ogg.dll bin\amd64-retro-winxp\ || goto error copy /y ..\..\bin\release\vs2017-winxp-shared\amd64\openmpt-vorbis.dll bin\amd64-retro-winxp\ || goto error copy /y ..\..\bin\release\vs2017-winxp-shared\amd64\openmpt-zlib.dll bin\amd64-retro-winxp\ || goto error -..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 ..\libopenmpt\dev.windows.retro.winxp\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.windows.retro.winxp.%MPT_PKG_FORMAT% ^ +..\..\build\tools\7zip\7z.exe a -t%MPT_PKG_FORMAT% -mx=9 %MPT_PKG_FORMAT_OPTIONS% ..\libopenmpt\dev.windows.retro.winxp\%LIBOPENMPT_VERSION_STRING%\libopenmpt-%MPT_REVISION%.dev.windows.retro.winxp.%MPT_PKG_FORMAT% ^ LICENSE.txt ^ Licenses ^ changelog.md ^ Modified: branches/OpenMPT-1.31/build/auto/setup_arguments.cmd ============================================================================== --- branches/OpenMPT-1.31/build/auto/setup_arguments.cmd Sat Jun 1 00:14:34 2024 (r20890) +++ branches/OpenMPT-1.31/build/auto/setup_arguments.cmd Sat Jun 1 09:21:15 2024 (r20891) @@ -162,8 +162,13 @@ if "%MPT_PKG_FORMAT%" == "" set MPT_PKG_FORMAT=zip + if "%MPT_PKG_FORMAT%" == "7z" set MPT_PKG_FORMAT_SYMBOLS=xz if "%MPT_PKG_FORMAT%" == "zip" set MPT_PKG_FORMAT_SYMBOLS=zip + +if "%MPT_PKG_FORMAT%" == "7z" set MPT_PKG_FORMAT_OPTIONS=-mf=off +if "%MPT_PKG_FORMAT%" == "zip" set MPT_PKG_FORMAT_OPTIONS= + if "%MPT_PKG_FORMAT_SYMBOLS%" == "" set MPT_PKG_FORMAT_SYMBOLS=zip Modified: branches/OpenMPT-1.31/build/download_externals.cmd ============================================================================== --- branches/OpenMPT-1.31/build/download_externals.cmd Sat Jun 1 00:14:34 2024 (r20890) +++ branches/OpenMPT-1.31/build/download_externals.cmd Sat Jun 1 09:21:15 2024 (r20891) @@ -29,11 +29,11 @@ if not exist "build\tools" mkdir "build\tools" -call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.7-zip.org/a/7za920.zip" "build\externals\7za920.zip" 84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3 384846 || goto error +call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7za920.zip" "build\externals\7za920.zip" 84e830c91a0e8ae499cc4814080da6569d8a6acbddc585c8b62abc86c809793aeb669b0a741063a379fd281ade85f120bc27efeb67d63bf961be893eec8bc3b3 384846 || goto error -call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.7-zip.org/a/7z2201-extra.7z" "build\externals\7z2201-extra.7z" 845b3fd5dda4187e47fa0650a5d8465484e6c407a2a1745bb12bc50aa266cc4b573393184642c1875388c262f16039c1b93f102908799147dbfc824a52d8d89d 1018450 || goto error +call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2301-extra.7z" "build\externals\7z2301-extra.7z" c849c2cb489cf5b6eeb92bfbc27dcb37d0349c36971e1bc7ef32c7cde1b659e19e8b46d734ba90f47affe07fdfd5b4774cbfa0fdf4b681e9f60bb46bba1f7f9b 1027828 || goto error -call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://www.7-zip.org/a/7z2201-x64.exe" "build\externals\7z2201-x64.exe" 965d43f06d104bf6707513c459f18aaf8b049f4a043643d720b184ed9f1bb6c929309c51c3991d5aaff7b9d87031a7248ee3274896521abe955d0e49f901ac94 1575742 || goto error +call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://7-zip.org/a/7z2301-x64.exe" "build\externals\7z2301-x64.exe" 1f4da167ff2f1d34eeaf76c3003ba5fcabfc7a7da40e73e317aa99c6e1321cdf97e00f4feb9e79e1a72240e0376af0c3becb3d309e5bb0385e5192da17ea77ff 1589510 || goto error call build\scriptlib\download.cmd %MPT_DOWNLOAD% x%1 "https://web.archive.org/web/20131217072017if_/http://download.nullsoft.com/winamp/plugin-dev/WA5.55_SDK.exe" "build\externals\WA5.55_SDK.exe" 394375db8a16bf155b5de9376f6290488ab339e503dbdfdc4e2f5bede967799e625c559cca363bc988324f1a8e86e5fd28a9f697422abd7bb3dcde4a766607b5 336166 || goto error @@ -65,8 +65,8 @@ rem Get 7zip installer and unpack it with current commandline 7zip rem This is a mess for automatic. Oh well. cscript build\scriptlib\unpack-zip.vbs "build\externals\7za920.zip" "build\tools\7zipold" || goto error -build\tools\7zipold\7za.exe x -y -obuild\tools\7zipa "build\externals\7z2201-extra.7z" || goto error -build\tools\7zipa\7za.exe x -y -obuild\tools\7zip "build\externals\7z2201-x64.exe" || goto error +build\tools\7zipold\7za.exe x -y -obuild\tools\7zipa "build\externals\7z2301-extra.7z" || goto error +build\tools\7zipa\7za.exe x -y -obuild\tools\7zip "build\externals\7z2301-x64.exe" || goto error call build\scriptlib\unpack.cmd "build\tools\htmlhelp" "build\externals\htmlhelp.exe" "." || goto error |
