In Preparation for VS2019 (now in Preview) (5)

* Bring the `Build*.vs2019.cmd` files up-to-date with recent changes to the `Build*.vs2017.cmd`
files

--HG--
branch : stable

diff --git a/BuildAll.vs2019.cmd b/BuildAll.vs2019.cmd
index e4c5c14..c0024e7 100644 (file)
--- a/BuildAll.vs2019.cmd
+++ b/BuildAll.vs2019.cmd
@@ -1,9 +1,9 @@
 pushd "%~dp0"
 call BuildManual.cmd
-call BuildBin.vs2019.cmd
+call BuildBin.vs2019.cmd %1
 pushd Testing\GoogleTest\UnitTests
 UnitTests.exe || exit
 popd
-call BuildInstaller.cmd
-call BuildArc.cmd
+call BuildInstaller.cmd %1
+call BuildArc.cmd %1
 popd

diff --git a/BuildBin.vs2019.cmd b/BuildBin.vs2019.cmd
index b5b6dba..9c27455 100644 (file)
--- a/BuildBin.vs2019.cmd
+++ b/BuildBin.vs2019.cmd
@@ -8,20 +8,33 @@ for /f "usebackq tokens=*" %%i in (`"%programfiles(x86)%\microsoft visual studio
   set InstallDir=%%i
 )
 if exist "%InstallDir%\Common7\Tools\vsdevcmd.bat" (
-  call "%InstallDir%\Common7\Tools\vsdevcmd.bat %*
+  call "%InstallDir%\Common7\Tools\vsdevcmd.bat
 )
-MSBuild WinMerge.vs2019.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="Win32" || pause
-MSBuild WinMerge.vs2019.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="x64" || pause
+
+if "%1" == "" (
+  call :BuildBin
+  call :BuildBin x64
+) else (
+  call :BuildBin %1 
+)
+
+goto :eof
+
+:BuildBin
+set PLATFORM=%1
+if "%1" == "" (
+  set PLATFORM_VS=Win32
+) else (
+  set PLATFORM_VS=%1
+)
+MSBuild WinMerge.vs2019.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="%PLATFORM_VS%" || pause
 endlocal
 
 if exist "%SIGNBAT_PATH%" (
-  call "%SIGNBAT_PATH%" Build\MergeUnicodeRelease\WinMergeU.exe
-  call "%SIGNBAT_PATH%" Build\MergeUnicodeRelease\MergeLang.dll
-  call "%SIGNBAT_PATH%" Build\x64\MergeUnicodeRelease\WinMergeU.exe
-  call "%SIGNBAT_PATH%" Build\x64\MergeUnicodeRelease\MergeLang.dll
+  call "%SIGNBAT_PATH%" Build\%PLATFORM%\MergeUnicodeRelease\WinMergeU.exe
+  call "%SIGNBAT_PATH%" Build\%PLATFORM%\MergeUnicodeRelease\MergeLang.dll
 )
 
-mkdir Build\MergeUnicodeRelease\%APPVER% 2> NUL
-mkdir Build\x64\MergeUnicodeRelease\%APPVER% 2> NUL
-copy Build\MergeUnicodeRelease\*.pdb "Build\MergeUnicodeRelease\%APPVER%\"
-copy Build\x64\MergeUnicodeRelease\*.pdb "Build\x64\MergeUnicodeRelease\%APPVER%\"
+mkdir Build\%PLATFORM%\MergeUnicodeRelease\%APPVER% 2> NUL
+copy Build\%PlATFORM%\MergeUnicodeRelease\*.pdb "Build\%PLATFORM%\MergeUnicodeRelease\%APPVER%\"
+goto :eof