diff --git a/.gitignore b/.gitignore index eb9cb855f..374eb600b 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ configure libtool tesseract.pc stamp-h1 +build/ +.gradle/ diff --git a/README.md b/README.md index 93df3b518..2083e6424 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,93 @@ To build eyes-two, additionally run the following: After building, the tess-two and eyes-two projects can be imported into Eclipse using File->Import->Existing Projects into Workspace. +## Gradle build + +This project can also be built using Gradle, tested and installed into a (local) Maven repository. + +### Prerequisites + +Building the project through Gradle requires the NDK to be installed through the Android SDK manager. The build system will look for the NDK in $ANDROID_HOME/ndk-bundle/ + +A file local.properties needs to be created with the location of your android SDK, the contents of this file should be: + + sdk.dir= + +### Building + +The project can be built using the following command: + + ./gradlew build + +This produces a release and debug AAR file in tess-two/build/outputs/aar/ + +### Installing in Maven + +The group and artifact ID's are: + +Release version: +groupId: com.googlecode.tesseract.android +artifactId: tess-two +version: 5.2.0-SNAPSHOT +packaging: aar + +Debug version +groupId: com.googlecode.tesseract.android +artifactId: tess-two-debug +version: 5.2.0-SNAPSHOT +packaging: aar + + +Both the debug and release builds can be installed as artifacts in a Maven repository of your choosing. + +To install the debug build into your local repository run the following command: + + ./gradlew publishDebugPublicationToMavenLocal + +To install the release build into your local repository run the following command: + + ./gradlew publishReleasePublicationToMavenLocal + +To install the build into a remote repository the following configuration items need to be added to your ~/.gradle/gradle.properties file + + mavenSnapshots= + mavenSnapshotsUsername= + mavenSnapshotsPassword= + mavenReleases= + mavenReleasesUsername= + mavenReleasesPassword= + +To install into a maven repository, run one of the following commands: + +Debug/Release | Snapshots/Releases | Command +--------------|--------------------|------------------------------------------------------------------- +Debug | Snapshot | ./gradlew publishDebugPublicationToTess-two-snapshotsRepository +Debug | Releases | ./gradlew publishDebugPublicationToTess-two-releasesRepository +Release | Snapshot | ./gradlew publishReleasePublicationToTess-two-snapshotsRepository +Release | Releases | ./gradlew publishReleasePublicationToTess-two-releasesRepository + +## Depending on tess-two from Gradle + +To use tess-two as a dependency in your Android Gradle project make sure the following lines are in your gradle build files: + +app/build.gradle: + + dependencies { + compile 'com.googlecode.tesseract.android:tess-two:5.2.0-SNAPSHOT' + // other dependencies + } + +build.gradle: + + allprojects { + repositories { + mavenLocal() + // other repo's + } + } + + + ## Maven While this project does not require Maven (and this project has not yet been diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..9405f3fd1 --- /dev/null +++ b/build.gradle @@ -0,0 +1,19 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.2.3' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} diff --git a/eyes-two/build.gradle b/eyes-two/build.gradle new file mode 100644 index 000000000..a922d2565 --- /dev/null +++ b/eyes-two/build.gradle @@ -0,0 +1,71 @@ +import org.apache.tools.ant.taskdefs.condition.Os + +apply plugin: 'com.android.application' +apply plugin: 'maven-publish' + +android { + compileSdkVersion 22 + buildToolsVersion "23.0.0 rc3" + + defaultConfig { + minSdkVersion 8 + targetSdkVersion 22 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + aidl.srcDirs = ['src'] + java.srcDirs = ['src'] + res.srcDirs = ['res'] + jniLibs.srcDirs = ['libs'] + } + } + + // call regular ndk-build(.cmd) script from app directory + task ndkBuild(type: Exec) { + workingDir = file("${android.sdkDirectory}/ndk-bundle") + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + commandLine 'ndk-build.cmd', '-C', file('.').absolutePath + } else { + commandLine './ndk-build', '-C', file('.').absolutePath + } + } + + tasks.withType(JavaCompile) { + compileTask -> compileTask.dependsOn ndkBuild + } + + // cleanup task + task ndkClean(type: Exec) { + workingDir = file("${android.sdkDirectory}/ndk-bundle") + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + commandLine 'ndk-build.cmd', '-C', file('.').absolutePath, 'clean' + } else { + commandLine './ndk-build', '-C', file('.').absolutePath, 'clean' + } + } + + tasks.withType(Delete) { + cleanTask -> cleanTask.dependsOn ndkClean + } + + lintOptions { + abortOnError false + } + +} + +dependencies { + compile project(':tess-two'); + compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'com.android.support:appcompat-v7:22.2.1' +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..8c0fb64a8 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..d214ddf8f --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Jul 21 14:03:24 CEST 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..91a7e269e --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..aec99730b --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/preparetests.sh b/preparetests.sh new file mode 100755 index 000000000..51b23615f --- /dev/null +++ b/preparetests.sh @@ -0,0 +1,15 @@ +#!/bin/sh +wget https://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.eng.tar.gz +tar xvfz tesseract-ocr-3.02.eng.tar.gz +adb shell mkdir /mnt/sdcard/tesseract +adb shell mkdir /mnt/sdcard/tesseract/tessdata + +adb push -p tesseract-ocr/tessdata/eng.traineddata /mnt/sdcard/tesseract/tessdata +adb push -p tesseract-ocr/tessdata/eng.cube.bigrams /mnt/sdcard/tesseract/tessdata +adb push -p tesseract-ocr/tessdata/eng.cube.fold /mnt/sdcard/tesseract/tessdata +adb push -p tesseract-ocr/tessdata/eng.cube.lm /mnt/sdcard/tesseract/tessdata +adb push -p tesseract-ocr/tessdata/eng.cube.nn /mnt/sdcard/tesseract/tessdata +adb push -p tesseract-ocr/tessdata/eng.cube.params /mnt/sdcard/tesseract/tessdata +adb push -p tesseract-ocr/tessdata/eng.cube.size /mnt/sdcard/tesseract/tessdata +adb push -p tesseract-ocr/tessdata/eng.cube.word-freq /mnt/sdcard/tesseract/tessdata +adb push -p tesseract-ocr/tessdata/eng.tesseract_cube.nn /mnt/sdcard/tesseract/tessdata diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..20127e1ca --- /dev/null +++ b/settings.gradle @@ -0,0 +1,3 @@ +include ':eyes-two' +include ':tess-two' +include ':tess-two-test' diff --git a/tess-two-test/build.gradle b/tess-two-test/build.gradle new file mode 100644 index 000000000..028db30af --- /dev/null +++ b/tess-two-test/build.gradle @@ -0,0 +1,43 @@ +import org.apache.tools.ant.taskdefs.condition.Os + +apply plugin: 'com.android.application' +apply plugin: 'maven-publish' + +android { + compileSdkVersion 22 + buildToolsVersion "23.0.0 rc3" + + defaultConfig { + minSdkVersion 8 + targetSdkVersion 22 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + res.srcDirs = ['res'] + } + androidTest { + manifest.srcFile 'AndroidManifest.xml' + aidl.srcDirs = ['src'] + java.srcDirs = ['src'] + res.srcDirs = ['res'] + jniLibs.srcDirs = ['libs'] + } + } +} + +dependencies { + compile project(':tess-two'); + compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'com.android.support:appcompat-v7:22.2.1' + testCompile 'junit:junit:4.12' +} diff --git a/tess-two/build.gradle b/tess-two/build.gradle new file mode 100644 index 000000000..9fd785232 --- /dev/null +++ b/tess-two/build.gradle @@ -0,0 +1,113 @@ +import org.apache.tools.ant.taskdefs.condition.Os + +apply plugin: 'com.android.library' +apply plugin: 'maven-publish' + +android { + compileSdkVersion 22 + buildToolsVersion "23.0.0 rc3" + + defaultConfig { + minSdkVersion 8 + targetSdkVersion 22 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + res.srcDirs = ['res'] + jniLibs.srcDirs = ['libs'] + } + } + + // call regular ndk-build(.cmd) script from app directory + task ndkBuild(type: Exec) { + workingDir = file("${android.sdkDirectory}/ndk-bundle") + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + commandLine 'ndk-build.cmd', '-C', file('.').absolutePath + } else { + commandLine './ndk-build', '-C', file('.').absolutePath + } + } + + tasks.withType(JavaCompile) { + compileTask -> compileTask.dependsOn ndkBuild + } + + // cleanup task + task ndkClean(type: Exec) { + workingDir = file("${android.sdkDirectory}/ndk-bundle") + if (Os.isFamily(Os.FAMILY_WINDOWS)) { + commandLine 'ndk-build.cmd', '-C', file('.').absolutePath, 'clean' + } else { + commandLine './ndk-build', '-C', file('.').absolutePath, 'clean' + } + } + + tasks.withType(Delete) { + cleanTask -> cleanTask.dependsOn ndkClean + } +} + +tasks.whenTaskAdded { task -> + if( task instanceof org.gradle.api.publish.maven.tasks.GenerateMavenPom ) { + task.dependsOn assemble + } +} + + +publishing { + publications { + release(MavenPublication) { + artifactId "tess-two" + groupId "com.googlecode.tesseract.android" + artifact "build/outputs/aar/tess-two-release.aar" + version "5.2.0-SNAPSHOT" + pom { + packaging "aar" + } + } + debug(MavenPublication) { + artifactId "tess-two-debug" + groupId "com.googlecode.tesseract.android" + artifact "build/outputs/aar/tess-two-debug.aar" + version "5.2.0-SNAPSHOT" + pom { + packaging "aar" + } + } + } + + repositories { + maven { + name "tess-two-releases" + url "${mavenReleases}" + credentials(PasswordCredentials) { + username mavenReleasesUsername + password mavenReleasesPassword + } + } + maven { + name "tess-two-snapshots" + url "${mavenSnapshots}" + credentials(PasswordCredentials) { + username mavenSnapshotsUsername + password mavenSnapshotsPassword + } + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'com.android.support:appcompat-v7:22.2.1' +} diff --git a/tess-two/proguard-rules.pro b/tess-two/proguard-rules.pro new file mode 100644 index 000000000..302ac6c92 --- /dev/null +++ b/tess-two/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/aaargh/android-sdks/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#}