From d92f3691c71a7f3eeb7ca34d1b99e7c16a6e3ca9 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 23 Mar 2018 14:54:11 +0300 Subject: build scripts to replace all build files automatically when running --- tools/build_scripts/a_SetVar32.bat | 15 --------------- tools/build_scripts/a_SetVar32.bat.sample | 15 +++++++++++++++ tools/build_scripts/a_SetVar64.bat | 15 --------------- tools/build_scripts/a_SetVar64.bat.sample | 15 +++++++++++++++ tools/build_scripts/zz_zRebuildUploadStable.bat | 2 ++ tools/build_scripts/zz_zRebuildUploadTrunk.bat | 2 ++ 6 files changed, 34 insertions(+), 30 deletions(-) delete mode 100644 tools/build_scripts/a_SetVar32.bat create mode 100644 tools/build_scripts/a_SetVar32.bat.sample delete mode 100644 tools/build_scripts/a_SetVar64.bat create mode 100644 tools/build_scripts/a_SetVar64.bat.sample diff --git a/tools/build_scripts/a_SetVar32.bat b/tools/build_scripts/a_SetVar32.bat deleted file mode 100644 index 60def50208..0000000000 --- a/tools/build_scripts/a_SetVar32.bat +++ /dev/null @@ -1,15 +0,0 @@ -@echo off -set Drive=%~d0 -set SourceDir=%~dp0 -for %%a in (%SourceDir:~0,-1%) do set "SourceDir=%%a" -set DropDir=%Drive%\Dropbox -set StableInstDir=%SourceDir%\tools\installer_ng_stable -set GetIt=%StableInstDir%\Tools\wget.exe -set Arch=%Drive%\Arch -set ArchPdb=%Drive%\ArchPdb -set ArchDistr=%Drive%\ArchDistr -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 WinSCP=%SourceDir%\tools\WinSCP\WinSCP.com diff --git a/tools/build_scripts/a_SetVar32.bat.sample b/tools/build_scripts/a_SetVar32.bat.sample new file mode 100644 index 0000000000..60def50208 --- /dev/null +++ b/tools/build_scripts/a_SetVar32.bat.sample @@ -0,0 +1,15 @@ +@echo off +set Drive=%~d0 +set SourceDir=%~dp0 +for %%a in (%SourceDir:~0,-1%) do set "SourceDir=%%a" +set DropDir=%Drive%\Dropbox +set StableInstDir=%SourceDir%\tools\installer_ng_stable +set GetIt=%StableInstDir%\Tools\wget.exe +set Arch=%Drive%\Arch +set ArchPdb=%Drive%\ArchPdb +set ArchDistr=%Drive%\ArchDistr +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 WinSCP=%SourceDir%\tools\WinSCP\WinSCP.com diff --git a/tools/build_scripts/a_SetVar64.bat b/tools/build_scripts/a_SetVar64.bat deleted file mode 100644 index f370a53054..0000000000 --- a/tools/build_scripts/a_SetVar64.bat +++ /dev/null @@ -1,15 +0,0 @@ -@echo off -set Drive=%~d0 -set SourceDir=%~dp0 -for %%a in (%SourceDir:~0,-1%) do set "SourceDir=%%a" -set DropDir=%Drive%\Dropbox -set StableInstDir=%SourceDir%\tools\installer_ng_stable -set GetIt=%StableInstDir%\Tools\wget.exe -set Arch=%Drive%\Arch64 -set ArchPdb=%Drive%\ArchPdb64 -set ArchDistr=%Drive%\ArchDistr -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 WinSCP=%SourceDir%\tools\WinSCP\WinSCP.com diff --git a/tools/build_scripts/a_SetVar64.bat.sample b/tools/build_scripts/a_SetVar64.bat.sample new file mode 100644 index 0000000000..f370a53054 --- /dev/null +++ b/tools/build_scripts/a_SetVar64.bat.sample @@ -0,0 +1,15 @@ +@echo off +set Drive=%~d0 +set SourceDir=%~dp0 +for %%a in (%SourceDir:~0,-1%) do set "SourceDir=%%a" +set DropDir=%Drive%\Dropbox +set StableInstDir=%SourceDir%\tools\installer_ng_stable +set GetIt=%StableInstDir%\Tools\wget.exe +set Arch=%Drive%\Arch64 +set ArchPdb=%Drive%\ArchPdb64 +set ArchDistr=%Drive%\ArchDistr +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 WinSCP=%SourceDir%\tools\WinSCP\WinSCP.com diff --git a/tools/build_scripts/zz_zRebuildUploadStable.bat b/tools/build_scripts/zz_zRebuildUploadStable.bat index 3ec480bff8..7377428d4f 100644 --- a/tools/build_scripts/zz_zRebuildUploadStable.bat +++ b/tools/build_scripts/zz_zRebuildUploadStable.bat @@ -11,6 +11,8 @@ set GIT_STATUS=%ERRORLEVEL% if %GIT_STATUS%==0 echo Git update success if not %GIT_STATUS%==0 goto :Error +copy /S /Y tools\build_scripts\*.* . + del /F /Q version.txt pushd build diff --git a/tools/build_scripts/zz_zRebuildUploadTrunk.bat b/tools/build_scripts/zz_zRebuildUploadTrunk.bat index d7cf691207..b12887a70f 100644 --- a/tools/build_scripts/zz_zRebuildUploadTrunk.bat +++ b/tools/build_scripts/zz_zRebuildUploadTrunk.bat @@ -5,6 +5,8 @@ set GIT_STATUS=%ERRORLEVEL% if %GIT_STATUS%==0 echo Git update success if not %GIT_STATUS%==0 goto :Error +copy /S /Y tools\build_scripts\*.* . + start /min /wait z1_ReBuild_Full.bat 32 %comp% start /min /wait z1_ReBuild_Full.bat 64 %comp% -- cgit v1.2.3