You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ry...@apache.org on 2012/02/22 19:27:17 UTC
svn commit: r1292433 - in /lucene/dev/branches/lucene3795_lsp_spatial_module:
dev-tools/idea/.idea/ant.xml lucene/build.xml
lucene/contrib/contrib-build.xml modules/spatial/strategy/build.xml
Author: ryan
Date: Wed Feb 22 18:27:17 2012
New Revision: 1292433
URL: http://svn.apache.org/viewvc?rev=1292433&view=rev
Log:
LUCENE-3795: fix paths for spatial-base.jar and spatial-strategy.jar
Modified:
lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/ant.xml
lucene/dev/branches/lucene3795_lsp_spatial_module/lucene/build.xml
lucene/dev/branches/lucene3795_lsp_spatial_module/lucene/contrib/contrib-build.xml
lucene/dev/branches/lucene3795_lsp_spatial_module/modules/spatial/strategy/build.xml
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/ant.xml?rev=1292433&r1=1292432&r2=1292433&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/dev-tools/idea/.idea/ant.xml Wed Feb 22 18:27:17 2012
@@ -8,7 +8,6 @@
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/memory/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/misc/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/sandbox/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/lucene/contrib/spatial/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/core/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/tools/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/test-framework/build.xml" />
Modified: lucene/dev/branches/lucene3795_lsp_spatial_module/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3795_lsp_spatial_module/lucene/build.xml?rev=1292433&r1=1292432&r2=1292433&view=diff
==============================================================================
--- lucene/dev/branches/lucene3795_lsp_spatial_module/lucene/build.xml (original)
+++ lucene/dev/branches/lucene3795_lsp_spatial_module/lucene/build.xml Wed Feb 22 18:27:17 2012
@@ -264,7 +264,6 @@
<packageset dir="contrib/memory/src/java"/>
<packageset dir="contrib/misc/src/java"/>
<packageset dir="contrib/sandbox/src/java"/>
- <packageset dir="contrib/spatial/src/java"/>
<!-- end alpha sort -->
<!-- If the main javadoc Group listing includes an "Other -->
@@ -279,7 +278,6 @@
<group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
<group title="contrib: Misc " packages="org.apache.lucene.misc*"/>
<group title="contrib: Sandbox" packages="org.apache.lucene.sandbox*"/>
- <group title="contrib: Spatial" packages="org.apache.lucene.spatial*"/>
</sources>
</invoke-javadoc>
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=1292433&r1=1292432&r2=1292433&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 18:27:17 2012
@@ -228,7 +228,7 @@
<property name="sandbox.uptodate" value="true"/>
</target>
- <property name="spatial-base.jar" value="${common.dir}/../modules/spatial/base/build/lucene-spatial-base-${version}.jar"/>
+ <property name="spatial-base.jar" value="${common.dir}/../modules/spatial/build/base/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>
@@ -239,7 +239,7 @@
<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"/>
+ <property name="spatial-strategy.jar" value="${common.dir}/../modules/spatial/build/strategy/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>
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=1292433&r1=1292432&r2=1292433&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 18:27:17 2012
@@ -29,8 +29,6 @@
<!--
<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>
<pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies" />