diff options
Diffstat (limited to 'tools/build_scripts/z1_ReBuild_Full_Stable.bat')
| -rw-r--r-- | tools/build_scripts/z1_ReBuild_Full_Stable.bat | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/tools/build_scripts/z1_ReBuild_Full_Stable.bat b/tools/build_scripts/z1_ReBuild_Full_Stable.bat index 2731f1595b..9e12ade93a 100644 --- a/tools/build_scripts/z1_ReBuild_Full_Stable.bat +++ b/tools/build_scripts/z1_ReBuild_Full_Stable.bat @@ -11,18 +11,6 @@ set comp=%2 if "%comp%"=="" (echo "please specify target compiler folder!" && pause && goto :EOF) call a_SetVar%tp%.bat -if "%comp%"=="bin10" ( - call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" -) else if "%comp%"=="bin12" ( - call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" -) else if "%comp%"=="bin15" ( - if /i '%tp%' == '32' ( - call "%VS141COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvars32.bat" - ) else if /i '%tp%' == '64' ( - call "%VS141COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvars64.bat" - ) -) - call svn_stable_ver.bat pushd %comp% @@ -42,13 +30,21 @@ move make_ver_stable.bat make_ver.bat call make_ver.bat popd -MsBuild.exe "mir_full.sln" /m /t:Rebuild /p:Configuration=Release;Platform="%ptr%" /fileLogger /fileLoggerParameters:LogFile=Logs\full%tp%.log;errorsonly;warningsonly;summary -MsBuild.exe "mir_icons.sln" /m /t:Rebuild /p:Configuration=Release;Platform="%ptr%" /fileLogger /fileLoggerParameters:LogFile=Logs\icons%tp%.log;errorsonly;warningsonly;summary - if "%comp%" == "bin10" ( start /wait z1_ReBuild_w810.bat %tp% ) +if "%comp%"=="bin10" ( + call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" +) else if "%comp%"=="bin12" ( + call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" +) else if "%comp%"=="bin15" ( + call "%VS141COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvars%tp%.bat" +) + +MsBuild.exe "mir_full.sln" /m /t:Rebuild /p:Configuration=Release;Platform="%ptr%" /fileLogger /fileLoggerParameters:LogFile=Logs\full%tp%.log;errorsonly;warningsonly;summary +MsBuild.exe "mir_icons.sln" /m /t:Rebuild /p:Configuration=Release;Platform="%ptr%" /fileLogger /fileLoggerParameters:LogFile=Logs\icons%tp%.log;errorsonly;warningsonly;summary + call pascal%tp%.bat pushd ..\plugins\NotifyAnything\SendLog "%comp%" call compile%tp%.bat |