1
0
Prechádzať zdrojové kódy

HADOOP-2537. Make build process compatible with Ant 1.7.0. Contributed by Hrishikesh.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@610450 13f79535-47bb-0310-9956-ffa450edef68
Nigel Daley 17 rokov pred
rodič
commit
b86d84b163
2 zmenil súbory, kde vykonal 6 pridanie a 2 odobranie
  1. 3 0
      CHANGES.txt
  2. 3 2
      build.xml

+ 3 - 0
CHANGES.txt

@@ -375,6 +375,9 @@ Trunk (unreleased changes)
     HADOOP-2446. Fixes TestHDFSServerPorts and TestMRServerPorts so they
     do not rely on statically configured ports and cleanup better. (nigel)
 
+    HADOOP-2537. Make build process compatible with Ant 1.7.0.
+    (Hrishikesh via nigel)
+
 Release 0.15.2 - 2008-01-02
 
   BUG FIXES

+ 3 - 2
build.xml

@@ -148,11 +148,12 @@
     <mkdir dir="${test.build.dir}"/>
     <mkdir dir="${test.build.classes}"/>
     <mkdir dir="${test.build.testjar}"/>
-    <touch millis="0">
+    <tempfile property="touch.temp.file" destDir="${java.io.tmpdir}"/>
+    <touch millis="0" file="${touch.temp.file}">
       <fileset dir="${conf.dir}" includes="**/*.template"/>
       <fileset dir="${contrib.dir}" includes="**/*.template"/>
     </touch>
-
+    <delete file="${touch.temp.file}"/>
     <!-- copy all of the jsp and static files -->
     <copy todir="${build.webapps}">
       <fileset dir="${src.webapps}">