conor 2003/02/18 04:12:03
Modified: src/main/org/apache/tools/ant/taskdefs Manifest.java
. build.xml
Log:
Manifests should remain in UTF-8, not the platform encoding.
Revision Changes Path
1.40 +1 -1 ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java
Index: Manifest.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Manifest.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -w -u -r1.39 -r1.40
--- Manifest.java 10 Feb 2003 14:13:35 -0000 1.39
+++ Manifest.java 18 Feb 2003 12:12:02 -0000 1.40
@@ -730,7 +730,7 @@
}
try {
Manifest defaultManifest
- = new Manifest(new InputStreamReader(in, "ASCII"));
+ = new Manifest(new InputStreamReader(in, "UTF-8"));
Attribute createdBy = new Attribute("Created-By",
System.getProperty("java.vm.version") + " ("
+ System.getProperty("java.vm.vendor") + ")" );
1.350 +1 -1 ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -w -u -r1.349 -r1.350
--- build.xml 9 Feb 2003 12:59:12 -0000 1.349
+++ build.xml 18 Feb 2003 12:12:02 -0000 1.350
@@ -638,7 +638,7 @@
</copy>
<copy todir="${build.classes}"
- overwrite="true">
+ overwrite="true" encoding="UTF-8">
<fileset dir="${java.dir}">
<include name="**/version.txt"/>
<include name="**/defaultManifest.mf"/>
