8 files changed, 123 insertions, 2 deletions
diff --git a/tools/build_scripts/z1_ReBuild_Full.bat b/tools/build_scripts/z1_ReBuild_Full.bat
index 4ca8985378..6a2d94ab9e 100644
--- a/tools/build_scripts/z1_ReBuild_Full.bat
+++ b/tools/build_scripts/z1_ReBuild_Full.bat
@@ -119,6 +119,7 @@ call :checksum Icons dll
 
 copy /V /Y ..\..\docs\mirandaboot.ini
 copy /V /Y ..\..\redist\x%tp%\DbChecker.bat
+copy /V /Y ..\..\redist\x%tp%\*.dll
 copy /V /Y ..\..\redist\x%tp%\bass\*.dll "Plugins\BASS"
 
 popd
diff --git a/tools/build_scripts/z1_ReBuild_Full_Stable.bat b/tools/build_scripts/z1_ReBuild_Full_Stable.bat
index 9e12ade93a..87ea3135ad 100644
--- a/tools/build_scripts/z1_ReBuild_Full_Stable.bat
+++ b/tools/build_scripts/z1_ReBuild_Full_Stable.bat
@@ -125,6 +125,7 @@ call :checksum Icons dll
 
 copy /V /Y ..\..\docs\mirandaboot.ini
 copy /V /Y ..\..\redist\x%tp%\DbChecker.bat
+copy /V /Y ..\..\redist\x%tp%\*.dll
 copy /V /Y ..\..\redist\x%tp%\bass\*.dll "Plugins\BASS"
 
 popd
diff --git a/tools/build_scripts/z2_PackPluginUpdater.bat b/tools/build_scripts/z2_PackPluginUpdater.bat
index 9a39f0d04e..7928b7761a 100644
--- a/tools/build_scripts/z2_PackPluginUpdater.bat
+++ b/tools/build_scripts/z2_PackPluginUpdater.bat
@@ -26,7 +26,7 @@ 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%\miranda%tp%.zip" "Miranda%tp%.exe" -i@..\..\z2_PackPluginUpdater.txt
 REM end Core
 
 REM Langpacks
diff --git a/tools/build_scripts/z2_PackPluginUpdater.txt b/tools/build_scripts/z2_PackPluginUpdater.txt
new file mode 100644
index 0000000000..597f246b16
--- /dev/null
+++ b/tools/build_scripts/z2_PackPluginUpdater.txt
@@ -0,0 +1,69 @@
+api_ms_win_core_console_l1_1_0.dll
+api_ms_win_core_datetime_l1_1_0.dll
+api_ms_win_core_debug_l1_1_0.dll
+api_ms_win_core_errorhandling_l1_1_0.dll
+api_ms_win_core_file_l1_1_0.dll
+api_ms_win_core_file_l1_2_0.dll
+api_ms_win_core_file_l2_1_0.dll
+api_ms_win_core_handle_l1_1_0.dll
+api_ms_win_core_heap_l1_1_0.dll
+api_ms_win_core_interlocked_l1_1_0.dll
+api_ms_win_core_libraryloader_l1_1_0.dll
+api_ms_win_core_localization_l1_2_0.dll
+api_ms_win_core_memory_l1_1_0.dll
+api_ms_win_core_namedpipe_l1_1_0.dll
+api_ms_win_core_processenvironment_l1_1_0.dll
+api_ms_win_core_processthreads_l1_1_0.dll
+api_ms_win_core_processthreads_l1_1_1.dll
+api_ms_win_core_profile_l1_1_0.dll
+api_ms_win_core_rtlsupport_l1_1_0.dll
+api_ms_win_core_string_l1_1_0.dll
+api_ms_win_core_synch_l1_1_0.dll
+api_ms_win_core_synch_l1_2_0.dll
+api_ms_win_core_sysinfo_l1_1_0.dll
+api_ms_win_core_timezone_l1_1_0.dll
+api_ms_win_core_util_l1_1_0.dll
+api_ms_win_crt_conio_l1_1_0.dll
+api_ms_win_crt_convert_l1_1_0.dll
+api_ms_win_crt_environment_l1_1_0.dll
+api_ms_win_crt_filesystem_l1_1_0.dll
+api_ms_win_crt_heap_l1_1_0.dll
+api_ms_win_crt_locale_l1_1_0.dll
+api_ms_win_crt_math_l1_1_0.dll
+api_ms_win_crt_multibyte_l1_1_0.dll
+api_ms_win_crt_private_l1_1_0.dll
+api_ms_win_crt_process_l1_1_0.dll
+api_ms_win_crt_runtime_l1_1_0.dll
+api_ms_win_crt_stdio_l1_1_0.dll
+api_ms_win_crt_string_l1_1_0.dll
+api_ms_win_crt_time_l1_1_0.dll
+api_ms_win_crt_utility_l1_1_0.dll
+msvcp140.dll
+ucrtbase.dll
+vcomp140.dll
+vcruntime140.dll
+Core\StdAuth.dll
+Core\StdAutoAway.dll
+Core\StdAway.dll
+Core\StdClist.dll
+Core\StdCrypt.dll
+Core\StdEmail.dll
+Core\StdFile.dll
+Core\StdHelp.dll
+Core\StdIdle.dll
+Core\StdMsg.dll
+Core\StdSSL.dll
+Core\StdUIHist.dll
+Core\StdUrl.dll
+Core\StdUserInfo.dll
+Core\StdUserOnline.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
+\ No newline at end of file
diff --git a/tools/build_scripts/z3_PackArchives.bat b/tools/build_scripts/z3_PackArchives.bat
index a4416e8ff5..d639b146cf 100644
--- a/tools/build_scripts/z3_PackArchives.bat
+++ b/tools/build_scripts/z3_PackArchives.bat
@@ -26,6 +26,9 @@ move /Y miranda-ng*.7z %ArchDistr%
 
 del /f /q miranda%tp%.exe
 del /f /q hashes.txt
