Menu
▾
▴
[OMPT-svn-commit] OpenMPT r20482 - trunk/OpenMPT/build/auto
|
From: <sv...@op...> - 2024-03-30 09:56:28
|
Author: manx Date: Sat Mar 30 10:56:13 2024 New Revision: 20482 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20482 Log: [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. Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd trunk/OpenMPT/build/auto/setup_arguments.cmd Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py ============================================================================== --- trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py Fri Mar 29 09:46:35 2024 (r20481) +++ trunk/OpenMPT/build/auto/build_openmpt_release_packages_multiarch.py Sat Mar 30 10:56:13 2024 (r20482) @@ -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: trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py ============================================================================== --- trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py Fri Mar 29 09:46:35 2024 (r20481) +++ trunk/OpenMPT/build/auto/build_openmpt_release_packages_retro.py Sat Mar 30 10:56:13 2024 (r20482) @@ -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: trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd ============================================================================== --- trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd Fri Mar 29 09:46:35 2024 (r20481) +++ trunk/OpenMPT/build/auto/package_libopenmpt_multi_args.cmd Sat Mar 30 10:56:13 2024 (r20482) @@ -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: trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd ============================================================================== --- trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd Fri Mar 29 09:46:35 2024 (r20481) +++ trunk/OpenMPT/build/auto/package_libopenmpt_retro_winxp.cmd Sat Mar 30 10:56:13 2024 (r20482) @@ -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: trunk/OpenMPT/build/auto/setup_arguments.cmd ============================================================================== --- trunk/OpenMPT/build/auto/setup_arguments.cmd Fri Mar 29 09:46:35 2024 (r20481) +++ trunk/OpenMPT/build/auto/setup_arguments.cmd Sat Mar 30 10:56:13 2024 (r20482) @@ -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 |
