final pack of changes for builder

12 files changed, 24 insertions, 35 deletions

diff --git a/tools/build_scripts/a_SetVar32.bat b/tools/build_scripts/a_SetVar32.bat
index 8e2a9dccaf..902f276dfd 100644
--- a/tools/build_scripts/a_SetVar32.bat
+++ b/tools/build_scripts/a_SetVar32.bat
@@ -11,5 +11,4 @@ set Errors=..\z_Errors.txt
 set NoErrors=..\z_No_Errors.txt
 set CompressIt=%SourceDir%\tools\7-zip\7z.exe
 set ZipIt=%SourceDir%\tools\7-zip\7z.exe a -r -tzip
-set WinSCPini="%DropDir%\Docs\watcher\WinSCP_dsk6500.ini"
-set WinSCP=%SourceDir%\tools\WinSCP\WinSCP.com /ini=%WinSCPini%
\ No newline at end of file
+set WinSCP=%SourceDir%\tools\WinSCP\WinSCP.com
diff --git a/tools/build_scripts/a_SetVar64.bat b/tools/build_scripts/a_SetVar64.bat
index f6fdbe8842..d5f6d6e9b6 100644
--- a/tools/build_scripts/a_SetVar64.bat
+++ b/tools/build_scripts/a_SetVar64.bat
@@ -11,5 +11,4 @@ set Errors=..\z_Errors64.txt
 set NoErrors=..\z_No_Errors64.txt
 set CompressIt=%SourceDir%\tools\7-zip\7z.exe
 set ZipIt=%SourceDir%\tools\7-zip\7z.exe a -r -tzip
-set WinSCPini="%DropDir%\Docs\watcher\WinSCP_dsk6500.ini"
-set WinSCP=%SourceDir%\tools\WinSCP\WinSCP.com /ini=%WinSCPini%
\ No newline at end of file
+set WinSCP=%SourceDir%\tools\WinSCP\WinSCP.com
diff --git a/tools/build_scripts/bin10/z1_ReBuild_w810.bat b/tools/build_scripts/bin10/z1_ReBuild_w810.bat
index f20def3076..23c99cce21 100644
--- a/tools/build_scripts/bin10/z1_ReBuild_w810.bat
+++ b/tools/build_scripts/bin10/z1_ReBuild_w810.bat
@@ -7,8 +7,7 @@ if /i '%tp%' == '32' (
   set ptr=X64
 )
 
-call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
-
+call "%VS120COMNTOOLS%\VsDevCmd.bat"
 
 MsBuild.exe "fwin8_10.sln" /m /t:Rebuild /p:Configuration=Release;Platform="%ptr%" /fileLogger /fileLoggerParameters:LogFile=Logs\fwin8_10%tp%.log;errorsonly;warningsonly;summary
 
diff --git a/tools/build_scripts/z1_ReBuild_Full.bat b/tools/build_scripts/z1_ReBuild_Full.bat
index 3eb9e9df4b..a4a40956b2 100644
--- a/tools/build_scripts/z1_ReBuild_Full.bat
+++ b/tools/build_scripts/z1_ReBuild_Full.bat
@@ -13,12 +13,13 @@ if exist git_error.txt del /f /q git_error.txt
 REM call git_update.bat
 
 pushd bin10
-if not exist log mkdir log
-REM if /i '%tp%' == '32' (
-REM if exist "Release" rd /Q /S "Release" >nul
-REM )
-REM if exist "Release%tp%" rd /Q /S "Release%tp%" >nul
-REM if exist "Symbols%tp%" rd /Q /S "Symbols%tp%" >nul
+if not exist Logs mkdir Logs
+
+if /i '%tp%' == '32' (
+  if exist "Release" rd /Q /S "Release" >nul
+)
+if exist "Release%tp%" rd /Q /S "Release%tp%" >nul
+if exist "Symbols%tp%" rd /Q /S "Symbols%tp%" >nul
 
 if exist "..\include\m_version.h" del /F /Q "..\include\m_version.h"
 pushd ..\build
@@ -26,6 +27,7 @@ call make_ver.bat
 popd
 
 MsBuild.exe "full.sln" /m /t:Rebuild /p:Configuration=Release;Platform="%ptr%" /fileLogger /fileLoggerParameters:LogFile=Logs\full%tp%.log;errorsonly;warningsonly;summary
+start /wait z1_ReBuild_w810.bat %tp%
 call pascal%tp%.bat
 pushd ..\plugins\NotifyAnything\SendLog
 call compile%tp%.bat
diff --git a/tools/build_scripts/z1_ReBuild_Full_Stable.bat b/tools/build_scripts/z1_ReBuild_Full_Stable.bat
index 944958d521..b52c173747 100644
--- a/tools/build_scripts/z1_ReBuild_Full_Stable.bat
+++ b/tools/build_scripts/z1_ReBuild_Full_Stable.bat
@@ -12,12 +12,13 @@ call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat"
 call svn_stable_ver.bat
 
 pushd bin10
-if not exist log mkdir log
-REM if /i '%tp%' == '32' (
-REM if exist "Release" rd /Q /S "Release" >nul
-REM )
-REM if exist "Release%tp%" rd /Q /S "Release%tp%" >nul
-REM if exist "Symbols%tp%" rd /Q /S "Symbols%tp%" >nul
+if not exist Logs mkdir Logs
+
+if /i '%tp%' == '32' (
+  if exist "Release" rd /Q /S "Release" >nul
+)
+if exist "Release%tp%" rd /Q /S "Release%tp%" >nul
+if exist "Symbols%tp%" rd /Q /S "Symbols%tp%" >nul
 
 if exist "..\include\m_version.h" del /F /Q "..\include\m_version.h"
 pushd ..\build
