From 747d8ec7e94e720884e4362a7dce0d2fc5477e77 Mon Sep 17 00:00:00 2001 From: Wengier Date: Wed, 30 Sep 2020 19:22:22 -0400 Subject: [PATCH] update --- INSTALL.md | 2 +- build_windows_installer.bat | 12 ++++++------ contrib/windows/installer/DOSBox-X-setup.iss | 2 +- make-windows-release.pl | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 1a7a61343..1865be723 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -25,7 +25,7 @@ You can easily upgrade from a previous version of DOSBox-X to the new version wi Apart from the Windows installers, you can usually find three zip packages for each DOSBox-X version for the Windows platform in the Releases page as an alternative way to install DOSBox-X. These zip files are portable packages containing binaries built with Visual Studio 2019, MinGW 32-bit and MinGW 64-bit (or mingw-w64). For the current DOSBox-X version 0.83.6, these portable builds are separately available from: -* [dosbox-x-windows-vsbin-20200930224615.zip](https://github.com/joncampbell123/dosbox-x/releases/download/dosbox-x-v0.83.6/dosbox-x-windows-vsbin-20200930224615.zip) +* [dosbox-x-vsbuild-win-20200930224615.zip](https://github.com/joncampbell123/dosbox-x/releases/download/dosbox-x-v0.83.6/dosbox-x-vsbuild-win-20200930224615.zip) * [dosbox-x-mingw-win32-20200930224903.zip](https://github.com/joncampbell123/dosbox-x/releases/download/dosbox-x-v0.83.6/dosbox-x-mingw-win32-20200930224903.zip) * [dosbox-x-mingw-win64-20200930235023.zip](https://github.com/joncampbell123/dosbox-x/releases/download/dosbox-x-v0.83.6/dosbox-x-mingw-win64-20200930235023.zip) diff --git a/build_windows_installer.bat b/build_windows_installer.bat index 39f6b1630..249d5443f 100644 --- a/build_windows_installer.bat +++ b/build_windows_installer.bat @@ -47,12 +47,12 @@ set winzip= set m32zip= set m64zip= -for %%i in (%vsbinpath%\dosbox-x-windows-vsbin-%datestr%*.zip) do set winzip=%%i +for %%i in (%vsbinpath%\dosbox-x-vsbuild-win-%datestr%*.zip) do set winzip=%%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 "%winzip%" ( - echo Couldn't find dosbox-x-windows-vsbin-%datestr%*.zip at %vsbinpath% + echo Couldn't find dosbox-x-vsbuild-win-%datestr%*.zip at %vsbinpath% goto error ) @@ -111,11 +111,11 @@ echo. echo *************************************** echo * Building DOSBox-X installers ... * echo *************************************** -if exist %isspath%\DOSBox-X-setup*.exe del %isspath%\DOSBox-X-setup*.exe +if exist %isspath%\dosbox-x-windows-*-setup.exe del %isspath%\dosbox-x-windows-*-setup.exe %isspath%\ISCC.exe %isspath%\DOSBox-X-setup.iss -if exist %isspath%\DOSBox-X-setup.exe ( - echo Copying to %vsbinpath%\DOSBox-X-setup-%datestr%.exe .. - copy /y %isspath%\DOSBox-X-setup.exe %vsbinpath%\DOSBox-X-setup-%datestr%-windows.exe +if exist %isspath%\dosbox-x-windows-*-setup.exe ( + for %%i in (%isspath%\dosbox-x-windows-*-setup.exe) do echo Copying to %vsbinpath%\%%~nxi... + copy /y %isspath%\dosbox-x-windows-*-setup.exe %vsbinpath% goto success ) diff --git a/contrib/windows/installer/DOSBox-X-setup.iss b/contrib/windows/installer/DOSBox-X-setup.iss index 0f3cfbecc..db25e7fc7 100644 --- a/contrib/windows/installer/DOSBox-X-setup.iss +++ b/contrib/windows/installer/DOSBox-X-setup.iss @@ -23,7 +23,7 @@ DisableProgramGroupPage=yes InfoBeforeFile=setup_preamble.txt InfoAfterFile=setup_epilogue.txt OutputDir=.\ -OutputBaseFilename=DOSBox-X-setup +OutputBaseFilename=dosbox-x-windows-{#MyAppVersion}-setup SetupIconFile=..\..\icons\dosbox-x.ico Compression=lzma SolidCompression=yes diff --git a/make-windows-release.pl b/make-windows-release.pl index 000c2d426..7a8ea20de 100644 --- a/make-windows-release.pl +++ b/make-windows-release.pl @@ -24,14 +24,14 @@ if ( "$branch" eq "develop-win-sdl1-async-hack-201802" ) { } $suffix = $subdir; -$suffix =~ s/^.*\/windows/vsbin/g; +$suffix =~ s/^.*\/windows/vsbuild/g; mkdir "release" unless -d "release"; mkdir "$subdir" unless -d "$subdir"; die "bin directory not exist" unless -d "bin"; -my $zipname = "dosbox-x-windows-$suffix-$datestr.zip"; +my $zipname = "dosbox-x-$suffix-win-$datestr.zip"; exit 0 if -f $zipname; die unless -f $ziptool;