Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-3795 Trying more ant build.xml progress but Solr isn't working 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3795_lsp_spatial_module@1292167 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David Wayne Smiley 2012-02-22 07:51:53 +00:00
parent 42d08cd271
commit 3f5d66037e
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lucene/contrib/contrib-build.xml
View File

@ -228,15 +228,26 @@
<property name="sandbox.uptodate" value="true"/> <property name="sandbox.uptodate" value="true"/>
</target> </target>
<property name="spatial.jar" value="${common.dir}/build/contrib/spatial/lucene-spatial-${version}.jar"/> <property name="spatial-base.jar" value="${common.dir}/../modules/spatial/base/build/lucene-spatial-base-${version}.jar"/>
<target name="check-spatial-uptodate" unless="spatial.uptodate"> <target name="check-spatial-base-uptodate" unless="spatial-base.uptodate">
<contrib-uptodate name="spatial" jarfile="${spatial.jar}" property="spatial.uptodate"/> <module-uptodate name="spatial/base" jarfile="${spatial-base.jar}" property="spatial-base.uptodate"/>
</target> </target>
<target name="jar-spatial" unless="spatial.uptodate" depends="check-spatial-uptodate"> <target name="jar-spatial-base" unless="spatial-base.uptodate" depends="check-spatial-base-uptodate">
<ant dir="${common.dir}/contrib/spatial" target="jar-core" inheritAll="false"> <ant dir="${common.dir}/../modules/spatial/base" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/> <propertyset refid="uptodate.and.compiled.properties"/>
</ant> </ant>
<property name="spatial.uptodate" value="true"/> <property name="spatial-base.uptodate" value="true"/>
</target>
<property name="spatial-strategy.jar" value="${common.dir}/../modules/spatial/strategy/build/lucene-spatial-strategy-${version}.jar"/>
<target name="check-spatial-strategy-uptodate" unless="spatial-strategy.uptodate">
<module-uptodate name="spatial/strategy" jarfile="${spatial-strategy.jar}" property="spatial-strategy.uptodate"/>
</target>
<target name="jar-spatial-strategy" unless="spatial-strategy.uptodate" depends="check-spatial-strategy-uptodate">
<ant dir="${common.dir}/../modules/spatial/strategy" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</ant>
<property name="spatial-strategy.uptodate" value="true"/>
</target> </target>
<property name="suggest.jar" value="${common.dir}/../modules/suggest/build/lucene-suggest-${version}.jar"/> <property name="suggest.jar" value="${common.dir}/../modules/suggest/build/lucene-suggest-${version}.jar"/>

4
modules/spatial/strategy/build.xml
View File

@ -29,6 +29,7 @@
<!-- <!--
<fileset dir="lib" includes="*.jar"/> <fileset dir="lib" includes="*.jar"/>
--> -->
<!-- TODO why is this necessary if we put <pathelement path="${spatial-base.jar}" /> in classpath? -->
<pathelement path="../base/build/classes/java" /> <pathelement path="../base/build/classes/java" />
<fileset dir="../base/lib" includes="*.jar"/> <fileset dir="../base/lib" includes="*.jar"/>
</path> </path>
@ -38,6 +39,7 @@
<path id="classpath"> <path id="classpath">
<path refid="base.classpath"/> <path refid="base.classpath"/>
<pathelement path="${spatial-base.jar}" />
<pathelement path="${queries.jar}" /> <pathelement path="${queries.jar}" />
</path> </path>
@ -49,7 +51,7 @@
</path> </path>
<target name="dist-maven" depends="jar-core,javadocs,common.dist-maven"/> <target name="dist-maven" depends="jar-core,javadocs,common.dist-maven"/>
<target name="compile" depends="jar-queries,common.compile-core" /> <target name="compile" depends="jar-spatial-base,jar-queries,common.compile-core" />
<target name="test" depends="jar-analyzers-common,compile-test,validate,junit-mkdir,junit-sequential,junit-parallel" description="Runs unit tests"/> <target name="test" depends="jar-analyzers-common,compile-test,validate,junit-mkdir,junit-sequential,junit-parallel" description="Runs unit tests"/>
</project> </project>

8
solr/common-build.xml
View File

@ -86,7 +86,8 @@
<pathelement path="${highlighter.jar}"/> <pathelement path="${highlighter.jar}"/>
<pathelement path="${memory.jar}"/> <pathelement path="${memory.jar}"/>
<pathelement path="${misc.jar}"/> <pathelement path="${misc.jar}"/>
<pathelement path="${spatial.jar}"/> <pathelement path="${spatial-base.jar}"/>
<pathelement path="${spatial-strategy.jar}"/>
<pathelement path="${suggest.jar}"/> <pathelement path="${suggest.jar}"/>
<pathelement path="${grouping.jar}"/> <pathelement path="${grouping.jar}"/>
<pathelement path="${queries.jar}"/> <pathelement path="${queries.jar}"/>
@ -133,7 +134,7 @@
<target name="prep-lucene-jars" <target name="prep-lucene-jars"
depends="jar-lucene-core, jar-analyzers-phonetic, jar-analyzers-kuromoji, jar-suggest, jar-highlighter, jar-memory, depends="jar-lucene-core, jar-analyzers-phonetic, jar-analyzers-kuromoji, jar-suggest, jar-highlighter, jar-memory,
jar-misc, jar-spatial, jar-grouping, jar-queries, jar-queryparser"> jar-misc, jar-spatial-base, jar-spatial-strategy, jar-grouping, jar-queries, jar-queryparser">
<property name="solr.deps.compiled" value="true"/> <property name="solr.deps.compiled" value="true"/>
</target> </target>
@ -155,7 +156,8 @@
<fileset file="${highlighter.jar}" /> <fileset file="${highlighter.jar}" />
<fileset file="${memory.jar}" /> <fileset file="${memory.jar}" />
<fileset file="${misc.jar}" /> <fileset file="${misc.jar}" />
<fileset file="${spatial.jar}" /> <fileset file="${spatial-base.jar}" />
<fileset file="${spatial-strategy.jar}" />
</copy> </copy>
</sequential> </sequential>
</target> </target>