diff options
| author | George Hazan <ghazan@miranda.im> | 2017-10-03 23:45:55 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-10-03 23:45:55 +0300 |
| commit | 45415f74bb85f0911df291be21a8156040a0fd98 (patch) | |
| tree | 3d6787fec6795cc3ab46496d37dee223dfb231a1 /tools | |
| parent | 5de01a5435c1c1733d07da01f1900abe97a1af0c (diff) | |
prebuilt modules also separated between compilers
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build_scripts/z1_ReBuild_Full.bat | 4 | ||||
| -rw-r--r-- | tools/build_scripts/z1_ReBuild_Full_Stable.bat | 4 | ||||
| -rw-r--r-- | tools/build_scripts/zz_zRebuildUploadStable.bat | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/build_scripts/z1_ReBuild_Full.bat b/tools/build_scripts/z1_ReBuild_Full.bat index 791faceb7a..386dc40118 100644 --- a/tools/build_scripts/z1_ReBuild_Full.bat +++ b/tools/build_scripts/z1_ReBuild_Full.bat @@ -102,8 +102,8 @@ if /i '%tp%' == '32' ( ) rem xcopy /S /V /Y "..\delphi\%tp%" "Release%tp%" -xcopy /S /V /Y "..\pre-symbols\%tp%" "Symbols%tp%" -xcopy /S /V /Y "..\pre-build\%tp%" "Release%tp%" +xcopy /S /V /Y "..\pre-symbols\%comp%\%tp%" "Symbols%tp%" +xcopy /S /V /Y "..\pre-build\%comp%\%tp%" "Release%tp%" cd "Release%tp%" dir /B /S *.dll | %SourceDir%\tools\rebaser\rebaser.exe /BASE:13000000 diff --git a/tools/build_scripts/z1_ReBuild_Full_Stable.bat b/tools/build_scripts/z1_ReBuild_Full_Stable.bat index 3b8ae145da..e21984b2f1 100644 --- a/tools/build_scripts/z1_ReBuild_Full_Stable.bat +++ b/tools/build_scripts/z1_ReBuild_Full_Stable.bat @@ -108,8 +108,8 @@ if /i '%tp%' == '32' ( ) rem xcopy /S /V /Y "..\delphi\%tp%" "Release%tp%" -xcopy /S /V /Y "..\pre-symbols\%tp%" "Symbols%tp%" -xcopy /S /V /Y "..\pre-build\%tp%" "Release%tp%" +xcopy /S /V /Y "..\pre-symbols\%comp%\%tp%" "Symbols%tp%" +xcopy /S /V /Y "..\pre-build\%comp%\%tp%" "Release%tp%" cd "Release%tp%" dir /B /S *.dll | %SourceDir%\tools\rebaser\rebaser.exe /BASE:13000000 diff --git a/tools/build_scripts/zz_zRebuildUploadStable.bat b/tools/build_scripts/zz_zRebuildUploadStable.bat index 4e127f61c0..c5bf6c8e61 100644 --- a/tools/build_scripts/zz_zRebuildUploadStable.bat +++ b/tools/build_scripts/zz_zRebuildUploadStable.bat @@ -11,9 +11,9 @@ 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 %comp% +start /min /wait z1_ReBuild_Full.bat 32 %comp% -call z1_ReBuild_Full_Stable.bat 64 %comp% +start /min /wait z1_ReBuild_Full.bat 64 %comp% call z2_PackPluginUpdater.bat 32 DEV_STABLE %comp% |