/hg/icedtea6-hg: Make source & target 1.6 when building Nimbus t...

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Sun Jun 13 16:21:55 PDT 2010 

changeset 609c64d51922 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=609c64d51922
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 14 00:21:47 2010 +0100

	Make source & target 1.6 when building Nimbus to allow @Override on
	interfaces.

	2010-06-13 Andrew John Hughes <ahughes at redhat.com>

	 * overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/D
	efaultSelectorProvider.java: Removed, provided upstream.
		* Makefile.am: Add new nimbus-source-target.patch.
		* patches/ecj/bootver.patch: Always set required version to 1.5,
	don't bother checking DISABLE_NIMBUS.
		* patches/nimbus-source-target.patch: Fix source/target options
	for Nimbus sources to 6, due to presence of @Override on interfaces.


diffstat:

5 files changed, 39 insertions(+), 59 deletions(-)
ChangeLog                                                                             |   10 ++
Makefile.am                                                                           |    3 
overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java |   49 ----------
patches/ecj/bootver.patch                                                             |   14 +-
patches/nimbus-source-target.patch                                                    |   22 ++++

diffs (136 lines):

diff -r f7f32c0c87c1 -r 609c64d51922 ChangeLog
--- a/ChangeLog	Sun Jun 13 01:41:08 2010 +0100
+++ b/ChangeLog	Mon Jun 14 00:21:47 2010 +0100
@@ -1,3 +1,13 @@ 2010-06-13 Andrew John Hughes  <ahughes@
+2010-06-13 Andrew John Hughes  <ahughes at redhat.com>
+
+	* overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java:
+	Removed, provided upstream.
+	* Makefile.am: Add new nimbus-source-target.patch.
+	* patches/ecj/bootver.patch: Always set required version to 1.5,
+	don't bother checking DISABLE_NIMBUS.
+	* patches/nimbus-source-target.patch: Fix source/target options
+	for Nimbus sources to 6, due to presence of @Override on interfaces.
+
 2010-06-13 Andrew John Hughes  <ahughes at redhat.com>
 
 	* generated/com/sun/java/swing/plaf/nimbus/ArrowButtonPainter.java,
diff -r f7f32c0c87c1 -r 609c64d51922 Makefile.am
--- a/Makefile.am	Sun Jun 13 01:41:08 2010 +0100
+++ b/Makefile.am	Mon Jun 14 00:21:47 2010 +0100
@@ -293,7 +293,8 @@ ICEDTEA_PATCHES = \
 	patches/extensions/netx.patch \
 	patches/extensions/netx-dist.patch \
 	patches/extensions/netx-umask.patch \
-	patches/icedtea-jtreg-httpTest.patch
+	patches/icedtea-jtreg-httpTest.patch \
+	patches/nimbus-source-target.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r f7f32c0c87c1 -r 609c64d51922 overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java
--- a/overlays/nio2/openjdk/jdk/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java	Sun Jun 13 01:41:08 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright 2001-2002 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.
- */
-
-package sun.nio.ch;
-
-import java.nio.channels.spi.SelectorProvider;
-
-
-/**
- * Creates this platform's default SelectorProvider
- */
-
-public class DefaultSelectorProvider {
-
-    /**
-     * Prevent instantiation.
-     */
-    private DefaultSelectorProvider() { }
-
-    /**
-     * Returns the default SelectorProvider.
-     */
-    public static SelectorProvider create() {
-        return new sun.nio.ch.WindowsSelectorProvider();
-    }
-
-}
diff -r f7f32c0c87c1 -r 609c64d51922 patches/ecj/bootver.patch
--- a/patches/ecj/bootver.patch	Sun Jun 13 01:41:08 2010 +0100
+++ b/patches/ecj/bootver.patch	Mon Jun 14 00:21:47 2010 +0100
@@ -1,18 +1,14 @@ diff -r b202c79afde3 make/common/shared/
-diff -r b202c79afde3 make/common/shared/Platform.gmk
---- openjdk-ecj.orig/jdk/make/common/shared/Platform.gmk	Thu Dec 10 13:04:13 2009 -0800
-+++ openjdk-ecj/jdk/make/common/shared/Platform.gmk	Tue Dec 15 16:19:38 2009 +0000
-@@ -89,8 +89,13 @@
+diff -r b6701047e287 make/common/shared/Platform.gmk
+--- openjdk-ecj.orig/jdk/make/common/shared/Platform.gmk	Sat Jun 12 00:15:32 2010 +0100
++++ openjdk-ecj/jdk/make/common/shared/Platform.gmk	Sun Jun 13 23:54:02 2010 +0100
+@@ -88,8 +88,8 @@
  
  SYSTEM_UNAME := $(shell uname)
  
 -# Normal boot jdk is previous release, but a hard requirement is a 1.6 boot
+-REQUIRED_BOOT_VER = 1.6
 +# Normal boot jdk is previous release, but a hard requirement is a 1.5 boot
-+# without Nimbus or a 1.6 boot with
-+ifdef DISABLE_NIMBUS
 +REQUIRED_BOOT_VER = 1.5
-+else
- REQUIRED_BOOT_VER = 1.6
-+endif
  
  # If we are using freetype, this is the required version
  REQUIRED_FREETYPE_VERSION=2.3.0
diff -r f7f32c0c87c1 -r 609c64d51922 patches/nimbus-source-target.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/nimbus-source-target.patch	Mon Jun 14 00:21:47 2010 +0100
@@ -0,0 +1,22 @@
+--- openjdk.orig/jdk/make/javax/swing/Makefile	2010-06-13 20:19:57.324427433 +0100
++++ openjdk/jdk/make/javax/swing/Makefile	2010-06-13 20:19:57.161043101 +0100
+@@ -35,6 +35,8 @@
+ NIMBUS_GENERATOR_JAR = $(BUILDTOOLJARDIR)/generatenimbus.jar
+ 
+ include $(BUILDDIR)/common/Defs.gmk
++LANGUAGE_VERSION = -source 6
++CLASS_VERSION = -target 6
+ 
+ #
+ # Files
+--- openjdk.orig/jdk/make/javax/swing/plaf/Makefile	2010-06-13 20:19:58.277416821 +0100
++++ openjdk/jdk/make/javax/swing/plaf/Makefile	2010-06-13 20:19:58.121793675 +0100
+@@ -29,6 +29,8 @@
+ SWING_SRC = $(SHARE_SRC)/classes/javax/swing
+ 
+ include $(BUILDDIR)/common/Defs.gmk
++LANGUAGE_VERSION = -source 6
++CLASS_VERSION = -target 6
+ 
+ #
+ # Files

More information about the distro-pkg-dev mailing list