瀏覽代碼

Merge -r 667505:667506 from trunk onto 0.18 branch. Fixes HADOOP-3548.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@667507 13f79535-47bb-0310-9956-ffa450edef68
Devaraj Das 17 年之前
父節點
當前提交
92c6251b1a
共有 2 個文件被更改,包括 6 次插入5 次删除
  1. 3 0
      CHANGES.txt
  2. 3 5
      build.xml

+ 3 - 0
CHANGES.txt

@@ -580,6 +580,9 @@ Release 0.18.0 - Unreleased
     HADOOP-3517. Fixes a problem in the reducer due to which the last InMemory
     merge may be missed. (Arun Murthy via ddas)
 
+    HADOOP-3548. Fixes build.xml to copy all *.jar files to the dist.
+    (Owen O'Malley via ddas)
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

+ 3 - 5
build.xml

@@ -843,12 +843,10 @@
       <fileset dir="${build.webapps}"/>
     </copy>
 
-    <copy file="${build.dir}/${final.name}-core.jar" todir="${dist.dir}"/>
-
-    <copy file="${build.dir}/${final.name}-examples.jar" todir="${dist.dir}"/>
+    <copy todir="${dist.dir}"> 
+      <fileset file="${build.dir}/${final.name}-*.jar"/>
+    </copy>
     
-    <copy file="${build.dir}/${final.name}-test.jar" todir="${dist.dir}"/>
-
     <copy todir="${dist.dir}/bin">
       <fileset dir="bin"/>
     </copy>