build scripts cleaning

8 files changed, 16 insertions, 92 deletions

diff --git a/tools/build_scripts/bin10/CRC32.exe b/tools/build_scripts/bin10/CRC32.exe
deleted file mode 100644
index 2cccdeb552..0000000000
--- a/tools/build_scripts/bin10/CRC32.exe
+++ /dev/null
diff --git a/tools/build_scripts/bin10/CheckSum.exe b/tools/build_scripts/bin10/CheckSum.exe
deleted file mode 100644
index 65aac50d8f..0000000000
--- a/tools/build_scripts/bin10/CheckSum.exe
+++ /dev/null
diff --git a/tools/build_scripts/bin10/git_update.bat b/tools/build_scripts/bin10/git_update.bat
deleted file mode 100644
index 9936973e18..0000000000
--- a/tools/build_scripts/bin10/git_update.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-pushd ..
-
-git pull --rebase=true --progress -v 2>&1 > update.log
-
-popd
\ No newline at end of file
diff --git a/tools/build_scripts/bin10/md5.exe b/tools/build_scripts/bin10/md5.exe
deleted file mode 100644
index 73c6d01ec9..0000000000
--- a/tools/build_scripts/bin10/md5.exe
+++ /dev/null
diff --git a/tools/build_scripts/bin10/rebaser.exe b/tools/build_scripts/bin10/rebaser.exe
deleted file mode 100644
index a3f0526daf..0000000000
--- a/tools/build_scripts/bin10/rebaser.exe
+++ /dev/null
diff --git a/tools/build_scripts/chk.bat b/tools/build_scripts/chk.bat
deleted file mode 100644
index eade87a2f5..0000000000
--- a/tools/build_scripts/chk.bat
+++ /dev/null
@@ -1,32 +0,0 @@
-rem set tp=%1
-rem if  "%tp%"=="" (echo "please specify target platform 32 or 64!"&&pause&&goto :EOF)
-
-copy ..\crc32.exe /v /y %cd%
-
-set hashes=%cd%\hash.txt
-set checksum=%cd%\..\checksum.exe
-rem %checksum% Miranda%tp%.exe > %hashes%
-rem %checksum% Zlib.dll >> %hashes%
-
-rem get checksum  for folder(first param) and ext (second param)
-call :checksum Plugins dll
-call :checksum Icons dll
-for /f "tokens=1,2 delims= " %%i in (%hashes%) do call :WriteLine %%i %%j
-:WriteLine
-for /F "tokens=1,2 delims=:" %%i in ('crc32.exe %~n1.zip') do echo %1 %2 %%j > %hashes%
-del /f /q crc32.exe
-
-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 ('%checksum% *.%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
\ No newline at end of file
diff --git a/tools/build_scripts/z1_ReBuild_Full.bat b/tools/build_scripts/z1_ReBuild_Full.bat
index 326d45aa3d..18e28bbd68 100644
--- a/tools/build_scripts/z1_ReBuild_Full.bat
+++ b/tools/build_scripts/z1_ReBuild_Full.bat
@@ -50,25 +50,13 @@ pushd "..\tools\lpgen"
 cscript /nologo translate.js /sourcelang:"belarusian" /release:"..\..\bin10\Release%tp%\Languages\langpack_belarusian.txt"
 cscript /nologo translate.js /sourcelang:"bulgarian" /release:"..\..\bin10\Release%tp%\langpack_bulgarian_nodupes.txt"
 copy /B "..\..\bin10\Release%tp%\langpack_bulgarian_nodupes.txt"+"..\..\langpacks\bulgarian\=DUPES=.txt" ..\..\bin10\Release%tp%\Languages\langpack_bulgarian.txt
-REM cscript /nologo translate.js /sourcelang:"chinese" /release:"..\..\bin10\Release%tp%\Languages\langpack_chinese.txt"
 cscript /nologo translate.js /sourcelang:"czech" /release:"..\..\bin10\Release%tp%\Languages\langpack_czech.txt"
-REM cscript /nologo translate.js /sourcelang:"dutch" /release:"..\..\bin10\Release%tp%\Languages\langpack_dutch.txt"
 cscript /nologo translate.js /sourcelang:"english_gb" /release:"..\..\bin10\Release%tp%\Languages\langpack_english_gb.txt"
-REM cscript /nologo translate.js /sourcelang:"estonian" /release:"..\..\bin10\Release%tp%\Languages\langpack_estonian.txt"
 cscript /nologo translate.js /sourcelang:"french" /release:"..\..\bin10\Release%tp%\Languages\langpack_french.txt"
 cscript /nologo translate.js /sourcelang:"german" /release:"..\..\bin10\Release%tp%\Languages\langpack_german.txt"
-REM cscript /nologo translate.js /sourcelang:"hebrew" /release:"..\..\bin10\Release%tp%\Languages\langpack_hebrew.txt"
-REM cscript /nologo translate.js /sourcelang:"hungarian" /release:"..\..\bin10\Release%tp%\Languages\langpack_hungarian.txt"
-REM cscript /nologo translate.js /sourcelang:"italian" /release:"..\..\bin10\Release%tp%\Languages\langpack_italian.txt"
-REM cscript /nologo translate.js /sourcelang:"japanese" /release:"..\..\bin10\Release%tp%\Languages\langpack_japanese.txt"
-REM cscript /nologo translate.js /sourcelang:"korean" /release:"..\..\bin10\Release%tp%\Languages\langpack_korean.txt"
-REM cscript /nologo translate.js /sourcelang:"norwegian" /release:"..\..\bin10\Release%tp%\Languages\langpack_norwegian.txt"
 cscript /nologo translate.js /sourcelang:"polish" /release:"..\..\bin10\Release%tp%\Languages\langpack_polish.txt"
-REM cscript /nologo translate.js /sourcelang:"portuguese_br" /release:"..\..\bin10\Release%tp%\Languages\langpack_portuguese_br.txt"
-REM cscript /nologo translate.js /sourcelang:"slovak" /release:"..\..\bin10\Release%tp%\Languages\langpack_slovak.txt"
 cscript /nologo translate.js /sourcelang:"serbian" /release:"..\..\bin10\Release%tp%\Languages\langpack_serbian.txt"
 cscript /nologo translate.js /sourcelang:"spanish" /release:"..\..\bin10\Release%tp%\Languages\langpack_spanish.txt"
-REM cscript /nologo translate.js /sourcelang:"turkish" /release:"..\..\bin10\Release%tp%\Languages\langpack_turkish.txt"
 del /f /q ..\..\bin10\Release%tp%\*_nodupes.txt
 popd
 
@@ -83,9 +71,7 @@ md "Release%tp%\Plugins\Quotes"
 md "Release%tp%\Plugins\Weather"
 
 copy /V /Y ..\plugins\FavContacts\gadget\favcontacts.gadget "Release%tp%\Gadgets\"
-REM copy /V /Y ..\plugins\SpellChecker\Docs\Dictionaries\*.* "Release%tp%\Dictionaries\"
 copy /V /Y ..\plugins\Nudge\docs\Sounds\*.wav "Release%tp%\Sounds\"
-REM copy /V /Y ..\plugins\MirLua\docs\examples\*.lua "Release%tp%\Scripts\"
 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\"
@@ -93,8 +79,6 @@ 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%\"
-rem copy /V /Y ..\protocols\FacebookRM\docs\*.* "Release%tp%\Docs\"
-rem copy /V /Y ..\protocols\Omegle\docs\*.* "Release%tp%\Docs\"
 
 if /i '%tp%' == '32' (
   md "Release32\Plugins\Importtxt"
@@ -105,20 +89,17 @@ 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%"
-copy /v /y ..\tools\checksum\checksum.exe
 
 cd "Release%tp%"
-dir /B /S *.dll | ..\rebaser /BASE:13000000
-dir /B /S *.mir | ..\rebaser /BASE:12000000
+dir /B /S *.dll | %SourceDir%\tools\rebaser\rebaser.exe /BASE:13000000
+dir /B /S *.mir | %SourceDir%\tools\rebaser\rebaser.exe /BASE:12000000
 copy /V /Y ..\..\redist\x%tp%\msvc*.dll
 
 set hashes=%cd%\hashes.txt
-set checksum=%cd%\..\checksum.exe
-set md5=%cd%\..\md5.exe
-%checksum% Miranda%tp%.exe > %hashes%
-%checksum% msvcp100.dll >> %hashes%
-%checksum% msvcr100.dll >> %hashes%
-for /f "tokens=1,2 delims= " %%i in ('%md5% Languages\lang*.txt') do echo %%j %%i >> %hashes%
+%SourceDir%\tools\checksum\checksum.exe Miranda%tp%.exe > %hashes%
+%SourceDir%\tools\checksum\checksum.exe msvcp100.dll >> %hashes%
+%SourceDir%\tools\checksum\checksum.exe msvcr100.dll >> %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
@@ -139,8 +120,8 @@ rem the subroutine itself starts here
 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 ('%checksum% *.%2') do echo %1\%%a %%b >> %hashes%
+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
\ No newline at end of file
+goto :eof
diff --git a/tools/build_scripts/z1_ReBuild_Full_Stable.bat b/tools/build_scripts/z1_ReBuild_Full_Stable.bat
index e0bfd26559..200a2adc59 100644
--- a/tools/build_scripts/z1_ReBuild_Full_Stable.bat
+++ b/tools/build_scripts/z1_ReBuild_Full_Stable.bat
@@ -58,29 +58,16 @@ pushd "..\tools\lpgen"
 cscript /nologo translate.js /sourcelang:"belarusian" /release:"..\..\bin10\Release%tp%\Languages\langpack_belarusian.txt"
 cscript /nologo translate.js /sourcelang:"bulgarian" /release:"..\..\bin10\Release%tp%\langpack_bulgarian_nodupes.txt"
 copy /B "..\..\bin10\Release%tp%\langpack_bulgarian_nodupes.txt"+"..\..\langpacks\bulgarian\=DUPES=.txt" ..\..\bin10\Release%tp%\Languages\langpack_bulgarian.txt
-REM cscript /nologo translate.js /sourcelang:"chinese" /release:"..\..\bin10\Release%tp%\Languages\langpack_chinese.txt"
 cscript /nologo translate.js /sourcelang:"czech" /release:"..\..\bin10\Release%tp%\Languages\langpack_czech.txt"
-REM cscript /nologo translate.js /sourcelang:"dutch" /release:"..\..\bin10\Release%tp%\Languages\langpack_dutch.txt"
 cscript /nologo translate.js /sourcelang:"english_gb" /release:"..\..\bin10\Release%tp%\Languages\langpack_english_gb.txt"
-REM cscript /nologo translate.js /sourcelang:"estonian" /release:"..\..\bin10\Release%tp%\Languages\langpack_estonian.txt"
 cscript /nologo translate.js /sourcelang:"french" /release:"..\..\bin10\Release%tp%\Languages\langpack_french.txt"
 cscript /nologo translate.js /sourcelang:"german" /release:"..\..\bin10\Release%tp%\Languages\langpack_german.txt"
-REM cscript /nologo translate.js /sourcelang:"hebrew" /release:"..\..\bin10\Release%tp%\Languages\langpack_hebrew.txt"
-REM cscript /nologo translate.js /sourcelang:"hungarian" /release:"..\..\bin10\Release%tp%\Languages\langpack_hungarian.txt"
-REM cscript /nologo translate.js /sourcelang:"italian" /release:"..\..\bin10\Release%tp%\Languages\langpack_italian.txt"
-REM cscript /nologo translate.js /sourcelang:"japanese" /release:"..\..\bin10\Release%tp%\Languages\langpack_japanese.txt"
-REM cscript /nologo translate.js /sourcelang:"korean" /release:"..\..\bin10\Release%tp%\Languages\langpack_korean.txt"
-REM cscript /nologo translate.js /sourcelang:"norwegian" /release:"..\..\bin10\Release%tp%\Languages\langpack_norwegian.txt"
 cscript /nologo translate.js /sourcelang:"polish" /release:"..\..\bin10\Release%tp%\Languages\langpack_polish.txt"
-REM cscript /nologo translate.js /sourcelang:"portuguese_br" /release:"..\..\bin10\Release%tp%\Languages\langpack_portuguese_br.txt"
-REM cscript /nologo translate.js /sourcelang:"slovak" /release:"..\..\bin10\Release%tp%\Languages\langpack_slovak.txt"
 cscript /nologo translate.js /sourcelang:"serbian" /release:"..\..\bin10\Release%tp%\Languages\langpack_serbian.txt"
 cscript /nologo translate.js /sourcelang:"spanish" /release:"..\..\bin10\Release%tp%\Languages\langpack_spanish.txt"
-REM cscript /nologo translate.js /sourcelang:"turkish" /release:"..\..\bin10\Release%tp%\Languages\langpack_turkish.txt"
 del /f /q ..\..\bin10\Release%tp%\*_nodupes.txt
 popd
 
-REM md "Release%tp%\Dictionaries"
 md "Release%tp%\Docs"
 md "Release%tp%\Gadgets"
 md "Release%tp%\Sounds"
@@ -91,9 +78,7 @@ md "Release%tp%\Plugins\Quotes"
 md "Release%tp%\Plugins\Weather"
 
 copy /V /Y ..\plugins\FavContacts\gadget\favcontacts.gadget "Release%tp%\Gadgets\"
-REM copy /V /Y ..\plugins\SpellChecker\Docs\Dictionaries\*.* "Release%tp%\Dictionaries\"
 copy /V /Y ..\plugins\Nudge\docs\Sounds\*.wav "Release%tp%\Sounds\"
-REM copy /V /Y ..\plugins\MirLua\docs\examples\*.lua "Release%tp%\Scripts\"
 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\"
@@ -101,8 +86,6 @@ 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%\"
-rem copy /V /Y ..\protocols\FacebookRM\docs\*.* "Release%tp%\Docs\"
-rem copy /V /Y ..\protocols\Omegle\docs\*.* "Release%tp%\Docs\"
 
 if /i '%tp%' == '32' (
   md "Release32\Plugins\Importtxt"
@@ -113,20 +96,17 @@ 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%"
-copy /v /y ..\tools\checksum\checksum.exe
 
 cd "Release%tp%"
-dir /B /S *.dll | ..\rebaser /BASE:13000000
-dir /B /S *.mir | ..\rebaser /BASE:12000000
+dir /B /S *.dll | %SourceDir%\tools\rebaser\rebaser.exe /BASE:13000000
+dir /B /S *.mir | %SourceDir%\tools\rebaser\rebaser.exe /BASE:12000000
 copy /V /Y ..\..\redist\x%tp%\msvc*.dll
 
 set hashes=%cd%\hashes.txt
-set checksum=%cd%\..\checksum.exe
-set md5=%cd%\..\md5.exe
-%checksum% Miranda%tp%.exe > %hashes%
-%checksum% msvcp100.dll >> %hashes%
-%checksum% msvcr100.dll >> %hashes%
-for /f "tokens=1,2 delims= " %%i in ('%md5% Languages\lang*.txt') do echo %%j %%i >> %hashes%
+%SourceDir%\tools\checksum\checksum.exe Miranda%tp%.exe > %hashes%
+%SourceDir%\tools\checksum\checksum.exe msvcp100.dll >> %hashes%
+%SourceDir%\tools\checksum\checksum.exe msvcr100.dll >> %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
@@ -147,8 +127,8 @@ rem the subroutine itself starts here
 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 ('%checksum% *.%2') do echo %1\%%a %%b >> %hashes%
+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
\ No newline at end of file
+goto :eof