Revert "Much cleaner build for JSword"

This reverts commit 68a3824a59.
master
Bradlee Speice 2015-06-28 21:38:12 -04:00
parent 3b72254b6a
commit 6bef7e78f6
40 changed files with 243 additions and 604 deletions

6
.classpath Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>

8
.gitignore vendored
View File

@ -1 +1,7 @@
# Created by .ignore support plugin (hsz.mobi)
/bin
/build
/distribution
/ivy
/tools
/.gradle
*.iml

View File

@ -1 +0,0 @@
jsword-minimalbible

View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<resourceExtensions />
<wildcardResourcePatterns>
<entry name="!?*.java" />
<entry name="!?*.form" />
<entry name="!?*.class" />
<entry name="!?*.groovy" />
<entry name="!?*.scala" />
<entry name="!?*.flex" />
<entry name="!?*.kt" />
<entry name="!?*.clj" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
</component>
</project>

View File

@ -1,3 +0,0 @@
<component name="CopyrightManager">
<settings default="" />
</component>

View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="1.7" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</GradleProjectSettings>
</option>
</component>
</project>

View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="Gradle: commons-codec:commons-codec:1.6">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/b7f0fc8f61ecadeb3695f0b9464755eee44374d4/commons-codec-1.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.6/61e9f9d11fe3e12ec62f633006e99d75fd7f19c8/commons-codec-1.6-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="Gradle: commons-logging:commons-logging:1.1.3">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f/commons-logging-1.1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/28bb0405fddaf04f15058fbfbe01fe2780d7d3b6/commons-logging-1.1.3-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="Gradle: commons-net:commons-net:3.3">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.3/cd0d5510908225f76c5fe5a3f1df4fa44866f81e/commons-net-3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.3/ccfa0721eae567b3c47cfaf3cca20e2491362bf6/commons-net-3.3-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="Gradle: junit:junit:4.11">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.11/4e031bb61df09069aeb2bffb4019e7a5034a4ee0/junit-4.11.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/junit/junit/4.11/28e0ad201304e4a4abf999ca0570b7cffc352c3c/junit-4.11-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="Gradle: org.apache.commons:commons-compress:1.7">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.7/ab365c96ee9bc88adcc6fa40d185c8e15a31410d/commons-compress-1.7.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.7/8b080f4c0bfc9977093412376e2d300512a5981/commons-compress-1.7-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="Gradle: org.apache.httpcomponents:httpclient:4.3.2">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.2/10a45d03873baa34436ae54548d9f1140d4bb68a/httpclient-4.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.2/b2ee1f7676394469864f3350c34dceb2214cd372/httpclient-4.3.2-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="Gradle: org.apache.httpcomponents:httpcore:4.3.2">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.3.2/31fbbff1ddbf98f3aa7377c94d33b0447c646b6e/httpcore-4.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.3.2/4809f38359edeea9487f747e09aa58ec8d3a54c5/httpcore-4.3.2-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="Gradle: org.apache.lucene:lucene-analyzers:3.0.3">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-analyzers/3.0.3/9fd07cce890dd18bdd2616b5fb5e6f10d55b819e/lucene-analyzers-3.0.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-analyzers/3.0.3/b18bfcfabcb35e3e95dccd3498c2d6a5aa49f469/lucene-analyzers-3.0.3-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="Gradle: org.apache.lucene:lucene-core:3.0.3">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-core/3.0.3/335f7ea0e28a4a1358aa745f4bd2037e8afe44fc/lucene-core-3.0.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-core/3.0.3/d3b608052205d068ddccbffd9fd5e24fdd438060/lucene-core-3.0.3-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="Gradle: org.apache.lucene:lucene-smartcn:3.0.3">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-smartcn/3.0.3/97ebddd027f8f7bc51eab43d0c204be699c8694/lucene-smartcn-3.0.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-smartcn/3.0.3/adb22a6f574633fff215d0f1273648f731d5df9d/lucene-smartcn-3.0.3-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="Gradle: org.apache.lucene:lucene-snowball:3.0.3">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-snowball/3.0.3/e0c15cc6929e29cc7908246cc8e2c906ff2c1cc6/lucene-snowball-3.0.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.lucene/lucene-snowball/3.0.3/7e8fa7f20dd96f1aacc3c170ead9d0efc4b32c67/lucene-snowball-3.0.3-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="Gradle: org.hamcrest:hamcrest-core:1.3">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b/hamcrest-core-1.3-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="Gradle: org.jdom:jdom2:2.0.5">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.5/2001db51c131e555bafdb77fc52af6a9408c505e/jdom2-2.0.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.5/769f3cca4ce92088288be3d0238ef96ef787e82f/jdom2-2.0.5-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="Gradle: org.slf4j:slf4j-api:1.7.6">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.6/562424e36df3d2327e8e9301a76027fca17d54ea/slf4j-api-1.7.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.slf4j/slf4j-api/1.7.6/97bb93c1badeae97a3d37e3c902df2985ee3de34/slf4j-api-1.7.6-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,11 +0,0 @@
<component name="libraryTable">
<library name="Gradle: org.tukaani:xz:1.4">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.tukaani/xz/1.4/18a9a2ce6abf32ea1b5fd31dae5210ad93f4e5e3/xz-1.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.tukaani/xz/1.4/4627f50e8fedcd2002f7ace1cfa1a1eea0ab631a/xz-1.4-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -1,38 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="UnicodeBrowser">
<option name="fontName" value="Source Code Pro" />
</component>
<component name="masterDetails">
<states>
<state key="ProjectJDKs.UI">
<settings>
<last-edited>1.7</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/jsword-minimalbible.iml" filepath="$PROJECT_DIR$/jsword-minimalbible.iml" />
</modules>
</component>
</project>

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
<mapping directory="$PROJECT_DIR$/jsword" vcs="Git" />
</component>
</project>

