diff options
| author | George Hazan <ghazan@miranda.im> | 2018-05-22 12:40:03 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-05-22 12:40:03 +0300 |
| commit | 775290b963def8a8f4ed9ec50e86f8d3ca438c46 (patch) | |
| tree | 744c67db3aaed43d4ad5d31fc70a13f3bc50b51a | |
| parent | a53727dda0389031085752f0f15ebbbcf4adf5b3 (diff) | |
if a machine suddenly is able to compile h++, there's no need to copy it
| -rw-r--r-- | tools/build_scripts/copyhpp.cmd | 3 | ||||
| -rw-r--r-- | tools/build_scripts/z1_ReBuild_Full.bat | 3 | ||||
| -rw-r--r-- | tools/build_scripts/zz_zRebuildUploadStable.bat | 4 | ||||
| -rw-r--r-- | tools/build_scripts/zz_zRebuildUploadTrunk.bat | 4 |
4 files changed, 5 insertions, 9 deletions
diff --git a/tools/build_scripts/copyhpp.cmd b/tools/build_scripts/copyhpp.cmd deleted file mode 100644 index 5615ee138b..0000000000 --- a/tools/build_scripts/copyhpp.cmd +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -copy /Y W:\miranda-ng\bin15\Release\Plugins\historypp.dll .\pre-build\bin15\32\Plugins -copy /Y W:\miranda-ng\bin15\Release64\Plugins\historypp.dll .\pre-build\bin15\64\Plugins diff --git a/tools/build_scripts/z1_ReBuild_Full.bat b/tools/build_scripts/z1_ReBuild_Full.bat index daef07a8d9..a3f8d8bb3e 100644 --- a/tools/build_scripts/z1_ReBuild_Full.bat +++ b/tools/build_scripts/z1_ReBuild_Full.bat @@ -36,6 +36,9 @@ MsBuild.exe "mir_full.sln" /m /t:Rebuild /p:Configuration=Release;Platform="%ptr 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 + +MsBuild.exe ..\plugins\HistoryPlusPlus\historypp.dproj /t:Rebuild /p:Configuration=Release;Platform=Win%tp% /fileLogger /fileLoggerParameters:LogFile=Logs\icons%tp%.log;errorsonly;warningsonly;summary + pushd ..\plugins\NotifyAnything\SendLog call compile%tp%.bat "%comp%" popd diff --git a/tools/build_scripts/zz_zRebuildUploadStable.bat b/tools/build_scripts/zz_zRebuildUploadStable.bat index 580d185bfe..4e2700a75c 100644 --- a/tools/build_scripts/zz_zRebuildUploadStable.bat +++ b/tools/build_scripts/zz_zRebuildUploadStable.bat @@ -11,9 +11,7 @@ set GIT_STATUS=%ERRORLEVEL% if %GIT_STATUS%==0 echo Git update success if not %GIT_STATUS%==0 goto :Error -xcopy /S /Y tools\build_scripts\*.* . >nul - -call copyhpp.cmd +rem xcopy /S /Y tools\build_scripts\*.* . >nul del /F /Q version.txt diff --git a/tools/build_scripts/zz_zRebuildUploadTrunk.bat b/tools/build_scripts/zz_zRebuildUploadTrunk.bat index 92eaa2b103..0045636637 100644 --- a/tools/build_scripts/zz_zRebuildUploadTrunk.bat +++ b/tools/build_scripts/zz_zRebuildUploadTrunk.bat @@ -5,9 +5,7 @@ set GIT_STATUS=%ERRORLEVEL% if %GIT_STATUS%==0 echo Git update success if not %GIT_STATUS%==0 goto :Error -xcopy /S /Y tools\build_scripts\*.* . >nul - -call copyhpp.cmd +rem xcopy /S /Y tools\build_scripts\*.* . >nul start /min /wait z1_ReBuild_Full.bat 32 %comp% |