+del /f /q *.dll
+del /f /q /s *.iobj
+del /f /q /s *.ipdb
 for /f %%a in (..\..\z3_PackArchives.txt) do del /s /q  %%a
 rd /s /q Core
 REM rd /s /q Libs
diff --git a/tools/build_scripts/z3_PackArchives.txt b/tools/build_scripts/z3_PackArchives.txt
index 0305f285ec..662686dcbe 100644
--- a/tools/build_scripts/z3_PackArchives.txt
+++ b/tools/build_scripts/z3_PackArchives.txt
@@ -1,4 +1,48 @@
 dbchecker.bat
+api_ms_win_core_console_l1_1_0.dll
+api_ms_win_core_datetime_l1_1_0.dll
+api_ms_win_core_debug_l1_1_0.dll
+api_ms_win_core_errorhandling_l1_1_0.dll
+api_ms_win_core_file_l1_1_0.dll
+api_ms_win_core_file_l1_2_0.dll
+api_ms_win_core_file_l2_1_0.dll
+api_ms_win_core_handle_l1_1_0.dll
+api_ms_win_core_heap_l1_1_0.dll
+api_ms_win_core_interlocked_l1_1_0.dll
+api_ms_win_core_libraryloader_l1_1_0.dll
+api_ms_win_core_localization_l1_2_0.dll
+api_ms_win_core_memory_l1_1_0.dll
+api_ms_win_core_namedpipe_l1_1_0.dll
+api_ms_win_core_processenvironment_l1_1_0.dll
+api_ms_win_core_processthreads_l1_1_0.dll
+api_ms_win_core_processthreads_l1_1_1.dll
+api_ms_win_core_profile_l1_1_0.dll
+api_ms_win_core_rtlsupport_l1_1_0.dll
+api_ms_win_core_string_l1_1_0.dll
+api_ms_win_core_synch_l1_1_0.dll
+api_ms_win_core_synch_l1_2_0.dll
+api_ms_win_core_sysinfo_l1_1_0.dll
+api_ms_win_core_timezone_l1_1_0.dll
+api_ms_win_core_util_l1_1_0.dll
+api_ms_win_crt_conio_l1_1_0.dll
+api_ms_win_crt_convert_l1_1_0.dll
+api_ms_win_crt_environment_l1_1_0.dll
+api_ms_win_crt_filesystem_l1_1_0.dll
+api_ms_win_crt_heap_l1_1_0.dll
+api_ms_win_crt_locale_l1_1_0.dll
+api_ms_win_crt_math_l1_1_0.dll
+api_ms_win_crt_multibyte_l1_1_0.dll
+api_ms_win_crt_private_l1_1_0.dll
+api_ms_win_crt_process_l1_1_0.dll
+api_ms_win_crt_runtime_l1_1_0.dll
+api_ms_win_crt_stdio_l1_1_0.dll
+api_ms_win_crt_string_l1_1_0.dll
+api_ms_win_crt_time_l1_1_0.dll
+api_ms_win_crt_utility_l1_1_0.dll
+msvcp140.dll
+ucrtbase.dll
+vcomp140.dll
+vcruntime140.dll
 mirandaboot.ini
 pu_stub.exe
 Core\StdAuth.dll
diff --git a/tools/build_scripts/z3_PackArchivesStable.bat b/tools/build_scripts/z3_PackArchivesStable.bat
index 631967fd70..ed75a7d31d 100644
--- a/tools/build_scripts/z3_PackArchivesStable.bat
+++ b/tools/build_scripts/z3_PackArchivesStable.bat
@@ -28,6 +28,9 @@ if exist %ArchDistr%\miranda-ng-v0.9*%bit%.exe del /F /Q %ArchDistr%\miranda-ng-
 move /Y miranda-ng*.7z %ArchDistr%
 
 del /f /q miranda%tp%.exe
+del /f /q *.dll
+del /f /q /s *.iobj
+del /f /q /s *.ipdb
 del /f /q hashes.txt
 for /f %%a in (..\..\z3_PackArchives.txt) do del /s /q  %%a
 rd /s /q Core
diff --git a/tools/build_scripts/zz_zRebuildUploadTrunk.bat b/tools/build_scripts/zz_zRebuildUploadTrunk.bat
index dd5a6ea259..d7cf691207 100644
--- a/tools/build_scripts/zz_zRebuildUploadTrunk.bat
+++ b/tools/build_scripts/zz_zRebuildUploadTrunk.bat
@@ -1,4 +1,4 @@
-set comp=bin10
+set comp=bin15
 
 call git_update.bat master
 set GIT_STATUS=%ERRORLEVEL%