From a134632daa2df54eedc8944c3bfa15731beda3ab Mon Sep 17 00:00:00 2001 From: Wengier Date: Thu, 15 Apr 2021 18:42:27 -0400 Subject: [PATCH] 8 zips just for Visual Studio builds may be too many; 4 is probably better --- build_windows_installer.bat | 50 +++++++++++++++++++++++++++---------- make-windows-release.pl | 7 +++++- 2 files changed, 43 insertions(+), 14 deletions(-) diff --git a/build_windows_installer.bat b/build_windows_installer.bat index 719945416..cc580640e 100644 --- a/build_windows_installer.bat +++ b/build_windows_installer.bat @@ -48,16 +48,37 @@ if "%datestr%"=="" ( goto error ) -set vsbzip= +set vwin32zip= +set vwin64zip= +set varm32zip= +set varm64zip= set m32zip= set m64zip= -for %%i in (%vsbinpath%\dosbox-x-vsbuild-win-%datestr%*.zip) do set vsbzip=%%i +for %%i in (%vsbinpath%\dosbox-x-vsbuild-win32-%datestr%*.zip) do set vwin32zip=%%i +for %%i in (%vsbinpath%\dosbox-x-vsbuild-win64-%datestr%*.zip) do set vwin64zip=%%i +for %%i in (%vsbinpath%\dosbox-x-vsbuild-arm32-%datestr%*.zip) do set varm32zip=%%i +for %%i in (%vsbinpath%\dosbox-x-vsbuild-arm64-%datestr%*.zip) do set varm64zip=%%i for %%i in (%mgbinpath%\dosbox-x-mingw-win32-%datestr%*.zip) do set m32zip=%%i for %%i in (%mgbinpath%\dosbox-x-mingw-win64-%datestr%*.zip) do set m64zip=%%i -if not exist "%vsbzip%" ( - echo Couldn't find dosbox-x-vsbuild-win-%datestr%*.zip at %vsbinpath% +if not exist "%vwin32zip%" ( + echo Couldn't find dosbox-x-vsbuild-win32-%datestr%*.zip at %vsbinpath% + goto error +) + +if not exist "%vwin64zip%" ( + echo Couldn't find dosbox-x-vsbuild-win64-%datestr%*.zip at %vsbinpath% + goto error +) + +if not exist "%varm32zip%" ( + echo Couldn't find dosbox-x-vsbuild-arm32-%datestr%*.zip at %vsbinpath% + goto error +) + +if not exist "%varm64zip%" ( + echo Couldn't find dosbox-x-vsbuild-arm64-%datestr%*.zip at %vsbinpath% goto error ) @@ -77,14 +98,14 @@ echo * Extract DOSBox-X executables ... * echo *************************************** if exist %isspath%\Win32_builds\nul rd %isspath%\Win32_builds /s /q if exist %isspath%\Win64_builds\nul rd %isspath%\Win64_builds /s /q -%isspath%\7za.exe e -y -o%isspath%\Win32_builds\x86_Release %vsbzip% "bin\Win32\Release\dosbox-x.exe" -%isspath%\7za.exe e -y -o%isspath%\Win32_builds\x86_Release_SDL2 %vsbzip% "bin\Win32\Release SDL2\dosbox-x.exe" -%isspath%\7za.exe e -y -o%isspath%\Win32_builds\ARM_Release %vsbzip% "bin\ARM\Release\dosbox-x.exe" -%isspath%\7za.exe e -y -o%isspath%\Win32_builds\ARM_Release_SDL2 %vsbzip% "bin\ARM\Release SDL2\dosbox-x.exe" -%isspath%\7za.exe e -y -o%isspath%\Win64_builds\x64_Release %vsbzip% "bin\x64\Release\dosbox-x.exe" -%isspath%\7za.exe e -y -o%isspath%\Win64_builds\x64_Release_SDL2 %vsbzip% "bin\x64\Release SDL2\dosbox-x.exe" -%isspath%\7za.exe e -y -o%isspath%\Win64_builds\ARM64_Release %vsbzip% "bin\ARM64\Release\dosbox-x.exe" -%isspath%\7za.exe e -y -o%isspath%\Win64_builds\ARM64_Release_SDL2 %vsbzip% "bin\ARM64\Release SDL2\dosbox-x.exe" +%isspath%\7za.exe e -y -o%isspath%\Win32_builds\x86_Release %vwin32zip% "bin\Win32\Release\dosbox-x.exe" +%isspath%\7za.exe e -y -o%isspath%\Win32_builds\x86_Release_SDL2 %vwin32zip% "bin\Win32\Release SDL2\dosbox-x.exe" +%isspath%\7za.exe e -y -o%isspath%\Win32_builds\ARM_Release %varm32zip% "bin\ARM\Release\dosbox-x.exe" +%isspath%\7za.exe e -y -o%isspath%\Win32_builds\ARM_Release_SDL2 %varm32zip% "bin\ARM\Release SDL2\dosbox-x.exe" +%isspath%\7za.exe e -y -o%isspath%\Win64_builds\x64_Release %vwin64zip% "bin\x64\Release\dosbox-x.exe" +%isspath%\7za.exe e -y -o%isspath%\Win64_builds\x64_Release_SDL2 %vwin64zip% "bin\x64\Release SDL2\dosbox-x.exe" +%isspath%\7za.exe e -y -o%isspath%\Win64_builds\ARM64_Release %varm64zip% "bin\ARM64\Release\dosbox-x.exe" +%isspath%\7za.exe e -y -o%isspath%\Win64_builds\ARM64_Release_SDL2 %varm64zip% "bin\ARM64\Release SDL2\dosbox-x.exe" %isspath%\7za.exe e -y -o%isspath%\Win32_builds\mingw %m32zip% "mingw-build\mingw\dosbox-x.exe" %isspath%\7za.exe e -y -o%isspath%\Win32_builds\mingw-lowend %m32zip% "mingw-build\mingw-lowend\dosbox-x.exe" %isspath%\7za.exe e -y -o%isspath%\Win32_builds\mingw-sdl2 %m32zip% "mingw-build\mingw-sdl2\dosbox-x.exe" @@ -151,6 +172,9 @@ set rootdir= set isspath= set vsbinpath= set mgbinpath= -set vsbzip= +set vwin32zip= +set vwin64zip= +set varm32zip= +set varm64zip= set m32zip= set m64zip= diff --git a/make-windows-release.pl b/make-windows-release.pl index b3a084d6f..9694ca638 100644 --- a/make-windows-release.pl +++ b/make-windows-release.pl @@ -40,6 +40,12 @@ my @builds = ('Release', 'Release SDL2'); my @files = ('dosbox-x.reference.conf', 'dosbox-x.reference.full.conf', 'dosbox-x.exe', 'FREECG98.bmp', 'changelog.txt', 'shaders'); foreach $platform (@platforms) { + $plat = $platform; + $plat = 'win32' if $plat eq 'Win32'; + $plat = 'win64' if $plat eq 'x64'; + $plat = 'arm32' if $plat eq 'ARM'; + $plat = 'arm64' if $plat eq 'ARM64'; + $zipname = "dosbox-x-$suffix-$plat-$datestr.zip"; foreach $build (@builds) { my @filelist = (); @@ -47,7 +53,6 @@ foreach $platform (@platforms) { my $p_build = $build; $p_build =~ s/ /-/g; - my $zipname = "dosbox-x-$suffix-win-$platform-$p_build-$datestr.zip"; next if -f $zipname; foreach $file (@files) {