cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-11-14 02:29:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Convert NAPS2.Setup to new project format and fix t4s

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2020-01-29 14:35:20 -05:00
parent 0902ac4a91
commit a82dfb5420
5 changed files with 60 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
NAPS2.Setup/LanguageComponents.tt
View File

@ -1,13 +1,6 @@
<#@ template debug="true" hostSpecific="true" #>
<#@ output extension=".wxs" encoding="us-ascii" #>
<#@ Assembly Name="System.Core" #>
<#@ Assembly Name="System.Windows.Forms" #>
<#@ import namespace="System" #>
<#@ import namespace="System.IO" #>
<#@ import namespace="System.Diagnostics" #>
<#@ import namespace="System.Linq" #>
<#@ import namespace="System.Collections" #>
<#@ import namespace="System.Collections.Generic" #>
<?xml version='1.0' encoding='windows-1252'?>
<!-- This file is auto-generated by LanguageComponents.tt -->
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
@ -35,7 +28,7 @@
#>
<Directory Id="LangFolder_<#= langName.Replace("-", "_") #>" Name="<#= langName #>">
<Component Id="LangComponent_<#= langName.Replace("-", "_") #>">
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI\\<#= langName #>\NAPS2.Sdk.resources.dll" Id="LangFile_<#= langName.Replace("-", "_") #>" />
<File Source="..\NAPS2.App.WinForms\bin\InstallerMSI<#= "\\" + langName #>\NAPS2.Sdk.resources.dll" Id="LangFile_<#= langName.Replace("-", "_") #>" />
</Component>
</Directory>
<#

110
NAPS2.Setup/NAPS2.Setup.csproj
View File

@ -1,103 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{AC67D0DB-F980-456C-9E91-654CB4989736}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NAPS2.Setup2</RootNamespace>
<AssemblyName>NAPS2.Setup2</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
<TargetFramework>net461</TargetFramework>
<LangVersion>8</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Build-Test.ps1" />
<None Include="CommonTargets.targets" />
<None Include="LanguageComponents.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>LanguageComponents.wxs</LastGenOutput>
</None>
<None Include="LanguageComponents.wxs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>LanguageComponents.tt</DependentUpon>
</None>
<None Include="lib\linux\libgrpc_csharp_ext.x64.so" />
<None Include="lib\osx\libgrpc_csharp_ext.x64.dylib" />
<None Include="lib\win64\NAPS2.WIA.dll" />
<None Include="lib\win64\twaindsm.dll" />
<None Include="lib\dbg\win64\NAPS2.WIA.dll" />
<None Include="lib\dbg\win32\NAPS2.WIA.dll" />
<None Include="lib\linux\libpdfium.so" />
<None Include="lib\win32\NAPS2.WIA.dll" />
<None Include="lib\NTwain.dll" />
<None Include="lib\osx\libpdfium.dylib" />
<None Include="lib\PdfSharp.dll" />
<None Include="lib\win32\twaindsm.dll" />
<None Include="license.rtf" />
<None Include="naps2.ps1" />
<None Include="ps.bat" />
<None Include="Publish-NAPS2.ps1" />
<None Include="setup.iss" />
<None Include="setup.languagefiles.iss">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>setup.languagefiles.tt</DependentUpon>
</None>
<None Include="setup.languagefiles.tt">
<None Update="setup.languagefiles.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>setup.languagefiles.iss</LastGenOutput>
</None>
<None Include="Test-Lang.ps1" />
<None Include="Update-Resources.ps1" />
<None Include="Update-Templates.ps1" />
<None Include="WIA-Build.ps1" />
<None Update="setup.languagefiles.iss">
<DependentUpon>setup.languagefiles.tt</DependentUpon>
</None>
<None Update="LanguageComponents.tt">
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>LanguageComponents.wxs</LastGenOutput>
</None>
<None Update="LanguageComponents.wxs">
<DependentUpon>LanguageComponents.tt</DependentUpon>
</None>
</ItemGroup>
<ItemGroup>
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
</ItemGroup>
<ItemGroup>
<Content Include="lib\win32\grpc_csharp_ext.x86.dll" />
<Content Include="lib\win64\grpc_csharp_ext.x64.dll" />
<Content Include="lib\win64\pdfium.dll" />
<Content Include="lib\win32\pdfium.dll" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

35
NAPS2.Setup/Properties/AssemblyInfo.cs
View File

@ -1,35 +0,0 @@
using System.Reflection;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("NAPS2.Setup2")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("NAPS2.Setup2")]
[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("ac67d0db-f980-456c-9e91-654cb4989736")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

41
NAPS2.Setup/setup.languagefiles.iss
View File

@ -1 +1,42 @@
; This file is auto-generated by setup.languagefiles.tt
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\af\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\af"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\ar\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\ar"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\bg\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\bg"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\ca\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\ca"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\cs\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\cs"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\da\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\da"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\de\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\de"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\el\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\el"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\es\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\es"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\et\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\et"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\fa\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\fa"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\fi\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\fi"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\fr\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\fr"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\he\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\he"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\hr\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\hr"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\hu\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\hu"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\it\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\it"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\ja\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\ja"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\ko\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\ko"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\lt\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\lt"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\lv\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\lv"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\nb\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\nb"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\nl\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\nl"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\nn\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\nn"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\pl\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\pl"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\pt-BR\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\pt-BR"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\pt-PT\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\pt-PT"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\ro\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\ro"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\ru\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\ru"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\si\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\si"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\sk\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\sk"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\sl\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\sl"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\sq\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\sq"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\sr-Cyrl\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\sr-Cyrl"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\sr-Latn\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\sr-Latn"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\sv\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\sv"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\tr\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\tr"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\uk\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\uk"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\vi\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\vi"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\zh-CHS\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\zh-CHS"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\zh-TW\NAPS2.Core.resources.dll"; DestDir: "{app}\lib\zh-TW"; Flags: ignoreversion

11
NAPS2.Setup/setup.languagefiles.tt
View File

@ -1,22 +1,15 @@
<#@ template debug="true" hostSpecific="true" #>
<#@ output extension=".iss" encoding="us-ascii" #>
<#@ Assembly Name="System.Core" #>
<#@ Assembly Name="System.Windows.Forms" #>
<#@ import namespace="System" #>
<#@ import namespace="System.IO" #>
<#@ import namespace="System.Diagnostics" #>
<#@ import namespace="System.Linq" #>
<#@ import namespace="System.Collections" #>
<#@ import namespace="System.Collections.Generic" #>
; This file is auto-generated by setup.languagefiles.tt
<#
var setupDirPath = Path.GetDirectoryName(this.Host.TemplateFile);
var outputDirPath = Path.Combine(setupDirPath, @"..\..\NAPS2.Sdk\bin\InstallerEXE");
var outputDirPath = Path.Combine(setupDirPath, @"..\NAPS2.Sdk\bin\InstallerEXE");
var outputDir = new DirectoryInfo(outputDirPath);
foreach(var folder in outputDir.EnumerateDirectories()) {
var langName = folder.Name;
#>
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE\\<#= langName #>\NAPS2.Core.resources.dll"; DestDir: "{app}\\lib\\<#= langName #>"; Flags: ignoreversion
Source: "..\NAPS2.App.WinForms\bin\InstallerEXE<#= "\\" + langName #>\NAPS2.Core.resources.dll"; DestDir: "{app}\lib<#= "\\" + langName #>"; Flags: ignoreversion
<#
}
#>