Browse Source

HDFS-912. sed in build.xml on Solaris fails. Contributed by Allen Wittenauer.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/trunk@981706 13f79535-47bb-0310-9956-ffa450edef68
Jakob Homan 14 years ago
parent
commit
595f93b7dc
2 changed files with 6 additions and 2 deletions
  1. 2 0
      CHANGES.txt
  2. 4 2
      build.xml

+ 2 - 0
CHANGES.txt

@@ -174,6 +174,8 @@ Trunk (unreleased changes)
     HDFS-1317. Remove the FILEPATH_PATTERN from hdfsproxy.AuthorizationFilter.
     (Rohini Palaniswamy via szetszwo)
 
+    HDFS-912. sed in build.xml on Solaris fails. (Allen Wittenauer via jghoman)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

+ 4 - 2
build.xml

@@ -53,10 +53,12 @@
   <property name="build.src" value="${build.dir}/src"/>
   <property name="build.webapps" value="${build.dir}/webapps"/>
   <property name="build.anttasks" value="${build.dir}/ant"/>
+
   <!-- convert spaces to _ so that mac os doesn't break things -->
-  <exec executable="sed" inputstring="${os.name}" 
+  <exec executable="tr" inputstring="${os.name}" 
         outputproperty="nonspace.os">
-     <arg value="s/ /_/g"/>
+     <arg value="[:space:]"/>
+     <arg value="_"/>
   </exec>
   <property name="build.platform" 
             value="${nonspace.os}-${os.arch}-${sun.arch.data.model}"/>