harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odea...@apache.org
Subject svn commit: r785609 - /harmony/enhanced/classlib/trunk/make/depends-common.xml
Date Wed, 17 Jun 2009 14:02:20 GMT
Author: odeakin
Date: Wed Jun 17 14:02:20 2009
New Revision: 785609

URL: http://svn.apache.org/viewvc?rev=785609&view=rev
Log:
As discussed on the dev list, convert the properties file to ascii encoding before loading
so it works correctly on zOS - works around Ant bug 47382.

Modified:
    harmony/enhanced/classlib/trunk/make/depends-common.xml

Modified: harmony/enhanced/classlib/trunk/make/depends-common.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends-common.xml?rev=785609&r1=785608&r2=785609&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends-common.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends-common.xml Wed Jun 17 14:02:20 2009
@@ -25,7 +25,9 @@
     where possible.
     </description>
 
-    <loadproperties srcfile="${basedir}/make/depends.properties">
+    <!-- temporary workaround for Ant bug 47382 - to be removed when that is resolved
and released -->
+    <copy file="${basedir}/make/depends.properties" tofile="${basedir}/make/depends.properties.ascii"
outputencoding="ISO-8859-1" />
+    <loadproperties srcfile="${basedir}/make/depends.properties.ascii" encoding="ISO-8859-1">
       <filterchain>
         <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
             <param type="token" name="${hy.arch}" value=""/>
@@ -35,6 +37,7 @@
         </filterreader>
       </filterchain>
     </loadproperties>
+    <delete file="${basedir}/make/depends.properties.ascii" />
 
     <macrodef name="download-one-file">
         <attribute name="src" />



Mime
View raw message