svn commit: r951343 - /harmony/enhanced/java/trunk/classlib/make/depends-common.xml

[od...@apache.org]

Author: odeakin
Date: Fri Jun  4 09:46:18 2010
New Revision: 951343

URL: http://svn.apache.org/viewvc?rev=951343&view=rev
Log:
Since Ant bug 47382 has been fixed in Ant 1.8.0 onwards, revert the workaround committed at revision r785609.

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

Modified: harmony/enhanced/java/trunk/classlib/make/depends-common.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/make/depends-common.xml?rev=951343&r1=951342&r2=951343&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/make/depends-common.xml (original)
+++ harmony/enhanced/java/trunk/classlib/make/depends-common.xml Fri Jun  4 09:46:18 2010
@@ -25,9 +25,7 @@
     where possible.
     </description>
 
-    <!-- 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">
+    <loadproperties srcfile="${basedir}/make/depends.properties">
       <filterchain>
         <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
             <param type="token" name="${hy.arch}" value=""/>
@@ -37,7 +35,6 @@
         </filterreader>
       </filterchain>
     </loadproperties>
-    <delete file="${basedir}/make/depends.properties.ascii" />
 
     <macrodef name="download-one-file">
         <attribute name="src" />