From 3f5d66037e68082c0eeac830bd8cea3b21e5c33c Mon Sep 17 00:00:00 2001
From: David Wayne Smiley <dsmiley@apache.org>
Date: Wed, 22 Feb 2012 07:51:53 +0000
Subject: [PATCH] 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
---
 lucene/contrib/contrib-build.xml   | 23 +++++++++++++++++------
 modules/spatial/strategy/build.xml |  4 +++-
 solr/common-build.xml              |  8 +++++---
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/lucene/contrib/contrib-build.xml b/lucene/contrib/contrib-build.xml
index 22ef4e61053..13f37b0f911 100644
--- a/lucene/contrib/contrib-build.xml
+++ b/lucene/contrib/contrib-build.xml
@@ -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"/>
diff --git a/modules/spatial/strategy/build.xml b/modules/spatial/strategy/build.xml
index 14c98dd7f48..36c4b415caa 100644
--- a/modules/spatial/strategy/build.xml
+++ b/modules/spatial/strategy/build.xml
@@ -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
diff --git a/solr/common-build.xml b/solr/common-build.xml
index 9f80a15f3ca..dff93051811 100644
--- a/solr/common-build.xml
+++ b/solr/common-build.xml
@@ -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>