17
.project Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>jsword-minimalbible</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

View File

@ -1,52 +1,19 @@
group 'org.bspeice'
version '1.0-SNAPSHOT'
apply plugin: 'java'
repositories {
mavenCentral()
configurations {
buildJSword
}
sourceSets {
main {
java {
srcDir 'src/main/java'
}
resources {
srcDir 'src/main/resources'
}
task compileJava (type: GradleBuild) {
buildFile = 'jsword-stub.gradle'
tasks = ['clean', 'ivy.check', 'ivy.download', 'ivy.task', 'ivy',
'init', 'mergeCode', 'compile', 'jar'] //, 'copyJarsToMinimalBible']
ext.outputJar = file('distribution/jsword.jar')
outputs.upToDateWhen {
ext.outputJar.exists()
}
}
println(sourceSets.main.java)
task mergeSources(type: Copy) {
from 'jsword/src/main/java'
from 'src/stage/java'
into 'src/main/java'
}
task mergeResources(type: Copy) {
from 'jsword/src/main/resources'
from 'src/stage/resources'
into 'src/main/resources'
}
tasks.compileJava.dependsOn(mergeSources)
dependencies {
compile 'commons-net:commons-net:3.3'
compile 'org.apache.commons:commons-compress:1.7'
compile 'org.apache.httpcomponents:httpcore:4.3.2'
compile 'org.apache.httpcomponents:httpclient:4.3.2'
compile 'org.slf4j:slf4j-api:1.7.6'
compile 'org.jdom:jdom2:2.0.5'
compile 'org.apache.lucene:lucene-core:3.0.3'
compile 'org.apache.lucene:lucene-analyzers:3.0.3'
compile 'org.apache.lucene:lucene-snowball:3.0.3'
compile 'org.apache.lucene:lucene-smartcn:3.0.3'
testCompile group: 'junit', name: 'junit', version: '4.11'
artifacts {
buildJSword(compileJava.ext.outputJar) {
builtBy compileJava
}
}

165
build.xml Normal file
View File

@ -0,0 +1,165 @@
<project name="buildJswordTweakedJar" default="copyJarsToMinimalBible"
basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- Much of this code taken lovingly from https://github.com/mjdenham/and-bible/blob/master/jsword-tweaks/build.xml -->
<property name="jsword.project" location="../jsword" />
<property name="jsword.src" location="${jsword.project}/src/main/java" />
<property name="jsword.resources" location="${jsword.project}/src/main/resources" />
<property name="minbible.jsword.src" location="src/main/java/jsword" />
<property name="build.src" location="build/src" />
<property name="build.class" location="build/class" />
<property name="distribution" location="distribution" />
<property name="MinimalBible" location="../MinimalBible" />
<dirname property="core.basedir" file="${ant.file.core}" />
<property name="jsword-tweaks.home" location="${core.basedir}" />
<property name="jsword-dependencydir" location="${jsword-tweaks.home}/lib/jars" />
<path id="classpath">
<!-- First set of jars is given us by ivy -->
<fileset dir="${jsword-dependencydir}" includes="*.jar" />
<fileset dir="./libs" includes="*.jar" />
</path>
<target name="clean">
<delete dir="${build.src}" />
<delete dir="${build.class}" />
<delete dir="${distribution}" />
<delete dir="${jsword-dependencydir}" />
</target>
<target name="init" depends="clean">
<tstamp />
<mkdir dir="${build.src}" />
<mkdir dir="${build.class}" />
<mkdir dir="${distribution}" />
<mkdir dir="${jsword-dependencydir}" />
</target>
<target name="mergeCode" depends="init">
<copy todir="${build.src}">
<fileset dir="${jsword.src}" />
<fileset dir="${jsword.resources}">
<exclude name="org/crosswire/jsword/versification/**" />
</fileset>
</copy>
<copy todir="${build.src}" filtering="yes">
<fileset dir="${jsword.resources}">
<include name="org/crosswire/jsword/versification/**" />
</fileset>
<!-- zerosUnmapped causes exceptions and does not map verse 0 so comment
it out -->
<filterchain>
<tokenfilter>
<replaceregex pattern="!zerosUnmapped"
replace="#!zerosUnmapped // commented out" />
</tokenfilter>
</filterchain>
</copy>
<!-- switch the Chinese localisation defaults around so default CN is simplified
and TW is Traditional -->
<copy file="${jsword.resources}/BibleNames_zh.properties" tofile="${build.src}/BibleNames_zh_TW.properties" />
<copy file="${jsword.resources}/BibleNames_zh_CN.properties"
tofile="${build.src}/BibleNames_zh.properties" overwrite="true" />
<copy todir="${build.src}" overwrite="true">
<fileset dir="${minbible.jsword.src}" />
</copy>
</target>
<target name="compile" depends="mergeCode, ivy">
<javac srcdir="${build.src}" destdir="${build.class}"
classpathref="classpath" debug="true" source="1.6" target="1.6" />
</target>
<target name="jar" depends="compile">
<!-- And use JarJar to shade the HttpClient -->
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
classpath="${jsword-dependencydir}/jarjar-1.3.jar" />
<jarjar jarfile="${distribution}/jsword.jar">
<fileset dir="${build.class}" />
<!-- need to include the .properties and .plugin files -->
<fileset dir="${build.src}">
<exclude name="**/*.java" />
<exclude name="**/*.html" />
</fileset>
<zipgroupfileset dir="${jsword-dependencydir}" includes="*.jar" excludes="junit-*.jar, hamcrest-*.jar, jarjar-*.jar, icu4j-*.jar" />
<rule pattern="org.apache.http.**" result="org.apache.shaded.http.@1" />
</jarjar>
<!-- We can use regular jar to build the src -->
<jar jarfile="${distribution}/jsword-src.jar" basedir="${build.src}" />
</target>
<target name="copyJarsToMinimalBible" depends="jar"
description="Copy generated jars to And Bible for use">
<copy todir="${MinimalBible}/libs">
<fileset dir="${distribution}" includes="*.jar" excludes="*-src.jar" />
<!-- We only need to include jsword.jar, the jarjar already included dependencies. -->
</copy>
<copy todir="${MinimalBible}/libs-src">
<fileset dir="${distribution}" includes="*-src.jar" />
</copy>
</target>
<!--=======================================================================
== Use ivy to manage external jars. == These are properties related to ivy.
========================================================================= -->
<property name="ivy.version" value="2.3.0" />
<property name="tools.home" location="${jsword-tweaks.home}/tools" />
<property name="ivy.home" location="${tools.home}/ivy" />
<property name="ivy.url"
value="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar" />
<property name="ivy.jar.file" location="${ivy.home}/ivy-${ivy.version}.jar" />
<property name="ivy.quiet" value="default" /> <!-- default or quiet -->
<property name="ivy.sync" value="false" /> <!-- true or false -->
<property name="ivy.project.dir" location="${jsword-tweaks.home}" />
<property name="ivy.lib.dir" location="${ivy.project.dir}/lib" />
<property name="ivy.dep.file" location="${ivy.project.dir}/ivy.xml" />
<property name="ivy.default.ivy.user.dir" location="${ivy.project.dir}/ivy" />
<!-- Ivy.sync controls whether only the current version of jar is allowed.
== This is good when updating the project, but not from day-to-day == since
we build extra stuff into the same location. Having sync="true" == causes
that to be deleted and need to be restored. -->
<target name="ivy" description="Retrieve dependencies with ivy"
depends="ivy.task">
<ivy:retrieve sync="${ivy.sync}"
pattern="${ivy.lib.dir}/[type]s/[artifact]-[revision].[ext]" log="${ivy.quiet}" />
<ivy:cachepath pathid="default.path" />
</target>
<target name="ivy.clean" description="Remove the ivy installation">
<delete dir="${ivy.home}" />
</target>
<target name="ivy.clean-cache" description="Remove dependent jars that ivy manages"
depends="ivy.task">
<ivy:cleancache />
</target>
<!-- Make ivy visible to Ant -->
<target name="ivy.task" depends="ivy.download">
<path id="ivy.lib.path">
<fileset dir="${ivy.home}" includes="*.jar" />
</path>
<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
classpathref="ivy.lib.path" />
</target>
<!-- Download ivy -->
<target name="ivy.download" depends="ivy.check" unless="ivy.present">
<mkdir dir="${ivy.home}" />
<!-- download Ivy from web site so that it can be used even without any
special installation -->
<get src="${ivy.url}" dest="${ivy.jar.file}" usetimestamp="true" />
</target>
<!-- See if Ivy is installed -->
<target name="ivy.check">
<available file="${ivy.jar.file}" type="file" property="ivy.present" />
</target>
</project>

Binary file not shown.

View File

@ -1,6 +0,0 @@
#Sat Jun 13 18:08:03 EDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip

164
gradlew vendored
View File

@ -1,164 +0,0 @@
#!/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 "$@"

90
gradlew.bat vendored
View File

@ -1,90 +0,0 @@
@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

30
ivy.xml Normal file
View File

@ -0,0 +1,30 @@
<ivy-module version="2.0">
<info organisation="org.crosswire" module="jsword"/>
<dependencies>
<dependency org="commons-codec" name="commons-codec" rev="1.9" conf="default->master,sources" />
<dependency org="commons-net" name="commons-net" rev="3.3" conf="default->master,sources" />
<dependency org="org.apache.commons" name="commons-compress" rev="1.7" conf="default->master,sources" />
<dependency org="org.tukaani" name="xz" rev="1.4" conf="default->master,sources" />
<dependency org="org.apache.httpcomponents" name="httpcore" rev="4.3.2" conf="default->master,sources" />
<dependency org="org.apache.httpcomponents" name="httpclient" rev="4.3.2" conf="default->master,sources" />
<dependency org="org.jdom" name="jdom2" rev="2.0.5" conf="default->master,sources" />
<dependency org="org.apache.lucene" name="lucene-core" rev="3.0.3" conf="default->master,sources" />
<dependency org="org.apache.lucene" name="lucene-analyzers" rev="3.0.3" conf="default->master,sources" />
<dependency org="org.apache.lucene" name="lucene-smartcn" rev="3.0.3" conf="default->master,sources" />
<dependency org="org.apache.lucene" name="lucene-snowball" rev="3.0.3" conf="default->master,sources" />
<dependency org="junit" name="junit" rev="4.11" conf="default->master,sources" />
<dependency org="org.hamcrest" name="hamcrest-library" rev="1.3"/>
<dependency org="com.ibm.icu" name="icu4j" rev="52.1" conf="default->master,sources" />
<dependency org="org.slf4j" name="slf4j-api" rev="1.7.6" conf="default->master,sources" />
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.7.6" conf="default->master,sources" />
<dependency org="org.slf4j" name="slf4j-jdk14" rev="1.7.6" conf="default->master,sources" />
<!-- dependency org="xalan" name="xalan" rev="2.7.1" conf="default->master,sources" / -->
<!-- dependency org="xalan" name="serializer" rev="2.7.1" conf="default->master,sources" / -->
<!-- dependency org="xerces" name="xercesImpl" rev="2.11.0" conf="default->master,sources" / -->
<!-- And to fix the HttpClient shenanigans...
http://stackoverflow.com/questions/20238421/java-lang-nosuchfielderror-org-apache-http-message-basiclineformatter-instance -->
<dependency org="com.googlecode.jarjar" name="jarjar" rev="1.3" />
</dependencies>
</ivy-module>

1
jsword

@ -1 +0,0 @@
Subproject commit d7ad5ef9b9ace682f80fff65c8e9124748b1b210

View File

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="jsword-minimalbible" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="org.bspeice" external.system.module.version="1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.11" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: commons-net:commons-net:3.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.slf4j:slf4j-api:1.7.6" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.commons:commons-compress:1.7" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.httpcomponents:httpcore:4.3.2" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.httpcomponents:httpclient:4.3.2" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.jdom:jdom2:2.0.5" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.lucene:lucene-core:3.0.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.lucene:lucene-analyzers:3.0.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.lucene:lucene-snowball:3.0.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.apache.lucene:lucene-smartcn:3.0.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.tukaani:xz:1.4" level="project" />
<orderEntry type="library" exported="" name="Gradle: commons-logging:commons-logging:1.1.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: commons-codec:commons-codec:1.6" level="project" />
</component>
</module>

1
jsword-stub.gradle Normal file
View File

@ -0,0 +1 @@
ant.importBuild('../jsword-minimalbible/build.xml')

3
lib/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
/javadocs
/sources
/jars

1
libs/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
*

View File

@ -1,2 +0,0 @@
rootProject.name = 'jsword-minimalbible'