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

LUCENE-3795: fix paths for spatial-base.jar and spatial-strategy.jar 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3795_lsp_spatial_module@1292433 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan McKinley 2012-02-22 18:27:17 +00:00
parent a5ae2b0e9d
commit 5818381078
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev-tools/idea/.idea/ant.xml
View File

@ -8,7 +8,6 @@
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/memory/build.xml" /> <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/misc/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/sandbox/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/core/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/tools/build.xml" /> <buildFile url="file://$PROJECT_DIR$/lucene/tools/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/test-framework/build.xml" /> <buildFile url="file://$PROJECT_DIR$/lucene/test-framework/build.xml" />

2
lucene/build.xml
View File

@ -264,7 +264,6 @@
<packageset dir="contrib/memory/src/java"/> <packageset dir="contrib/memory/src/java"/>
<packageset dir="contrib/misc/src/java"/> <packageset dir="contrib/misc/src/java"/>
<packageset dir="contrib/sandbox/src/java"/> <packageset dir="contrib/sandbox/src/java"/>
<packageset dir="contrib/spatial/src/java"/>
<!-- end alpha sort --> <!-- end alpha sort -->
<!-- If the main javadoc Group listing includes an "Other --> <!-- 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: Memory" packages="org.apache.lucene.index.memory*"/>
<group title="contrib: Misc " packages="org.apache.lucene.misc*"/> <group title="contrib: Misc " packages="org.apache.lucene.misc*"/>
<group title="contrib: Sandbox" packages="org.apache.lucene.sandbox*"/> <group title="contrib: Sandbox" packages="org.apache.lucene.sandbox*"/>
<group title="contrib: Spatial" packages="org.apache.lucene.spatial*"/>
</sources> </sources>
</invoke-javadoc> </invoke-javadoc>

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

@ -228,7 +228,7 @@
<property name="sandbox.uptodate" value="true"/> <property name="sandbox.uptodate" value="true"/>
</target> </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"> <target name="check-spatial-base-uptodate" unless="spatial-base.uptodate">
<module-uptodate name="spatial/base" jarfile="${spatial-base.jar}" property="spatial-base.uptodate"/> <module-uptodate name="spatial/base" jarfile="${spatial-base.jar}" property="spatial-base.uptodate"/>
</target> </target>
@ -239,7 +239,7 @@
<property name="spatial-base.uptodate" value="true"/> <property name="spatial-base.uptodate" value="true"/>
</target> </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"> <target name="check-spatial-strategy-uptodate" unless="spatial-strategy.uptodate">
<module-uptodate name="spatial/strategy" jarfile="${spatial-strategy.jar}" property="spatial-strategy.uptodate"/> <module-uptodate name="spatial/strategy" jarfile="${spatial-strategy.jar}" property="spatial-strategy.uptodate"/>
</target> </target>

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

@ -29,8 +29,6 @@
<!-- <!--
<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" />
<fileset dir="../base/lib" includes="*.jar"/> <fileset dir="../base/lib" includes="*.jar"/>
</path> </path>
<pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies" /> <pathconvert property="project.classpath" targetos="unix" refid="additional.dependencies" />