You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2012/02/22 08:51:53 UTC
svn commit: r1292167 - in /lucene/dev/branches/lucene3795_lsp_spatial_module:
lucene/contrib/contrib-build.xml modules/spatial/strategy/build.xml
solr/common-build.xml
Author: dsmiley
Date: Wed Feb 22 07:51:53 2012
New Revision: 1292167
URL: http://svn.apache.org/viewvc?rev=1292167&view=rev
Log:
LUCENE-3795 Trying more ant build.xml progress but Solr isn't working
Modified:
lucene/dev/branches/lucene3795_lsp_spatial_module/lucene/contrib/contrib-build.xml
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/strategy/build.xml
lucene/dev/branches/lucene3795_lsp_spatial_module/solr/common-build.xml
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/lucene/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/lucene/contrib/contrib-build.xml?rev=1292167&r1=1292166&r2=1292167&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/lucene/contrib/contrib-build.xml (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/lucene/contrib/contrib-build.xml Wed Feb 22 07:51:53 2012
@@ -228,15 +228,26 @@
<property name="sandbox.uptodate" value="true"/>
</target>
- <property name="spatial.jar" value="${common.dir}/build/contrib/spatial/lucene-spatial-${version}.jar"/>
- <target name="check-spatial-uptodate" unless="spatial.uptodate">
- <contrib-uptodate name="spatial" jarfile="${spatial.jar}" property="spatial.uptodate"/>
+ <property name="spatial-base.jar" value="${common.dir}/../modules/spatial/base/build/lucene-spatial-base-${version}.jar"/>
+ <target name="check-spatial-base-uptodate" unless="spatial-base.uptodate">
+ <module-uptodate name="spatial/base" jarfile="${spatial-base.jar}" property="spatial-base.uptodate"/>
</target>
- <target name="jar-spatial" unless="spatial.uptodate" depends="check-spatial-uptodate">
- <ant dir="${common.dir}/contrib/spatial" target="jar-core" inheritAll="false">
+ <target name="jar-spatial-base" unless="spatial-base.uptodate" depends="check-spatial-base-uptodate">
+ <ant dir="${common.dir}/../modules/spatial/base" target="jar-core" inheritAll="false">
<propertyset refid="uptodate.and.compiled.properties"/>
</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>
<property name="suggest.jar" value="${common.dir}/../modules/suggest/build/lucene-suggest-${version}.jar"/>
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/strategy/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/strategy/build.xml?rev=1292167&r1=1292166&r2=1292167&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/strategy/build.xml (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/strategy/build.xml Wed Feb 22 07:51:53 2012
@@ -29,6 +29,7 @@
<!--
<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" />
<fileset dir="../base/lib" includes="*.jar"/>
</path>
@@ -38,6 +39,7 @@
<path id="classpath">
<path refid="base.classpath"/>
+ <pathelement path="${spatial-base.jar}" />
<pathelement path="${queries.jar}" />
</path>
@@ -49,7 +51,7 @@
</path>
<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"/>
</project>
\ No newline at end of file
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/solr/common-build.xml?rev=1292167&r1=1292166&r2=1292167&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/solr/common-build.xml (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/solr/common-build.xml Wed Feb 22 07:51:53 2012
@@ -86,7 +86,8 @@
<pathelement path="${highlighter.jar}"/>
<pathelement path="${memory.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="${grouping.jar}"/>
<pathelement path="${queries.jar}"/>
@@ -133,7 +134,7 @@
<target name="prep-lucene-jars"
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"/>
</target>
@@ -155,7 +156,8 @@
<fileset file="${highlighter.jar}" />
<fileset file="${memory.jar}" />
<fileset file="${misc.jar}" />
- <fileset file="${spatial.jar}" />
+ <fileset file="${spatial-base.jar}" />
+ <fileset file="${spatial-strategy.jar}" />
</copy>
</sequential>
</target>