Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 11:12:36 +01:00
Code Issues Projects Releases Wiki Activity

Use ILRepack to pack .NET libraries.

Browse Source
This commit is contained in:
_aLfa_ 2014-09-21 00:45:13 +02:00 committed by XhmikosR
parent 0f3879e08e
commit a055a3cea1
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.bat
View File

@ -90,7 +90,6 @@ IF NOT EXIST "temp_zip\Tesseract\tessdata\configs" MD "temp_zip\Tesseract\tessda
COPY /Y /V "..\..\..\gpl.txt" "temp_zip\"
COPY /Y /V "..\..\..\Changelog.txt" "temp_zip\"
COPY /Y /V "Interop.QuartzTypeLib.dll" "temp_zip\"
COPY /Y /V "Hunspellx86.dll" "temp_zip\"
COPY /Y /V "Hunspellx64.dll" "temp_zip\"
COPY /Y /V "SubtitleEdit.exe" "temp_zip\"

1
installer/Subtitle_Edit_installer.iss
View File

@ -208,7 +208,6 @@ Source: {#bindir}\Icons\SpellCheck.png; DestDir: {app}\Icons;
Source: {#bindir}\Icons\VideoToogle.png; DestDir: {app}\Icons; Flags: ignoreversion; Components: main
Source: {#bindir}\Icons\VisualSync.png; DestDir: {app}\Icons; Flags: ignoreversion; Components: main
Source: {#bindir}\Icons\WaveFormToogle.png; DestDir: {app}\Icons; Flags: ignoreversion; Components: main
Source: {#bindir}\Interop.QuartzTypeLib.dll; DestDir: {app}; Flags: ignoreversion; Components: main
#ifdef localize
Source: {#bindir}\Languages\ar-EG.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations

4
src/Logic/Utilities.cs
View File

@ -1831,10 +1831,6 @@ namespace Nikse.SubtitleEdit.Logic
if (IsRunningOnMono())
return false;
string quartsInteropFileName = Path.GetDirectoryName(Application.ExecutablePath).TrimEnd('\\') + @"\Interop.QuartzTypeLib.dll";
if (!File.Exists(quartsInteropFileName))
return false;
string quartzFileName = Environment.GetFolderPath(Environment.SpecialFolder.System).TrimEnd('\\') + @"\quartz.dll";
return File.Exists(quartzFileName);
}

8
src/SubtitleEdit.csproj
View File

@ -17,7 +17,7 @@
<RootNamespace>Nikse.SubtitleEdit</RootNamespace>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<NuGetPackageImportStamp>de8d0e94</NuGetPackageImportStamp>
<NuGetPackageImportStamp>275fbe13</NuGetPackageImportStamp>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">.\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
@ -1903,12 +1903,12 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>"$(ProjectDir)..\build_helpers.bat" rev
</PreBuildEvent>
<PreBuildEvent>"$(ProjectDir)..\build_helpers.bat" rev</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>COPY /Y /V "$(ProjectDir)packages\NHunspell.1.2.5359.26126\content\*.dll" "$(TargetDir)"
COPY /Y /V "$(ProjectDir)Dlls\Interop.QuartzTypeLib.dll" "$(TargetDir)"
COPY /Y /V "$(ProjectDir)DLLs\Interop.QuartzTypeLib.dll" "$(TargetDir)"
"$(ProjectDir)packages\ILRepack.1.25.0\tools\ILRepack.exe" /out:"$(TargetDir)$(TargetName).exe" "$(TargetDir)$(TargetName).exe" "$(TargetDir)NHunspell.dll" "$(TargetDir)Interop.QuartzTypeLib.dll" /targetplatform:v4 /internalize /parallel
"$(ProjectDir)..\build_helpers.bat" lang</PostBuildEvent>
</PropertyGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

1
src/packages.config
View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="ILRepack" version="1.25.0" />
<package id="NHunspell" version="1.2.5359.26126" targetFramework="net40-Client" />
</packages>