Skip to content

Commit

Permalink
Merge branch 'release/3.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesw committed Dec 16, 2018
2 parents 29b855a + 11a0676 commit b614b6d
Show file tree
Hide file tree
Showing 99 changed files with 5,256 additions and 2,524 deletions.
52 changes: 2 additions & 50 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,31 +1,6 @@
# myget
.buildtools

#################
## Eclipse
#################

*.pydevproject
.project
.metadata
bin/**
tmp/**
tmp/**/*
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

Expand Down Expand Up @@ -146,29 +121,6 @@ Thumbs.db
# Folder config file
Desktop.ini


#############
## Python
#############

*.py[co]

# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox
Expand All @@ -186,12 +138,12 @@ pip-log.txt
# Project Specific
###############

/src/AssemblyVersionInfo.cs

/*.Log
*.sdsettings

###############
# GIT Change files
################
*.orig

src/Tesseract/Tesseract.xml
24 changes: 23 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,26 @@
### Version 3.0.2
### Version 3.3.0

* Updated to Tesseract 3.05.2
* Updated to Leptonica 1.75.3
* Added support for setting Pix resolution - [Issue 366](https://github.com/charlesw/tesseract/issues/366)

### Version 3.2.0

* Support for .Net Standard 2.0 (.net Core 2) - [Issue 298](https://github.com/charlesw/tesseract/issues/298)
* Removed support for TESSDATA environment variable
* Added support for the renderer api (generation of PDF, Text, etc) - [Issue 193](https://github.com/charlesw/tesseract/issues/193)
* Added support for the multiple renderers - [Issue 297](https://github.com/charlesw/tesseract/issues/297)
* Updated to Tesseract 3.05.1 - [Issue #340](https://github.com/charlesw/tesseract/issues/340)
* Added support Adding pix to, Removing pix from, and clearing PixA - [Issue #340](https://github.com/charlesw/tesseract/issues/340)
* Fixed PolyBlockType definition - [Issue #280](https://github.com/charlesw/tesseract/issues/280)
* Added support for Font attributes to Result Iterator - [Issue #9](https://github.com/charlesw/tesseract/issues/9)

### Version 3.1.0

* Support for printing list of available variables - [Issue 256](https://github.com/charlesw/tesseract/issues/256)
* Support for line removal - [Issue 268](https://github.com/charlesw/tesseract/issues/256)

### Version 3.0.2

* Fixed intermittent crash on initialisation - [Issue 231](https://github.com/charlesw/tesseract/issues/231)
* Upgraded native tesseract libraries to those provided by https://github.com/charlesw/tesseract-vs (Visual Studio 2015)
Expand Down
8 changes: 4 additions & 4 deletions ReadMe.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
A .NET wrapper for [tesseract-ocr] 3.04.
A .NET wrapper for [tesseract-ocr] 3.05.02

## Dependencies

Expand All @@ -9,13 +9,13 @@ Since tesseract and leptonica binaries are compiled with Visual Studio 2015 you'

### Tesseract language data

You will also need to download the language data files for tesseract 3.04 from [tesseract-ocr].
You will also need to download the language data files for tesseract 3.05.02 from [tesseract-ocr].

## Getting started quickly

1. Add the ``Tesseract`` NuGet Package by running ``Install-Package Tesseract`` from the [Package Manager Console](http://docs.nuget.org/docs/start-here/using-the-package-manager-console).
2. Ensure you have Visual Studio 2015 x86 & x64 runtimes installed (see note above).
3. Download language data files for tesseract 3.04 from the [tessdata repository](https://github.com/tesseract-ocr/tessdata/releases/tag/3.04.00) and add them to your project,
3. Download language data files for tesseract 3.05 from the [tessdata repository](https://github.com/tesseract-ocr/tessdata/releases/tag/3.04.00) and add them to your project,
ensure 'Copy to output directory' is set to Always.
4. Check out the Samples solution ``~/src/Tesseract.Samples.sln`` in the [tesseract-samples](https://github.com/charlesw/tesseract-samples) repository for a working example.

Expand All @@ -27,7 +27,7 @@ Please create your pull requests to target the "develop" branch. "Master" is onl

## License

Copyright 2012-2016 Charles Weld.
Copyright 2012-2018 Charles Weld.

Licensed under the [Apache License, Version 2.0][apache2] (the "License"); you
may not use this software except in compliance with the License. You may obtain
Expand Down
58 changes: 0 additions & 58 deletions build.bat

This file was deleted.

143 changes: 71 additions & 72 deletions build.proj
Original file line number Diff line number Diff line change
@@ -1,77 +1,76 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Package" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Version>3.0.2.0</Version>
<ReleaseVersion>3.0.2.0</ReleaseVersion>
<SourceDir>$(MSBuildProjectDirectory)\src</SourceDir>
<BuildDir>$(MSBuildProjectDirectory)\bin</BuildDir>
<ReleaseDir>$(MSBuildProjectDirectory)\release</ReleaseDir>
<ToolsDir>$(MSBuildProjectDirectory)\tools</ToolsDir>
<ExtensionTasksPath>$(ToolsDir)\MSBuild.ExtensionPack\</ExtensionTasksPath>
</PropertyGroup>
<Import Project="$(ExtensionTasksPath)\MSBuild.ExtensionPack.tasks"/>
<ItemGroup>
<Template Include="$(SourceDir)\AssemblyVersionInfo.template.cs" />
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Debug451</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Release451</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Debug45</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Release45</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Debug40</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Release40</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Debug40Client</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Release40Client</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Debug35</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Release35</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Debug20</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Release20</Configuration>
</Flavor>
</ItemGroup>
<Target Name="PrepareBuild">
<Copy SourceFiles="$(SourceDir)\AssemblyVersionInfo.template.cs" DestinationFiles="$(SourceDir)\AssemblyVersionInfo.cs" />
<MSBuild.ExtensionPack.FileSystem.File TaskAction="Replace" RegexPattern="\$\(Version\)" Replacement="$(Version)" Files="$(SourceDir)\AssemblyVersionInfo.cs"/>
</Target>
<Target Name="ExpandFlavors" DependsOnTargets="PrepareBuild">
<CreateItem Include="@(Flavor)" AdditionalMetadata="Properties=Configuration=%(Flavor.Configuration)%3BPlatform=Any CPU%3BOutDir=$(BuildDir)\%(Flavor.Configuration)\">
<Output TaskParameter="Include" ItemName="ProjectToBuild" />
</CreateItem>
</Target>
<PropertyGroup>
<Version>3.3.0.0</Version>
<ReleaseVersion>3.3.0</ReleaseVersion>
<SourceDir>$(MSBuildProjectDirectory)\src</SourceDir>
<BuildDir>$(MSBuildProjectDirectory)\bin</BuildDir>
<ReleaseDir>$(MSBuildProjectDirectory)\release</ReleaseDir>
<ToolsDir>$(MSBuildProjectDirectory)\tools</ToolsDir>
<ExtensionTasksPath>$(ToolsDir)\MSBuild.ExtensionPack\</ExtensionTasksPath>
</PropertyGroup>
<Import Project="$(ExtensionTasksPath)\MSBuild.ExtensionPack.tasks" />
<ItemGroup>
<Template Include="$(SourceDir)\AssemblyVersionInfo.template.cs" />

<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Debug451</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Release451</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Debug45</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Release45</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Debug40</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Release40</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Debug40Client</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Release40Client</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Debug35</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Release35</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Debug20</Configuration>
</Flavor>
<Flavor Include="$(SourceDir)\Tesseract.sln">
<Configuration>Release20</Configuration>
</Flavor>
</ItemGroup>
<Target Name="PrepareBuild">
<Copy SourceFiles="$(SourceDir)\AssemblyVersionInfo.template.cs" DestinationFiles="$(SourceDir)\AssemblyVersionInfo.cs" />
<MSBuild.ExtensionPack.FileSystem.File TaskAction="Replace" RegexPattern="\$\(Version\)" Replacement="$(Version)" Files="$(SourceDir)\AssemblyVersionInfo.cs" />
</Target>
<Target Name="ExpandFlavors" DependsOnTargets="PrepareBuild">
<CreateItem Include="@(Flavor)" AdditionalMetadata="Properties=Configuration=%(Flavor.Configuration)%3BPlatform=Any CPU%3BOutDir=$(BuildDir)\%(Flavor.Configuration)\">
<Output TaskParameter="Include" ItemName="ProjectToBuild" />
</CreateItem>
</Target>
<Target Name="RestorePackages">
<Exec Command='$(ToolsDir)\NuGet.exe restore "$(SourceDir)\Tesseract.sln"'/>
<Exec Command='"$(ToolsDir)\NuGet.exe" restore "$(SourceDir)\Tesseract.sln"' />
</Target>
<Target Name="Clean" DependsOnTargets="ExpandFlavors;RestorePackages">
<MSBuild Projects="@(ProjectToBuild)" Targets="Clean" />
<RemoveDir Directories="$(BuildDir)" />
</Target>
<Target Name="Build" DependsOnTargets="ExpandFlavors;RestorePackages">
<MSBuild Projects="@(ProjectToBuild)" Targets="Build" />
</Target>
<Target Name="Package" DependsOnTargets="Build">
<MakeDir Directories='$(ReleaseDir)' />
<Exec Command='$(ToolsDir)\NuGet.exe pack "$(SourceDir)\Tesseract.nuspec" -BasePath "$(BuildDir)" -Version $(ReleaseVersion) -o "$(ReleaseDir)"' />
</Target>
<Target Name="Clean" DependsOnTargets="ExpandFlavors;RestorePackages">
<MSBuild Projects="@(ProjectToBuild)" Targets="Clean" />
<RemoveDir Directories="$(BuildDir)" />
</Target>
<Target Name="Build" DependsOnTargets="ExpandFlavors;RestorePackages">
<MSBuild Projects="@(ProjectToBuild)" Targets="Build" />
</Target>
<Target Name="Package" DependsOnTargets="Build">
<MakeDir Directories='$(ReleaseDir)'/>
<Exec Command='$(ToolsDir)\NuGet.exe pack "$(SourceDir)\Tesseract.nuspec" -BasePath "$(BuildDir)" -Version $(ReleaseVersion) -o "$(ReleaseDir)"'/>
</Target>

</Project>
14 changes: 0 additions & 14 deletions src/AssemblyVersionInfo.template.cs

This file was deleted.

Loading

0 comments on commit b614b6d

Please sign in to comment.