summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2017-09-29 14:31:54 +0300
committerGeorge Hazan <ghazan@miranda.im>2017-09-29 14:31:54 +0300
commit86733ecb57c0709873e1c4612306cfcf006858a4 (patch)
treebb79cdd716e77e0334c1857e49e2ac83cdcb3ade
parent5709b0dfa9523055ec423e48d411f098ba6882eb (diff)
runtime dlls exluded from build & hashes.txt
-rw-r--r--tools/build_scripts/z1_ReBuild_Full.bat7
-rw-r--r--tools/build_scripts/z1_ReBuild_Full_Stable.bat3
-rw-r--r--tools/build_scripts/z2_PackPluginUpdater.bat2
3 files changed, 2 insertions, 10 deletions
diff --git a/tools/build_scripts/z1_ReBuild_Full.bat b/tools/build_scripts/z1_ReBuild_Full.bat
index 32442ac988..97377e94af 100644
--- a/tools/build_scripts/z1_ReBuild_Full.bat
+++ b/tools/build_scripts/z1_ReBuild_Full.bat
@@ -48,8 +48,8 @@ if "%comp%" == "bin10" (
)
call pascal%tp%.bat
-pushd ..\plugins\NotifyAnything\SendLog "%comp%"
-call compile%tp%.bat
+pushd ..\plugins\NotifyAnything\SendLog
+call compile%tp%.bat "%comp%"
popd
if exist Release ren Release Release32
@@ -112,12 +112,9 @@ xcopy /S /V /Y "..\pre-build\%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
-copy /V /Y ..\..\redist\x%tp%\msvc*.dll
set hashes=%cd%\hashes.txt
%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)
diff --git a/tools/build_scripts/z1_ReBuild_Full_Stable.bat b/tools/build_scripts/z1_ReBuild_Full_Stable.bat
index 1058e7dccb..2731f1595b 100644
--- a/tools/build_scripts/z1_ReBuild_Full_Stable.bat
+++ b/tools/build_scripts/z1_ReBuild_Full_Stable.bat
@@ -118,12 +118,9 @@ xcopy /S /V /Y "..\pre-build\%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
-copy /V /Y ..\..\redist\x%tp%\msvc*.dll
set hashes=%cd%\hashes.txt
%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)
diff --git a/tools/build_scripts/z2_PackPluginUpdater.bat b/tools/build_scripts/z2_PackPluginUpdater.bat
index cf04dfa1ee..9a39f0d04e 100644
--- a/tools/build_scripts/z2_PackPluginUpdater.bat
+++ b/tools/build_scripts/z2_PackPluginUpdater.bat
@@ -27,8 +27,6 @@ for /f %%a in (..\..\z2_PackPluginUpdater_x%tp%.txt) do (if not exist %%a echo %
:COMPRESS
REM Core
%ZipIt% "%Arch%\miranda%tp%.zip" "Miranda%tp%.exe" "Core\*.dll" "Plugins\Dbx_mmap.dll" "Plugins\DbChecker.dll" "Icons\Proto_MetaContacts.dll" "Libs\mir_app.mir" "Libs\mir_core.mir" "Libs\libjson.mir" "Libs\Pcre16.mir" "Libs\Zlib.mir" "Libs\libeay32.mir" "Libs\ssleay32.mir"
-%ZipIt% "%Arch%\msvcp100.zip" msvcp100.dll
-%ZipIt% "%Arch%\msvcr100.zip" msvcr100.dll
REM end Core
REM Langpacks