hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkesa...@apache.org
Subject svn commit: r801517 - in /hadoop/mapreduce/trunk: CHANGES.txt build.xml src/benchmarks/gridmix2/build.xml
Date Thu, 06 Aug 2009 06:41:50 GMT
Author: gkesavan
Date: Thu Aug  6 06:41:50 2009
New Revision: 801517

URL: http://svn.apache.org/viewvc?rev=801517&view=rev
Log:
MAPREDUCE-659. Fix gridmix2 compilation. Contributed by Giridharan Kesavan.

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/build.xml
    hadoop/mapreduce/trunk/src/benchmarks/gridmix2/build.xml

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=801517&r1=801516&r2=801517&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Thu Aug  6 06:41:50 2009
@@ -316,3 +316,5 @@
 
     MAPREDUCE-408. Fixes an assertion problem in TestKillSubProcesses
     (Ravi Gummadi via ddas)
+     
+    MAPREDUCE-659. Fix gridmix2 compilation. (Giridharan Kesavan)

Modified: hadoop/mapreduce/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/build.xml?rev=801517&r1=801516&r2=801517&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/build.xml (original)
+++ hadoop/mapreduce/trunk/build.xml Thu Aug  6 06:41:50 2009
@@ -674,7 +674,7 @@
     </available>  	
   </target>
 
- <target name="all-jars" depends="tools-jar,examples">
+ <target name="all-jars" depends="tools-jar,examples,jar-test">
    <subant target="jar">
       <property name="version" value="${version}"/>
       <property name="dist.dir" value="${dist.dir}"/>
@@ -957,9 +957,9 @@
 
     <copy todir="${dist.dir}"> 
       <fileset file="${build.dir}/${final.name}*.jar"/>
-    <!--  <fileset file="${build.dir}/${test.final.name}.jar"/>
+      <fileset file="${build.dir}/${test.final.name}.jar"/>
       <fileset file="${build.dir}/${examples.final.name}.jar"/>
-      <fileset file="${build.dir}/${tools.final.name}.jar"/> -->
+      <fileset file="${build.dir}/${tools.final.name}.jar"/> 
     </copy>
     
 

Modified: hadoop/mapreduce/trunk/src/benchmarks/gridmix2/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/benchmarks/gridmix2/build.xml?rev=801517&r1=801516&r2=801517&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/benchmarks/gridmix2/build.xml (original)
+++ hadoop/mapreduce/trunk/src/benchmarks/gridmix2/build.xml Thu Aug  6 06:41:50 2009
@@ -28,12 +28,30 @@
         	<classpath refid="classpath" />
         </javac>
     </target>
-	
 
-	 <target name="compress" depends="compile" description="Compression target">
-  	      <jar jarfile="${build.dir}/gridmix.jar" basedir="${build.dir}" includes="**/*.class"
/>
-                   
+    <target name="dev-build" depends="init, dev-compile, compress" description="Developers
build target">
+        <echo>
+            Building the .jar files.
+        </echo>
+    </target>
+
+    <target name="dev-compile" depends="init" description="Compilation target">
+        <path id="dev-classpath">
+            <pathelement location="${build.classes}"/>
+            <fileset dir="${hadoop.dir}/build">
+               <include name="**.jar" />
+               <include name="contrib/streaming/**.jar" />
+            </fileset>
+            <fileset dir="${lib.dir}">
+               <include name="*.jar" />
+               <exclude name="**/excluded/" />
+            </fileset>
+         </path>
+        <javac srcdir="src/java/" destdir="${build.dir}" classpathref="dev-classpath"/>
+    </target>
 
+    <target name="compress" depends="compile" description="Compression target">
+        <jar jarfile="${build.dir}/gridmix.jar" basedir="${build.dir}" includes="**/*.class"
/>
         <copy todir="." includeEmptyDirs="false">
             <fileset dir="${build.dir}">
 	        <exclude name="**" />



Mime
View raw message