changeset in /hg/icedtea: Fix build on systems without java.util...

[Andrew John Hughes]

changeset 2341c4735ea7 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2341c4735ea7
description:
	Fix build on systems without java.util.Scanner.

	2009-07-15  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am:
		Turn on euctw patch for systems without
		java.util.Scanner.
		* patches/ecj/icedtea-euctw.patch:
		Remove java.util.Scanner from GenerateEUC_TW.java

diffstat:

3 files changed, 42 insertions(+), 1 deletion(-)
ChangeLog                       |    8 ++++++++
Makefile.am                     |    3 ++-
patches/ecj/icedtea-euctw.patch |   32 ++++++++++++++++++++++++++++++++

diffs (64 lines):

diff -r e2ff1b52131d -r 2341c4735ea7 ChangeLog
--- a/ChangeLog	Tue Jul 14 19:44:20 2009 +0100
+++ b/ChangeLog	Wed Jul 15 13:39:06 2009 +0100
@@ -1,3 +1,11 @@ 2009-07-14  Andrew John Hughes  <ahughes
+2009-07-15  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Turn on euctw patch for systems without
+	java.util.Scanner.
+	* patches/ecj/icedtea-euctw.patch:
+	Remove java.util.Scanner from GenerateEUC_TW.java
+
 2009-07-14  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-messageutils.patch,
diff -r e2ff1b52131d -r 2341c4735ea7 Makefile.am
--- a/Makefile.am	Tue Jul 14 19:44:20 2009 +0100
+++ b/Makefile.am	Wed Jul 15 13:39:06 2009 +0100
@@ -2501,7 +2501,8 @@ SCANNER_PATCHES = patches/ecj/icedtea-sp
 	patches/ecj/icedtea-dbcs.patch
 
 if LACKS_JAVA_UTIL_SCANNER
-ICEDTEA_ECJ_PATCHES += $(SCANNER_PATCHES)
+ICEDTEA_ECJ_PATCHES += $(SCANNER_PATCHES) \
+	patches/ecj/icedtea-euctw.patch
 else
 if CP40630
 ICEDTEA_ECJ_PATCHES += $(SCANNER_PATCHES)
diff -r e2ff1b52131d -r 2341c4735ea7 patches/ecj/icedtea-euctw.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/icedtea-euctw.patch	Wed Jul 15 13:39:06 2009 +0100
@@ -0,0 +1,32 @@
+diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java	2009-07-15 13:08:40.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java	2009-07-15 13:12:08.000000000 +0100
+@@ -27,7 +27,6 @@
+ 
+ import java.io.*;
+ import java.util.ArrayList;
+-import java.util.Scanner;
+ import java.util.Formatter;
+ import java.util.regex.*;
+ import java.nio.charset.*;
+@@ -42,16 +41,16 @@
+     }
+ 
+     private static String getCopyright(File f) throws IOException {
+-        Scanner s = new Scanner(f, "ISO-8859-1");
++        BufferedReader r =
++            new BufferedReader(new InputStreamReader(new FileInputStream(f), "ISO-8859-1"));
+         StringBuilder sb = new StringBuilder();
+-        while (s.hasNextLine()) {
+-            String ln = s.nextLine();
++        for (String ln = r.readLine(); ln != null; ln = r.readLine()) {
+             sb.append(ln + "\n");
+             // assume we have the copyright as the first comment
+             if (ln.matches("^\\s\\*\\/$"))
+                 break;
+         }
+-        s.close();
++        r.close();
+         return sb.toString();
+     }
+