diff --git a/build.bat b/build.bat index e5035dab5..1bac5e528 100644 --- a/build.bat +++ b/build.bat @@ -180,7 +180,7 @@ EXIT /B TITLE Creating ZIP archive with 7-Zip... ECHO. ECHO Creating ZIP archive with 7-Zip... -PUSHD "src\ui\bin\Release" +PUSHD "src\ui\bin\Release\net48" IF EXIST "temp_zip" RD /S /Q "temp_zip" IF NOT EXIST "temp_zip" MD "temp_zip" IF NOT EXIST "temp_zip\Languages" MD "temp_zip\Languages" @@ -198,9 +198,9 @@ IF NOT EXIST "temp_zip\Icons\Black" MD "temp_zip\Icons\Black" IF NOT EXIST "temp_zip\Icons\Black\VideoPlayer" MD "temp_zip\Icons\Black\VideoPlayer" ECHO. -COPY /Y /V "..\..\..\..\LICENSE.txt" "temp_zip\" -COPY /Y /V "..\..\..\..\Changelog.txt" "temp_zip\" -COPY /Y /V "..\..\..\..\preview.mkv" "temp_zip\" +COPY /Y /V "..\..\..\..\..\LICENSE.txt" "temp_zip\" +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\" @@ -209,7 +209,7 @@ COPY /Y /V "NHunspell.dll" "temp_zip\" COPY /Y /V "UtfUnknown.dll" "temp_zip\" COPY /Y /V "Vosk.dll" "temp_zip\" COPY /Y /V "NCalc.dll" "temp_zip\" -COPY /Y /V "..\..\DLLs\Interop.QuartzTypeLib.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\" @@ -218,18 +218,18 @@ COPY /Y /V "NAudio.WinMM.dll" "temp_zip\" COPY /Y /V "Microsoft.Win32.Registry.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\" -COPY /Y /V "..\..\..\..\Ocr\*.*" "temp_zip\Ocr\" -XCOPY /Y /V "..\..\..\..\Tesseract302\*.*" "temp_zip\Tesseract302\" /S -COPY /Y /V "..\..\..\..\Icons\*.ico" "temp_zip\Icons\" -COPY /Y /V "..\..\..\..\Icons\DefaultTheme\*.png" "temp_zip\Icons\DefaultTheme" -COPY /Y /V "..\..\..\..\Icons\DefaultTheme\VideoPlayer\*.png" "temp_zip\Icons\DefaultTheme\VideoPlayer" -COPY /Y /V "..\..\..\..\Icons\DarkTheme\*.png" "temp_zip\Icons\DarkTheme" -COPY /Y /V "..\..\..\..\Icons\DarkTheme\VideoPlayer\*.png" "temp_zip\Icons\DarkTheme\VideoPlayer" -COPY /Y /V "..\..\..\..\Icons\Legacy\*.png" "temp_zip\Icons\Legacy" -COPY /Y /V "..\..\..\..\Icons\Legacy\VideoPlayer\*.png" "temp_zip\Icons\Legacy\VideoPlayer" -COPY /Y /V "..\..\..\..\Icons\Black\*.png" "temp_zip\Icons\Black" -COPY /Y /V "..\..\..\..\Icons\Black\VideoPlayer\*.png" "temp_zip\Icons\Black\VideoPlayer" +COPY /Y /V "..\..\..\..\..\Dictionaries\*.*" "temp_zip\Dictionaries\" +COPY /Y /V "..\..\..\..\..\Ocr\*.*" "temp_zip\Ocr\" +XCOPY /Y /V "..\..\..\..\..\Tesseract302\*.*" "temp_zip\Tesseract302\" /S +COPY /Y /V "..\..\..\..\..\Icons\*.ico" "temp_zip\Icons\" +COPY /Y /V "..\..\..\..\..\Icons\DefaultTheme\*.png" "temp_zip\Icons\DefaultTheme" +COPY /Y /V "..\..\..\..\..\Icons\DefaultTheme\VideoPlayer\*.png" "temp_zip\Icons\DefaultTheme\VideoPlayer" +COPY /Y /V "..\..\..\..\..\Icons\DarkTheme\*.png" "temp_zip\Icons\DarkTheme" +COPY /Y /V "..\..\..\..\..\Icons\DarkTheme\VideoPlayer\*.png" "temp_zip\Icons\DarkTheme\VideoPlayer" +COPY /Y /V "..\..\..\..\..\Icons\Legacy\*.png" "temp_zip\Icons\Legacy" +COPY /Y /V "..\..\..\..\..\Icons\Legacy\VideoPlayer\*.png" "temp_zip\Icons\Legacy\VideoPlayer" +COPY /Y /V "..\..\..\..\..\Icons\Black\*.png" "temp_zip\Icons\Black" +COPY /Y /V "..\..\..\..\..\Icons\Black\VideoPlayer\*.png" "temp_zip\Icons\Black\VideoPlayer" PUSHD "temp_zip" START "" /B /WAIT "%SEVENZIP%" a -tzip -mx=9 "SubtitleEdit-%VERSION%.zip" * >NUL diff --git a/build_beta.bat b/build_beta.bat index 261b2a552..2511f3fb5 100644 --- a/build_beta.bat +++ b/build_beta.bat @@ -154,7 +154,7 @@ EXIT /B TITLE Creating ZIP archive with 7-Zip... ECHO. ECHO Creating ZIP archive with 7-Zip... -PUSHD "src\ui\bin\Release" +PUSHD "src\ui\bin\Release\net48" IF EXIST "temp_zip" RD /S /Q "temp_zip" IF NOT EXIST "temp_zip" MD "temp_zip" IF NOT EXIST "temp_zip\Languages" MD "temp_zip\Languages" @@ -172,9 +172,9 @@ IF NOT EXIST "temp_zip\Icons\Black" MD "temp_zip\Icons\Black" IF NOT EXIST "temp_zip\Icons\Black\VideoPlayer" MD "temp_zip\Icons\Black\VideoPlayer" ECHO. -COPY /Y /V "..\..\..\..\LICENSE.txt" "temp_zip\" -COPY /Y /V "..\..\..\..\Changelog.txt" "temp_zip\" -COPY /Y /V "..\..\..\..\preview.mkv" "temp_zip\" +COPY /Y /V "..\..\..\..\..\LICENSE.txt" "temp_zip\" +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\" @@ -183,7 +183,7 @@ COPY /Y /V "NHunspell.dll" "temp_zip\" COPY /Y /V "UtfUnknown.dll" "temp_zip\" COPY /Y /V "Vosk.dll" "temp_zip\" COPY /Y /V "NCalc.dll" "temp_zip\" -COPY /Y /V "..\..\DLLs\Interop.QuartzTypeLib.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\" @@ -192,18 +192,18 @@ COPY /Y /V "NAudio.WinMM.dll" "temp_zip\" COPY /Y /V "Microsoft.Win32.Registry.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\" -COPY /Y /V "..\..\..\..\Ocr\*.*" "temp_zip\Ocr\" -XCOPY /Y /V "..\..\..\..\Tesseract302\*.*" "temp_zip\Tesseract302\" /S -COPY /Y /V "..\..\..\..\Icons\*.ico" "temp_zip\Icons\" -COPY /Y /V "..\..\..\..\Icons\DefaultTheme\*.png" "temp_zip\Icons\DefaultTheme" -COPY /Y /V "..\..\..\..\Icons\DefaultTheme\VideoPlayer\*.png" "temp_zip\Icons\DefaultTheme\VideoPlayer" -COPY /Y /V "..\..\..\..\Icons\DarkTheme\*.png" "temp_zip\Icons\DarkTheme" -COPY /Y /V "..\..\..\..\Icons\DarkTheme\VideoPlayer\*.png" "temp_zip\Icons\DarkTheme\VideoPlayer" -COPY /Y /V "..\..\..\..\Icons\Legacy\*.png" "temp_zip\Icons\Legacy" -COPY /Y /V "..\..\..\..\Icons\Legacy\VideoPlayer\*.png" "temp_zip\Icons\Legacy\VideoPlayer" -COPY /Y /V "..\..\..\..\Icons\Black\*.png" "temp_zip\Icons\Black" -COPY /Y /V "..\..\..\..\Icons\Black\VideoPlayer\*.png" "temp_zip\Icons\Black\VideoPlayer" +COPY /Y /V "..\..\..\..\..\Dictionaries\*.*" "temp_zip\Dictionaries\" +COPY /Y /V "..\..\..\..\..\Ocr\*.*" "temp_zip\Ocr\" +XCOPY /Y /V "..\..\..\..\..\Tesseract302\*.*" "temp_zip\Tesseract302\" /S +COPY /Y /V "..\..\..\..\..\Icons\*.ico" "temp_zip\Icons\" +COPY /Y /V "..\..\..\..\..\Icons\DefaultTheme\*.png" "temp_zip\Icons\DefaultTheme" +COPY /Y /V "..\..\..\..\..\Icons\DefaultTheme\VideoPlayer\*.png" "temp_zip\Icons\DefaultTheme\VideoPlayer" +COPY /Y /V "..\..\..\..\..\Icons\DarkTheme\*.png" "temp_zip\Icons\DarkTheme" +COPY /Y /V "..\..\..\..\..\Icons\DarkTheme\VideoPlayer\*.png" "temp_zip\Icons\DarkTheme\VideoPlayer" +COPY /Y /V "..\..\..\..\..\Icons\Legacy\*.png" "temp_zip\Icons\Legacy" +COPY /Y /V "..\..\..\..\..\Icons\Legacy\VideoPlayer\*.png" "temp_zip\Icons\Legacy\VideoPlayer" +COPY /Y /V "..\..\..\..\..\Icons\Black\*.png" "temp_zip\Icons\Black" +COPY /Y /V "..\..\..\..\..\Icons\Black\VideoPlayer\*.png" "temp_zip\Icons\Black\VideoPlayer" PUSHD "temp_zip" START "" /B /WAIT "%SEVENZIP%" a -tzip -mx=9 "SubtitleEditBeta.zip" * >NUL @@ -211,7 +211,7 @@ IF %ERRORLEVEL% NEQ 0 GOTO EndWithError ECHO. ECHO ZIP archive created successfully! -MOVE /Y "SubtitleEditBeta.zip" "..\..\..\..\..\SubtitleEditBeta" >NUL +MOVE /Y "SubtitleEditBeta.zip" "..\..\..\..\..\..\SubtitleEditBeta" >NUL POPD IF EXIST "temp_zip" RD /S /Q "temp_zip" POPD diff --git a/installer/Subtitle_Edit_Installer.iss b/installer/Subtitle_Edit_Installer.iss index 595fa6b79..92bdf8271 100644 --- a/installer/Subtitle_Edit_Installer.iss +++ b/installer/Subtitle_Edit_Installer.iss @@ -43,7 +43,7 @@ #define VerBuild #define VerRevision -#define bindir "..\src\ui\bin\Release" +#define bindir "..\src\ui\bin\Release\net48" #ifnexist bindir + "\SubtitleEdit.exe" #error Compile Subtitle Edit first