You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ma...@apache.org on 2010/03/19 20:11:50 UTC
svn commit: r925382 - in /lucene/solr/branches/newtrunk/solr: build.xml
common-build.xml
Author: markrmiller
Date: Fri Mar 19 19:11:50 2010
New Revision: 925382
URL: http://svn.apache.org/viewvc?rev=925382&view=rev
Log:
keep lucene from compiling 5 times when running test and reorganize all the lucene refs in one spot
Modified:
lucene/solr/branches/newtrunk/solr/build.xml
lucene/solr/branches/newtrunk/solr/common-build.xml
Modified: lucene/solr/branches/newtrunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/build.xml?rev=925382&r1=925381&r2=925382&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/build.xml (original)
+++ lucene/solr/branches/newtrunk/solr/build.xml Fri Mar 19 19:11:50 2010
@@ -639,53 +639,6 @@
</target>
- <target name="prep-lucene-jars">
- <sequential>
- <subant target="jar-core" inheritall="false" failonerror="true">
- <fileset dir="../lucene/" includes="build.xml" />
- </subant>
- <subant target="jar" inheritall="false" failonerror="true">
- <fileset dir="../lucene/contrib/analyzers/common" includes="build.xml" />
- <fileset dir="../lucene/contrib/fast-vector-highlighter" includes="build.xml" />
- <fileset dir="../lucene/contrib/highlighter" includes="build.xml" />
- <fileset dir="../lucene/contrib/memory" includes="build.xml" />
- <fileset dir="../lucene/contrib/misc" includes="build.xml" />
- <fileset dir="../lucene/contrib/queries" includes="build.xml" />
- <fileset dir="../lucene/contrib/spatial" includes="build.xml" />
- <fileset dir="../lucene/contrib/spellchecker" includes="build.xml" />
- </subant>
- </sequential>
- </target>
-
- <target name="lucene-jars-to-solr" depends="prep-lucene-jars">
- <mkdir dir="lucene-libs"/>
- <copy todir="lucene-libs" preservelastmodified="true" flatten="true" failonerror="true">
- <resources>
- <file file="../lucene/build/lucene-core-${lucene_version}.jar" />
- <file file="../lucene/build/contrib/analyzers/common/lucene-analyzers-${lucene_version}.jar" />
- <file file="../lucene/build/contrib/fast-vector-highlighter/lucene-fast-vector-highlighter-${lucene_version}.jar" />
- <file file="../lucene/build/contrib/highlighter/lucene-highlighter-${lucene_version}.jar" />
- <file file="../lucene/build/contrib/memory/lucene-memory-${lucene_version}.jar" />
- <file file="../lucene/build/contrib/misc/lucene-misc-${lucene_version}.jar" />
- <file file="../lucene/build/contrib/queries/lucene-queries-${lucene_version}.jar" />
- <file file="../lucene/build/contrib/spatial/lucene-spatial-${lucene_version}.jar" />
- <file file="../lucene/build/contrib/spellchecker/lucene-spellchecker-${lucene_version}.jar" />
- </resources>
- </copy>
- </target>
-
- <target name="compile-lucene">
- <ant antfile="build.xml" target="compile" dir="../lucene"/>
- <ant antfile="build.xml" target="compile" dir="../lucene/contrib/analyzers/common"/>
- <ant antfile="build.xml" target="compile" dir="../lucene/contrib/fast-vector-highlighter"/>
- <ant antfile="build.xml" target="compile" dir="../lucene/contrib/highlighter"/>
- <ant antfile="build.xml" target="compile" dir="../lucene/contrib/memory"/>
- <ant antfile="build.xml" target="compile" dir="../lucene/contrib/misc"/>
- <ant antfile="build.xml" target="compile" dir="../lucene/contrib/queries"/>
- <ant antfile="build.xml" target="compile" dir="../lucene/contrib/spatial"/>
- <ant antfile="build.xml" target="compile" dir="../lucene/contrib/spellchecker"/>
- </target>
-
<!-- make a distribution -->
<target name="package" depends="generate-maven-artifacts"/>
Modified: lucene/solr/branches/newtrunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/common-build.xml?rev=925382&r1=925381&r2=925382&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/common-build.xml (original)
+++ lucene/solr/branches/newtrunk/solr/common-build.xml Fri Mar 19 19:11:50 2010
@@ -142,6 +142,8 @@
</and>
</condition>
+ <!-- Lucene -->
+
<path id="lucene.classpath">
<pathelement location="${common-solr.dir}/../lucene/build/classes/java" />
<pathelement location="${common-solr.dir}/../lucene/build/contrib/analyzers/common/classes/java" />
@@ -153,6 +155,54 @@
<pathelement location="${common-solr.dir}/../lucene/build/contrib/spatial/classes/java" />
<pathelement location="${common-solr.dir}/../lucene/build/contrib/spellchecker/classes/java" />
</path>
+
+ <target name="prep-lucene-jars">
+ <sequential>
+ <subant target="jar-core" inheritall="false" failonerror="true">
+ <fileset dir="../lucene/" includes="build.xml" />
+ </subant>
+ <subant target="jar" inheritall="false" failonerror="true">
+ <fileset dir="../lucene/contrib/analyzers/common" includes="build.xml" />
+ <fileset dir="../lucene/contrib/fast-vector-highlighter" includes="build.xml" />
+ <fileset dir="../lucene/contrib/highlighter" includes="build.xml" />
+ <fileset dir="../lucene/contrib/memory" includes="build.xml" />
+ <fileset dir="../lucene/contrib/misc" includes="build.xml" />
+ <fileset dir="../lucene/contrib/queries" includes="build.xml" />
+ <fileset dir="../lucene/contrib/spatial" includes="build.xml" />
+ <fileset dir="../lucene/contrib/spellchecker" includes="build.xml" />
+ </subant>
+ </sequential>
+ </target>
+
+ <target name="lucene-jars-to-solr" depends="prep-lucene-jars">
+ <mkdir dir="lucene-libs"/>
+ <copy todir="lucene-libs" preservelastmodified="true" flatten="true" failonerror="true">
+ <resources>
+ <file file="../lucene/build/lucene-core-${lucene_version}.jar" />
+ <file file="../lucene/build/contrib/analyzers/common/lucene-analyzers-${lucene_version}.jar" />
+ <file file="../lucene/build/contrib/fast-vector-highlighter/lucene-fast-vector-highlighter-${lucene_version}.jar" />
+ <file file="../lucene/build/contrib/highlighter/lucene-highlighter-${lucene_version}.jar" />
+ <file file="../lucene/build/contrib/memory/lucene-memory-${lucene_version}.jar" />
+ <file file="../lucene/build/contrib/misc/lucene-misc-${lucene_version}.jar" />
+ <file file="../lucene/build/contrib/queries/lucene-queries-${lucene_version}.jar" />
+ <file file="../lucene/build/contrib/spatial/lucene-spatial-${lucene_version}.jar" />
+ <file file="../lucene/build/contrib/spellchecker/lucene-spellchecker-${lucene_version}.jar" />
+ </resources>
+ </copy>
+ </target>
+
+ <target name="compile-lucene" unless="lucene-compiled">
+ <property name="lucene-compiled" value="true"/>
+ <ant antfile="build.xml" target="compile" dir="../lucene"/>
+ <ant antfile="build.xml" target="compile" dir="../lucene/contrib/analyzers/common"/>
+ <ant antfile="build.xml" target="compile" dir="../lucene/contrib/fast-vector-highlighter"/>
+ <ant antfile="build.xml" target="compile" dir="../lucene/contrib/highlighter"/>
+ <ant antfile="build.xml" target="compile" dir="../lucene/contrib/memory"/>
+ <ant antfile="build.xml" target="compile" dir="../lucene/contrib/misc"/>
+ <ant antfile="build.xml" target="compile" dir="../lucene/contrib/queries"/>
+ <ant antfile="build.xml" target="compile" dir="../lucene/contrib/spatial"/>
+ <ant antfile="build.xml" target="compile" dir="../lucene/contrib/spellchecker"/>
+ </target>
<!-- Macro for compilation -->
@@ -229,6 +279,7 @@
<attribute name="failonerror" default="true"/>
<sequential>
<subant target="@{target}" failonerror="@{failonerror}">
+ <property name="lucene-compiled" value="${lucene.compiled}"/>
<fileset dir="."
includes="contrib/*/build.xml"
/>