mirror of
https://github.com/cyanfish/naps2.git
synced 2024-11-13 06:27:11 +03:00
Remove NAPS2_32 and add NAPS2_64 projects
This commit is contained in:
Ben Olden-Cooligan
parent
8255e9095c
commit
094824a217
64
NAPS2.sln
64
NAPS2.sln
@ -22,6 +22,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NAPS2.Portable", "NAPS2.Por
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NAPS2.DI", "NAPS2.DI\NAPS2.DI.csproj", "{4D349529-149B-498B-8A55-373E6A67E1F0}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NAPS2_64", "NAPS2_64\NAPS2_64.csproj", "{BA9A65A0-00FE-4BF4-A023-7D804817453F}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NAPS2_64.Console", "NAPS2_64.Console\NAPS2_64.Console.csproj", "{2982FF97-C9E3-412F-AEB5-E52E27E5C850}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@ -275,6 +279,66 @@ Global
|
||||
{4D349529-149B-498B-8A55-373E6A67E1F0}.StandaloneZIP|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{4D349529-149B-498B-8A55-373E6A67E1F0}.StandaloneZIP|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{4D349529-149B-498B-8A55-373E6A67E1F0}.StandaloneZIP|x86.ActiveCfg = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.InstallerEXE|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.InstallerEXE|Any CPU.Build.0 = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.InstallerEXE|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.InstallerEXE|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.InstallerEXE|x86.ActiveCfg = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.InstallerMSI|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.InstallerMSI|Any CPU.Build.0 = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.InstallerMSI|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.InstallerMSI|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.InstallerMSI|x86.ActiveCfg = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.Standalone7Z|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.Standalone7Z|Any CPU.Build.0 = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.Standalone7Z|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.Standalone7Z|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.Standalone7Z|x86.ActiveCfg = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.StandaloneZIP|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.StandaloneZIP|Any CPU.Build.0 = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.StandaloneZIP|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.StandaloneZIP|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{BA9A65A0-00FE-4BF4-A023-7D804817453F}.StandaloneZIP|x86.ActiveCfg = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.InstallerEXE|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.InstallerEXE|Any CPU.Build.0 = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.InstallerEXE|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.InstallerEXE|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.InstallerEXE|x86.ActiveCfg = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.InstallerMSI|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.InstallerMSI|Any CPU.Build.0 = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.InstallerMSI|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.InstallerMSI|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.InstallerMSI|x86.ActiveCfg = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.Standalone7Z|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.Standalone7Z|Any CPU.Build.0 = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.Standalone7Z|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.Standalone7Z|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.Standalone7Z|x86.ActiveCfg = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.StandaloneZIP|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.StandaloneZIP|Any CPU.Build.0 = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.StandaloneZIP|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.StandaloneZIP|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{2982FF97-C9E3-412F-AEB5-E52E27E5C850}.StandaloneZIP|x86.ActiveCfg = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
@ -35,8 +35,10 @@ function Set-Assembly-Version {
|
||||
function Set-NAPS2-Version {
|
||||
param([Parameter(Position=0)] [String] $Version)
|
||||
Set-Assembly-Version ([IO.Path]::Combine($pwd, "..\Properties\AssemblyInfo.cs")) $Version".*"
|
||||
Set-Assembly-Version ([IO.Path]::Combine($pwd, "..\..\NAPS2_64\Properties\AssemblyInfo.cs")) $Version".*"
|
||||
Set-Assembly-Version ([IO.Path]::Combine($pwd, "..\..\NAPS2.Core\Properties\AssemblyInfo.cs")) $Version".*"
|
||||
Set-Assembly-Version ([IO.Path]::Combine($pwd, "..\..\NAPS2.Console\Properties\AssemblyInfo.cs")) $Version".*"
|
||||
Set-Assembly-Version ([IO.Path]::Combine($pwd, "..\..\NAPS2_64.Console\Properties\AssemblyInfo.cs")) $Version".*"
|
||||
Replace-Content ([IO.Path]::Combine($pwd, "setup.iss")) '^#define AppVersion "[^"]+"' "#define AppVersion `"$Version`""
|
||||
# TODO: Do some XML processing instead of this flaky replacement
|
||||
Replace-Content ([IO.Path]::Combine($pwd, "..\..\NAPS2.Setup\NAPS2.Setup.wxs")) '^ Version="[^"]+"' " Version=`"$Version`""
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
<configuration>
|
||||
<startup>
|
||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
|
||||
</startup>
|
||||
<system.serviceModel>
|
||||
<behaviors>
|
||||
<serviceBehaviors>
|
||||
<behavior name="">
|
||||
<serviceDebug includeExceptionDetailInFaults="true" />
|
||||
</behavior>
|
||||
</serviceBehaviors>
|
||||
</behaviors>
|
||||
<diagnostics>
|
||||
<messageLogging
|
||||
logMessagesAtTransportLevel="true" logMessagesAtServiceLevel="true"
|
||||
logMalformedMessages="true" logEntireMessage="true"
|
||||
maxSizeOfMessageToLog="65535000" maxMessagesToLog="500" />
|
||||
</diagnostics>
|
||||
</system.serviceModel>
|
||||
<system.diagnostics>
|
||||
<sources>
|
||||
<source name="System.ServiceModel"
|
||||
switchValue="Information, ActivityTracing, Error, Warning, Critical"
|
||||
propagateActivity="true">
|
||||
<listeners>
|
||||
<add name="traceListener"
|
||||
type="System.Diagnostics.XmlWriterTraceListener"
|
||||
initializeData= "c:\wcf.svclog" />
|
||||
</listeners>
|
||||
</source>
|
||||
</sources>
|
||||
<trace autoflush="true" />
|
||||
</system.diagnostics>
|
||||
</configuration>
|
||||
@ -1,18 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using NAPS2.DI;
|
||||
using NAPS2.Host;
|
||||
using Ninject;
|
||||
|
||||
namespace NAPS2_32
|
||||
{
|
||||
static class Program
|
||||
{
|
||||
[STAThread]
|
||||
static void Main(string[] args)
|
||||
{
|
||||
X86HostEntry.Run(args, KernelManager.Kernel.Get<X86HostService>());
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Ninject" version="3.2.2.0" targetFramework="net40-Client" />
|
||||
<package id="NLog" version="4.2.3" targetFramework="net40-Client" />
|
||||
</packages>
|
||||
8
NAPS2_64.Console/App.config
Normal file
8
NAPS2_64.Console/App.config
Normal file
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<probing privatePath="lib"/>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
|
||||
72
NAPS2_64.Console/NAPS2_64.Console.csproj
Normal file
72
NAPS2_64.Console/NAPS2_64.Console.csproj
Normal file
@ -0,0 +1,72 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{2982FF97-C9E3-412F-AEB5-E52E27E5C850}</ProjectGuid>
|
||||
<OutputType>Exe</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>NAPS2_64.Console</RootNamespace>
|
||||
<AssemblyName>NAPS2_64.Console</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</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="Program.cs">
|
||||
<SubType>
|
||||
</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="App.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\NAPS2.Core\NAPS2.Core.csproj">
|
||||
<Project>{968378fa-a649-4058-a928-1fcd97b23070}</Project>
|
||||
<Name>NAPS2.Core</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\NAPS2.DI\NAPS2.DI.csproj">
|
||||
<Project>{4d349529-149b-498b-8a55-373e6a67e1f0}</Project>
|
||||
<Name>NAPS2.DI</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
36
NAPS2_64.Console/Program.cs
Normal file
36
NAPS2_64.Console/Program.cs
Normal file
@ -0,0 +1,36 @@
|
||||
/*
|
||||
NAPS2 (Not Another PDF Scanner 2)
|
||||
http://sourceforge.net/projects/naps2/
|
||||
|
||||
Copyright (C) 2009 Pavel Sorejs
|
||||
Copyright (C) 2012 Michael Adams
|
||||
Copyright (C) 2013 Peter De Leeuw
|
||||
Copyright (C) 2012-2015 Ben Olden-Cooligan
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation; either version 2
|
||||
of the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using NAPS2.DI.EntryPoints;
|
||||
|
||||
namespace NAPS2_64.Console
|
||||
{
|
||||
static class Program
|
||||
{
|
||||
[STAThread]
|
||||
static void Main(string[] args)
|
||||
{
|
||||
ConsoleEntryPoint.Run(args);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -24,12 +24,12 @@ 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 32-bit Host")]
|
||||
[assembly: AssemblyTitle("NAPS2 (Not Another PDF Scanner 2)")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("NAPS2 32-bit Host")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2016 Ben Olden-Cooligan")]
|
||||
[assembly: AssemblyProduct("NAPS2 (Not Another PDF Scanner 2)")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2009-2014 NAPS & NAPS2 Contributors")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
@ -39,7 +39,7 @@ using System.Runtime.InteropServices;
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||
[assembly: Guid("b021485b-14cc-4dbd-85b4-6a6cd7049d10")]
|
||||
[assembly: Guid("25ebbe9b-6e86-4ded-9dd3-9e3480ba1939")]
|
||||
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
@ -48,7 +48,4 @@ using System.Runtime.InteropServices;
|
||||
// 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("4.4.1.*")]
|
||||
[assembly: AssemblyVersion("5.0.3.*")]
|
||||
31
NAPS2_64/.gitignore
vendored
Normal file
31
NAPS2_64/.gitignore
vendored
Normal file
@ -0,0 +1,31 @@
|
||||
Thumbs.db
|
||||
*.obj
|
||||
*.exe
|
||||
*.pdb
|
||||
*.user
|
||||
*.aps
|
||||
*.pch
|
||||
*.vspscc
|
||||
*_i.c
|
||||
*_p.c
|
||||
*.ncb
|
||||
*.suo
|
||||
*.sln.docstates
|
||||
*.tlb
|
||||
*.tlh
|
||||
*.bak
|
||||
*.cache
|
||||
*.ilk
|
||||
*.log
|
||||
[Bb]in
|
||||
[Dd]ebug*/
|
||||
*.lib
|
||||
*.sbr
|
||||
obj/
|
||||
[Rr]elease*/
|
||||
_ReSharper*/
|
||||
[Tt]est[Rr]esult*
|
||||
*.vssscc
|
||||
$tf*/
|
||||
publish/
|
||||
bin/
|
||||
8
NAPS2_64/App.config
Normal file
8
NAPS2_64/App.config
Normal file
@ -0,0 +1,8 @@
|
||||
<?xml version="1.0"?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<probing privatePath="lib"/>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
|
||||
@ -4,20 +4,17 @@
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{4B5BDC54-5443-4A16-A223-135218988D40}</ProjectGuid>
|
||||
<ProjectGuid>{BA9A65A0-00FE-4BF4-A023-7D804817453F}</ProjectGuid>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>NAPS2_32</RootNamespace>
|
||||
<AssemblyName>NAPS2_32</AssemblyName>
|
||||
<RootNamespace>NAPS2_64</RootNamespace>
|
||||
<AssemblyName>NAPS2_64</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
|
||||
<RestorePackages>true</RestorePackages>
|
||||
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
|
||||
<WcfConfigValidationEnabled>True</WcfConfigValidationEnabled>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
@ -27,7 +24,7 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
@ -36,19 +33,8 @@
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Ninject.3.2.2.0\lib\net40\Ninject.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NLog.4.2.3\lib\net40\NLog.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.configuration" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Runtime.Serialization" />
|
||||
<Reference Include="System.ServiceModel" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
@ -59,7 +45,10 @@
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Program.cs" />
|
||||
<Compile Include="Program.cs">
|
||||
<SubType>
|
||||
</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<EmbeddedResource Include="Properties\Resources.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
@ -71,7 +60,6 @@
|
||||
<DependentUpon>Resources.resx</DependentUpon>
|
||||
<DesignTime>True</DesignTime>
|
||||
</Compile>
|
||||
<None Include="packages.config" />
|
||||
<None Include="Properties\Settings.settings">
|
||||
<Generator>SettingsSingleFileGenerator</Generator>
|
||||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
||||
@ -90,23 +78,12 @@
|
||||
<Project>{968378fa-a649-4058-a928-1fcd97b23070}</Project>
|
||||
<Name>NAPS2.Core</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\NAPS2\NAPS2.csproj">
|
||||
<Project>{eac4a133-93be-4400-bfa9-ceb1615693c4}</Project>
|
||||
<Name>NAPS2</Name>
|
||||
<ProjectReference Include="..\NAPS2.DI\NAPS2.DI.csproj">
|
||||
<Project>{4d349529-149b-498b-8a55-373e6a67e1f0}</Project>
|
||||
<Name>NAPS2.DI</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
|
||||
</Target>
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>copy $(ProjectDir)$(OutDir)NAPS2_32.exe $(SolutionDir)NAPS2\$(OutDir)
|
||||
copy $(ProjectDir)$(OutDir)NAPS2_32.exe.config $(SolutionDir)NAPS2\$(OutDir)</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
39
NAPS2_64/Program.cs
Normal file
39
NAPS2_64/Program.cs
Normal file
@ -0,0 +1,39 @@
|
||||
/*
|
||||
NAPS2 (Not Another PDF Scanner 2)
|
||||
http://sourceforge.net/projects/naps2/
|
||||
|
||||
Copyright (C) 2009 Pavel Sorejs
|
||||
Copyright (C) 2012 Michael Adams
|
||||
Copyright (C) 2013 Peter De Leeuw
|
||||
Copyright (C) 2012-2015 Ben Olden-Cooligan
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation; either version 2
|
||||
of the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using NAPS2.DI.EntryPoints;
|
||||
|
||||
namespace NAPS2_64
|
||||
{
|
||||
static class Program
|
||||
{
|
||||
/// <summary>
|
||||
/// The main entry point for the application.
|
||||
/// </summary>
|
||||
[STAThread]
|
||||
static void Main(string[] args)
|
||||
{
|
||||
WinFormsEntryPoint.Run(args);
|
||||
}
|
||||
}
|
||||
}
|
||||
55
NAPS2_64/Properties/AssemblyInfo.cs
Normal file
55
NAPS2_64/Properties/AssemblyInfo.cs
Normal file
@ -0,0 +1,55 @@
|
||||
/*
|
||||
NAPS2 (Not Another PDF Scanner 2)
|
||||
http://sourceforge.net/projects/naps2/
|
||||
|
||||
Copyright (C) 2009 Pavel Sorejs
|
||||
Copyright (C) 2012 Michael Adams
|
||||
Copyright (C) 2013 Peter De Leeuw
|
||||
Copyright (C) 2012-2015 Ben Olden-Cooligan
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation; either version 2
|
||||
of the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
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 (Not Another PDF Scanner 2)")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("NAPS2 (Not Another PDF Scanner 2)")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2009 Pavel Sorejs, Copyright © 2012 Michael Adams, Copyright © 2013 Peter De Leeuw, Copyright © 2012-2015 Ben Olden-Cooligan; Icons from http://www.fatcow.com/free-icons")]
|
||||
[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("db643920-c3d4-4e9f-b4f3-22fbeb689ea1")]
|
||||
|
||||
// Version information for an assembly consists of the following four values:
|
||||
//
|
||||
// Major Version
|
||||
// Minor Version
|
||||
// Build Number
|
||||
// Revision
|
||||
//
|
||||
[assembly: AssemblyVersion("5.0.3.*")]
|
||||
@ -8,7 +8,7 @@
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace NAPS2_32.Properties {
|
||||
namespace NAPS2_64.Properties {
|
||||
using System;
|
||||
|
||||
|
||||
@ -39,7 +39,7 @@ namespace NAPS2_32.Properties {
|
||||
internal static global::System.Resources.ResourceManager ResourceManager {
|
||||
get {
|
||||
if (object.ReferenceEquals(resourceMan, null)) {
|
||||
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NAPS2_32.Properties.Resources", typeof(Resources).Assembly);
|
||||
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NAPS2_64.Properties.Resources", typeof(Resources).Assembly);
|
||||
resourceMan = temp;
|
||||
}
|
||||
return resourceMan;
|
||||
@ -8,7 +8,7 @@
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace NAPS2_32.Properties {
|
||||
namespace NAPS2_64.Properties {
|
||||
|
||||
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
Loading…
Reference in New Issue
Block a user