hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sur...@apache.org
Subject svn commit: r1466304 - in /hadoop/common/branches/branch-1-win: CHANGES.branch-1-win.txt build.xml
Date Wed, 10 Apr 2013 00:31:55 GMT
Author: suresh
Date: Wed Apr 10 00:31:55 2013
New Revision: 1466304

URL: http://svn.apache.org/r1466304
Log:
HADOOP-9463. branch-1-win fails to build with OpenJDK7. Contributed by Ivan Mitic.

Modified:
    hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
    hadoop/common/branches/branch-1-win/build.xml

Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1466304&r1=1466303&r2=1466304&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Wed Apr 10 00:31:55 2013
@@ -252,6 +252,9 @@ Branch-hadoop-1-win (branched from branc
 
     HADOOP-9250. Windows installer bugfixes. (Ivan Mitic via suresh)
 
+    HADOOP-9463. branch-1-win fails to build with OpenJDK7.
+    (Ivan Mitic via suresh)
+
   Merged from branch-1
 
     HDFS-385. Backport: Add support for an experimental API that allows a

Modified: hadoop/common/branches/branch-1-win/build.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/build.xml?rev=1466304&r1=1466303&r2=1466304&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/build.xml (original)
+++ hadoop/common/branches/branch-1-win/build.xml Wed Apr 10 00:31:55 2013
@@ -84,10 +84,15 @@
   <property name="build.anttasks" value="${build.dir}/ant"/>
   <property name="build.librecordio" value="${build.dir}/librecordio"/>
   <!-- convert spaces to _ so that mac os doesn't break things -->
-  <script language="javascript">
-    var before = project.getProperty("os.name");
-    project.setProperty("nonspace.os", before.replaceAll(" ", "_"));
-  </script>
+  <loadresource property="nonspace.os">
+    <propertyresource name="os.name"/>
+    <filterchain>
+      <tokenfilter>
+        <filetokenizer/>
+        <replacestring from=" " to="_"/>
+      </tokenfilter>
+    </filterchain>
+  </loadresource>
   <condition property="build.platform"
     value="${env.OS}-${os.arch}-${sun.arch.data.model}"
     else="${nonspace.os}-${os.arch}-${sun.arch.data.model}">



Mime
View raw message