mirror of
https://github.com/cyanfish/naps2.git
synced 2024-09-11 07:15:31 +03:00
Reorganize NAPS2.Setup files
This commit is contained in:
parent
947a187e87
commit
46259d2a7a
@ -19,9 +19,9 @@
|
||||
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\NativeLibs.targets" />
|
||||
<Import Project="..\NAPS2.Setup\SdkUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\NativeLibs.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="NAPS2.Wia" Version="1.0.1" />
|
||||
|
@ -19,9 +19,9 @@
|
||||
<Copyright>Copyright 2009, 2012-2022 NAPS2 Contributors</Copyright>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\NativeLibs.Linux.targets" />
|
||||
<Import Project="..\NAPS2.Setup\SdkUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\NativeLibs.Linux.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.0.3" />
|
||||
|
@ -15,9 +15,9 @@
|
||||
<Copyright>Copyright 2009, 2012-2022 NAPS2 Contributors</Copyright>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\NativeLibs.Mac.targets" />
|
||||
<Import Project="..\NAPS2.Setup\SdkUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\NativeLibs.Mac.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="NAPS2.Sane.Binaries" Version="1.0.4" />
|
||||
|
@ -11,6 +11,6 @@
|
||||
<Copyright>Copyright 2009, 2012-2020 NAPS2 Contributors; Icons from http://www.fatcow.com/free-icons</Copyright>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
|
||||
</Project>
|
@ -8,9 +8,9 @@
|
||||
<DefineConstants Condition=" '$(Configuration)' == 'DebugLang' ">DEBUG_LANG</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\NativeLibs.targets" />
|
||||
<Import Project="..\NAPS2.Setup\LibUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\NativeLibs.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\LibUsers.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.0.3" />
|
||||
|
@ -27,9 +27,9 @@
|
||||
<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\NativeLibs.targets" />
|
||||
<Import Project="..\NAPS2.Setup\SdkUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\NativeLibs.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.0.3" />
|
||||
|
@ -15,8 +15,8 @@
|
||||
<Copyright>Copyright 2009, 2012-2020 NAPS2 Contributors; Icons from http://www.fatcow.com/free-icons</Copyright>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\SdkUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="NAPS2.Wia" Version="1.0.1" />
|
||||
|
@ -22,7 +22,7 @@
|
||||
</AssemblyAttribute>
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\ImageUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\ImageUsers.targets" />
|
||||
|
||||
</Project>
|
||||
|
@ -21,7 +21,7 @@
|
||||
</AssemblyAttribute>
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\ImageUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\ImageUsers.targets" />
|
||||
|
||||
</Project>
|
||||
|
@ -43,7 +43,7 @@
|
||||
</AssemblyAttribute>
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\ImageUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\ImageUsers.targets" />
|
||||
|
||||
</Project>
|
||||
|
@ -31,6 +31,6 @@
|
||||
</AssemblyAttribute>
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\ImageUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\ImageUsers.targets" />
|
||||
</Project>
|
||||
|
@ -11,8 +11,8 @@
|
||||
<Copyright>Copyright 2009, 2012-2020 NAPS2 Contributors; Icons from http://www.fatcow.com/free-icons</Copyright>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\LibUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\LibUsers.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\NAPS2.Images.Gtk\NAPS2.Images.Gtk.csproj" />
|
||||
|
@ -11,8 +11,8 @@
|
||||
<Copyright>Copyright 2009, 2012-2020 NAPS2 Contributors; Icons from http://www.fatcow.com/free-icons</Copyright>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\LibUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\LibUsers.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\NAPS2.Images.Mac\NAPS2.Images.Mac.csproj" />
|
||||
|
@ -7,9 +7,9 @@
|
||||
<RootNamespace>NAPS2.Lib.Tests</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\NativeLibs.targets" />
|
||||
<Import Project="..\NAPS2.Setup\LibUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\NativeLibs.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\LibUsers.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="PdfSharpCore">
|
||||
|
@ -15,8 +15,8 @@
|
||||
<Configurations>Debug;Release;DebugLang</Configurations>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\LibUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\LibUsers.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\NAPS2.Lib\NAPS2.Lib.csproj" />
|
||||
|
@ -13,8 +13,8 @@
|
||||
<Configurations>Debug;Release;DebugLang</Configurations>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\LibUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\LibUsers.targets" />
|
||||
|
||||
<PropertyGroup Condition="'$(TargetFramework)' == 'net6-macos10.15'">
|
||||
<DefineConstants>MAC</DefineConstants>
|
||||
|
@ -4,8 +4,8 @@
|
||||
<TargetFrameworks>net6;net462</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\SdkUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\NAPS2.Sdk\NAPS2.Sdk.csproj" />
|
||||
|
@ -6,9 +6,9 @@
|
||||
<RootNamespace>NAPS2.Sdk.ScannerTests</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\NativeLibs.targets" />
|
||||
<Import Project="..\NAPS2.Setup\SdkUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\NativeLibs.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\NAPS2.Sdk.Tests\NAPS2.Sdk.Tests.csproj" />
|
||||
|
@ -11,9 +11,9 @@
|
||||
<DefineConstants Condition="$([MSBuild]::IsOSPlatform('Windows'))">WINDOWS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\NativeLibs.targets" />
|
||||
<Import Project="..\NAPS2.Setup\SdkUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\NativeLibs.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="PdfSharpCore">
|
||||
|
@ -15,8 +15,8 @@
|
||||
<Configurations>Debug;InstallerEXE;DebugLang;InstallerMSI;Standalone</Configurations>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\SdkUsers.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
|
||||
|
||||
<PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
|
||||
<DefineConstants>NONWINDOWS</DefineConstants>
|
||||
|
@ -4,6 +4,6 @@
|
||||
<TargetFrameworks>net6;net462</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
|
||||
</Project>
|
@ -25,52 +25,52 @@ Filename: "{app}\NAPS2.exe"; Flags: nowait postinstall
|
||||
; Only NAPS2-translated languages are included (to avoid misleading users)
|
||||
[Languages]
|
||||
Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||
Name: "Afrikaans"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Afrikaans.isl";
|
||||
Name: "Albanian"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Albanian.isl";
|
||||
Name: "Arabic"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Arabic.isl";
|
||||
; Name: "Bengali"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Bengali.isl";
|
||||
Name: "Afrikaans"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Afrikaans.isl";
|
||||
Name: "Albanian"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Albanian.isl";
|
||||
Name: "Arabic"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Arabic.isl";
|
||||
; Name: "Bengali"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Bengali.isl";
|
||||
Name: "BrazilianPortuguese"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\BrazilianPortuguese.isl";
|
||||
Name: "Bulgarian"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Bulgarian.isl";
|
||||
Name: "Catalan"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Catalan.isl";
|
||||
Name: "ChineseSimplified"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\ChineseSimplified.isl";
|
||||
Name: "ChineseTraditional"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\ChineseTraditional.isl";
|
||||
Name: "Croatian"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Croatian.isl";
|
||||
Name: "ChineseSimplified"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\ChineseSimplified.isl";
|
||||
Name: "ChineseTraditional"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\ChineseTraditional.isl";
|
||||
Name: "Croatian"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Croatian.isl";
|
||||
Name: "Czech"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Czech.isl";
|
||||
Name: "Danish"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Danish.isl";
|
||||
Name: "Dutch"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Dutch.isl";
|
||||
Name: "Estonian"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Estonian.isl";
|
||||
Name: "Farsi"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Farsi.isl";
|
||||
Name: "Estonian"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Estonian.isl";
|
||||
Name: "Farsi"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Farsi.isl";
|
||||
Name: "Finnish"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Finnish.isl";
|
||||
Name: "French"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\French.isl";
|
||||
Name: "German"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\German.isl";
|
||||
Name: "Greek"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Greek.isl";
|
||||
Name: "Greek"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Greek.isl";
|
||||
Name: "Hebrew"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Hebrew.isl";
|
||||
; Name: "Hindi"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Hindi.isl";
|
||||
Name: "Hungarian"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Hungarian.isl";
|
||||
; Name: "Indonesian"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Indonesian.isl";
|
||||
; Name: "Hindi"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Hindi.isl";
|
||||
Name: "Hungarian"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Hungarian.isl";
|
||||
; Name: "Indonesian"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Indonesian.isl";
|
||||
Name: "Italian"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Italian.isl";
|
||||
Name: "Japanese"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Japanese.isl";
|
||||
Name: "Korean"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Korean.isl";
|
||||
Name: "Latvian"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Latvian.isl";
|
||||
Name: "Lithuanian"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Lithuanian.isl";
|
||||
Name: "Korean"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Korean.isl";
|
||||
Name: "Latvian"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Latvian.isl";
|
||||
Name: "Lithuanian"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Lithuanian.isl";
|
||||
Name: "Norwegian"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Norwegian.isl";
|
||||
Name: "NorwegianNynorsk"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\NorwegianNynorsk.isl";
|
||||
Name: "NorwegianNynorsk"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\NorwegianNynorsk.isl";
|
||||
Name: "Polish"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Polish.isl";
|
||||
Name: "Portuguese"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Portuguese.isl";
|
||||
Name: "Romanian"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Romanian.isl";
|
||||
Name: "Romanian"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Romanian.isl";
|
||||
Name: "Russian"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Russian.isl";
|
||||
Name: "SerbianCyrillic"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\SerbianCyrillic.isl";
|
||||
Name: "SerbianLatin"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\SerbianLatin.isl";
|
||||
Name: "Sinhala"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Sinhala.isl";
|
||||
Name: "SerbianCyrillic"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\SerbianCyrillic.isl";
|
||||
Name: "SerbianLatin"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\SerbianLatin.isl";
|
||||
Name: "Sinhala"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Sinhala.isl";
|
||||
Name: "Slovak"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Slovak.isl";
|
||||
Name: "Slovenian"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Slovenian.isl";
|
||||
Name: "Spanish"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Spanish.isl";
|
||||
Name: "Swedish"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Swedish.isl";
|
||||
; Name: "Thai"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Thai.isl";
|
||||
Name: "Swedish"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Swedish.isl";
|
||||
; Name: "Thai"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Thai.isl";
|
||||
Name: "Turkish"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Turkish.isl";
|
||||
Name: "Ukrainian"; MessagesFile: "C:\Program Files (x86)\Inno Setup 6\Languages\Ukrainian.isl";
|
||||
; Name: "Urdu"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Urdu.isl";
|
||||
Name: "Vietnamese"; MessagesFile: "..\..\NAPS2.Setup\inno-lang\Vietnamese.isl";
|
||||
; Name: "Urdu"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Urdu.isl";
|
||||
Name: "Vietnamese"; MessagesFile: "..\..\NAPS2.Setup\config\windows\inno-lang\Vietnamese.isl";
|
||||
|
||||
[Tasks]
|
||||
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
|
@ -5,7 +5,7 @@
|
||||
<EnablePreviewFeatures>true</EnablePreviewFeatures>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\VersionTargets.targets" />
|
||||
<Import Project="VersionTargets.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<Using Include="System" />
|
@ -1,6 +1,6 @@
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<Import Project="..\NAPS2.Setup\SdkUsers.targets" />
|
||||
<Import Project="SdkUsers.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<Using Include="NAPS2.Config" />
|
@ -1,6 +1,6 @@
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
|
||||
<Import Project="..\NAPS2.Setup\ImageUsers.targets" />
|
||||
<Import Project="ImageUsers.targets" />
|
||||
|
||||
<ItemGroup>
|
||||
<Using Include="NAPS2.Lang.Resources" />
|
@ -19,6 +19,6 @@
|
||||
<PackageReference Include="VirusTotalNet" Version="2.0.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<Import Project="..\NAPS2.Setup\CommonTargets.targets" />
|
||||
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
|
||||
|
||||
</Project>
|
@ -28,6 +28,10 @@ internal static class Paths
|
||||
}
|
||||
|
||||
public static string Setup => Path.Combine(SolutionRoot, "NAPS2.Setup");
|
||||
|
||||
public static string SetupWindows => Path.Combine(Setup, "config", "windows");
|
||||
|
||||
public static string SetupLinux => Path.Combine(Setup, "config", "linux");
|
||||
|
||||
public static string SetupObj => Path.Combine(Setup, "obj");
|
||||
|
||||
|
@ -16,7 +16,7 @@ public static class FlatpakPackager
|
||||
VerifyCanBuildArch(packageInfo.Platform);
|
||||
|
||||
// Update metainfo file with the current version/date
|
||||
var metaInfo = File.ReadAllText(Path.Combine(Paths.Setup, "com.naps2.Naps2.metainfo.xml"));
|
||||
var metaInfo = File.ReadAllText(Path.Combine(Paths.SetupLinux, "com.naps2.Naps2.metainfo.xml"));
|
||||
var version = ProjectHelper.GetDefaultProjectVersion();
|
||||
var date = DateTime.Now.ToString("yyyy-MM-dd");
|
||||
metaInfo = Regex.Replace(metaInfo,
|
||||
@ -24,7 +24,7 @@ public static class FlatpakPackager
|
||||
$"<release version=\"{version}\" date=\"{date}\" />");
|
||||
|
||||
// Update manifest file with the correct paths
|
||||
var manifest = File.ReadAllText(Path.Combine(Paths.Setup, "com.naps2.Naps2.yml"));
|
||||
var manifest = File.ReadAllText(Path.Combine(Paths.SetupLinux, "com.naps2.Naps2.yml"));
|
||||
// TODO: Update this after we use a real repo path
|
||||
manifest = manifest.Replace("../../../../../..", Paths.SolutionRoot);
|
||||
|
||||
@ -34,7 +34,7 @@ public static class FlatpakPackager
|
||||
File.WriteAllText(Path.Combine(packageDir, "com.naps2.Naps2.metainfo.xml"), metaInfo);
|
||||
File.WriteAllText(Path.Combine(packageDir, "com.naps2.Naps2.yml"), manifest);
|
||||
File.Copy(
|
||||
Path.Combine(Paths.Setup, "com.naps2.Naps2.desktop"),
|
||||
Path.Combine(Paths.SetupLinux, "com.naps2.Naps2.desktop"),
|
||||
Path.Combine(packageDir, "com.naps2.Naps2.desktop"), true);
|
||||
File.Copy(
|
||||
Path.Combine(Paths.SolutionRoot, "NAPS2.Lib", "Icons", "scanner-128.png"),
|
||||
@ -47,7 +47,7 @@ public static class FlatpakPackager
|
||||
// TODO: Maybe have an option to just restore for the current arch? When we do an upload we definitely want all
|
||||
// of them, but for just building a single file we only need the current
|
||||
Output.Verbose("Generating nuget sources");
|
||||
var scriptPath = Path.Combine(Paths.Setup, "flatpak-dotnet-generator.py");
|
||||
var scriptPath = Path.Combine(Paths.SetupLinux, "flatpak-dotnet-generator.py");
|
||||
var nugetSourcesPath = Path.Combine(packageDir, "nuget-sources.json");
|
||||
var projectPath = Path.Combine(Paths.SolutionRoot, "NAPS2.App.Gtk", "NAPS2.App.Gtk.csproj");
|
||||
Cli.Run("python3", $"{scriptPath} {nugetSourcesPath} {projectPath}");
|
||||
|
@ -21,7 +21,7 @@ public static class InnoSetupPackager
|
||||
|
||||
private static string GenerateInnoDef(PackageInfo packageInfo)
|
||||
{
|
||||
var template = File.ReadAllText(Path.Combine(Paths.Setup, "setup.template.iss"));
|
||||
var template = File.ReadAllText(Path.Combine(Paths.SetupWindows, "setup.template.iss"));
|
||||
|
||||
var defLines = new StringBuilder();
|
||||
defLines.AppendLine($"#define AppVersion \"{packageInfo.Version}\"");
|
||||
|
@ -26,7 +26,7 @@ public static class WixToolsetPackager
|
||||
private static string GenerateWxs(PackageInfo packageInfo)
|
||||
{
|
||||
// TODO: Delete Setup.Msi project
|
||||
var template = File.ReadAllText(Path.Combine(Paths.SolutionRoot, "NAPS2.Setup", "setup.template.wxs"));
|
||||
var template = File.ReadAllText(Path.Combine(Paths.SetupWindows, "setup.template.wxs"));
|
||||
|
||||
template = template.Replace("{{ !version }}", packageInfo.Version);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user