diff options
| -rw-r--r-- | tools/build_scripts/svn_stable_ver.bat | 9 | ||||
| -rw-r--r-- | tools/build_scripts/z1_ReBuild_Full.bat | 1 | ||||
| -rw-r--r-- | tools/build_scripts/z1_ReBuild_Full_Stable.bat | 146 | ||||
| -rw-r--r-- | tools/build_scripts/z4_UploadPluginUpdater.txt | 10 | ||||
| -rw-r--r-- | tools/build_scripts/zz_zRebuildUploadStable.bat | 10 |
5 files changed, 15 insertions, 161 deletions
diff --git a/tools/build_scripts/svn_stable_ver.bat b/tools/build_scripts/svn_stable_ver.bat deleted file mode 100644 index d1f124dc67..0000000000 --- a/tools/build_scripts/svn_stable_ver.bat +++ /dev/null @@ -1,9 +0,0 @@ -del /F /Q version.txt - -cd build - -for /F "tokens=1,2,3 delims= " %%i in (build.no) do set MirVer=%%i.%%j.%%k - -cd .. - -echo v%MirVer% > version.txt diff --git a/tools/build_scripts/z1_ReBuild_Full.bat b/tools/build_scripts/z1_ReBuild_Full.bat index 386dc40118..e237da8e1f 100644 --- a/tools/build_scripts/z1_ReBuild_Full.bat +++ b/tools/build_scripts/z1_ReBuild_Full.bat @@ -75,7 +75,6 @@ cscript /nologo translate.js /sourcelang:"spanish" /release:"..\..\%comp%\Releas del /f /q ..\..\%comp%\Release%tp%\*_nodupes.txt popd -REM md "Release%tp%\Dictionaries" md "Release%tp%\Docs" md "Release%tp%\Gadgets" md "Release%tp%\Sounds" diff --git a/tools/build_scripts/z1_ReBuild_Full_Stable.bat b/tools/build_scripts/z1_ReBuild_Full_Stable.bat deleted file mode 100644 index e21984b2f1..0000000000 --- a/tools/build_scripts/z1_ReBuild_Full_Stable.bat +++ /dev/null @@ -1,146 +0,0 @@ -set tp=%1 -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 -) else if /i '%tp%' == '64' ( - set ptr=X64 -) - -set comp=%2 -if "%comp%"=="" (echo "please specify target compiler folder!" && pause && goto :EOF) - -call a_SetVar%tp%.bat -call svn_stable_ver.bat - -pushd %comp% -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 -copy build.no.stable build.no -move make_ver.bat make_ver.old -move make_ver_stable.bat make_ver.bat -call make_ver.bat -popd - -if "%comp%" == "bin10" ( - start /wait z1_ReBuild_w810.bat %tp% -) - -if "%comp%"=="bin10" ( - call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" -) else if "%comp%"=="bin12" ( - call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" -) else if "%comp%"=="bin15" ( - call "%VS141COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvars%tp%.bat" -) - -MsBuild.exe "mir_full.sln" /m /t:Rebuild /p:Configuration=Release;Platform="%ptr%" /fileLogger /fileLoggerParameters:LogFile=Logs\full%tp%.log;errorsonly;warningsonly;summary -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 -pushd ..\plugins\NotifyAnything\SendLog "%comp%" -call compile%tp%.bat -popd - -pushd ..\build -move make_ver.bat make_ver_stable.bat -move make_ver.old make_ver.bat -popd - -if exist Release ren Release Release32 -md Symbols%tp% -rd /S /Q "Release%tp%\Obj" >nul -xcopy /S /V /Y "Release%tp%\*.pdb" "Symbols%tp%\" -del /F /S /Q "Release%tp%\*.pdb" >> nul - -md "Release%tp%\Languages" - -pushd "..\langpacks\tool" -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:"..\..\%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" -md "Release%tp%\Gadgets" -md "Release%tp%\Sounds" -md "Release%tp%\Scripts" -md "Release%tp%\Plugins\Listeningto" -md "Release%tp%\Plugins\BASS" -md "Release%tp%\Plugins\Quotes" -md "Release%tp%\Plugins\Weather" - -copy /V /Y ..\plugins\FavContacts\gadget\favcontacts.gadget "Release%tp%\Gadgets\" -copy /V /Y ..\plugins\Nudge\docs\Sounds\*.wav "Release%tp%\Sounds\" -copy /V /Y ..\plugins\ListeningTo\listeningto\*.dll "Release%tp%\Plugins\Listeningto\" -copy /V /Y ..\plugins\Quotes\docs\Utility\*.xml "Release%tp%\Plugins\Quotes\" -copy /V /Y ..\plugins\Weather\docs\weather\*.ini "Release%tp%\Plugins\Weather\" -copy /V /Y ..\plugins\Actman\services.ini "Release%tp%\Plugins\" -copy /V /Y ..\plugins\Boltun\src\Engine\boltun.mindw "Release%tp%\Plugins\" -copy /V /Y ..\plugins\Watrack\player.ini "Release%tp%\Plugins\" -copy /V /Y ..\plugins\RemovePersonalSettings\docs\RemovePersonalSettings.ini "Release%tp%\" - -if /i '%tp%' == '32' ( - md "Release32\Plugins\Importtxt" - copy /V /Y ..\plugins\ImportTXT\importtxt\*.ini "Release32\Plugins\Importtxt\" - copy /V /Y ..\redist\pcre3.dll "Release32\Libs" -) - -rem xcopy /S /V /Y "..\delphi\%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 -dir /B /S *.mir | %SourceDir%\tools\rebaser\rebaser.exe /BASE:12000000 - -set hashes=%cd%\hashes.txt -%SourceDir%\tools\checksum\checksum.exe Miranda%tp%.exe > %hashes% -for /f "tokens=1,2 delims= " %%i in ('%SourceDir%\tools\md5.exe Languages\lang*.txt') do echo %%j %%i >> %hashes% - -rem get checksum for folder(first param) and ext (second param) -call :checksum Plugins dll -call :checksum Icons dll - -copy /V /Y ..\..\docs\mirandaboot.ini -copy /V /Y ..\..\redist\x%tp%\DbChecker.bat -copy /V /Y ..\..\redist\x%tp%\"%comp%"\*.dll -copy /V /Y ..\..\redist\x%tp%\bass\*.dll "Plugins\BASS" - -popd - -rem put me at the end of script -rem getting checksum for dlls -rem "goto :eof" here to avoid run this subroutine at the end of script, so script will run till this point, and subroutine will called only where we need it -goto :eof -rem the subroutine itself starts here -:checksum -rem change the dir to first parameter, and remember it -pushd %1 -rem now we are here, let's get the hashes for dll -for /F "tokens=1,2 delims= " %%a in ('%SourceDir%\tools\checksum\checksum.exe *.%2') do echo %1\%%a %%b >> %hashes% -rem return to the dir, where subroutine was called -popd -rem this is just for the case if another sobroutine will be after this one :) -goto :eof diff --git a/tools/build_scripts/z4_UploadPluginUpdater.txt b/tools/build_scripts/z4_UploadPluginUpdater.txt index 4291d1692b..f5369a0953 100644 --- a/tools/build_scripts/z4_UploadPluginUpdater.txt +++ b/tools/build_scripts/z4_UploadPluginUpdater.txt @@ -4,10 +4,10 @@ option confirm off open miranda-ng -put %Arch%\Icons\*.zip x%tp%/Icons/ -put %Arch%\Languages\lang*.zip x%tp%/Languages/ -put %Arch%\Plugins\*.zip x%tp%/Plugins/ -put %Arch%\miranda%tp%.zip x%tp%/ -put %Arch%\hashes.zip x%tp%/ +put %Arch%\Icons\*.zip distr/x%tp%/Icons/ +put %Arch%\Languages\lang*.zip distr/x%tp%/Languages/ +put %Arch%\Plugins\*.zip distr/x%tp%/Plugins/ +put %Arch%\miranda%tp%.zip distr/x%tp%/ +put %Arch%\hashes.zip distr/x%tp%/ exit
\ No newline at end of file diff --git a/tools/build_scripts/zz_zRebuildUploadStable.bat b/tools/build_scripts/zz_zRebuildUploadStable.bat index c5bf6c8e61..63612630d5 100644 --- a/tools/build_scripts/zz_zRebuildUploadStable.bat +++ b/tools/build_scripts/zz_zRebuildUploadStable.bat @@ -11,6 +11,16 @@ set GIT_STATUS=%ERRORLEVEL% if %GIT_STATUS%==0 echo Git update success if not %GIT_STATUS%==0 goto :Error +del /F /Q version.txt + +pushd build +copy build.no.stable build.no +copy make_ver_stable.bat make_ver.bat +for /F "tokens=1,2,3 delims= " %%i in (build.no) do set MirVer=%%i.%%j.%%k +popd + +echo v%MirVer% > version.txt + start /min /wait z1_ReBuild_Full.bat 32 %comp% start /min /wait z1_ReBuild_Full.bat 64 %comp% |