adapting build scripts to use any compiler, not only vs2010

7 files changed, 73 insertions, 55 deletions

diff --git a/tools/build_scripts/z1_ReBuild_Full.bat b/tools/build_scripts/z1_ReBuild_Full.bat
index 18e28bbd68..29c33fd180 100644
--- a/tools/build_scripts/z1_ReBuild_Full.bat
+++ b/tools/build_scripts/z1_ReBuild_Full.bat
@@ -1,5 +1,5 @@
 set tp=%1
-if  "%tp%"=="" (echo "please specify target platform 32 or 64!"&&pause&&goto :EOF)
+if "%tp%"=="" (echo "please specify target platform 32 or 64!" && pause && goto :EOF)
 if /i '%tp%' == '64' set bt=64
 if /i '%tp%' == '32' (
   set ptr=Win32
@@ -7,11 +7,14 @@ if /i '%tp%' == '32' (
   set ptr=X64
 )
 
+set comp=%2
+if "%comp%"=="" (echo "please specify target compiler folder!" && pause && goto :EOF)
+
 call a_SetVar%tp%.bat
 call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat"
 if exist git_error.txt del /f /q git_error.txt
 
-pushd bin10
+pushd %comp%
 if not exist Logs mkdir Logs
 
 if /i '%tp%' == '32' (
@@ -42,22 +45,22 @@ del /F /S /Q "Release%tp%\*.pdb" >> nul
 md "Release%tp%\Languages"
 
 pushd "..\langpacks\tool"
-LangpackSuite.exe \q \prussian \n..\..\bin10\Release%tp%\Languages\langpack_russian.txt
-LangpackSuite.exe \q \pukrainian \n..\..\bin10\Release%tp%\Languages\langpack_ukrainian.txt
+LangpackSuite.exe \q \prussian \n..\..\%comp%\Release%tp%\Languages\langpack_russian.txt
+LangpackSuite.exe \q \pukrainian \n..\..\%comp%\Release%tp%\Languages\langpack_ukrainian.txt
 popd
 
 pushd "..\tools\lpgen"
-cscript /nologo translate.js /sourcelang:"belarusian" /release:"..\..\bin10\Release%tp%\Languages\langpack_belarusian.txt"
-cscript /nologo translate.js /sourcelang:"bulgarian" /release:"..\..\bin10\Release%tp%\langpack_bulgarian_nodupes.txt"
-copy /B "..\..\bin10\Release%tp%\langpack_bulgarian_nodupes.txt"+"..\..\langpacks\bulgarian\=DUPES=.txt" ..\..\bin10\Release%tp%\Languages\langpack_bulgarian.txt
-cscript /nologo translate.js /sourcelang:"czech" /release:"..\..\bin10\Release%tp%\Languages\langpack_czech.txt"
-cscript /nologo translate.js /sourcelang:"english_gb" /release:"..\..\bin10\Release%tp%\Languages\langpack_english_gb.txt"
-cscript /nologo translate.js /sourcelang:"french" /release:"..\..\bin10\Release%tp%\Languages\langpack_french.txt"
-cscript /nologo translate.js /sourcelang:"german" /release:"..\..\bin10\Release%tp%\Languages\langpack_german.txt"
-cscript /nologo translate.js /sourcelang:"polish" /release:"..\..\bin10\Release%tp%\Languages\langpack_polish.txt"
-cscript /nologo translate.js /sourcelang:"serbian" /release:"..\..\bin10\Release%tp%\Languages\langpack_serbian.txt"
-cscript /nologo translate.js /sourcelang:"spanish" /release:"..\..\bin10\Release%tp%\Languages\langpack_spanish.txt"
-del /f /q ..\..\bin10\Release%tp%\*_nodupes.txt
+cscript /nologo translate.js /sourcelang:"belarusian" /release:"..\..\%comp%\Release%tp%\Languages\langpack_belarusian.txt"
+cscript /nologo translate.js /sourcelang:"bulgarian" /release:"..\..\%comp%\Release%tp%\langpack_bulgarian_nodupes.txt"
+copy /B "..\..\%comp%\Release%tp%\langpack_bulgarian_nodupes.txt"+"..\..\langpacks\bulgarian\=DUPES=.txt" ..\..\%comp%\Release%tp%\Languages\langpack_bulgarian.txt
+cscript /nologo translate.js /sourcelang:"czech" /release:"..\..\%comp%\Release%tp%\Languages\langpack_czech.txt"
+cscript /nologo translate.js /sourcelang:"english_gb" /release:"..\..\%comp%\Release%tp%\Languages\langpack_english_gb.txt"
+cscript /nologo translate.js /sourcelang:"french" /release:"..\..\%comp%\Release%tp%\Languages\langpack_french.txt"
+cscript /nologo translate.js /sourcelang:"german" /release:"..\..\%comp%\Release%tp%\Languages\langpack_german.txt"
+cscript /nologo translate.js /sourcelang:"polish" /release:"..\..\%comp%\Release%tp%\Languages\langpack_polish.txt"
+cscript /nologo translate.js /sourcelang:"serbian" /release:"..\..\%comp%\Release%tp%\Languages\langpack_serbian.txt"
+cscript /nologo translate.js /sourcelang:"spanish" /release:"..\..\%comp%\Release%tp%\Languages\langpack_spanish.txt"
+del /f /q ..\..\%comp%\Release%tp%\*_nodupes.txt
 popd
 
 REM md "Release%tp%\Dictionaries"
diff --git a/tools/build_scripts/z1_ReBuild_Full_Stable.bat b/tools/build_scripts/z1_ReBuild_Full_Stable.bat
index 200a2adc59..d2b13e61dc 100644
--- a/tools/build_scripts/z1_ReBuild_Full_Stable.bat
+++ b/tools/build_scripts/z1_ReBuild_Full_Stable.bat
@@ -7,11 +7,14 @@ if /i '%tp%' == '32' (
   set ptr=X64
 )
 
+set comp=%2
+if "%comp%"=="" (echo "please specify target compiler folder!" && pause && goto :EOF)
+
 call a_SetVar%tp%.bat
 call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat"
 call svn_stable_ver.bat
 
-pushd bin10
+pushd %comp%
 if not exist Logs mkdir Logs
 
 if /i '%tp%' == '32' (
@@ -50,22 +53,22 @@ del /F /S /Q "Release%tp%\*.pdb" >> nul
 md "Release%tp%\Languages"
 
 pushd "..\langpacks\tool"
-LangpackSuite.exe \q \prussian \n..\..\bin10\Release%tp%\Languages\langpack_russian.txt
-LangpackSuite.exe \q \pukrainian \n..\..\bin10\Release%tp%\Languages\langpack_ukrainian.txt
+LangpackSuite.exe \q \prussian \n..\..\%comp%\Release%tp%\Languages\langpack_russian.txt
+LangpackSuite.exe \q \pukrainian \n..\..\%comp%\Release%tp%\Languages\langpack_ukrainian.txt
 popd
 
 pushd "..\tools\lpgen"
-cscript /nologo translate.js /sourcelang:"belarusian" /release:"..\..\bin10\Release%tp%\Languages\langpack_belarusian.txt"
-cscript /nologo translate.js /sourcelang:"bulgarian" /release:"..\..\bin10\Release%tp%\langpack_bulgarian_nodupes.txt"
-copy /B "..\..\bin10\Release%tp%\langpack_bulgarian_nodupes.txt"+"..\..\langpacks\bulgarian\=DUPES=.txt" ..\..\bin10\Release%tp%\Languages\langpack_bulgarian.txt
-cscript /nologo translate.js /sourcelang:"czech" /release:"..\..\bin10\Release%tp%\Languages\langpack_czech.txt"
-cscript /nologo translate.js /sourcelang:"english_gb" /release:"..\..\bin10\Release%tp%\Languages\langpack_english_gb.txt"
-cscript /nologo translate.js /sourcelang:"french" /release:"..\..\bin10\Release%tp%\Languages\langpack_french.txt"
-cscript /nologo translate.js /sourcelang:"german" /release:"..\..\bin10\Release%tp%\Languages\langpack_german.txt"
-cscript /nologo translate.js /sourcelang:"polish" /release:"..\..\bin10\Release%tp%\Languages\langpack_polish.txt"
-cscript /nologo translate.js /sourcelang:"serbian" /release:"..\..\bin10\Release%tp%\Languages\langpack_serbian.txt"
-cscript /nologo translate.js /sourcelang:"spanish" /release:"..\..\bin10\Release%tp%\Languages\langpack_spanish.txt"
-del /f /q ..\..\bin10\Release%tp%\*_nodupes.txt
+cscript /nologo translate.js /sourcelang:"belarusian" /release:"..\..\%comp%\Release%tp%\Languages\langpack_belarusian.txt"
+cscript /nologo translate.js /sourcelang:"bulgarian" /release:"..\..\%comp%\Release%tp%\langpack_bulgarian_nodupes.txt"
+copy /B "..\..\%comp%\Release%tp%\langpack_bulgarian_nodupes.txt"+"..\..\langpacks\bulgarian\=DUPES=.txt" ..\..\%comp%\Release%tp%\Languages\langpack_bulgarian.txt
+cscript /nologo translate.js /sourcelang:"czech" /release:"..\..\%comp%\Release%tp%\Languages\langpack_czech.txt"
+cscript /nologo translate.js /sourcelang:"english_gb" /release:"..\..\%comp%\Release%tp%\Languages\langpack_english_gb.txt"
+cscript /nologo translate.js /sourcelang:"french" /release:"..\..\%comp%\Release%tp%\Languages\langpack_french.txt"
+cscript /nologo translate.js /sourcelang:"german" /release:"..\..\%comp%\Release%tp%\Languages\langpack_german.txt"
+cscript /nologo translate.js /sourcelang:"polish" /release:"..\..\%comp%\Release%tp%\Languages\langpack_polish.txt"
+cscript /nologo translate.js /sourcelang:"serbian" /release:"..\..\%comp%\Release%tp%\Languages\langpack_serbian.txt"
+cscript /nologo translate.js /sourcelang:"spanish" /release:"..\..\%comp%\Release%tp%\Languages\langpack_spanish.txt"
+del /f /q ..\..\%comp%\Release%tp%\*_nodupes.txt
 popd
 
 md "Release%tp%\Docs"
diff --git a/tools/build_scripts/z3_PackArchives.bat b/tools/build_scripts/z3_PackArchives.bat
index eff4dc58f7..a4416e8ff5 100644
--- a/tools/build_scripts/z3_PackArchives.bat
+++ b/tools/build_scripts/z3_PackArchives.bat
@@ -1,12 +1,15 @@
 set tp=%1
-if  "%tp%"=="" (echo "please specify target platform 32 or 64!"&&pause&&goto :EOF)
+if "%tp%"=="" (echo "please specify target platform 32 or 64!" && pause && goto :EOF)
 if /i '%tp%' == '64' set bit=_x64
 
+set comp=%2
+if "%comp%"=="" (echo "please specify target compiler folder!" && pause && goto :EOF)
+
 call a_SetVar%tp%.bat
 
 if not exist %ArchDistr% mkdir %ArchDistr%
 
-cd bin10
+cd %comp%
 rem for /F "tokens=2" %%x in (..\build\build.no) do set ver2=%%x
 rem for /F "tokens=3" %%y in (..\build\build.no) do set ver3=%%y
 
@@ -15,7 +18,7 @@ cd Symbols%tp%
 move /Y miranda-ng-debug*.7z %ArchDistr%
 cd ../..
 
-pushd "bin10\Release%tp%"
+pushd "%comp%\Release%tp%"
 
 rem if exist %AutoCompile%\miranda-ng-v0.9*-alpha-latest%bit%.7z del /F /Q %AutoCompile%\miranda-ng-v0.9*-alpha-latest%bit%.7z
 %CompressIt% a -r -mx=9 "miranda-ng-alpha-latest%bit%.7z" Miranda%tp%.exe -i@..\..\z3_PackArchives.txt
diff --git a/tools/build_scripts/z3_PackArchivesStable.bat b/tools/build_scripts/z3_PackArchivesStable.bat
index 45696d3609..631967fd70 100644
--- a/tools/build_scripts/z3_PackArchivesStable.bat
+++ b/tools/build_scripts/z3_PackArchivesStable.bat
@@ -9,15 +9,18 @@ if /i '%tp%' == '64' set VcURL=http://download.microsoft.com/download/A/8/0/A807
 if /i '%tp%' == '32' set CompileString=..\Tools\InnoSetup5\ISCC.exe /Dptx86 /DAppVer=%MirVer% "MirandaNG.iss" 
 if /i '%tp%' == '64' set CompileString=..\Tools\InnoSetup5\ISCC.exe /DAppVer=%MirVer% "MirandaNG.iss"
 
+set comp=%2
+if "%comp%"=="" (echo "please specify target compiler folder!" && pause && goto :EOF)
+
 call a_SetVar%tp%.bat
 if not exist %ArchDistr% mkdir %ArchDistr%
 
-pushd "bin10\Symbols%tp%"
+pushd "%comp%\Symbols%tp%"
 %CompressIt% a -mx=9 "miranda-ng-debug-symbols_pdb%bit%.7z" *.pdb .\Plugins\*.pdb .\Core\*.pdb .\Libs\*.pdb
 move /Y miranda-ng-debug*.7z %ArchDistr%
 popd
 
-pushd "bin10\Release%tp%"
+pushd "%comp%\Release%tp%"
 
 if exist %ArchDistr%\miranda-ng-v0.9*%bit%.7z del /F /Q %ArchDistr%\miranda-ng-v0.9*%bit%.7z
 if exist %ArchDistr%\miranda-ng-v0.9*%bit%.exe del /F /Q %ArchDistr%\miranda-ng-v0.9*%bit%.exe
diff --git a/tools/build_scripts/zz_zBuildNightly.bat b/tools/build_scripts/zz_zBuildNightly.bat
index a3007a662a..30e37ba439 100644
--- a/tools/build_scripts/zz_zBuildNightly.bat
+++ b/tools/build_scripts/zz_zBuildNightly.bat
@@ -1,18 +1,20 @@
-call z1_ReBuild_Full.bat 32
+set comp=bin10
 
-call z1_ReBuild_Full.bat 64
+call z1_ReBuild_Full.bat 32 %comp%
 
-call z2_PackPluginUpdater.bat 32 DEV_N_STABLE
+call z1_ReBuild_Full.bat 64 %comp%
 
-call z2_PackPluginUpdater.bat 64 DEV_N_STABLE
+call z2_PackPluginUpdater.bat 32 DEV_N_STABLE %comp%
 
-pushd bin10
+call z2_PackPluginUpdater.bat 64 DEV_N_STABLE %comp%
+
+pushd %comp%
 if exist z_Errors*.txt echo There were errors! && pause
 popd
 
-call z3_PackArchives.bat 32
+call z3_PackArchives.bat 32 %comp%
 
-call z3_PackArchives.bat 64
+call z3_PackArchives.bat 64 %comp%
 
 call z4_UploadPluginUpdater.bat 32
 
diff --git a/tools/build_scripts/zz_zRebuildUploadStable.bat b/tools/build_scripts/zz_zRebuildUploadStable.bat
index 851cecee03..4e127f61c0 100644
--- a/tools/build_scripts/zz_zRebuildUploadStable.bat
+++ b/tools/build_scripts/zz_zRebuildUploadStable.bat
@@ -2,6 +2,8 @@
 echo WARNING!!! You are about to compile and upload STABLE versions of Miranda NG! Are you absolutely sure?!
 pause
 
+set comp=bin10
+
 for /F "tokens=1,2,3 delims= " %%i in (build/build.no.stable) do set Branch=%%i_%%j_%%k
 
 call git_update.bat %Branch%
@@ -9,21 +11,21 @@ set GIT_STATUS=%ERRORLEVEL%
 if %GIT_STATUS%==0 echo Git update success
 if not %GIT_STATUS%==0 goto :Error
 
-call z1_ReBuild_Full_Stable.bat 32
+call z1_ReBuild_Full_Stable.bat 32 %comp%
 
-call z1_ReBuild_Full_Stable.bat 64
+call z1_ReBuild_Full_Stable.bat 64 %comp%
 
-call z2_PackPluginUpdater.bat 32
+call z2_PackPluginUpdater.bat 32 DEV_STABLE %comp%
 
-call z2_PackPluginUpdater.bat 64
+call z2_PackPluginUpdater.bat 64 DEV_STABLE %comp%
 
-pushd bin10
+pushd %comp%
 if exist z_Errors*.txt echo There were errors! && pause
 popd
 
-call z3_PackArchivesStable.bat 32
+call z3_PackArchivesStable.bat 32 %comp%
 
-call z3_PackArchivesStable.bat 64
+call z3_PackArchivesStable.bat 64 %comp%
 
 call z4_UploadPluginUpdaterStable.bat 32
 
diff --git a/tools/build_scripts/zz_zRebuildUploadTrunk.bat b/tools/build_scripts/zz_zRebuildUploadTrunk.bat
index 89e9224fed..85521f89c5 100644
--- a/tools/build_scripts/zz_zRebuildUploadTrunk.bat
+++ b/tools/build_scripts/zz_zRebuildUploadTrunk.bat
@@ -1,23 +1,25 @@
+set comp=bin10
+
 call git_update.bat master
 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
+call z1_ReBuild_Full.bat 32 %comp%
 
-call z1_ReBuild_Full.bat 64
+call z1_ReBuild_Full.bat 64 %comp%
 
-call z2_PackPluginUpdater.bat 32 DEV_N_STABLE
+call z2_PackPluginUpdater.bat 32 DEV_N_STABLE %comp%
 
-call z2_PackPluginUpdater.bat 64 DEV_N_STABLE
+call z2_PackPluginUpdater.bat 64 DEV_N_STABLE %comp%
 
-pushd bin10
+pushd %comp%
 if exist z_Errors*.txt echo There were errors! && pause
 popd
 
-call z3_PackArchives.bat 32
+call z3_PackArchives.bat 32 %comp%
 
-call z3_PackArchives.bat 64
+call z3_PackArchives.bat 64 %comp%
 
 call z4_UploadPluginUpdater.bat 32