svn commit: r1129436 - in /lucene/dev/branches/lucene_solr_3_2: ./ common-build.xml lucene/ lucene/backwards/ lucene/common-build.xml solr/ solr/common-build.xml

[rm...@apache.org]

Author: rmuir
Date: Mon May 30 23:49:43 2011
New Revision: 1129436

URL: http://svn.apache.org/viewvc?rev=1129436&view=rev
Log:
LUCENE-3160: lucene source build doesn't work correctly by itself

Removed:
    lucene/dev/branches/lucene_solr_3_2/common-build.xml
Modified:
    lucene/dev/branches/lucene_solr_3_2/   (props changed)
    lucene/dev/branches/lucene_solr_3_2/lucene/   (props changed)
    lucene/dev/branches/lucene_solr_3_2/lucene/backwards/   (props changed)
    lucene/dev/branches/lucene_solr_3_2/lucene/common-build.xml
    lucene/dev/branches/lucene_solr_3_2/solr/   (props changed)
    lucene/dev/branches/lucene_solr_3_2/solr/common-build.xml

Modified: lucene/dev/branches/lucene_solr_3_2/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_2/lucene/common-build.xml?rev=1129436&r1=1129435&r2=1129436&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_2/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_2/lucene/common-build.xml Mon May 30 23:49:43 2011
@@ -24,7 +24,6 @@
   </description>
 
   <dirname file="${ant.file.common}" property="common.dir"/>
-  <import file="${common.dir}/../common-build.xml"/>
   <property name="dev-tools.dir" value="${common.dir}/../dev-tools"/>
   <property name="prettify.dir" value="${common.dir}/src/tools/prettify"/>
   <property name="maven.build.dir" value="${common.dir}/build/maven"/>
@@ -61,6 +60,11 @@
     <fileset dir="${common.dir}/lib" includes="ant-*.jar"/>
   </path>
 
+  <path id="tools.runtime.classpath">
+    <pathelement location="${common.dir}/build/classes/tools"/>
+  </path>
+
+
   <!-- default arguments to pass to JVM executing tests -->
   <property name="testmethod" value=""/>
   <property name="args" value=""/>

Modified: lucene/dev/branches/lucene_solr_3_2/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_2/solr/common-build.xml?rev=1129436&r1=1129435&r2=1129436&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_2/solr/common-build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_2/solr/common-build.xml Mon May 30 23:49:43 2011
@@ -22,7 +22,6 @@
   </description>
 
   <dirname file="${ant.file.common-solr}" property="common-solr.dir"/>
-  <import file="${common-solr.dir}/../common-build.xml"/>
 
   <!-- change this together with the default and test's solrconfig.xml after starting a new development branch: -->
   <property name="tests.luceneMatchVersion" value="3.1"/>
@@ -636,4 +635,16 @@
     </java>
   </target>
 
+  <path id="tools.runtime.classpath">
+    <pathelement location="${common-solr.dir}/../lucene/build/classes/tools"/>
+  </path>
+  <target name="compile-tools" description="Compile the Test Framework and Validation tools">
+    <sequential>
+      <subant target="compile-tools" inheritall="false" failonerror="true">
+        <fileset dir="${common-solr.dir}/../lucene" includes="build.xml" />
+      </subant>
+    </sequential>
+  </target>
+
+
 </project>