@@ -25,6 +26,7 @@ call make_ver_stable.bat
 popd
 
 MsBuild.exe "full.sln" /m /t:Rebuild /p:Configuration=Release;Platform="%ptr%" /fileLogger /fileLoggerParameters:LogFile=Logs\full%tp%.log;errorsonly;warningsonly;summary
+start /wait z1_ReBuild_w810.bat %tp%
 call pascal%tp%.bat
 pushd ..\plugins\NotifyAnything\SendLog
 call compile%tp%.bat
diff --git a/tools/build_scripts/z4_UploadPluginUpdater.txt b/tools/build_scripts/z4_UploadPluginUpdater.txt
index 30351ee9c8..ecdb608bdd 100644
--- a/tools/build_scripts/z4_UploadPluginUpdater.txt
+++ b/tools/build_scripts/z4_UploadPluginUpdater.txt
@@ -2,7 +2,7 @@ option batch abort
 
 option confirm off
 
-open watcher
+open miranda-ng
 
 put %Arch%\Icons\*.zip x%tp%/Icons/
 put %Arch%\Languages\lang*.zip x%tp%/Languages/
diff --git a/tools/build_scripts/z4_UploadPluginUpdaterStable.txt b/tools/build_scripts/z4_UploadPluginUpdaterStable.txt
index cdc0cf243c..c8e713dcf1 100644
--- a/tools/build_scripts/z4_UploadPluginUpdaterStable.txt
+++ b/tools/build_scripts/z4_UploadPluginUpdaterStable.txt
@@ -2,7 +2,7 @@ option batch abort
 
 option confirm off
 
-open watcher
+open miranda-ng
 
 put %Arch%\Icons\*.zip distr/stable/x%tp%/Icons/
 put %Arch%\Languages\lang*.zip distr/stable/x%tp%/Languages/
diff --git a/tools/build_scripts/z5_UploadArchives.txt b/tools/build_scripts/z5_UploadArchives.txt
index 5edbd58917..33e55bcecb 100644
--- a/tools/build_scripts/z5_UploadArchives.txt
+++ b/tools/build_scripts/z5_UploadArchives.txt
@@ -2,7 +2,7 @@ option batch abort
 
 option confirm off
 
-open watcher
+open miranda-ng
 
 put "%ArchDistr%\miranda-ng-alpha-latest.7z" distr/
 put "%ArchDistr%\miranda-ng-alpha-latest_x64.7z" distr/
diff --git a/tools/build_scripts/z5_UploadArchivesStable.txt b/tools/build_scripts/z5_UploadArchivesStable.txt
index e2804fe6be..58f5648ff8 100644
--- a/tools/build_scripts/z5_UploadArchivesStable.txt
+++ b/tools/build_scripts/z5_UploadArchivesStable.txt
@@ -2,7 +2,7 @@ option batch abort
 
 option confirm off
 
-open watcher
+open miranda-ng
 
 rm distr/stable/version.txt
 rm distr/stable/miranda-ng-v*.7z
diff --git a/tools/build_scripts/z7_UploadInstallers.txt b/tools/build_scripts/z7_UploadInstallers.txt
index 3d42d4704a..ccf6ed3850 100644
--- a/tools/build_scripts/z7_UploadInstallers.txt
+++ b/tools/build_scripts/z7_UploadInstallers.txt
@@ -2,7 +2,7 @@ option batch abort
 
 option confirm off
 
-open watcher
+open miranda-ng
 
 put "%ArchDistr%\miranda-ng-alpha-latest.exe" distr/
 put "%ArchDistr%\miranda-ng-alpha-latest_x64.exe" distr/
diff --git a/tools/build_scripts/zz_zRebuildUploadStable.bat b/tools/build_scripts/zz_zRebuildUploadStable.bat
index 3313bdcc0c..1ec673df60 100644
--- a/tools/build_scripts/zz_zRebuildUploadStable.bat
+++ b/tools/build_scripts/zz_zRebuildUploadStable.bat
@@ -7,12 +7,6 @@ set GIT_STATUS=%ERRORLEVEL%
 if %GIT_STATUS%==0 echo Git update success
 if not %GIT_STATUS%==0 goto :Error
 
-pushd bin10
-start /wait z1_ReBuild_w810.bat 32
-
-start /wait z1_ReBuild_w810.bat 64
-popd
-
 call z1_ReBuild_Full_Stable.bat 32
 
 call z1_ReBuild_Full_Stable.bat 64
diff --git a/tools/build_scripts/zz_zRebuildUploadTrunk.bat b/tools/build_scripts/zz_zRebuildUploadTrunk.bat
index 0f0441bba9..70898b5463 100644
--- a/tools/build_scripts/zz_zRebuildUploadTrunk.bat
+++ b/tools/build_scripts/zz_zRebuildUploadTrunk.bat
@@ -3,12 +3,6 @@ set GIT_STATUS=%ERRORLEVEL%
 if %GIT_STATUS%==0 echo Git update success
 if not %GIT_STATUS%==0 goto :Error
 
-pushd bin10
-start /wait z1_ReBuild_w810.bat 32
-
-start /wait z1_ReBuild_w810.bat 64
-popd
-
 call z1_ReBuild_Full.bat 32
 
 call z1_ReBuild_Full.bat 64