changeset in /hg/icedtea: Bump to b68. Add some generated files...
Andrew John Hughes
ahughes at redhat.com
Fri Aug 7 13:44:33 PDT 2009
changeset 52ca492dae93 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=52ca492dae93
description:
Bump to b68. Add some generated files ecj just decided to start complaining about.
2009-08-07 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
Bump to b68, remove additional -source option.
* generated/java/nio/channels/AcceptPendingException.java,
* generated/java/nio/channels/IllegalChannelGroupException.java,
* generated/java/nio/channels/InterruptedByTimeoutException.java,
* generated/java/nio/channels/ReadPendingException.java,
* generated/java/nio/channels/ShutdownChannelGroupException.java,
* generated/java/nio/channels/WritePendingException.java,
* generated/sun/nio/fs/UnixConstants.java:
Add generated files.
* javac.in: Update to build 1.7 code.
* patches/ecj/icedtea.patch: Remove patch removing use of 1.6
source and target options.
* patches/icedtea-clean-crypto.patch: Regenerated.
* patches/xrender/icedtea-007.patch: Remove non-ASCII characters.
diffstat:
13 files changed, 468 insertions(+), 105 deletions(-)
ChangeLog | 18 +
Makefile.am | 41 +--
generated/java/nio/channels/AcceptPendingException.java | 51 ++++
generated/java/nio/channels/IllegalChannelGroupException.java | 51 ++++
generated/java/nio/channels/InterruptedByTimeoutException.java | 51 ++++
generated/java/nio/channels/ReadPendingException.java | 51 ++++
generated/java/nio/channels/ShutdownChannelGroupException.java | 52 +++++
generated/java/nio/channels/WritePendingException.java | 51 ++++
generated/sun/nio/fs/UnixConstants.java | 79 +++++++
javac.in | 6
patches/ecj/icedtea.patch | 14 -
patches/icedtea-clean-crypto.patch | 104 ++++------
patches/xrender/icedtea-007.patch | 4
diffs (truncated from 849 to 500 lines):
diff -r 209e9a326eb9 -r 52ca492dae93 ChangeLog
--- a/ChangeLog Fri Aug 07 11:53:17 2009 +0200
+++ b/ChangeLog Fri Aug 07 21:46:15 2009 +0100
@@ -1,3 +1,21 @@ 2009-08-07 Matthias Klose <doko at ubuntu
+2009-08-07 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Bump to b68, remove additional -source option.
+ * generated/java/nio/channels/AcceptPendingException.java,
+ * generated/java/nio/channels/IllegalChannelGroupException.java,
+ * generated/java/nio/channels/InterruptedByTimeoutException.java,
+ * generated/java/nio/channels/ReadPendingException.java,
+ * generated/java/nio/channels/ShutdownChannelGroupException.java,
+ * generated/java/nio/channels/WritePendingException.java,
+ * generated/sun/nio/fs/UnixConstants.java:
+ Add generated files.
+ * javac.in: Update to build 1.7 code.
+ * patches/ecj/icedtea.patch: Remove patch removing use of 1.6
+ source and target options.
+ * patches/icedtea-clean-crypto.patch: Regenerated.
+ * patches/xrender/icedtea-007.patch: Remove non-ASCII characters.
+
2009-08-07 Matthias Klose <doko at ubuntu.com>
* Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Add configure options
diff -r 209e9a326eb9 -r 52ca492dae93 Makefile.am
--- a/Makefile.am Fri Aug 07 11:53:17 2009 +0200
+++ b/Makefile.am Fri Aug 07 21:46:15 2009 +0100
@@ -1,20 +1,20 @@ OPENJDK_VERSION = b67
-OPENJDK_VERSION = b67
-
-OPENJDK_CHANGESET = f24111620a51
-CORBA_CHANGESET = 1cb0098b53b2
-JAXP_CHANGESET = 45fc86d2aa5c
-JAXWS_CHANGESET = 73440eb34fb0
-JDK_CHANGESET = cd7d9265b4e6
-LANGTOOLS_CHANGESET = 14b1a8ede954
-HOTSPOT_CHANGESET = 87c6731ab8d1
-
-OPENJDK_MD5SUM = f5cc1b21cf1a805528300bf931aa821e
-CORBA_MD5SUM = 00fa00a58b465cad40cab9ac05058c24
-JAXP_MD5SUM = 61230cee4199f91ed5675bcf2acad63d
-JAXWS_MD5SUM = fc9d2659fb875ece0e3a5e7894c1bbf8
-JDK_MD5SUM = 8e3fa808fcad7713635a21e127dd0f72
-LANGTOOLS_MD5SUM = a3b15bcf5b76b1639600250fc29c057b
-HOTSPOT_MD5SUM = d0632498485808fdf8f97ef1f388722d
+OPENJDK_VERSION = b68
+
+OPENJDK_CHANGESET = d8f0e9685212
+CORBA_CHANGESET = 4d8317ea0eec
+JAXP_CHANGESET = 216517ab5325
+JAXWS_CHANGESET = 4425f7c4fb5b
+JDK_CHANGESET = df6fceba2e80
+LANGTOOLS_CHANGESET = 95c1212b07e3
+HOTSPOT_CHANGESET = 91fcd98a5ae1
+
+OPENJDK_MD5SUM = 8c3d681d0a90ec9adf00870f5e20d09f
+CORBA_MD5SUM = c1c9db96634876b2c522dc387dec3864
+JAXP_MD5SUM = 9a821849b2b9bdf2f8dc32168809a063
+JAXWS_MD5SUM = 2d9fbeb543ee7bcd6621a3f131649db2
+JDK_MD5SUM = 418d860925e69cca57253e62508234b6
+LANGTOOLS_MD5SUM = e29f65271621d80aa8a894fe13325f23
+HOTSPOT_MD5SUM = 88cc373d7d04a2c9c60fd9343a28818c
CACAO_VERSION = 0.99.4
CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -3006,14 +3006,12 @@ stamps/hotspot-tools-class-files.stamp:
if ! test -d $(ICEDTEA_BOOT_DIR) ; \
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/hotspot-tools \
- -source 1.5 \
-sourcepath \
'hotspot-tools:$(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS)' \
-bootclasspath \'\' @$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
-d lib/hotspot-tools \
- -source 1.5 \
-sourcepath \
'hotspot-tools:$(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS)' \
-bootclasspath \'\' @$< ; \
@@ -3058,13 +3056,11 @@ stamps/rt-class-files.stamp: rt-source-f
if ! test -d $(ICEDTEA_BOOT_DIR) ; \
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d lib/rt \
- -source 1.5 \
-classpath $(abs_top_builddir)/lib/hotspot-tools \
-sourcepath '$(SOURCEPATH_DIRS)' \
-bootclasspath \'\' @$< ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d lib/rt \
- -source 1.5 \
-classpath $(abs_top_builddir)/lib/hotspot-tools \
-sourcepath '$(SOURCEPATH_DIRS)' \
-bootclasspath \'\' @$< ; \
@@ -3103,14 +3099,12 @@ stamps/extra-class-files.stamp: extra-so
if ! test -d $(ICEDTEA_BOOT_DIR) ; \
then \
$(JAVAC) $(MEMORY_LIMIT) -g -d extra-lib \
- -source 1.5 \
-classpath $(abs_top_builddir)/lib/hotspot-tools \
-sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \
-bootclasspath \'\' \
@extra-source-files.txt ; \
else \
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g -d extra-lib \
- -source 1.5 \
-classpath $(abs_top_builddir)/lib/hotspot-tools \
-sourcepath $(abs_top_srcdir)/extra:$(SOURCEPATH_DIRS) \
-bootclasspath \'\' \
@@ -3147,7 +3141,6 @@ stamps/netx.stamp: netx-source-files.txt
mkdir -p $(abs_top_builddir)/netx.build
$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
-d $(abs_top_builddir)/netx.build \
- -source 1.5 \
-classpath $(abs_top_builddir)/lib/hotspot-tools \
-sourcepath $(abs_top_srcdir)/netx:$(SOURCEPATH_DIRS): \
-bootclasspath \'\' \
diff -r 209e9a326eb9 -r 52ca492dae93 generated/java/nio/channels/AcceptPendingException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/generated/java/nio/channels/AcceptPendingException.java Fri Aug 07 21:46:15 2009 +0100
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+// -- This file was mechanically generated: Do not edit! -- //
+
+package java.nio.channels;
+
+
+/**
+ * Unchecked exception thrown when an attempt is made to initiate an accept
+ * operation on a channel and a previous accept operation has not completed.
+ *
+ * @since 1.7
+ */
+
+public class AcceptPendingException
+ extends IllegalStateException
+{
+
+ private static final long serialVersionUID = 2721339977965416421L;
+
+ /**
+ * Constructs an instance of this class.
+ */
+ public AcceptPendingException() { }
+
+}
diff -r 209e9a326eb9 -r 52ca492dae93 generated/java/nio/channels/IllegalChannelGroupException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/generated/java/nio/channels/IllegalChannelGroupException.java Fri Aug 07 21:46:15 2009 +0100
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+// -- This file was mechanically generated: Do not edit! -- //
+
+package java.nio.channels;
+
+
+/**
+ * Unchecked exception thrown when an attempt is made to open a channel
+ * in a group that was not created by the same provider.
+ *
+ * @since 1.7
+ */
+
+public class IllegalChannelGroupException
+ extends IllegalArgumentException
+{
+
+ private static final long serialVersionUID = -2495041211157744253L;
+
+ /**
+ * Constructs an instance of this class.
+ */
+ public IllegalChannelGroupException() { }
+
+}
diff -r 209e9a326eb9 -r 52ca492dae93 generated/java/nio/channels/InterruptedByTimeoutException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/generated/java/nio/channels/InterruptedByTimeoutException.java Fri Aug 07 21:46:15 2009 +0100
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+// -- This file was mechanically generated: Do not edit! -- //
+
+package java.nio.channels;
+
+
+/**
+ * Checked exception received by a thread when a timeout elapses before an
+ * asynchronous operation completes.
+ *
+ * @since 1.7
+ */
+
+public class InterruptedByTimeoutException
+ extends java.io.IOException
+{
+
+ private static final long serialVersionUID = -4268008601014042947L;
+
+ /**
+ * Constructs an instance of this class.
+ */
+ public InterruptedByTimeoutException() { }
+
+}
diff -r 209e9a326eb9 -r 52ca492dae93 generated/java/nio/channels/ReadPendingException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/generated/java/nio/channels/ReadPendingException.java Fri Aug 07 21:46:15 2009 +0100
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+// -- This file was mechanically generated: Do not edit! -- //
+
+package java.nio.channels;
+
+
+/**
+ * Unchecked exception thrown when an attempt is made to read from an
+ * asynchronous socket channel and a previous read has not completed.
+ *
+ * @since 1.7
+ */
+
+public class ReadPendingException
+ extends IllegalStateException
+{
+
+ private static final long serialVersionUID = 1986315242191227217L;
+
+ /**
+ * Constructs an instance of this class.
+ */
+ public ReadPendingException() { }
+
+}
diff -r 209e9a326eb9 -r 52ca492dae93 generated/java/nio/channels/ShutdownChannelGroupException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/generated/java/nio/channels/ShutdownChannelGroupException.java Fri Aug 07 21:46:15 2009 +0100
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+// -- This file was mechanically generated: Do not edit! -- //
+
+package java.nio.channels;
+
+
+/**
+ * Unchecked exception thrown when an attempt is made to construct a channel in
+ * a group that is shutdown or the completion handler for an I/O operation
+ * cannot be invoked because the channel group is shutdown.
+ *
+ * @since 1.7
+ */
+
+public class ShutdownChannelGroupException
+ extends IllegalStateException
+{
+
+ private static final long serialVersionUID = -3903801676350154157L;
+
+ /**
+ * Constructs an instance of this class.
+ */
+ public ShutdownChannelGroupException() { }
+
+}
diff -r 209e9a326eb9 -r 52ca492dae93 generated/java/nio/channels/WritePendingException.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/generated/java/nio/channels/WritePendingException.java Fri Aug 07 21:46:15 2009 +0100
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+// -- This file was mechanically generated: Do not edit! -- //
+
+package java.nio.channels;
+
+
+/**
+ * Unchecked exception thrown when an attempt is made to write to an
+ * asynchronous socket channel and a previous write has not completed.
+ *
+ * @since 1.7
+ */
+
+public class WritePendingException
+ extends IllegalStateException
+{
+
+ private static final long serialVersionUID = 7031871839266032276L;
+
+ /**
+ * Constructs an instance of this class.
+ */
+ public WritePendingException() { }
+
+}
diff -r 209e9a326eb9 -r 52ca492dae93 generated/sun/nio/fs/UnixConstants.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/generated/sun/nio/fs/UnixConstants.java Fri Aug 07 21:46:15 2009 +0100
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2008-2009 Sun Microsystems, Inc. All Rights Reserved.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+// AUTOMATICALLY GENERATED FILE - DO NOT EDIT
+package sun.nio.fs;
+class UnixConstants {
+ private UnixConstants() { }
+ static final int O_RDONLY = 0;
+ static final int O_WRONLY = 1;
+ static final int O_RDWR = 2;
+ static final int O_APPEND = 0x400;
+ static final int O_CREAT = 0x40;
+ static final int O_EXCL = 0x80;
+ static final int O_TRUNC = 0x200;
+ static final int O_SYNC = 0x1000;
+ static final int O_DSYNC = 0x1000;
+ static final int O_NOFOLLOW = 0x20000;
+ static final int S_IAMB = 0x1ff;
+ static final int S_IRUSR = 256;
+ static final int S_IWUSR = 128;
+ static final int S_IXUSR = 64;
+ static final int S_IRGRP = 32;
+ static final int S_IWGRP = 16;
+ static final int S_IXGRP = 8;
More information about the distro-pkg-dev
mailing list