changeset in /hg/icedtea: Bump to b63.
Andrew John Hughes
ahughes at redhat.com
Thu Jul 9 09:21:23 PDT 2009
changeset 3340f0afa232 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3340f0afa232
description:
Bump to b63.
2009-07-09 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
Bump to b63 and latest IcedTea changesets.
Add ANT_RESPECT_JAVA_HOME for Gentoo ant support.
Support patches for PR40616 and PR40630. Only
apply Scanner patches when needed.
* acinclude.m4:
(IT_LIBRARY_CHECK): Check for PR40616, missing
PrintStream constructors in GCJ.
(IT_SCANNER_CHECK): Check for PR30436, missing
java.util.Scanner class.
(IT_PR40630_CHECK): Check for PR40630, broken
java.util.Scanner#hasNextLine().
* configure.ac: Apply new macros.
* patches/ecj/icedtea-dbcs.patch: Replace java.util.Scanner
in GenerateDBCS.
* patches/ecj/icedtea-sbcs.patch,
* patches/ecj/icedtea.patch,
* patches/hotspot/default/icedtea-shark.patch,
* patches/icedtea-libraries.patch,
* patches/icedtea-liveconnect.patch,
* patches/icedtea-webstart.patch: Recreated.
diffstat:
11 files changed, 424 insertions(+), 249 deletions(-)
ChangeLog | 24 +++
Makefile.am | 56 +++++---
acinclude.m4 | 101 ++++++++++++++
configure.ac | 3
patches/ecj/icedtea-dbcs.patch | 40 +++++
patches/ecj/icedtea-sbcs.patch | 12 -
patches/ecj/icedtea.patch | 183 ++++++++++++---------------
patches/hotspot/default/icedtea-shark.patch | 40 ++---
patches/icedtea-libraries.patch | 90 ++++++-------
patches/icedtea-liveconnect.patch | 10 -
patches/icedtea-webstart.patch | 114 ++++++++--------
diffs (truncated from 1440 to 500 lines):
diff -r cba3ed800419 -r 3340f0afa232 ChangeLog
--- a/ChangeLog Wed Jun 24 10:31:06 2009 +0200
+++ b/ChangeLog Thu Jul 09 16:43:16 2009 +0100
@@ -1,3 +1,27 @@ 2009-06-24 Matthias Klose <doko at ubuntu
+2009-07-09 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Bump to b63 and latest IcedTea changesets.
+ Add ANT_RESPECT_JAVA_HOME for Gentoo ant support.
+ Support patches for PR40616 and PR40630. Only
+ apply Scanner patches when needed.
+ * acinclude.m4:
+ (IT_LIBRARY_CHECK): Check for PR40616, missing
+ PrintStream constructors in GCJ.
+ (IT_SCANNER_CHECK): Check for PR30436, missing
+ java.util.Scanner class.
+ (IT_PR40630_CHECK): Check for PR40630, broken
+ java.util.Scanner#hasNextLine().
+ * configure.ac: Apply new macros.
+ * patches/ecj/icedtea-dbcs.patch: Replace java.util.Scanner
+ in GenerateDBCS.
+ * patches/ecj/icedtea-sbcs.patch,
+ * patches/ecj/icedtea.patch,
+ * patches/hotspot/default/icedtea-shark.patch,
+ * patches/icedtea-libraries.patch,
+ * patches/icedtea-liveconnect.patch,
+ * patches/icedtea-webstart.patch: Recreated.
+
2009-06-24 Matthias Klose <doko at ubuntu.com>
* patches/cacao/no-strict-aliasing.patch: Apply for configure.ac.
diff -r cba3ed800419 -r 3340f0afa232 Makefile.am
--- a/Makefile.am Wed Jun 24 10:31:06 2009 +0200
+++ b/Makefile.am Thu Jul 09 16:43:16 2009 +0100
@@ -1,20 +1,20 @@ OPENJDK_VERSION = b60
-OPENJDK_VERSION = b60
-
-OPENJDK_CHANGESET = 472c21584cfd
-CORBA_CHANGESET = e906b16a12a9
-JAXP_CHANGESET = f1ac756616ea
-JAXWS_CHANGESET = 55ffcbca5f46
-JDK_CHANGESET = 1a01c90431a7
-LANGTOOLS_CHANGESET = 522520757dd3
-HOTSPOT_CHANGESET = 86092459c54d
-
-OPENJDK_MD5SUM = 9f5e15067cf5207760a83cea8ba41da8
-CORBA_MD5SUM = 7f00e0b5d16046d116cd53c9f43c7122
-JAXP_MD5SUM = 2de0ec54014eb7f25c811e40fc2e3e3f
-JAXWS_MD5SUM = 9c0131755eefaa929ca8e47abe21cc58
-JDK_MD5SUM = 1fd637880521f3e2c274a1db8bfed89b
-LANGTOOLS_MD5SUM = e7c0ac7a9d67d361cc64fc15312d4a85
-HOTSPOT_MD5SUM = 18c922319545d7e907a2d6cbb265865d
+OPENJDK_VERSION = b63
+
+OPENJDK_CHANGESET = 57f7e028c7ad
+CORBA_CHANGESET = d20e45cd539f
+JAXP_CHANGESET = ae449e9c04c1
+JAXWS_CHANGESET = 5b9e8315aab2
+JDK_CHANGESET = 6388560a8d7e
+LANGTOOLS_CHANGESET = 5c2c81120555
+HOTSPOT_CHANGESET = 32c83fb84370
+
+OPENJDK_MD5SUM = 01a2fe09452d8579fb251120e37dc45a
+CORBA_MD5SUM = 865e397135e2b9f8e4a256b4146b6852
+JAXP_MD5SUM = 008c8971c40aca1759dd0129a025f9b8
+JAXWS_MD5SUM = 86d18ba378cb83a2bd33b334c7bd610e
+JDK_MD5SUM = 68b034a7d0906a0f7b471e080b45407a
+LANGTOOLS_MD5SUM = 5ff432cec3ddf86ae5dbd147da1a7f92
+HOTSPOT_MD5SUM = a97947d03665b39b806ddcf2e48b9fc8
CACAO_VERSION = 0.99.4
CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -1567,6 +1567,7 @@ ICEDTEA_ENV = \
"ALT_PARALLEL_COMPILE_JOBS=$(PARALLEL_JOBS)" \
"HOTSPOT_BUILD_JOBS=$(PARALLEL_JOBS)" \
"JAVAC=" \
+ "ANT_RESPECT_JAVA_HOME=TRUE" \
"RHINO_JAR=$(RHINO_JAR)" \
"DISTRIBUTION_ID=$(DIST_ID)" \
"ALT_JIBX_LIBS_PATH=$(JIBX_DEPS_DIR)" \
@@ -2479,9 +2480,7 @@ stamps/ports-ecj.stamp: stamps/clone-ecj
# Patch OpenJDK for ecj/gcj builds.
ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \
patches/ecj/icedtea-hotspot-$(HSBUILD).patch \
- patches/ecj/icedtea-spp.patch \
patches/ecj/icedtea-jopt.patch \
- patches/ecj/icedtea-sbcs.patch \
patches/ecj/icedtea-dyn.patch
if CP39408_JAVAH
@@ -2490,6 +2489,25 @@ endif
if CP40188_JAVAH
ICEDTEA_ECJ_PATCHES += patches/ecj/icedtea-pr40188.patch
+endif
+
+if CP40616
+ICEDTEA_ECJ_PATCHES += patches/ecj/icedtea-pr40616.patch
+endif
+
+# Patches for when java.util.Scanner is missing
+# or has the bug #40630 (all these classes rely
+# on Scanner#hasNextLine() looping behaviour)
+SCANNER_PATCHES = patches/ecj/icedtea-spp.patch \
+ patches/ecj/icedtea-sbcs.patch \
+ patches/ecj/icedtea-dbcs.patch
+
+if LACKS_JAVA_UTIL_SCANNER
+ICEDTEA_ECJ_PATCHES += $(SCANNER_PATCHES)
+else
+if CP40630
+ICEDTEA_ECJ_PATCHES += $(SCANNER_PATCHES)
+endif
endif
stamps/patch-ecj.stamp: stamps/clone-ecj.stamp
diff -r cba3ed800419 -r 3340f0afa232 acinclude.m4
--- a/acinclude.m4 Wed Jun 24 10:31:06 2009 +0200
+++ b/acinclude.m4 Thu Jul 09 16:43:16 2009 +0100
@@ -1561,3 +1561,104 @@ if test "x${ADD_ZERO_BUILD_TRUE}" = x &&
AC_MSG_ERROR([build of additional zero/shark VM requires build with srcdir != builddir])
fi
])
+
+AC_DEFUN([IT_LIBRARY_CHECK],[
+AC_CACHE_CHECK([if java.io.PrintStream is missing the 1.5 constructors (PR40616)], it_cv_cp40616, [
+CLASS=Test.java
+mkdir tmp.$$
+cd tmp.$$
+cat << \EOF > $CLASS
+/* [#]line __oline__ "configure" */
+public class Test
+{
+ public static void main(String[] args)
+ throws Exception
+ {
+ new java.io.PrintStream(new java.io.File("bluh"), "UTF-8");
+ }
+}
+EOF
+if $JAVAC -cp . $JAVACFLAGS $CLASS >/dev/null 2>&1; then
+ it_cv_cp40616=no;
+else
+ it_cv_cp40616=yes;
+fi
+])
+rm -f $CLASS *.class
+cd ..
+rmdir tmp.$$
+AM_CONDITIONAL([CP40616], test x"${it_cv_cp40616}" = "xyes")
+AC_PROVIDE([$0])dnl
+])
+
+AC_DEFUN([IT_SCANNER_CHECK],[
+AC_CACHE_CHECK([if java.util.Scanner is missing], it_cv_cp30436, [
+CLASS=Test.java
+BYTECODE=$(echo $CLASS|sed 's#\.java##')
+mkdir tmp.$$
+cd tmp.$$
+cat << \EOF > $CLASS
+/* [#]line __oline__ "configure" */
+public class Test
+{
+ public static void main(String[] args)
+ throws Exception
+ {
+ new java.util.Scanner("Hello");
+ }
+}
+EOF
+if $JAVAC -cp . $JAVACFLAGS $CLASS >/dev/null 2>&1; then
+ if $JAVA -classpath . $BYTECODE 2>&1 | grep 'Exception'; then
+ it_cv_cp30436=yes;
+ else
+ it_cv_cp30436=no;
+ fi
+else
+ it_cv_cp30436=yes;
+fi
+])
+rm -f $CLASS *.class
+cd ..
+rmdir tmp.$$
+AM_CONDITIONAL([LACKS_JAVA_UTIL_SCANNER], test x"${it_cv_cp30436}" = "xyes")
+AC_PROVIDE([$0])dnl
+])
+
+AC_DEFUN([IT_PR40630_CHECK],[
+if test "x${it_cv_cp30436}" = "xno"; then
+ AC_CACHE_CHECK([if java.util.Scanner exhibits Classpath bug 40630], it_cv_cp40630, [
+ CLASS=Test.java
+ mkdir tmp.$$
+ cd tmp.$$
+ cat << \EOF > $CLASS
+ /* [#]line __oline__ "configure" */
+public class Test
+{
+ public static void main(String[] args)
+ throws Exception
+ {
+ Scanner s = new Scanner("Blah\nBlah\n\nBlah\n\n");
+ for (int i = 0; i < 5; ++i)
+ s.nextLine();
+ s.hasNextLine();
+ }
+}
+EOF
+ if $JAVAC -cp . $JAVACFLAGS $CLASS >/dev/null 2>&1; then
+ if $JAVA -classpath . $CLASS 2>&1 | grep 'Exception'; then
+ it_cv_cp40630=yes;
+ else
+ it_cv_cp40630=no;
+ fi
+ else
+ it_cv_cp40630=yes;
+ fi
+ ])
+ rm -f $CLASS *.class
+ cd ..
+ rmdir tmp.$$
+fi
+AM_CONDITIONAL([CP40630], test x"${it_cv_cp40630}" = "xyes")
+AC_PROVIDE([$0])dnl
+])
diff -r cba3ed800419 -r 3340f0afa232 configure.ac
--- a/configure.ac Wed Jun 24 10:31:06 2009 +0200
+++ b/configure.ac Thu Jul 09 16:43:16 2009 +0100
@@ -290,6 +290,9 @@ fi
fi
fi
IT_JAVAH
+IT_LIBRARY_CHECK
+IT_SCANNER_CHECK
+IT_PR40630_CHECK
FIND_RHINO_JAR
WITH_OPENJDK_SRC_ZIP
WITH_HOTSPOT_SRC_ZIP
diff -r cba3ed800419 -r 3340f0afa232 patches/ecj/icedtea-dbcs.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/ecj/icedtea-dbcs.patch Thu Jul 09 16:43:16 2009 +0100
@@ -0,0 +1,40 @@
+diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java 2009-07-08 18:00:55.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java 2009-07-08 23:45:44.000000000 +0100
+@@ -27,7 +27,6 @@
+ import java.io.*;
+ import java.util.Arrays;
+ import java.util.ArrayList;
+-import java.util.Scanner;
+ import java.util.Formatter;
+ import java.util.regex.*;
+ import java.nio.charset.*;
+@@ -38,9 +37,8 @@
+ static Pattern mPattern = Pattern.compile("(\\p{XDigit}++)\\s++(\\p{XDigit}++)(\\s++#.*)?");
+ public static void genDBCS(String args[]) throws Exception {
+
+- Scanner s = new Scanner(new File(args[0], args[2]));
+- while (s.hasNextLine()) {
+- String line = s.nextLine();
++ BufferedReader s = new BufferedReader(new FileReader(new File(args[0], args[2])));
++ for (String line = s.readLine(); line != null; line = s.readLine()) {
+ if (line.startsWith("#") || line.length() == 0)
+ continue;
+ String[] fields = line.split("\\s+");
+@@ -239,14 +237,13 @@
+ String b2cNR = b2cNRSB.toString();
+ String c2bNR = c2bNRSB.toString();
+
+- Scanner s = new Scanner(new File(srcDir, template));
++ BufferedReader s = new BufferedReader(new FileReader(new File(srcDir, template)));
+ PrintStream out = new PrintStream(new FileOutputStream(
+ new File(dstDir, clzName + ".java")));
+ if (hisName == null)
+ hisName = "";
+
+- while (s.hasNextLine()) {
+- String line = s.nextLine();
++ for (String line = s.readLine(); line != null; line = s.readLine()) {
+ if (line.indexOf("$") == -1) {
+ out.println(line);
+ continue;
diff -r cba3ed800419 -r 3340f0afa232 patches/ecj/icedtea-sbcs.patch
--- a/patches/ecj/icedtea-sbcs.patch Wed Jun 24 10:31:06 2009 +0200
+++ b/patches/ecj/icedtea-sbcs.patch Thu Jul 09 16:43:16 2009 +0100
@@ -1,6 +1,6 @@ diff -Nru openjdk-ecj.orig/jdk/make/tool
diff -Nru openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java
---- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java 2009-01-18 03:30:42.000000000 +0000
-+++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java 2009-01-19 00:55:58.000000000 +0000
+--- openjdk-ecj.orig/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java 2009-07-01 11:39:50.000000000 +0100
++++ openjdk-ecj/jdk/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java 2009-07-01 12:24:04.000000000 +0100
@@ -27,7 +27,6 @@
import java.io.*;
@@ -9,9 +9,9 @@ diff -Nru openjdk-ecj.orig/jdk/make/tool
import java.util.Formatter;
import java.util.regex.*;
import java.nio.charset.*;
-@@ -40,9 +39,8 @@
- System.exit(1);
- }
+@@ -37,9 +36,8 @@
+
+ public static void genSBCS(String args[]) throws Exception {
- Scanner s = new Scanner(new File(args[0], args[2]));
- while (s.hasNextLine()) {
@@ -21,7 +21,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/tool
if (line.startsWith("#") || line.length() == 0)
continue;
String[] fields = line.split("\\s+");
-@@ -201,12 +199,10 @@
+@@ -198,12 +196,10 @@
int c2blen)
throws Exception
{
diff -r cba3ed800419 -r 3340f0afa232 patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch Wed Jun 24 10:31:06 2009 +0200
+++ b/patches/ecj/icedtea.patch Thu Jul 09 16:43:16 2009 +0100
@@ -1,6 +1,6 @@ diff -Nru openjdk-ecj.orig/corba/make/co
diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile openjdk-ecj/corba/make/com/sun/corba/se/Makefile
--- openjdk-ecj.orig/corba/make/com/sun/corba/se/Makefile 2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/Makefile 2009-07-01 13:52:45.000000000 +0100
@@ -42,7 +42,7 @@
# the rmic iiop backend needs some classes that are part of the impl/util
# package. These classes use log wrappers, so they must be built after
@@ -12,7 +12,7 @@ diff -Nru openjdk-ecj.orig/corba/make/co
diff -Nru openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile
--- openjdk-ecj.orig/corba/make/com/sun/corba/se/org/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2009-05-28 09:03:57.000000000 +0100
++++ openjdk-ecj/corba/make/com/sun/corba/se/org/Makefile 2009-07-01 13:52:45.000000000 +0100
@@ -0,0 +1,38 @@
+#
+# Copyright 2001-2005 Sun Microsystems, Inc. All Rights Reserved.
@@ -54,7 +54,7 @@ diff -Nru openjdk-ecj.orig/corba/make/co
+include $(BUILDDIR)/common/Classes.gmk
diff -Nru openjdk-ecj.orig/corba/make/common/Defs.gmk openjdk-ecj/corba/make/common/Defs.gmk
--- openjdk-ecj.orig/corba/make/common/Defs.gmk 2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs.gmk 2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs.gmk 2009-07-01 13:52:45.000000000 +0100
@@ -53,6 +53,13 @@
_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -88,8 +88,8 @@ diff -Nru openjdk-ecj.orig/corba/make/co
vpath %.java $(VPATH.java)
vpath %.class $(CLASSBINDIR)
diff -Nru openjdk-ecj.orig/corba/make/common/Defs-linux.gmk openjdk-ecj/corba/make/common/Defs-linux.gmk
---- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2009-06-15 17:14:30.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2009-06-15 17:19:32.000000000 +0100
+--- openjdk-ecj.orig/corba/make/common/Defs-linux.gmk 2009-07-01 13:42:16.000000000 +0100
++++ openjdk-ecj/corba/make/common/Defs-linux.gmk 2009-07-01 13:52:45.000000000 +0100
@@ -276,7 +276,7 @@
fi; \
done)
@@ -101,7 +101,7 @@ diff -Nru openjdk-ecj.orig/corba/make/co
# We want to privatize JVM symbols on Solaris. This is so the user can
diff -Nru openjdk-ecj.orig/corba/make/common/Rules.gmk openjdk-ecj/corba/make/common/Rules.gmk
--- openjdk-ecj.orig/corba/make/common/Rules.gmk 2009-03-30 23:07:09.000000000 +0100
-+++ openjdk-ecj/corba/make/common/Rules.gmk 2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/corba/make/common/Rules.gmk 2009-07-01 13:52:45.000000000 +0100
@@ -201,8 +201,10 @@
$(ECHO) "# Java sources to be compiled: (listed in file $(JAVA_SOURCE_LIST))"; \
$(CAT) $(JAVA_SOURCE_LIST); \
@@ -117,7 +117,7 @@ diff -Nru openjdk-ecj.orig/corba/make/co
diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk 2009-03-30 23:07:09.000000000 +0100
-+++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk 2009-07-01 13:52:45.000000000 +0100
@@ -120,31 +120,14 @@
JAVACFLAGS += $(OTHER_JAVACFLAGS)
@@ -158,7 +158,7 @@ diff -Nru openjdk-ecj.orig/corba/make/co
ifdef JAVAC
diff -Nru openjdk-ecj.orig/corba/make/org/omg/sources/Makefile openjdk-ecj/corba/make/org/omg/sources/Makefile
--- openjdk-ecj.orig/corba/make/org/omg/sources/Makefile 2009-03-30 17:13:01.000000000 +0100
-+++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/corba/make/org/omg/sources/Makefile 2009-07-01 13:52:45.000000000 +0100
@@ -93,8 +93,6 @@
POAHELHOLFILES = $(POA_GENERATED_HELP_HOL_java:%=$(GENSRCDIR)/%)
@@ -237,7 +237,7 @@ diff -Nru openjdk-ecj.orig/corba/make/or
diff -Nru openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile
--- openjdk-ecj.orig/corba/make/sun/rmi/corbalogsources/Makefile 2009-03-30 23:07:09.000000000 +0100
-+++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/corba/make/sun/rmi/corbalogsources/Makefile 2009-07-01 13:52:45.000000000 +0100
@@ -172,7 +172,6 @@
ACTIVATIONFILES = $(com_sun_corba_se_spi_activation_java:%=$(GENSRCDIR)/%)
@@ -255,8 +255,8 @@ diff -Nru openjdk-ecj.orig/corba/make/su
portableactivation.idl.compile: $(PORTABLEACTIVATIONFILES)
diff -Nru openjdk-ecj.orig/jaxp/make/build.xml openjdk-ecj/jaxp/make/build.xml
---- openjdk-ecj.orig/jaxp/make/build.xml 2009-06-15 14:57:04.000000000 +0100
-+++ openjdk-ecj/jaxp/make/build.xml 2009-06-15 17:21:10.000000000 +0100
+--- openjdk-ecj.orig/jaxp/make/build.xml 2009-06-30 14:24:48.000000000 +0100
++++ openjdk-ecj/jaxp/make/build.xml 2009-07-01 13:55:31.000000000 +0100
@@ -71,7 +71,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
@@ -269,22 +269,21 @@ diff -Nru openjdk-ecj.orig/jaxp/make/bui
<taskdef name="pstrip"
classname="StripPropertiesTask"
classpath="${build.toolclasses.dir}/"/>
-@@ -86,7 +89,9 @@
- memoryInitialSize="${javac.memoryInitialSize}"
+@@ -87,7 +90,8 @@
memoryMaximumSize="${javac.memoryMaximumSize}"
+ source="${javac.source}"
debug="${javac.debug}"
- target="${javac.target}">
+ target="${javac.target}"
-+ executable="${javac.executable}"
-+ source="1.5">
++ executable="${javac.executable}">
<compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
<compilerarg line="${javac.version.opt}"/>
</javac>
diff -Nru openjdk-ecj.orig/jaxp/make/Makefile openjdk-ecj/jaxp/make/Makefile
---- openjdk-ecj.orig/jaxp/make/Makefile 2009-06-15 17:14:26.000000000 +0100
-+++ openjdk-ecj/jaxp/make/Makefile 2009-06-15 17:19:32.000000000 +0100
-@@ -84,7 +84,7 @@
- endif
+--- openjdk-ecj.orig/jaxp/make/Makefile 2009-07-01 13:42:16.000000000 +0100
++++ openjdk-ecj/jaxp/make/Makefile 2009-07-01 13:52:45.000000000 +0100
+@@ -92,7 +92,7 @@
+ endif
ifdef ALT_BOOTDIR
- ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
@@ -293,9 +292,9 @@ diff -Nru openjdk-ecj.orig/jaxp/make/Mak
ifdef ALT_OUTPUTDIR
diff -Nru openjdk-ecj.orig/jaxws/make/build.properties openjdk-ecj/jaxws/make/build.properties
---- openjdk-ecj.orig/jaxws/make/build.properties 2009-06-15 17:14:30.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.properties 2009-06-15 17:19:32.000000000 +0100
-@@ -36,7 +36,7 @@
+--- openjdk-ecj.orig/jaxws/make/build.properties 2009-07-01 13:42:16.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.properties 2009-07-01 13:52:45.000000000 +0100
+@@ -37,7 +37,7 @@
# set the following to -version to verify the versions of javac being used
javac.version.opt =
# in time, there should be no exceptions to -Xlint:all
@@ -305,8 +304,8 @@ diff -Nru openjdk-ecj.orig/jaxws/make/bu
# JVM memory size
javac.memoryInitialSize = 128m
diff -Nru openjdk-ecj.orig/jaxws/make/build.xml openjdk-ecj/jaxws/make/build.xml
---- openjdk-ecj.orig/jaxws/make/build.xml 2009-06-15 14:57:13.000000000 +0100
-+++ openjdk-ecj/jaxws/make/build.xml 2009-06-15 17:22:06.000000000 +0100
+--- openjdk-ecj.orig/jaxws/make/build.xml 2009-06-30 14:24:56.000000000 +0100
++++ openjdk-ecj/jaxws/make/build.xml 2009-07-01 13:52:45.000000000 +0100
@@ -93,7 +93,10 @@
<mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/StripProperties"
@@ -319,27 +318,19 @@ diff -Nru openjdk-ecj.orig/jaxws/make/bu
<taskdef name="pstrip"
classname="StripPropertiesTask"
classpath="${build.toolclasses.dir}/"/>
-@@ -105,11 +108,14 @@
- <javac fork="true"
- srcdir="${src.classes.dir}"
- destdir="${build.classes.dir}"
-+ executable="${javac.executable}"
- memoryInitialSize="${javac.memoryInitialSize}"
- memoryMaximumSize="${javac.memoryMaximumSize}"
+@@ -111,6 +114,7 @@
debug="${javac.debug}"
target="${javac.target}"
-- excludes="com/sun/tools/internal/txw2/**">
-+ excludes="com/sun/tools/internal/txw2/**"
-+ source="1.5">
-+ <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar:${boot.java.home}/jre/lib/rt-system.jar"/>
+ excludes="com/sun/tools/internal/txw2/**">
++ <compilerarg line="-bootclasspath ${build.dir}/../../jaxp/build/classes:${build.classes.dir}:../../../generated:${boot.java.home}/lib/tools.jar:${boot.java.home}/jre/lib/rt.jar:${boot.java.home}/jre/lib/rt-system.jar"/>
<compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
<compilerarg line="${javac.version.opt}"/>
<compilerarg line="${javac.no.jdk.warnings}"/>
diff -Nru openjdk-ecj.orig/jaxws/make/Makefile openjdk-ecj/jaxws/make/Makefile
---- openjdk-ecj.orig/jaxws/make/Makefile 2009-06-15 17:14:26.000000000 +0100
-+++ openjdk-ecj/jaxws/make/Makefile 2009-06-15 17:19:32.000000000 +0100
-@@ -84,8 +84,8 @@
- endif
+--- openjdk-ecj.orig/jaxws/make/Makefile 2009-07-01 13:42:16.000000000 +0100
++++ openjdk-ecj/jaxws/make/Makefile 2009-07-01 13:52:45.000000000 +0100
+@@ -92,8 +92,8 @@
+ endif
ifdef ALT_BOOTDIR
- ANT_OPTIONS += -Dplugs=$(ALT_BINARY_PLUGS_PATH)
@@ -351,7 +342,7 @@ diff -Nru openjdk-ecj.orig/jaxws/make/Ma
ifdef ALT_OUTPUTDIR
diff -Nru openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk openjdk-ecj/jdk/make/common/BuildToolJar.gmk
--- openjdk-ecj.orig/jdk/make/common/BuildToolJar.gmk 2009-03-30 17:23:03.000000000 +0100
-+++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2009-06-15 17:19:32.000000000 +0100
++++ openjdk-ecj/jdk/make/common/BuildToolJar.gmk 2009-07-01 13:52:45.000000000 +0100
@@ -43,7 +43,8 @@
@$(prep-target)
@$(MKDIR) -p $(BUILDTOOLCLASSDIR)
More information about the distro-pkg-dev
mailing list