final fix for build scripts to avoid environment conflicts

4 files changed, 27 insertions, 38 deletions

diff --git a/tools/build_scripts/git_update.bat b/tools/build_scripts/git_update.bat
index e0292027fd..684ee6d786 100644
--- a/tools/build_scripts/git_update.bat
+++ b/tools/build_scripts/git_update.bat
@@ -7,6 +7,6 @@ git checkout %1
 
 git reset --hard
 
-git pull --rebase=true --progress -v 2>&1 > update.log
+git pull --rebase=true --progress -v
 
 echo %date% %time% > timestamp.chk
\ No newline at end of file
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
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
diff --git a/tools/build_scripts/zz_zRebuildUploadTrunk.bat b/tools/build_scripts/zz_zRebuildUploadTrunk.bat
index 85521f89c5..dd5a6ea259 100644
--- a/tools/build_scripts/zz_zRebuildUploadTrunk.bat
+++ b/tools/build_scripts/zz_zRebuildUploadTrunk.bat
@@ -5,9 +5,9 @@ set GIT_STATUS=%ERRORLEVEL%
 if %GIT_STATUS%==0 echo Git update success
 if not %GIT_STATUS%==0 goto :Error
 
-call z1_ReBuild_Full.bat 32 %comp%
+start /min /wait z1_ReBuild_Full.bat 32 %comp%
 
-call z1_ReBuild_Full.bat 64 %comp%
+start /min /wait z1_ReBuild_Full.bat 64 %comp%
 
 call z2_PackPluginUpdater.bat 32 DEV_N_STABLE %comp%