hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject svn commit: r805081 - in /hadoop/mapreduce/trunk: CHANGES.txt build.xml
Date Mon, 17 Aug 2009 18:13:06 GMT
Author: szetszwo
Date: Mon Aug 17 18:13:06 2009
New Revision: 805081

URL: http://svn.apache.org/viewvc?rev=805081&view=rev
Log:
MAPREDUCE-852. In build.xml, remove the Main-Class, which is incorrectly set in tools, and
rename the target "tools-jar" to "tools".

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/build.xml

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=805081&r1=805080&r2=805081&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Mon Aug 17 18:13:06 2009
@@ -403,3 +403,5 @@
     MAPREDUCE-877. Added avro as a dependency to contrib ivy settings.
     (Tsz Wo (Nicholas) Sze via yhemanth)
 
+    MAPREDUCE-852. In build.xml, remove the Main-Class, which is incorrectly
+    set in tools, and rename the target "tools-jar" to "tools".  (szetszwo)

Modified: hadoop/mapreduce/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/build.xml?rev=805081&r1=805080&r2=805081&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/build.xml (original)
+++ hadoop/mapreduce/trunk/build.xml Mon Aug 17 18:13:06 2009
@@ -440,14 +440,10 @@
     </jar>
   </target>
 
-  <target name="tools-jar" depends="jar, compile-tools" 
+  <target name="tools" depends="jar, compile-tools" 
           description="Make the Hadoop tools jar.">
     <jar jarfile="${build.dir}/${tools.final.name}.jar"
          basedir="${build.tools}">
-      <manifest>
-        <attribute name="Main-Class" 
-                   value="org/apache/hadoop/examples/ExampleDriver"/>
-      </manifest>
     </jar>
   </target>
 
@@ -675,7 +671,7 @@
     </available>  	
   </target>
 
- <target name="all-jars" depends="tools-jar,examples,jar-test">
+ <target name="all-jars" depends="tools,examples,jar-test">
    <subant target="jar">
       <property name="version" value="${version}"/>
       <property name="dist.dir" value="${dist.dir}"/>
@@ -924,7 +920,7 @@
   <!-- ================================================================== -->
   <!--                                                                    -->
   <!-- ================================================================== -->
-  <target name="package" depends="compile, jar, javadoc, docs, api-report, examples, tools-jar,
jar-test, package-librecordio"
+  <target name="package" depends="compile, jar, javadoc, docs, api-report, examples, tools,
jar-test, package-librecordio"
 	  description="Build distribution">
     <mkdir dir="${dist.dir}"/>
     <mkdir dir="${dist.dir}/lib"/>
@@ -1024,7 +1020,7 @@
     </macro_tar>
   </target>
 
-  <target name="bin-package" depends="compile, jar, examples, tools-jar, jar-test, package-librecordio"

+  <target name="bin-package" depends="compile, jar, examples, tools, jar-test, package-librecordio"

 		description="assembles artifacts for binary target">
     <mkdir dir="${dist.dir}"/>
     <mkdir dir="${dist.dir}/lib"/>



Mime
View raw message