Fix BuildAll.vs2019x64_vs2017Win32.cmd stopped running midway

diff --git a/BuildBin.vs2017.cmd b/BuildBin.vs2017.cmd
index 0665934..bb0194e 100644 (file)
--- a/BuildBin.vs2017.cmd
+++ b/BuildBin.vs2017.cmd
@@ -27,13 +27,18 @@ if "%1" == "" (
 ) else (
   set PLATFORM_VS=%1
 )
+if "%PLATFORM_VS%" == "Win32" (
+  set PLATFORM_DIR=
+) else (
+  set PLATFORM_DIR=%PLATFORM_VS%
+)
 MSBuild WinMerge.vs2017.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%PLATFORM_VS%" || goto :eof
 endlocal
 
 if exist "%SIGNBAT_PATH%" (
-  call "%SIGNBAT_PATH%" Build\%PLATFORM%\Release\WinMergeU.exe
+  call "%SIGNBAT_PATH%" Build\%PLATFORM_DIR%\Release\WinMergeU.exe
 )
 
-mkdir Build\%PLATFORM%\Release\%APPVER% 2> NUL
-copy Build\%PlATFORM%\Release\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
+mkdir Build\%PLATFORM_DIR%\Release\%APPVER% 2> NUL
+copy Build\%PlATFORM_DIR%\Release\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
 goto :eof

diff --git a/BuildBin.vs2019.cmd b/BuildBin.vs2019.cmd
index bee0e9c..be944b5 100644 (file)
--- a/BuildBin.vs2019.cmd
+++ b/BuildBin.vs2019.cmd
@@ -27,13 +27,18 @@ if "%1" == "" (
 ) else (
   set PLATFORM_VS=%1
 )
+if "%PLATFORM_VS%" == "Win32" (
+  set PLATFORM_DIR=
+) else (
+  set PLATFORM_DIR=%PLATFORM_VS%
+)
 MSBuild WinMerge.vs2019.sln /t:Rebuild /p:Configuration="Release" /p:Platform="%PLATFORM_VS%" || goto :eof
 endlocal
 
 if exist "%SIGNBAT_PATH%" (
-  call "%SIGNBAT_PATH%" Build\%PLATFORM%\Release\WinMergeU.exe
+  call "%SIGNBAT_PATH%" Build\%PLATFORM_DIR%\Release\WinMergeU.exe
 )
 
-mkdir Build\%PLATFORM%\Release\%APPVER% 2> NUL
-copy Build\%PlATFORM%\Release\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
+mkdir Build\%PLATFORM_DIR%\Release\%APPVER% 2> NUL
+copy Build\%PlATFORM_DIR%\Release\*.pdb "Build\%PLATFORM%\Release\%APPVER%\"
 goto :eof