You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by to...@apache.org on 2010/04/13 00:55:36 UTC

svn commit: r933441 - in /hadoop/mapreduce/trunk: CHANGES.txt build.xml src/contrib/build.xml src/contrib/data_join/ivy.xml src/contrib/index/ivy.xml

Author: tomwhite
Date: Mon Apr 12 22:55:35 2010
New Revision: 933441

URL: http://svn.apache.org/viewvc?rev=933441&view=rev
Log:
MAPREDUCE-1031. ant tar target doens't seem to compile tests in contrib projects. Contributed by Aaron Kimball.

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/build.xml
    hadoop/mapreduce/trunk/src/contrib/build.xml
    hadoop/mapreduce/trunk/src/contrib/data_join/ivy.xml
    hadoop/mapreduce/trunk/src/contrib/index/ivy.xml

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=933441&r1=933440&r2=933441&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Mon Apr 12 22:55:35 2010
@@ -528,6 +528,9 @@ Trunk (unreleased changes)
     MAPREDUCE-889. binary communication formats added to Streaming by
     HADOOP-1722 should be documented. (Klaas Bosteels via tomwhite)
 
+    MAPREDUCE-1031. ant tar target doens't seem to compile tests in contrib
+    projects. (Aaron Kimball via tomwhite)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/mapreduce/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/build.xml?rev=933441&r1=933440&r2=933441&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/build.xml (original)
+++ hadoop/mapreduce/trunk/build.xml Mon Apr 12 22:55:35 2010
@@ -1001,6 +1001,13 @@
       </fileset>
     </copy>
 
+    <subant target="compile-test">
+      <!--Pass down the version in case its needed again and the target
+      distribution directory so contribs know where to install to.-->
+      <property name="version" value="${version}"/>
+      <property name="dist.dir" value="${dist.dir}"/>
+      <fileset file="${contrib.dir}/build.xml"/>
+    </subant>  	
     <subant target="package">
       <!--Pass down the version in case its needed again and the target
       distribution directory so contribs know where to install to.-->

Modified: hadoop/mapreduce/trunk/src/contrib/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/build.xml?rev=933441&r1=933440&r2=933441&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/build.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/build.xml Mon Apr 12 22:55:35 2010
@@ -31,6 +31,15 @@
       <fileset dir="." includes="*/build.xml"/>
     </subant>
   </target>
+
+  <!-- ====================================================== -->
+  <!-- Compile contrib test code.                             -->
+  <!-- ====================================================== -->
+  <target name="compile-test">
+    <subant target="compile-test">
+      <fileset dir="." includes="*/build.xml"/>
+    </subant>
+  </target>
   
   <!-- ====================================================== -->
   <!-- Package contrib jars.                                  -->

Modified: hadoop/mapreduce/trunk/src/contrib/data_join/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/data_join/ivy.xml?rev=933441&r1=933440&r2=933441&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/data_join/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/data_join/ivy.xml Mon Apr 12 22:55:35 2010
@@ -42,6 +42,9 @@
   </publications>
   <dependencies>
     <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.version}" conf="common->default"/>
+     <dependency org="org.apache.hadoop" name="hadoop-core-test" rev="${hadoop-core.version}" conf="common->default"/>
+     <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}" conf="common->default"/>
+     <dependency org="org.apache.hadoop" name="hadoop-hdfs-test" rev="${hadoop-hdfs.version}" conf="common->default"/>
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="common->default"/>
     <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
   </dependencies>

Modified: hadoop/mapreduce/trunk/src/contrib/index/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/index/ivy.xml?rev=933441&r1=933440&r2=933441&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/index/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/index/ivy.xml Mon Apr 12 22:55:35 2010
@@ -42,6 +42,9 @@
   </publications>
   <dependencies>
     <dependency org="org.apache.hadoop" name="hadoop-core" rev="${hadoop-core.version}" conf="common->default"/>
+     <dependency org="org.apache.hadoop" name="hadoop-core-test" rev="${hadoop-core.version}" conf="common->default"/>
+     <dependency org="org.apache.hadoop" name="hadoop-hdfs" rev="${hadoop-hdfs.version}" conf="common->default"/>
+     <dependency org="org.apache.hadoop" name="hadoop-hdfs-test" rev="${hadoop-hdfs.version}" conf="common->default"/>
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}" conf="common->default"/>
     <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
     <dependency org="org.apache.lucene" name="lucene-core" rev="${lucene-core.version}" conf="common->default"/>