svn commit: r1084606 - in /lucene/dev/branches/branch_3x: ./ lucene/ lucene/common-build.xml solr/

[gs...@apache.org]

Author: gsingers
Date: Wed Mar 23 14:44:48 2011
New Revision: 1084606

URL: http://svn.apache.org/viewvc?rev=1084606&view=rev
Log:
LUCENE-2952: continued merge

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

Modified: lucene/dev/branches/branch_3x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/common-build.xml?rev=1084606&r1=1084605&r2=1084606&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/common-build.xml Wed Mar 23 14:44:48 2011
@@ -115,6 +115,8 @@
   <property name="tests.src.dir" location="src/test"/>
   <property name="tests-framework.src.dir" location="${common.dir}/src/test-framework"/>
   <property name="build.dir" location="build"/>
+  <!-- Needed in case a contrib needs the original build, also for compile-tools to be called from contrib -->
+  <property name="common.build.dir" location="${common.dir}/build"/>
   <property name="dist.dir" location="dist"/>
   <property name="maven.dist.dir" location="dist/maven"/>
   <property name="m2.repository.url" value="file://${maven.dist.dir}"/>
@@ -419,9 +421,10 @@
   </target>
 
   <target name="compile-tools">
+    <echo>Common dir: ${common.dir}, build: ${build.dir}</echo>
     <compile
       srcdir="${common.dir}/src/tools/java"
-      destdir="${build.dir}/classes/tools">
+      destdir="${common.build.dir}/classes/tools">
       <classpath refid="classpath"/>
     </compile>
   </target>
@@ -709,6 +712,8 @@
     <element name="nested" implicit="yes" optional="yes"/>
 
     <sequential>
+      <echo>@{srcdir}</echo>
+      <echo>@{destdir}</echo>
       <mkdir dir="@{destdir}"/>
       <javac
         includeAntRuntime="${javac.includeAntRuntime}"