diff options
| author | George Hazan <ghazan@miranda.im> | 2017-09-29 20:43:36 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-09-29 20:43:36 +0300 |
| commit | 62f5a4e21abc2a26cc59fdbd669d13052a4a53bd (patch) | |
| tree | 1f6961f2fc5297de9007e7ce58f42676f8d39326 /tools/build_scripts/z1_ReBuild_Full.bat | |
| parent | 36b9ade1bf6136ccc8a27b2803522840b665946f (diff) | |
final fix for build scripts to avoid environment conflicts
Diffstat (limited to 'tools/build_scripts/z1_ReBuild_Full.bat')
| -rw-r--r-- | tools/build_scripts/z1_ReBuild_Full.bat | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/tools/build_scripts/z1_ReBuild_Full.bat b/tools/build_scripts/z1_ReBuild_Full.bat index 97377e94af..4ca8985378 100644 --- a/tools/build_scripts/z1_ReBuild_Full.bat +++ b/tools/build_scripts/z1_ReBuild_Full.bat @@ -12,18 +12,6 @@ if "%comp%"=="" (echo "please specify target compiler folder!" && pause && goto 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" - ) -) - if exist git_error.txt del /f /q git_error.txt pushd %comp% @@ -40,13 +28,21 @@ pushd ..\build 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% + start /min /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 call compile%tp%.bat "%comp%" @@ -126,11 +122,8 @@ copy /V /Y ..\..\redist\x%tp%\DbChecker.bat copy /V /Y ..\..\redist\x%tp%\bass\*.dll "Plugins\BASS" popd +exit -rem put me at the end of script -rem getting checksum for dlls -rem "goto :eof" here to avoid run this subroutine at the end of script, so script will run till this point, and subroutine will called only where we need it -goto :eof rem the subroutine itself starts here :checksum rem change the dir to first parameter, and remember it |