summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-08-29 13:49:40 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-08-29 13:49:40 +0300
commit0c1b97a6027e2341a2d68711e147d87be08ca411 (patch)
tree2374b410b13133bfbbe63c4a3190a75af93b187a /tools
parent10a09ce7de1c3b87a99db2089399246fb44b71b4 (diff)
ImportTXT moved to deprecated
Diffstat (limited to 'tools')
-rw-r--r--tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt1
-rw-r--r--tools/build_scripts/z1_ReBuild_Full.bat8
-rw-r--r--tools/build_scripts/z2_PackPluginUpdater.bat1
3 files changed, 1 insertions, 9 deletions
diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
index dc04af300a..ac5d4b7043 100644
--- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
+++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
@@ -66,7 +66,6 @@ Plugins\iehistory.dll
Plugins\ieview.dll
Plugins\ignorestate.dll
Plugins\import.dll
-Plugins\importtxt.dll
Plugins\irc.dll
Plugins\jabber.dll
Plugins\keyboardnotify.dll
diff --git a/tools/build_scripts/z1_ReBuild_Full.bat b/tools/build_scripts/z1_ReBuild_Full.bat
index 7f098d232d..3c71d673c6 100644
--- a/tools/build_scripts/z1_ReBuild_Full.bat
+++ b/tools/build_scripts/z1_ReBuild_Full.bat
@@ -35,7 +35,7 @@ if "%comp%"=="bin15" (
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
+call pascal.bat %tp%
pushd ..\plugins\HistoryPlusPlus
call make.bat %tp%
@@ -92,12 +92,6 @@ 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 %SourceDir%\tools\build_scripts\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%"
diff --git a/tools/build_scripts/z2_PackPluginUpdater.bat b/tools/build_scripts/z2_PackPluginUpdater.bat
index 7bba9862c0..37d6d05534 100644
--- a/tools/build_scripts/z2_PackPluginUpdater.bat
+++ b/tools/build_scripts/z2_PackPluginUpdater.bat
@@ -57,7 +57,6 @@ for /f %%a in ('dir plugins\*.dll /B /L') do (
if /I "%%a"=="HistoryPP.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\HistoryPP_icons.dll")
if /I "%%a"=="ICQ.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_ICQ.dll" "Icons\xStatus_ICQ.dll")
if /I "%%a"=="Import.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Libs\sqlite3.mir")
- if /I "%%a"=="ImportTXT.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Libs\pcre3.dll" Plugins\Importtxt\*.ini)
if /I "%%a"=="IRC.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_IRC.dll")
if /I "%%a"=="Jabber.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Jabber.dll" "Icons\xStatus_Jabber.dll" "Libs\libaxolotl.mir")
if /I "%%a"=="Listeningto.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Plugins\Listeningto\*.dll")