From b364f75db47a6924a02972726d404688fcbc741e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D0=BE=D0=BD=D0=B4=D0=B0=D1=80=D0=B5=D0=B2=20=D0=98?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD?= Date: Sun, 23 Apr 2017 09:53:18 +0200 Subject: [PATCH] build scripts for VS Enterprise (as exception). --- _Clean.bat | 4 ++++ _GenerateAllSetups.bat | 4 ++++ _ReBuildDebug.bat | 4 ++++ _ReBuildRelease.bat | 4 ++++ _RebuildReleaseAndBuildUnits.bat | 4 ++++ _RebuildReleaseAndRunTests.bat | 5 +++++ 6 files changed, 25 insertions(+) diff --git a/_Clean.bat b/_Clean.bat index d3e782ded..1aa5198a9 100644 --- a/_Clean.bat +++ b/_Clean.bat @@ -1,2 +1,6 @@ +if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" ( +"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" /t:clean PascalABCNET.sln +) else ( "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\msbuild.exe" /t:clean PascalABCNET.sln +) @IF %ERRORLEVEL% NEQ 0 PAUSE diff --git a/_GenerateAllSetups.bat b/_GenerateAllSetups.bat index 5a379ae75..e6948d4e4 100644 --- a/_GenerateAllSetups.bat +++ b/_GenerateAllSetups.bat @@ -16,7 +16,11 @@ Utils\ReplaceInFiles\ReplaceInFiles.exe Configuration\Version.defs Configuration Utils\ReplaceInFiles\ReplaceInFiles.exe Configuration\Version.defs ReleaseGenerators\PascalABCNET_version.nsh.tmpl ReleaseGenerators\PascalABCNET_version.nsh Utils\ReplaceInFiles\ReplaceInFiles.exe Configuration\Version.defs Configuration\pabcversion.txt.tmpl Release\pabcversion.txt +if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" ( +"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" /t:rebuild /property:Configuration=Release PascalABCNET.sln +) else ( "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\msbuild.exe" /t:rebuild /property:Configuration=Release PascalABCNET.sln +) @IF %ERRORLEVEL% NEQ 0 GOTO ERROR cd ReleaseGenerators diff --git a/_ReBuildDebug.bat b/_ReBuildDebug.bat index cf1929cd0..198176964 100644 --- a/_ReBuildDebug.bat +++ b/_ReBuildDebug.bat @@ -1,2 +1,6 @@ +if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" ( +"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" /t:rebuild PascalABCNET.sln +) else ( "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\msbuild.exe" /t:rebuild PascalABCNET.sln +) @IF %ERRORLEVEL% NEQ 0 PAUSE \ No newline at end of file diff --git a/_ReBuildRelease.bat b/_ReBuildRelease.bat index 5672c9371..a6208ab84 100644 --- a/_ReBuildRelease.bat +++ b/_ReBuildRelease.bat @@ -1,2 +1,6 @@ +if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" ( +"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" /t:rebuild /verbosity:d /property:Configuration=Release PascalABCNET.sln +) else ( "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\msbuild.exe" /t:rebuild /verbosity:d /property:Configuration=Release PascalABCNET.sln +) @IF %ERRORLEVEL% NEQ 0 PAUSE \ No newline at end of file diff --git a/_RebuildReleaseAndBuildUnits.bat b/_RebuildReleaseAndBuildUnits.bat index a24d4f992..cca58dc61 100644 --- a/_RebuildReleaseAndBuildUnits.bat +++ b/_RebuildReleaseAndBuildUnits.bat @@ -1,4 +1,8 @@ +if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" ( +"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" /t:rebuild /property:Configuration=Release /p:Platform="Any CPU" PascalABCNET.sln +) else ( "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\msbuild.exe" /t:rebuild /property:Configuration=Release /p:Platform="Any CPU" PascalABCNET.sln +) @IF %ERRORLEVEL% NEQ 0 GOTO ERROR cd ReleaseGenerators diff --git a/_RebuildReleaseAndRunTests.bat b/_RebuildReleaseAndRunTests.bat index 3898b4cca..24e33ade6 100644 --- a/_RebuildReleaseAndRunTests.bat +++ b/_RebuildReleaseAndRunTests.bat @@ -1,4 +1,9 @@ +if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" ( +"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe" /t:rebuild /property:Configuration=Release /p:Platform="Any CPU" PascalABCNET.sln +) else ( "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\msbuild.exe" /t:rebuild /property:Configuration=Release /p:Platform="Any CPU" PascalABCNET.sln +) + @IF %ERRORLEVEL% NEQ 0 GOTO ERROR cd ReleaseGenerators