From d53617789bdbd24bdc6ec93a99de3fd17046a4f4 Mon Sep 17 00:00:00 2001 From: niksedk Date: Fri, 17 Sep 2021 16:59:05 +0200 Subject: [PATCH] Do not use ILRepack... to avoid anti-virus warnings --- build.bat | 22 ++++++++-------------- build_beta.bat | 22 ++++++++-------------- installer/Subtitle_Edit_installer.iss | 20 ++++++++++++++++---- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/build.bat b/build.bat index b9e607174..a7f35a1a8 100644 --- a/build.bat +++ b/build.bat @@ -108,20 +108,6 @@ IF %ERRORLEVEL% NEQ 0 GOTO EndWithError IF /I "%BUILDTYPE%" == "Clean" GOTO EndSuccessful -PUSHD "src/ui" -ECHO. -ECHO Merging assemblies with ILRepack... -FOR /D %%A IN (..\..\packages\ILRepack.*) DO (SET "ILREPACKDIR=%%A") -ECHO. -echo ILREPACKDIR -echo %ILREPACKDIR% -echo ILREPACKDIR done -"%ILREPACKDIR%\tools\ILRepack.exe" /parallel /internalize /targetplatform:v4 /out:"bin\Release\SubtitleEdit.exe" "bin\Release\SubtitleEdit.exe"^ - "bin\Release\libse.dll" "bin\Release\zlib.net.dll" "bin\Release\NHunspell.dll" "bin\Release\UtfUnknown.dll" "DLLs\Interop.QuartzTypeLib.dll"^ - "bin\Release\Newtonsoft.Json.dll" "bin\Release\System.Net.Http.Extensions.dll" "bin\Release\System.Net.Http.Primitives.dll" -IF %ERRORLEVEL% NEQ 0 GOTO EndWithError -POPD - CALL :SubDetectSevenzipPath IF DEFINED SEVENZIP IF EXIST "%SEVENZIP%" ( CALL :SubGetVersion @@ -194,6 +180,14 @@ COPY /Y /V "..\..\..\..\Changelog.txt" "temp_zip\" COPY /Y /V "..\..\..\..\preview.mkv" "temp_zip\" COPY /Y /V "Hunspellx86.dll" "temp_zip\" COPY /Y /V "Hunspellx64.dll" "temp_zip\" +COPY /Y /V "libse.dll" "temp_zip\" +COPY /Y /V "zlib.net.dll" "temp_zip\" +COPY /Y /V "NHunspell.dll" "temp_zip\" +COPY /Y /V "UtfUnknown.dll" "temp_zip\" +COPY /Y /V "..\..\DLLs\Interop.QuartzTypeLib.dll" "temp_zip\" +COPY /Y /V "System.Net.Http.Extensions.dll" "temp_zip\" +COPY /Y /V "Newtonsoft.Json.dll" "temp_zip\" +COPY /Y /V "System.Net.Http.Primitives.dll" "temp_zip\" COPY /Y /V "SubtitleEdit.exe" "temp_zip\" COPY /Y /V "Languages\*.xml" "temp_zip\Languages\" COPY /Y /V "..\..\..\..\Dictionaries\*.*" "temp_zip\Dictionaries\" diff --git a/build_beta.bat b/build_beta.bat index a389b7ed8..df9b64fa0 100644 --- a/build_beta.bat +++ b/build_beta.bat @@ -116,20 +116,6 @@ IF %ERRORLEVEL% NEQ 0 GOTO EndWithError IF /I "%BUILDTYPE%" == "Clean" GOTO EndSuccessful -PUSHD "src/ui" -ECHO. -ECHO Merging assemblies with ILRepack... -FOR /D %%A IN (..\..\packages\ILRepack.*) DO (SET "ILREPACKDIR=%%A") -ECHO. -echo ILREPACKDIR -echo %ILREPACKDIR% -echo ILREPACKDIR done -"%ILREPACKDIR%\tools\ILRepack.exe" /parallel /internalize /targetplatform:v4 /out:"bin\Release\SubtitleEdit.exe" "bin\Release\SubtitleEdit.exe"^ - "bin\Release\libse.dll" "bin\Release\zlib.net.dll" "bin\Release\NHunspell.dll" "bin\Release\UtfUnknown.dll" "DLLs\Interop.QuartzTypeLib.dll"^ - "bin\Release\Newtonsoft.Json.dll" "bin\Release\System.Net.Http.Extensions.dll" "bin\Release\System.Net.Http.Primitives.dll" -IF %ERRORLEVEL% NEQ 0 GOTO EndWithError -POPD - CALL :SubDetectSevenzipPath IF DEFINED SEVENZIP IF EXIST "%SEVENZIP%" ( CALL :SubZipFile @@ -182,6 +168,14 @@ COPY /Y /V "..\..\..\..\Changelog.txt" "temp_zip\" COPY /Y /V "..\..\..\..\preview.mkv" "temp_zip\" COPY /Y /V "Hunspellx86.dll" "temp_zip\" COPY /Y /V "Hunspellx64.dll" "temp_zip\" +COPY /Y /V "libse.dll" "temp_zip\" +COPY /Y /V "zlib.net.dll" "temp_zip\" +COPY /Y /V "NHunspell.dll" "temp_zip\" +COPY /Y /V "UtfUnknown.dll" "temp_zip\" +COPY /Y /V "..\..\DLLs\Interop.QuartzTypeLib.dll" "temp_zip\" +COPY /Y /V "System.Net.Http.Extensions.dll" "temp_zip\" +COPY /Y /V "Newtonsoft.Json.dll" "temp_zip\" +COPY /Y /V "System.Net.Http.Primitives.dll" "temp_zip\" COPY /Y /V "SubtitleEdit.exe" "temp_zip\" COPY /Y /V "Languages\*.xml" "temp_zip\Languages\" COPY /Y /V "..\..\..\..\Dictionaries\*.*" "temp_zip\Dictionaries\" diff --git a/installer/Subtitle_Edit_installer.iss b/installer/Subtitle_Edit_installer.iss index a277a9aed..8a364c004 100644 --- a/installer/Subtitle_Edit_installer.iss +++ b/installer/Subtitle_Edit_installer.iss @@ -285,6 +285,14 @@ Source: {#bindir}\SubtitleEdit.exe; DestDir: {app}; Source: {#bindirres}\SubtitleEdit.resources.dll; DestDir: {app}; Flags: ignoreversion; Components: main; AfterInstall: ClearMUICache Source: {#bindir}\Hunspellx64.dll; DestDir: {app}; Flags: ignoreversion; Components: main Source: {#bindir}\Hunspellx86.dll; DestDir: {app}; Flags: ignoreversion; Components: main +Source: {#bindir}\libse.dll; DestDir: {app}; Flags: ignoreversion; Components: main +Source: {#bindir}\zlib.net.dll; DestDir: {app}; Flags: ignoreversion; Components: main +Source: {#bindir}\NHunspell.dll; DestDir: {app}; Flags: ignoreversion; Components: main +Source: {#bindir}\UtfUnknown.dll; DestDir: {app}; Flags: ignoreversion; Components: main +Source: ..\src\ui\DLLs\Interop.QuartzTypeLib.dll; DestDir: {app}; Flags: ignoreversion; Components: main +Source: {#bindir}\Newtonsoft.Json.dll; DestDir: {app}; Flags: ignoreversion; Components: main +Source: {#bindir}\System.Net.Http.Extensions.dll; DestDir: {app}; Flags: ignoreversion; Components: main +Source: {#bindir}\System.Net.Http.Primitives.dll; DestDir: {app}; Flags: ignoreversion; Components: main Source: ..\Changelog.txt; DestDir: {app}; Flags: ignoreversion; Components: main Source: ..\LICENSE.txt; DestDir: {app}; Flags: ignoreversion; Components: main Source: Icons\uninstall.ico; DestDir: {app}\Icons; Flags: ignoreversion; Components: main @@ -313,11 +321,15 @@ Name: {#quick_launch}\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; Wo Type: files; Name: {userdesktop}\Subtitle Edit.lnk; Check: not IsTaskSelected('desktopicon\user') and IsUpgrade() Type: files; Name: {commondesktop}\Subtitle Edit.lnk; Check: not IsTaskSelected('desktopicon\common') and IsUpgrade() Type: files; Name: {#quick_launch}\Subtitle Edit.lnk; Check: not IsTaskSelected('quicklaunchicon') and IsUpgrade(); OnlyBelowVersion: 6.01 - Type: files; Name: {userappdata}\Subtitle Edit\Settings.xml; Tasks: reset_settings - -; Remove files merged from now on with ILRepack -Type: files; Name: {app}\Interop.QuartzTypeLib.dll; Check: IsUpgrade() +Type: files; Name: {app}\libse.dll; Check: IsUpgrade() +Type: files; Name: {app}\zlib.net.dll; Check: IsUpgrade() +Type: files; Name: {app}\NHunspell.dll; Check: IsUpgrade() +Type: files; Name: {app}\UtfUnknown.dll; Check: IsUpgrade() +Type: files; Name: {app}\Interop.QuartzTypeLib.dll; Check: IsUpgrade() +Type: files; Name: {app}\Newtonsoft.Json.dll; Check: IsUpgrade() +Type: files; Name: {app}\System.Net.Http.Extensions.dll; Check: IsUpgrade() +Type: files; Name: {app}\System.Net.Http.Primitives.dll; Check: IsUpgrade() ; Remove old files from the {app} dir Type: files; Name: {app}\Dictionaries\da_names.xml; Check: IsUpgrade()