From bugzilla-daemon at icedtea.classpath.org Sun Aug 1 04:51:57 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 01 Aug 2010 11:51:57 +0000 Subject: [Bug 515] cacao+Icedtea6 on ARM build failure on S390 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=515 stefan at complang.tuwien.ac.at changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED ------- Comment #1 from stefan at complang.tuwien.ac.at 2010-08-01 11:51 ------- I have a working debian s390 now, running inside Hercules, so I'm hoping to find some time to look into this soon. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From ahughes at redhat.com Sun Aug 1 08:29:40 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Sun, 1 Aug 2010 16:29:40 +0100 Subject: --with-openjdk bootstrap In-Reply-To: <4C546F47.2010205@linuxfromscratch.org> References: <4C546F47.2010205@linuxfromscratch.org> Message-ID: <20100801152940.GI11762@rivendell.middle-earth.co.uk> On 13:45 Sat 31 Jul , DJ Lucas wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Is there a simple way to do a three pass bootstrap when using the > - --with-openjdk flag? I browsed through the Makefile and didn't see > anything promising, but figured I'd ask those more familiar in case I > missed something obvious. I do plan to distribute a binary icedtea6 > package in BLFS, however, there are some users who will still want to > build it themselves. Easiest way I can think of to cover those users is > to install the bin package and let users bootstrap with that. > > Any pointers? > > - -- DJ Lucas > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2.0.15 (GNU/Linux) > > iQIcBAEBAgAGBQJMVG9GAAoJEIUM+xKzBYsIYBAP/2pGLv4GBZpnzfVN1Cc2roXv > WdXO4gghvVlm4Loir+UgO2Gm/8WeGk4Uw93fowjaf4pHHWOGJnl2fAW+ddJSX7Ts > 4mER8Cy2pbk11eG7pxWtlWlMCY5JSmFOcQOcNUWQnck8dECY5JTOinFhUt2bnJId > 3fuWKOXd6AR965jwAGDhf0WcaSk9n9TScg9SotZ9HuYLG9vr5iWaf7KJJLCeSduk > EXGPuocgBmnSvkv+6G+sQ2vEAd4tNhYf+eHLM+3LJkPdAixX/4t287sJ8P/dTdJn > reYoUDWYvG6vF/0b/1rfv3BKRFM5JF/EAU7CosL0rsWB93yu1XpQgzVlNekA2918 > eBfkxxWq6IrXoRB7S1mrlPtV3zo0Vl9y1uoG8Qx9GqcIszZRoaLTA7gQlDOnPDD4 > SpivqiMBKEYQvrWFwE6cSbWIghiiITHFaeVKbwJcX2M24pDo0ffTXwnIGLkcG6gE > GV+g3B9r4GWkSl96+Dxjta2r50/4gWbHD8vHChethTr2Lr6iD4qGbURkhpd7LWv3 > pfux5fehizFuOy05DUYThf36KAUP/qEvCLeN+B5Yf+vZi1EGBc96gQ8RviGl2wFP > Jz/UefJ1/EAg+YegdXJxCp5u7MxyD58OWckNzh4T2IYXkWJHN0N2mFo1M0h1oUGD > tSS/+SUCM7Y7d4qQ4sFa > =wrym > -----END PGP SIGNATURE----- > > -- > This message has been scanned for viruses and > dangerous content, and is believed to be clean. > --with-openjdk, as it stands in IcedTea6, is a pretty nasty option because it has two meanings: 1. Don't perform the bootstrap build 2. Use the specified JDK (if an argument is given) or pick the first JDK found from the following list: /usr/lib/jvm/java-openjdk /usr/lib/jvm/openjdk /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-icedtea Preferably, these should be two separate options; one to turn off the bootstrap and another to specify the JDK. That's a change I've already made in the Java 7 version of IcedTea (IcedTea7) but which hasn't yet been backported to IcedTea6. Hopefully, it will be changed for IcedTea6 1.10 but that probably won't appear until the end of the year. Within the current setup, there are a couple of options for you: * Build using gcj which will give you the full bootstrap. This also avoids having to use any binaries (with your current proposal, those who want to build IcedTea would have to install your IcedTea binary first). This is a well-tested option and the one I'd suggest. I don't really see why you want to use the --with-openjdk flag to begin with. * Force a full bootstrap with IcedTea using --with-gcj-home=. This is likely to run into issues. If so, please post them to the list as they need resolving. Please let us know what you decide, Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From dj at linuxfromscratch.org Sun Aug 1 10:57:09 2010 From: dj at linuxfromscratch.org (DJ Lucas) Date: Sun, 01 Aug 2010 12:57:09 -0500 Subject: --with-openjdk bootstrap In-Reply-To: <20100801152940.GI11762@rivendell.middle-earth.co.uk> References: <4C546F47.2010205@linuxfromscratch.org> <20100801152940.GI11762@rivendell.middle-earth.co.uk> Message-ID: <4C55B575.6020901@linuxfromscratch.org> On 08/01/2010 10:29 AM, Dr Andrew John Hughes wrote: > I don't really see why you want to use the --with-openjdk flag to > begin with. Simplicity is the goal. Rather than rebuilding gcc (to include gcj), then ecj, gcj-compat, the extra jars, etc., one download is provided to bootstrap the build. Simply drop the extracted tarball into /opt, add the bin dir to path, and they are off and running, and it is easily removed after they are done with it. I just figured I'd ask first before duplicating work that is already done (and am glad that I did). I'm going to take a look at the --with-gcj-home option first, since that can be beneficial for more than myself, and see if I can get that going, but I'll be poking around in 7 now as well, provide a local patch for the book if needs be. :-) Thanks for the help. -- DJ Lucas -- This message has been scanned for viruses and dangerous content, and is believed to be clean. From dj at linuxfromscratch.org Sun Aug 1 12:02:08 2010 From: dj at linuxfromscratch.org (DJ Lucas) Date: Sun, 01 Aug 2010 14:02:08 -0500 Subject: --with-openjdk bootstrap In-Reply-To: <4C55B575.6020901@linuxfromscratch.org> References: <4C546F47.2010205@linuxfromscratch.org> <20100801152940.GI11762@rivendell.middle-earth.co.uk> <4C55B575.6020901@linuxfromscratch.org> Message-ID: <4C55C4B0.1040200@linuxfromscratch.org> On 08/01/2010 12:57 PM, DJ Lucas wrote: > On 08/01/2010 10:29 AM, Dr Andrew John Hughes wrote: >> I don't really see why you want to use the --with-openjdk flag to >> begin with. > > Simplicity is the goal. Rather than rebuilding gcc (to include gcj), > then ecj, gcj-compat, the extra jars, etc., one download is provided to > bootstrap the build. Simply drop the extracted tarball into /opt, add > the bin dir to path, and they are off and running, and it is easily > removed after they are done with it. > > I just figured I'd ask first before duplicating work that is already > done (and am glad that I did). I'm going to take a look at the > --with-gcj-home option first, After toying with this for about 5 minutes, I'm not going to any longer. It is simply not correct for my intended goal. Configure completes, but it's looking for all the gcj pieces, the five jars, etc., which I have in place. There's no way around the gij check. Thanks again. -- DJ Lucas -- This message has been scanned for viruses and dangerous content, and is believed to be clean. From ahughes at redhat.com Mon Aug 2 08:44:15 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 2 Aug 2010 16:44:15 +0100 Subject: --with-openjdk bootstrap In-Reply-To: <4C55B575.6020901@linuxfromscratch.org> References: <4C546F47.2010205@linuxfromscratch.org> <20100801152940.GI11762@rivendell.middle-earth.co.uk> <4C55B575.6020901@linuxfromscratch.org> Message-ID: <20100802154415.GA32613@rivendell.middle-earth.co.uk> On 12:57 Sun 01 Aug , DJ Lucas wrote: > On 08/01/2010 10:29 AM, Dr Andrew John Hughes wrote: > > I don't really see why you want to use the --with-openjdk flag to > > begin with. > > Simplicity is the goal. Rather than rebuilding gcc (to include gcj), > then ecj, gcj-compat, the extra jars, etc., one download is provided to > bootstrap the build. Simply drop the extracted tarball into /opt, add > the bin dir to path, and they are off and running, and it is easily > removed after they are done with it. > It's been a long while since I went through LFS, but I remember I used to just build the initial gcc with gcj at the time. Maybe that would be an option for some users? IcedTea shouldn't require much more than that. You can disable Rhino using --without-rhino. > I just figured I'd ask first before duplicating work that is already > done (and am glad that I did). I'm going to take a look at the > --with-gcj-home option first, since that can be beneficial for more than > myself, and see if I can get that going, but I'll be poking around in 7 > now as well, provide a local patch for the book if needs be. :-) > Let us know how you get on. The eventual plan is to separate the options, so you'd have --disable-bootstrap and --with-jdk-home as in IcedTea7. > Thanks for the help. > > -- DJ Lucas > > -- > This message has been scanned for viruses and > dangerous content, and is believed to be clean. > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Mon Aug 2 08:45:50 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 2 Aug 2010 16:45:50 +0100 Subject: --with-openjdk bootstrap In-Reply-To: <4C55C4B0.1040200@linuxfromscratch.org> References: <4C546F47.2010205@linuxfromscratch.org> <20100801152940.GI11762@rivendell.middle-earth.co.uk> <4C55B575.6020901@linuxfromscratch.org> <4C55C4B0.1040200@linuxfromscratch.org> Message-ID: <20100802154550.GB32613@rivendell.middle-earth.co.uk> On 14:02 Sun 01 Aug , DJ Lucas wrote: > On 08/01/2010 12:57 PM, DJ Lucas wrote: > > On 08/01/2010 10:29 AM, Dr Andrew John Hughes wrote: > >> I don't really see why you want to use the --with-openjdk flag to > >> begin with. > > > > Simplicity is the goal. Rather than rebuilding gcc (to include gcj), > > then ecj, gcj-compat, the extra jars, etc., one download is provided to > > bootstrap the build. Simply drop the extracted tarball into /opt, add > > the bin dir to path, and they are off and running, and it is easily > > removed after they are done with it. > > > > I just figured I'd ask first before duplicating work that is already > > done (and am glad that I did). I'm going to take a look at the > > --with-gcj-home option first, > > After toying with this for about 5 minutes, I'm not going to any longer. > It is simply not correct for my intended goal. Configure completes, > but it's looking for all the gcj pieces, the five jars, etc., which I > have in place. There's no way around the gij check. > Ok, guess it still needs a lot of work then :-( > Thanks again. > > -- DJ Lucas > > -- > This message has been scanned for viruses and > dangerous content, and is believed to be clean. > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From andrew at icedtea.classpath.org Mon Aug 2 14:29:07 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 02 Aug 2010 21:29:07 +0000 Subject: /hg/icedtea6: 2 new changesets Message-ID: changeset e8dfb4f0000d in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e8dfb4f0000d author: Andrew John Hughes date: Mon Aug 02 17:52:22 2010 +0100 Add a font configuration for RHEL6. 2010-07-30 Andrew John Hughes * Makefile.am: Add patch below. * patches/fonts-rhel.patch: Add a font configuration for RHEL6 (currently a copy of Fedora's). changeset fc45c67366b9 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fc45c67366b9 author: Andrew John Hughes date: Mon Aug 02 22:28:51 2010 +0100 Support a font configuration for Gentoo systems. 2010-08-02 Andrew John Hughes * Makefile.am: Add patch below. * patches/fonts-gentoo.patch: Add a font configuration for Gentoo (currently a copy of Fedora's). diffstat: 4 files changed, 816 insertions(+), 1 deletion(-) ChangeLog | 14 + Makefile.am | 4 patches/fonts-gentoo.patch | 406 ++++++++++++++++++++++++++++++++++++++++++++ patches/fonts-rhel.patch | 393 ++++++++++++++++++++++++++++++++++++++++++ diffs (truncated from 842 to 500 lines): diff -r 4bd31caf5e07 -r fc45c67366b9 ChangeLog --- a/ChangeLog Fri Jul 30 15:42:22 2010 -0400 +++ b/ChangeLog Mon Aug 02 22:28:51 2010 +0100 @@ -1,3 +1,17 @@ 2010-07-30 Man Lung Wong + + * Makefile.am: Add patch below. + * patches/fonts-gentoo.patch: + Add a font configuration for Gentoo + (currently a copy of Fedora's). + +2010-07-30 Andrew John Hughes + + * Makefile.am: Add patch below. + * patches/fonts-rhel.patch: + Add a font configuration for RHEL6 + (currently a copy of Fedora's). + 2010-07-30 Man Lung Wong * netx/net/sourceforge/jnlp/Launcher.java (launchApplication): Make sure an Event Dispatch Thread diff -r 4bd31caf5e07 -r fc45c67366b9 Makefile.am --- a/Makefile.am Fri Jul 30 15:42:22 2010 -0400 +++ b/Makefile.am Mon Aug 02 22:28:51 2010 +0100 @@ -285,7 +285,9 @@ ICEDTEA_PATCHES = \ patches/icedtea-override-redirect-metacity.patch \ patches/openjdk/6963870-swing_npe.patch \ patches/openjdk/6668231-ssl_cert.patch \ - patches/openjdk/6967533-pre_epoch.patch + patches/openjdk/6967533-pre_epoch.patch \ + patches/fonts-rhel.patch \ + patches/fonts-gentoo.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r 4bd31caf5e07 -r fc45c67366b9 patches/fonts-gentoo.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/fonts-gentoo.patch Mon Aug 02 22:28:51 2010 +0100 @@ -0,0 +1,406 @@ +diff -Nru openjdk.orig/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile +--- openjdk.orig/jdk/make/sun/awt/Makefile 2010-08-02 20:41:47.000000000 +0100 ++++ openjdk/jdk/make/sun/awt/Makefile 2010-08-02 20:47:24.593166977 +0100 +@@ -388,7 +388,8 @@ + fontconfig.SuSE.properties \ + fontconfig.Ubuntu.properties \ + fontconfig.Fedora.properties \ +- fontconfig.RedHat.6.0.properties ++ fontconfig.RedHat.6.0.properties \ ++ fontconfig.Gentoo.properties + else + + FONTCONFIGS_SRC = $(CLOSED_SRC)/solaris/classes/sun/awt/fontconfigs +diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Gentoo.properties openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Gentoo.properties +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Gentoo.properties 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Gentoo.properties 2010-08-02 20:46:28.582307221 +0100 +@@ -0,0 +1,376 @@ ++# ++# Copyright (c) 2007, Oracle and/or its affiliates. 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. Oracle designates this ++# particular file as subject to the "Classpath" exception as provided ++# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++# or visit www.oracle.com if you need additional information or have any ++# questions. ++# ++ ++# Version ++ ++# Uses Fedora 9 fonts and file paths. ++version=1 ++ ++# Component Font Mappings ++ ++dialog.plain.latin-1=DejaVu Sans ++dialog.plain.japanese-x0208=Sazanami Gothic ++dialog.plain.korean=Baekmuk Gulim ++dialog.plain.chinese-big5=AR PL ShanHeiSun Uni ++dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.plain.bengali=Lohit Bengali ++dialog.plain.gujarati=Lohit Gujarati ++dialog.plain.hindi=Lohit Hindi ++dialog.plain.malayalam=Lohit Malayalam ++dialog.plain.oriya=Lohit Oriya ++dialog.plain.punjabi=Lohit Punjabi ++dialog.plain.tamil=Lohit Tamil ++dialog.plain.telugu=Lohit Telugu ++dialog.plain.sinhala=LKLUG ++ ++dialog.bold.latin-1=DejaVu Sans Bold ++dialog.bold.japanese-x0208=Sazanami Gothic ++dialog.bold.korean=Baekmuk Gulim ++dialog.bold.chinese-big5=AR PL ShanHeiSun Uni ++dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.bold.bengali=Lohit Bengali ++dialog.bold.gujarati=Lohit Gujarati ++dialog.bold.hindi=Lohit Hindi ++dialog.bold.malayalam=Lohit Malayalam ++dialog.bold.oriya=Lohit Oriya ++dialog.bold.punjabi=Lohit Punjabi ++dialog.bold.tamil=Lohit Tamil ++dialog.bold.telugu=Lohit Telugu ++dialog.bold.sinhala=LKLUG ++ ++dialog.italic.latin-1=DejaVu Sans Oblique ++dialog.italic.japanese-x0208=Sazanami Gothic ++dialog.italic.korean=Baekmuk Gulim ++dialog.italic.chinese-big5=AR PL ShanHeiSun Uni ++dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.italic.bengali=Lohit Bengali ++dialog.italic.gujarati=Lohit Gujarati ++dialog.italic.hindi=Lohit Hindi ++dialog.italic.malayalam=Lohit Malayalam ++dialog.italic.oriya=Lohit Oriya ++dialog.italic.punjabi=Lohit Punjabi ++dialog.italic.tamil=Lohit Tamil ++dialog.italic.telugu=Lohit Telugu ++dialog.italic.sinhala=LKLUG ++ ++dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique ++dialog.bolditalic.japanese-x0208=Sazanami Gothic ++dialog.bolditalic.korean=Baekmuk Gulim ++dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni ++dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.bolditalic.bengali=Lohit Bengali ++dialog.bolditalic.gujarati=Lohit Gujarati ++dialog.bolditalic.hindi=Lohit Hindi ++dialog.bolditalic.malayalam=Lohit Malayalam ++dialog.bolditalic.oriya=Lohit Oriya ++dialog.bolditalic.punjabi=Lohit Punjabi ++dialog.bolditalic.tamil=Lohit Tamil ++dialog.bolditalic.telugu=Lohit Telugu ++dialog.bolditalic.sinhala=LKLUG ++ ++sansserif.plain.latin-1=DejaVu Sans ++sansserif.plain.japanese-x0208=Sazanami Gothic ++sansserif.plain.korean=Baekmuk Gulim ++sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni ++sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.plain.bengali=Lohit Bengali ++sansserif.plain.gujarati=Lohit Gujarati ++sansserif.plain.hindi=Lohit Hindi ++sansserif.plain.malayalam=Lohit Malayalam ++sansserif.plain.oriya=Lohit Oriya ++sansserif.plain.punjabi=Lohit Punjabi ++sansserif.plain.tamil=Lohit Tamil ++sansserif.plain.telugu=Lohit Telugu ++sansserif.plain.sinhala=LKLUG ++ ++sansserif.bold.latin-1=DejaVu Sans Bold ++sansserif.bold.japanese-x0208=Sazanami Gothic ++sansserif.bold.korean=Baekmuk Gulim ++sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni ++sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.bold.bengali=Lohit Bengali ++sansserif.bold.gujarati=Lohit Gujarati ++sansserif.bold.hindi=Lohit Hindi ++sansserif.bold.malayalam=Lohit Malayalam ++sansserif.bold.oriya=Lohit Oriya ++sansserif.bold.punjabi=Lohit Punjabi ++sansserif.bold.tamil=Lohit Tamil ++sansserif.bold.telugu=Lohit Telugu ++sansserif.bold.sinhala=LKLUG ++ ++sansserif.italic.latin-1=DejaVu Sans Oblique ++sansserif.italic.japanese-x0208=Sazanami Gothic ++sansserif.italic.korean=Baekmuk Gulim ++sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni ++sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.italic.bengali=Lohit Bengali ++sansserif.italic.gujarati=Lohit Gujarati ++sansserif.italic.hindi=Lohit Hindi ++sansserif.italic.malayalam=Lohit Malayalam ++sansserif.italic.oriya=Lohit Oriya ++sansserif.italic.punjabi=Lohit Punjabi ++sansserif.italic.tamil=Lohit Tamil ++sansserif.italic.telugu=Lohit Telugu ++sansserif.italic.sinhala=LKLUG ++ ++sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique ++sansserif.bolditalic.japanese-x0208=Sazanami Gothic ++sansserif.bolditalic.korean=Baekmuk Gulim ++sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni ++sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.bolditalic.bengali=Lohit Bengali ++sansserif.bolditalic.gujarati=Lohit Gujarati ++sansserif.bolditalic.hindi=Lohit Hindi ++sansserif.bolditalic.malayalam=Lohit Malayalam ++sansserif.bolditalic.oriya=Lohit Oriya ++sansserif.bolditalic.punjabi=Lohit Punjabi ++sansserif.bolditalic.tamil=Lohit Tamil ++sansserif.bolditalic.telugu=Lohit Telugu ++sansserif.bolditalic.sinhala=LKLUG ++ ++serif.plain.latin-1=DejaVu Serif ++serif.plain.japanese-x0208=Sazanami Mincho ++serif.plain.korean=Baekmuk Batang ++serif.plain.chinese-big5=AR PL ZenKai Uni ++serif.plain.chinese-gb18030=AR PL ZenKai Uni ++serif.plain.bengali=Lohit Bengali ++serif.plain.gujarati=Lohit Gujarati ++serif.plain.hindi=Lohit Hindi ++serif.plain.malayalam=Lohit Malayalam ++serif.plain.oriya=Lohit Oriya ++serif.plain.punjabi=Lohit Punjabi ++serif.plain.tamil=Lohit Tamil ++serif.plain.telugu=Lohit Telugu ++serif.plain.sinhala=LKLUG ++ ++serif.bold.latin-1=DejaVu Serif Bold ++serif.bold.japanese-x0208=Sazanami Mincho ++serif.bold.korean=Baekmuk Batang ++serif.bold.chinese-big5=AR PL ZenKai Uni ++serif.bold.chinese-gb18030=AR PL ZenKai Uni ++serif.bold.bengali=Lohit Bengali ++serif.bold.gujarati=Lohit Gujarati ++serif.bold.hindi=Lohit Hindi ++serif.bold.malayalam=Lohit Malayalam ++serif.bold.oriya=Lohit Oriya ++serif.bold.punjabi=Lohit Punjabi ++serif.bold.tamil=Lohit Tamil ++serif.bold.telugu=Lohit Telugu ++serif.bold.sinhala=LKLUG ++ ++serif.italic.latin-1=DejaVu Serif Oblique ++serif.italic.japanese-x0208=Sazanami Mincho ++serif.italic.korean=Baekmuk Batang ++serif.italic.chinese-big5=AR PL ZenKai Uni ++serif.italic.chinese-gb18030=AR PL ZenKai Uni ++serif.italic.bengali=Lohit Bengali ++serif.italic.gujarati=Lohit Gujarati ++serif.italic.hindi=Lohit Hindi ++serif.italic.malayalam=Lohit Malayalam ++serif.italic.oriya=Lohit Oriya ++serif.italic.punjabi=Lohit Punjabi ++serif.italic.tamil=Lohit Tamil ++serif.italic.telugu=Lohit Telugu ++serif.italic.sinhala=LKLUG ++ ++serif.bolditalic.latin-1=DejaVu Serif Bold Oblique ++serif.bolditalic.japanese-x0208=Sazanami Mincho ++serif.bolditalic.korean=Baekmuk Batang ++serif.bolditalic.chinese-big5=AR PL ZenKai Uni ++serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni ++serif.bolditalic.bengali=Lohit Bengali ++serif.bolditalic.gujarati=Lohit Gujarati ++serif.bolditalic.hindi=Lohit Hindi ++serif.bolditalic.malayalam=Lohit Malayalam ++serif.bolditalic.oriya=Lohit Oriya ++serif.bolditalic.punjabi=Lohit Punjabi ++serif.bolditalic.tamil=Lohit Tamil ++serif.bolditalic.telugu=Lohit Telugu ++serif.bolditalic.sinhala=LKLUG ++ ++monospaced.plain.latin-1=DejaVu Sans Mono ++monospaced.plain.japanese-x0208=Sazanami Gothic ++monospaced.plain.korean=Baekmuk Gulim ++monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni ++monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.plain.bengali=Lohit Bengali ++monospaced.plain.gujarati=Lohit Gujarati ++monospaced.plain.hindi=Lohit Hindi ++monospaced.plain.malayalam=Lohit Malayalam ++monospaced.plain.oriya=Lohit Oriya ++monospaced.plain.punjabi=Lohit Punjabi ++monospaced.plain.tamil=Lohit Tamil ++monospaced.plain.telugu=Lohit Telugu ++monospaced.plain.sinhala=LKLUG ++ ++monospaced.bold.latin-1=DejaVu Sans Mono Bold ++monospaced.bold.japanese-x0208=Sazanami Gothic ++monospaced.bold.korean=Baekmuk Gulim ++monospaced.bold.chinese-big5=AR PL ShanHeiSun Uni ++monospaced.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.bold.bengali=Lohit Bengali ++monospaced.bold.gujarati=Lohit Gujarati ++monospaced.bold.hindi=Lohit Hindi ++monospaced.bold.malayalam=Lohit Malayalam ++monospaced.bold.oriya=Lohit Oriya ++monospaced.bold.punjabi=Lohit Punjabi ++monospaced.bold.tamil=Lohit Tamil ++monospaced.bold.telugu=Lohit Telugu ++monospaced.bold.sinhala=LKLUG ++ ++monospaced.italic.latin-1=DejaVu Sans Mono Oblique ++monospaced.italic.japanese-x0208=Sazanami Gothic ++monospaced.italic.korean=Baekmuk Gulim ++monospaced.italic.chinese-big5=AR PL ShanHeiSun Uni ++monospaced.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.italic.bengali=Lohit Bengali ++monospaced.italic.gujarati=Lohit Gujarati ++monospaced.italic.hindi=Lohit Hindi ++monospaced.italic.malayalam=Lohit Malayalam ++monospaced.italic.oriya=Lohit Oriya ++monospaced.italic.punjabi=Lohit Punjabi ++monospaced.italic.tamil=Lohit Tamil ++monospaced.italic.telugu=Lohit Telugu ++monospaced.italic.sinhala=LKLUG ++ ++monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique ++monospaced.bolditalic.japanese-x0208=Sazanami Gothic ++monospaced.bolditalic.korean=Baekmuk Gulim ++monospaced.bolditalic.chinese-big5=AR PL ShanHeiSun Uni ++monospaced.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.bolditalic.bengali=Lohit Bengali ++monospaced.bolditalic.gujarati=Lohit Gujarati ++monospaced.bolditalic.hindi=Lohit Hindi ++monospaced.bolditalic.malayalam=Lohit Malayalam ++monospaced.bolditalic.oriya=Lohit Oriya ++monospaced.bolditalic.punjabi=Lohit Punjabi ++monospaced.bolditalic.tamil=Lohit Tamil ++monospaced.bolditalic.telugu=Lohit Telugu ++monospaced.bolditalic.sinhala=LKLUG ++ ++dialoginput.plain.latin-1=DejaVu Sans Mono ++dialoginput.plain.japanese-x0208=Sazanami Gothic ++dialoginput.plain.korean=Baekmuk Gulim ++dialoginput.plain.chinese-big5=AR PL ShanHeiSun Uni ++dialoginput.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.plain.bengali=Lohit Bengali ++dialoginput.plain.gujarati=Lohit Gujarati ++dialoginput.plain.hindi=Lohit Hindi ++dialoginput.plain.malayalam=Lohit Malayalam ++dialoginput.plain.oriya=Lohit Oriya ++dialoginput.plain.punjabi=Lohit Punjabi ++dialoginput.plain.tamil=Lohit Tamil ++dialoginput.plain.telugu=Lohit Telugu ++dialoginput.plain.sinhala=LKLUG ++ ++dialoginput.bold.latin-1=DejaVu Sans Mono Bold ++dialoginput.bold.japanese-x0208=Sazanami Gothic ++dialoginput.bold.korean=Baekmuk Gulim ++dialoginput.bold.chinese-big5=AR PL ShanHeiSun Uni ++dialoginput.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.bold.bengali=Lohit Bengali ++dialoginput.bold.gujarati=Lohit Gujarati ++dialoginput.bold.hindi=Lohit Hindi ++dialoginput.bold.malayalam=Lohit Malayalam ++dialoginput.bold.oriya=Lohit Oriya ++dialoginput.bold.punjabi=Lohit Punjabi ++dialoginput.bold.tamil=Lohit Tamil ++dialoginput.bold.telugu=Lohit Telugu ++dialoginput.bold.sinhala=LKLUG ++ ++dialoginput.italic.latin-1=DejaVu Sans Mono Oblique ++dialoginput.italic.japanese-x0208=Sazanami Gothic ++dialoginput.italic.korean=Baekmuk Gulim ++dialoginput.italic.chinese-big5=AR PL ShanHeiSun Uni ++dialoginput.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.italic.bengali=Lohit Bengali ++dialoginput.italic.gujarati=Lohit Gujarati ++dialoginput.italic.hindi=Lohit Hindi ++dialoginput.italic.malayalam=Lohit Malayalam ++dialoginput.italic.oriya=Lohit Oriya ++dialoginput.italic.punjabi=Lohit Punjabi ++dialoginput.italic.tamil=Lohit Tamil ++dialoginput.italic.telugu=Lohit Telugu ++dialoginput.italic.sinhala=LKLUG ++ ++dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique ++dialoginput.bolditalic.japanese-x0208=Sazanami Gothic ++dialoginput.bolditalic.korean=Baekmuk Gulim ++dialoginput.bolditalic.chinese-big5=AR PL ShanHeiSun Uni ++dialoginput.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialoginput.bolditalic.bengali=Lohit Bengali ++dialoginput.bolditalic.gujarati=Lohit Gujarati ++dialoginput.bolditalic.hindi=Lohit Hindi ++dialoginput.bolditalic.malayalam=Lohit Malayalam ++dialoginput.bolditalic.oriya=Lohit Oriya ++dialoginput.bolditalic.punjabi=Lohit Punjabi ++dialoginput.bolditalic.tamil=Lohit Tamil ++dialoginput.bolditalic.telugu=Lohit Telugu ++dialoginput.bolditalic.sinhala=LKLUG ++ ++# Search Sequences ++ ++sequence.allfonts=latin-1 ++sequence.allfonts.Big5=chinese-big5,latin-1 ++sequence.allfonts.x-euc-jp-linux=japanese-x0208,latin-1 ++sequence.allfonts.EUC-KR=korean,latin-1 ++sequence.allfonts.GB18030=chinese-gb18030,latin-1 ++sequence.fallback=chinese-big5,chinese-gb18030,japanese-x0208,korean,bengali,gujarati,hindi,oriya,punjabi,malayalam,tamil,telugu,sinhala ++ ++# Font File Names ++ ++filename.DejaVu_Sans=/usr/share/fonts/dejavu/DejaVuSans.ttf ++filename.DejaVu_Sans_Bold=/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf ++filename.DejaVu_Sans_Oblique=/usr/share/fonts/dejavu/DejaVuSans-Oblique.ttf ++filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSans-BoldOblique.ttf ++ ++filename.DejaVu_Sans_Mono=/usr/share/fonts/dejavu/DejaVuSansMono.ttf ++filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf ++filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-Oblique.ttf ++filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf ++ ++filename.DejaVu_Serif=/usr/share/fonts/dejavu/DejaVuSerif.ttf ++filename.DejaVu_Serif_Bold=/usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf ++filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf ++filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf ++ ++filename.Sazanami_Gothic=/usr/share/fonts/sazanami-fonts-gothic/sazanami-gothic.ttf ++filename.Sazanami_Mincho=/usr/share/fonts/sazanami-fonts-mincho/sazanami-mincho.ttf ++filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/cjkunifonts-uming/uming.ttc ++filename.AR_PL_ZenKai_Uni=/usr/share/fonts/cjkunifonts-ukai/ukai.ttc ++filename.Baekmuk_Gulim=/usr/share/fonts/baekmuk-ttf-gulim/gulim.ttf ++filename.Baekmuk_Batang=/usr/share/fonts/baekmuk-ttf-batang/batang.ttf ++ ++filename.Lohit_Bengali=/usr/share/fonts/lohit-bengali/lohit_bn.ttf ++filename.Lohit_Gujarati=/usr/share/fonts/lohit-gujarati/lohit_gu.ttf ++filename.Lohit_Hindi=/usr/share/fonts/lohit-hindi/lohit_hi.ttf ++filename.Lohit_Kannda=/usr/share/fonts/lohit-kannada/lohit_kn.ttf ++filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf ++filename.Lohit_Oriya=/usr/share/fonts/lohit-oriya/lohit_or.ttf ++filename.Lohit_Punjabi=/usr/share/fonts/lohit-punjabi/lohit_pa.ttf ++filename.Lohit_Tamil=/usr/share/fonts/lohit-tamil/lohit_ta.ttf ++filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/lohit_te.ttf ++filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf ++ +diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java openjdk/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java 2010-06-21 22:15:43.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java 2010-08-02 20:46:28.582307221 +0100 +@@ -176,6 +176,9 @@ + } else if ((f = new File("/etc/SuSE-release")).canRead()) { + osName = "SuSE"; + osVersion = getVersionString(f); ++ } else if ((f = new File("/etc/gentoo-release")).canRead()) { ++ osName = "Gentoo"; ++ osVersion = getVersionString(f); + } else if ((f = new File("/etc/lsb-release")).canRead()) { + /* Ubuntu and (perhaps others) use only lsb-release. + * Syntax and encoding is compatible with java properties. diff -r 4bd31caf5e07 -r fc45c67366b9 patches/fonts-rhel.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/fonts-rhel.patch Mon Aug 02 22:28:51 2010 +0100 @@ -0,0 +1,393 @@ +diff -r ea703df72762 make/sun/awt/Makefile +--- openjdk.orig/jdk/make/sun/awt/Makefile Mon Jul 26 13:05:38 2010 -0700 ++++ openjdk/jdk/make/sun/awt/Makefile Mon Aug 02 16:56:20 2010 +0100 +@@ -387,7 +387,8 @@ + fontconfig.properties \ + fontconfig.SuSE.properties \ + fontconfig.Ubuntu.properties \ +- fontconfig.Fedora.properties ++ fontconfig.Fedora.properties \ ++ fontconfig.RedHat.6.0.properties + else + + FONTCONFIGS_SRC = $(CLOSED_SRC)/solaris/classes/sun/awt/fontconfigs +diff -r ea703df72762 src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.RedHat.6.0.properties +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.RedHat.6.0.properties Mon Aug 02 16:56:20 2010 +0100 +@@ -0,0 +1,376 @@ ++# ++# Copyright (c) 2007, Oracle and/or its affiliates. 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. Oracle designates this ++# particular file as subject to the "Classpath" exception as provided ++# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++# or visit www.oracle.com if you need additional information or have any ++# questions. ++# ++ ++# Version ++ ++# Uses Fedora 9 fonts and file paths. ++version=1 ++ ++# Component Font Mappings ++ ++dialog.plain.latin-1=DejaVu Sans ++dialog.plain.japanese-x0208=Sazanami Gothic From andrew at icedtea.classpath.org Mon Aug 2 14:34:07 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Mon, 02 Aug 2010 21:34:07 +0000 Subject: /hg/icedtea6: Update NEWS with font fixes. Message-ID: changeset fe41bee26224 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fe41bee26224 author: Andrew John Hughes date: Mon Aug 02 22:34:02 2010 +0100 Update NEWS with font fixes. 2010-08-02 Andrew John Hughes * NEWS: Updated with font fixes. diffstat: 2 files changed, 9 insertions(+) ChangeLog | 6 ++++++ NEWS | 3 +++ diffs (35 lines): diff -r fc45c67366b9 -r fe41bee26224 ChangeLog --- a/ChangeLog Mon Aug 02 22:28:51 2010 +0100 +++ b/ChangeLog Mon Aug 02 22:34:02 2010 +0100 @@ -1,5 +1,10 @@ 2010-08-02 Andrew John Hughes + * NEWS: Updated with font fixes. + +2010-08-02 Andrew John Hughes + + http://bugs.gentoo.org/show_bug.cgi?id=266295: * Makefile.am: Add patch below. * patches/fonts-gentoo.patch: Add a font configuration for Gentoo @@ -13,6 +18,7 @@ 2010-07-30 Andrew John Hughes + * netx/net/sourceforge/jnlp/Launcher.java (launchApplication): Make sure an Event Dispatch Thread is created before contextclassloader gets set. diff -r fc45c67366b9 -r fe41bee26224 NEWS --- a/NEWS Mon Aug 02 22:28:51 2010 +0100 +++ b/NEWS Mon Aug 02 22:34:02 2010 +0100 @@ -690,6 +690,9 @@ New in release 1.9 (2010-XX-XX): * Backports: - S6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds - S6967533: ExceptionInInitializerError on systems with uninitialized clock +* Fixes: + - Provide font configuration for RHEL 6. + - G266295: Provide font configuration for Gentoo. * Zero/Shark - Update Shark for LLVM 2.8 API change r100304 - Shark calling static jni methods jclass argument fix. From dj at linuxfromscratch.org Mon Aug 2 16:58:08 2010 From: dj at linuxfromscratch.org (DJ Lucas) Date: Mon, 02 Aug 2010 18:58:08 -0500 Subject: --with-openjdk bootstrap In-Reply-To: <20100802154415.GA32613@rivendell.middle-earth.co.uk> References: <4C546F47.2010205@linuxfromscratch.org> <20100801152940.GI11762@rivendell.middle-earth.co.uk> <4C55B575.6020901@linuxfromscratch.org> <20100802154415.GA32613@rivendell.middle-earth.co.uk> Message-ID: <4C575B90.2000703@linuxfromscratch.org> On 08/02/2010 10:44 AM, Dr Andrew John Hughes wrote: > It's been a long while since I went through LFS, but I remember I used > to just build the initial gcc with gcj at the time. Maybe that would be > an option for some users? IcedTea shouldn't require much more than that. > You can disable Rhino using --without-rhino. Yes that would be possible. I'm also not sure if it is possible to build now without the symlinks provided by the gcj-compat package. I've honestly never tried it. Is gcj and the third party jars all that are required now? >> I just figured I'd ask first before duplicating work that is already >> done (and am glad that I did). I'm going to take a look at the >> --with-gcj-home option first, since that can be beneficial for more than >> myself, and see if I can get that going, but I'll be poking around in 7 >> now as well, provide a local patch for the book if needs be. :-) >> > > Let us know how you get on. The eventual plan is to separate the options, > so you'd have --disable-bootstrap and --with-jdk-home as in IcedTea7. Funny, prior to that response, I was going to ask if --with-java-home and --enable-bootstrap options would be useful to the project. :-) I'll probably go ahead and go for the changes that you've already put into 7 for a local patch (for my own use at first). I want the option of providing a fully self contained JDK (as has always been, though I will loose a lot of the educational value), and I'll want it for 1.8.1 and then 1.9. Seems a good place where I could help out a little. I imagine that it'll be too raw for 1.9 this close to a release, not sure about after the fact for the branch though. Given the time since those changes were made (July of 2009) and the number of changes since (plus I've still got to find when --with-icedtea came into the mix), I doubt that a true 'backport' by taking the unaltered commits is possible (though I certainly could be wrong). I figure single stepping through commits to configure.ac from the time that --with-icedtea went in will get me to most, if not all, of the needed changes. I'll be happy to break it down into pieces as I go (I'll need to do this anyway). Is there any more accounting info other than the changeset numbers needed for a backport when the time comes for 1.10 (or 1.9.1 if deemed safe)? Again, thank you very much for the suggestions and help so far, and everyone involved for this project as a whole. -- DJ Lucas -- This message has been scanned for viruses and dangerous content, and is believed to be clean. From bugzilla-daemon at icedtea.classpath.org Tue Aug 3 01:19:30 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 03 Aug 2010 08:19:30 +0000 Subject: [Bug 525] Shark made not entrant deopt sigsegv regression after bump to b20 and hs17 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=525 ------- Comment #9 from gbenson at redhat.com 2010-08-03 08:19 ------- It's in debugInfoRec.hpp, line 90 or so. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From ptisnovs at icedtea.classpath.org Tue Aug 3 05:46:53 2010 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 03 Aug 2010 12:46:53 +0000 Subject: /hg/gfx-test: Added support for automatic generation of dash pat... Message-ID: changeset f42b6b6ff41f in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=f42b6b6ff41f author: Pavel Tisnovsky date: Tue Aug 03 14:47:06 2010 +0200 Added support for automatic generation of dash pattern, some tests refactored to use this functionality. diffstat: 8 files changed, 101 insertions(+), 185 deletions(-) TODO | 4 - src/org/gfxtest/framework/EntityRenderingStyle.java | 9 ++ src/org/gfxtest/framework/GfxTest.java | 35 +++++++-- src/org/gfxtest/testsuites/DashedLines.java | 71 +++++-------------- src/org/gfxtest/testsuites/DashedPolylines.java | 61 +++------------- src/org/gfxtest/testsuites/NormalLines.java | 1 src/org/gfxtest/testsuites/NormalPolylines.java | 43 ++--------- src/org/gfxtest/testsuites/ScaledLines.java | 62 ++++++---------- diffs (482 lines): diff -r be2c8cfb62cd -r f42b6b6ff41f TODO --- a/TODO Thu Jul 22 18:15:34 2010 +0200 +++ b/TODO Tue Aug 03 14:47:06 2010 +0200 @@ -1,12 +1,8 @@ BlankImage.java -BlankImage.java -DashedLines.java -DashedPolylines.java DashedRectangles.java FilledEllipses.java Normal3DRectangles.java NormalEllipses.java NormalLines.java -NormalPolylines.java ScaledLines.java ScaledPolylines.java ScaledRectangles.java diff -r be2c8cfb62cd -r f42b6b6ff41f src/org/gfxtest/framework/EntityRenderingStyle.java --- a/src/org/gfxtest/framework/EntityRenderingStyle.java Thu Jul 22 18:15:34 2010 +0200 +++ b/src/org/gfxtest/framework/EntityRenderingStyle.java Tue Aug 03 14:47:06 2010 +0200 @@ -46,17 +46,19 @@ public class EntityRenderingStyle private int join; private float width; private float scale; + private float[] dash; private int arcWidth; private int arcHeight; private boolean raised; private float eccentricity; - public EntityRenderingStyle(int cap, int join, float width, float scale, int arcWidth, int arcHeight, boolean raised, float eccentricity) + public EntityRenderingStyle(int cap, int join, float width, float scale, float dash1, float dash2, int arcWidth, int arcHeight, boolean raised, float eccentricity) { this.cap = cap; this.join = join; this.width = width; this.scale = scale; + this.dash = new float[] {dash1, dash2}; this.arcWidth = arcWidth; this.arcHeight = arcHeight; this.raised = raised; @@ -83,6 +85,11 @@ public class EntityRenderingStyle return this.scale; } + public float[] getDash() + { + return this.dash; + } + public int getArcWidth() { return this.arcWidth; diff -r be2c8cfb62cd -r f42b6b6ff41f src/org/gfxtest/framework/GfxTest.java --- a/src/org/gfxtest/framework/GfxTest.java Thu Jul 22 18:15:34 2010 +0200 +++ b/src/org/gfxtest/framework/GfxTest.java Tue Aug 03 14:47:06 2010 +0200 @@ -115,6 +115,16 @@ public abstract class GfxTest protected static final float[] ECCENTRICITIES = {1/3.0f, 1/2.5f, 1/2.0f, 1/1.5f, 1.0f, 1.5f, 2.0f, 2.5f, 3.0f}; /** + * Default pattern. + */ + protected static final float[] DEFAULT_DASH_PATTERN = { 1.0f }; + + /** + * All dash patterns. + */ + protected static final float[] ALL_DASH_PATTERNS = {1.0f, 2.0f, 8.0f, 16.0f}; + + /** * Write test suite duration to the log file. * * @param t1 time when the test suite has been started @@ -225,6 +235,8 @@ public abstract class GfxTest int[] joins = changeJoin ? ALL_JOIN_STYLES : DEFAULT_JOIN_STYLE; float[] widths = changeWidth ? ALL_WIDTHS : DEFAULT_WIDTH; float[] eccentricities = changeEccentricity ? ECCENTRICITIES : DEFAULT_ECCENTRICITY; + float[] dash1patterns = changeDash ? ALL_DASH_PATTERNS : DEFAULT_DASH_PATTERN; + float[] dash2patterns = changeDash ? ALL_DASH_PATTERNS : DEFAULT_DASH_PATTERN; int testNumber = 0; for (int cap : caps) { @@ -238,13 +250,20 @@ public abstract class GfxTest { for (int arcWidth = minArcWidth; arcWidth <= maxArcWidth; arcWidth += ARC_STEP) { - /* - * TODO: add support to various scales and dashes - */ - EntityRenderingStyle entityRenderingStyle = new EntityRenderingStyle(cap, join, width, - 1.0f, arcHeight, arcWidth, false, eccentricity); - performOneTest(configuration, testNumber, entityRenderingStyle); - testNumber++; + for (float dash1 : dash1patterns) + { + for (float dash2 : dash2patterns) + { + /* + * TODO: add support to various scales + * and dashes + */ + EntityRenderingStyle entityRenderingStyle = new EntityRenderingStyle(cap, join, + width, 1.0f, dash1, dash2, arcHeight, arcWidth, false, eccentricity); + performOneTest(configuration, testNumber, entityRenderingStyle); + testNumber++; + } + } } } } @@ -279,6 +298,8 @@ public abstract class GfxTest this.log.logSet("cap", entityRenderingStyle.getCap()); this.log.logSet("join", entityRenderingStyle.getJoin()); this.log.logSet("width", entityRenderingStyle.getWidth()); + float[] dash = entityRenderingStyle.getDash(); + this.log.logSet("dash", "[" + dash[0] + ", " + dash[1] + "]"); this.log.logSet("arc width", entityRenderingStyle.getArcWidth()); this.log.logSet("arc height", entityRenderingStyle.getArcHeight()); } diff -r be2c8cfb62cd -r f42b6b6ff41f src/org/gfxtest/testsuites/DashedLines.java --- a/src/org/gfxtest/testsuites/DashedLines.java Thu Jul 22 18:15:34 2010 +0200 +++ b/src/org/gfxtest/testsuites/DashedLines.java Tue Aug 03 14:47:06 2010 +0200 @@ -41,8 +41,6 @@ package org.gfxtest.testsuites; package org.gfxtest.testsuites; import java.awt.*; -import java.awt.geom.*; -import java.io.IOException; import org.gfxtest.framework.*; import org.gfxtest.framework.annotations.*; @@ -58,59 +56,34 @@ import org.gfxtest.framework.annotations @Transformation(Transformations.NONE) public class DashedLines extends GfxTest { - private static final float DEFAULT_SCALE = 20.0f; - private void drawDashedLine(TestImage image, Graphics2D graphics, float scale, int cap, float[] dash) + @Override + protected void drawEntity(TestImage image, Graphics2D graphics, int testNumber, EntityRenderingStyle entityRenderingStyle) { - graphics.setColor(Color.BLACK); - graphics.setStroke(new BasicStroke(1, // width - cap, // cap - BasicStroke.JOIN_ROUND, // join - 1.0f, - dash, // dash - 0.0f)); // dash phase - graphics.scale(scale, scale); - int x1 = (int) (OFFSET / scale); - int y1 = (int) (OFFSET / scale); - int x2 = (int) ((image.getWidth() - OFFSET) / scale); - int y2 = (int) ((image.getHeight() - OFFSET) / scale); - graphics.drawLine(x1, y1, x2, y2); - - graphics.setTransform(new AffineTransform()); - drawCross(graphics, OFFSET, OFFSET, CROSS_SIZE); - drawCross(graphics, image.getWidth() - OFFSET, image.getHeight() - OFFSET, CROSS_SIZE); + graphics.setStroke(new BasicStroke(entityRenderingStyle.getWidth(), entityRenderingStyle.getCap(), entityRenderingStyle.getJoin(), 1.0f, entityRenderingStyle.getDash(), 0.0f)); + int xc = image.getCenterX(); + int yc = image.getCenterY(); + for (int i = 0; i < ANGLES; i++) + { + Color color = new Color(Color.HSBtoRGB((float)i/ANGLES, 1.0f, 1.0f)); + graphics.setColor(color); + int majorRadius = (xc > yc ? yc : xc) - 20; + double angle = 2.0 * i / ANGLES * Math.PI; + double cos = Math.cos(angle); + double sin = Math.sin(angle); + int x1 = xc + (int)(MINOR_RADIUS*cos); + int y1 = yc + (int)(MINOR_RADIUS*sin); + int x2 = xc + (int)(majorRadius*cos); + int y2 = yc + (int)(majorRadius*sin); + graphics.drawLine(x1, y1, x2, y2); + } + drawCross(graphics, xc, yc, CROSS_SIZE); } + @Override protected void runOtherTests(Configuration configuration) { - int[] caps = { BasicStroke.CAP_SQUARE, BasicStroke.CAP_BUTT, BasicStroke.CAP_ROUND }; - int testNumber = 0; - for (int cap : caps) - { - for (float dash1 = 0.25f; dash1 <= 4.0; dash1 *= 2) - { - for (float dash2 = 0.25f; dash2 <= 4.0; dash2 *= 2) - { - String testName = "test" + testNumber; - log.logBegin(testName); - TestImage image = new TestImage(configuration); - Graphics2D graphics = (Graphics2D) image.getGraphics(); - drawDashedLine(image, graphics, DEFAULT_SCALE, cap, new float[] - { dash1, dash2 }); - graphics.dispose(); - try - { - image.writeImage(configuration, suiteName, testName); - } - catch (IOException e) - { - e.printStackTrace(); - } - log.logEnd(testName); - testNumber++; - } - } - } + drawEntityWithVariousStyles(configuration, true, false, true, false, true); } public static void main(String[] args) diff -r be2c8cfb62cd -r f42b6b6ff41f src/org/gfxtest/testsuites/DashedPolylines.java --- a/src/org/gfxtest/testsuites/DashedPolylines.java Thu Jul 22 18:15:34 2010 +0200 +++ b/src/org/gfxtest/testsuites/DashedPolylines.java Tue Aug 03 14:47:06 2010 +0200 @@ -42,7 +42,6 @@ package org.gfxtest.testsuites; import java.awt.*; import java.awt.geom.*; -import java.io.IOException; import org.gfxtest.framework.*; import org.gfxtest.framework.annotations.*; @@ -58,71 +57,35 @@ import org.gfxtest.framework.annotations @Transformation(Transformations.NONE) public class DashedPolylines extends GfxTest { - private static final float DEFAULT_SCALE = 20.0f; - private void drawDashedPolyline(TestImage image, Graphics2D graphics, float scale, int cap, int join, float[] dash) + @Override + protected void drawEntity(TestImage image, Graphics2D graphics, int testNumber, EntityRenderingStyle entityRenderingStyle) { graphics.setColor(Color.BLACK); - graphics.setStroke(new BasicStroke(1, // width - cap, // cap - join, // join - 1.0f, - dash, - 0.0f)); - graphics.scale(scale, scale); - int x1 = (int) (OFFSET / scale); - int y1 = (int) ((image.getHeight() - OFFSET) / scale); - int x2 = (int) ((image.getWidth() / 2) / scale); - int y2 = (int) (OFFSET / scale); - int x3 = (int) ((image.getWidth() - OFFSET) / scale); + graphics.setStroke(new BasicStroke(entityRenderingStyle.getWidth(), entityRenderingStyle.getCap(), entityRenderingStyle.getJoin(), 1.0f, entityRenderingStyle.getDash(), 0.0f)); + + int x1 = OFFSET; + int y1 = image.getHeight() - OFFSET; + int x2 = image.getWidth() / 2; + int y2 = OFFSET; + int x3 = image.getWidth() - OFFSET; int y3 = y1; - GeneralPath polyline = new GeneralPath(GeneralPath.WIND_EVEN_ODD, 3); + GeneralPath polyline = new GeneralPath(Path2D.WIND_EVEN_ODD, 3); polyline.moveTo(x1, y1); polyline.lineTo(x2, y2); polyline.lineTo(x3, y3); graphics.draw(polyline); - graphics.setTransform(new AffineTransform()); drawCross(graphics, OFFSET, image.getHeight() - OFFSET, CROSS_SIZE); drawCross(graphics, image.getWidth() / 2, OFFSET, CROSS_SIZE); drawCross(graphics, image.getWidth() - OFFSET, image.getHeight() - OFFSET, CROSS_SIZE); } + @Override protected void runOtherTests(Configuration configuration) { - int[] caps = { BasicStroke.CAP_SQUARE, BasicStroke.CAP_BUTT, BasicStroke.CAP_ROUND }; - int[] joins = { BasicStroke.JOIN_BEVEL, BasicStroke.JOIN_MITER, BasicStroke.CAP_ROUND }; - int testNumber = 0; - for (int join : joins) - { - for (int cap : caps) - { - for (float dash1 = 0.25f; dash1 <= 4.0; dash1 *= 2.0) - { - for (float dash2 = 0.25f; dash2 <= 4.0; dash2 *= 2.0) - { - String testName = "test" + testNumber; - log.logBegin(testName); - TestImage image = new TestImage(configuration); - Graphics2D graphics = (Graphics2D) image.getGraphics(); - drawDashedPolyline(image, graphics, DEFAULT_SCALE, cap, join, new float[] - { dash1, dash2 }); - graphics.dispose(); - try - { - image.writeImage(configuration, suiteName, testName); - } - catch (IOException e) - { - e.printStackTrace(); - } - log.logEnd(testName); - testNumber++; - } - } - } - } + drawEntityWithVariousStyles(configuration, true, true, true, false, true); } public static void main(String[] args) diff -r be2c8cfb62cd -r f42b6b6ff41f src/org/gfxtest/testsuites/NormalLines.java --- a/src/org/gfxtest/testsuites/NormalLines.java Thu Jul 22 18:15:34 2010 +0200 +++ b/src/org/gfxtest/testsuites/NormalLines.java Tue Aug 03 14:47:06 2010 +0200 @@ -56,7 +56,6 @@ import org.gfxtest.framework.annotations @Transformation(Transformations.NONE) public class NormalLines extends GfxTest { - protected static final int LINE_MINOR_RADIUS = 50; @Override protected void drawEntity(TestImage image, Graphics2D graphics, int testNumber, EntityRenderingStyle entityRenderingStyle) diff -r be2c8cfb62cd -r f42b6b6ff41f src/org/gfxtest/testsuites/NormalPolylines.java --- a/src/org/gfxtest/testsuites/NormalPolylines.java Thu Jul 22 18:15:34 2010 +0200 +++ b/src/org/gfxtest/testsuites/NormalPolylines.java Tue Aug 03 14:47:06 2010 +0200 @@ -42,7 +42,7 @@ package org.gfxtest.testsuites; import java.awt.*; import java.awt.geom.GeneralPath; -import java.io.IOException; +import java.awt.geom.Path2D; import org.gfxtest.framework.*; import org.gfxtest.framework.annotations.*; @@ -59,12 +59,12 @@ public class NormalPolylines extends Gfx public class NormalPolylines extends GfxTest { - private void drawPolyline(TestImage image, Graphics2D graphics, float width, int cap, int join) + @Override + protected void drawEntity(TestImage image, Graphics2D graphics, int testNumber, EntityRenderingStyle entityRenderingStyle) { graphics.setColor(Color.BLACK); - graphics.setStroke(new BasicStroke(width, // width - cap, // cap - join)); // join + graphics.setStroke(new BasicStroke(entityRenderingStyle.getWidth(), entityRenderingStyle.getCap(), entityRenderingStyle.getJoin())); + int x1 = OFFSET; int y1 = image.getHeight() - OFFSET; int x2 = image.getWidth() / 2; @@ -72,7 +72,7 @@ public class NormalPolylines extends Gfx int x3 = image.getWidth() - OFFSET; int y3 = y1; - GeneralPath polyline = new GeneralPath(GeneralPath.WIND_EVEN_ODD, 3); + GeneralPath polyline = new GeneralPath(Path2D.WIND_EVEN_ODD, 3); polyline.moveTo(x1, y1); polyline.lineTo(x2, y2); polyline.lineTo(x3, y3); @@ -83,37 +83,10 @@ public class NormalPolylines extends Gfx drawCross(graphics, image.getWidth() - OFFSET, image.getHeight() - OFFSET, CROSS_SIZE); } + @Override protected void runOtherTests(Configuration configuration) { - float[] widths = { 1.0f, 10.0f, 20.0f, 40.0f, 80.0f }; - int[] caps = { BasicStroke.CAP_SQUARE, BasicStroke.CAP_BUTT, BasicStroke.CAP_ROUND }; - int[] joins = { BasicStroke.JOIN_BEVEL, BasicStroke.JOIN_MITER, BasicStroke.CAP_ROUND }; - int testNumber = 0; - for (int join : joins) - { - for (int cap : caps) - { - for (float width : widths) - { - String testName = "test" + testNumber; - log.logBegin(testName); - TestImage image = new TestImage(configuration); - Graphics2D graphics = (Graphics2D) image.getGraphics(); - drawPolyline(image, graphics, width, cap, join); - graphics.dispose(); - try - { - image.writeImage(configuration, suiteName, testName); - } - catch (IOException e) - { - e.printStackTrace(); - } - log.logEnd(testName); - testNumber++; - } - } - } + drawEntityWithVariousStyles(configuration, true, true, true, false, false); } public static void main(String[] args) diff -r be2c8cfb62cd -r f42b6b6ff41f src/org/gfxtest/testsuites/ScaledLines.java --- a/src/org/gfxtest/testsuites/ScaledLines.java Thu Jul 22 18:15:34 2010 +0200 +++ b/src/org/gfxtest/testsuites/ScaledLines.java Tue Aug 03 14:47:06 2010 +0200 @@ -42,7 +42,6 @@ package org.gfxtest.testsuites; import java.awt.*; import java.awt.geom.AffineTransform; -import java.io.IOException; import org.gfxtest.framework.*; import org.gfxtest.framework.annotations.*; @@ -60,51 +59,36 @@ public class ScaledLines extends GfxTest public class ScaledLines extends GfxTest { - private void drawScaledLine(TestImage image, Graphics2D graphics, float scale, int cap) + @Override + protected void drawEntity(TestImage image, Graphics2D graphics, int testNumber, EntityRenderingStyle entityRenderingStyle) { - graphics.setColor(Color.BLACK); - graphics.setStroke(new BasicStroke(1, // width - cap, // cap - BasicStroke.JOIN_ROUND)); // join - graphics.scale(scale, scale); - int x1 = (int) (OFFSET / scale); - int y1 = (int) (OFFSET / scale); - int x2 = (int) ((image.getWidth() - OFFSET) / scale); - int y2 = (int) ((image.getHeight() - OFFSET) / scale); - graphics.drawLine(x1, y1, x2, y2); + graphics.setStroke(new BasicStroke(entityRenderingStyle.getWidth(), entityRenderingStyle.getCap(), entityRenderingStyle.getJoin())); + graphics.scale(entityRenderingStyle.getScale(), entityRenderingStyle.getScale()); + int xc = image.getCenterX(); + int yc = image.getCenterY(); + for (int i = 0; i < ANGLES; i++) + { + Color color = new Color(Color.HSBtoRGB((float)i/ANGLES, 1.0f, 1.0f)); + graphics.setColor(color); + int majorRadius = (xc > yc ? yc : xc) - 20; + double angle = 2.0 * i / ANGLES * Math.PI; + double cos = Math.cos(angle); + double sin = Math.sin(angle); + int x1 = xc + (int)(MINOR_RADIUS*cos); + int y1 = yc + (int)(MINOR_RADIUS*sin); + int x2 = xc + (int)(majorRadius*cos); + int y2 = yc + (int)(majorRadius*sin); + graphics.drawLine(x1, y1, x2, y2); + } graphics.setTransform(new AffineTransform()); - drawCross(graphics, OFFSET, OFFSET, CROSS_SIZE); - drawCross(graphics, image.getWidth() - OFFSET, image.getHeight() - OFFSET, CROSS_SIZE); + drawCross(graphics, xc, yc, CROSS_SIZE); } + @Override protected void runOtherTests(Configuration configuration) { - float[] scales = { 1.0f, 10.0f, 20.0f, 40.0f, 80.0f }; - int[] caps = { BasicStroke.CAP_SQUARE, BasicStroke.CAP_BUTT, BasicStroke.CAP_ROUND }; - int testNumber = 0; - for (int cap : caps) - { - for (float scale : scales) - { - String testName = "test" + testNumber; - log.logBegin(testName); - TestImage image = new TestImage(configuration); - Graphics2D graphics = (Graphics2D) image.getGraphics(); - drawScaledLine(image, graphics, scale, cap); - graphics.dispose(); - try - { - image.writeImage(configuration, suiteName, testName); - } - catch (IOException e) - { - e.printStackTrace(); - } - log.logEnd(testName); - testNumber++; - } - } + drawEntityWithVariousStyles(configuration, true, false, true, true, false); } public static void main(String[] args) From ptisnovs at icedtea.classpath.org Tue Aug 3 09:27:23 2010 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 03 Aug 2010 16:27:23 +0000 Subject: /hg/gfx-test: Added new tests for rendering dashed circles and e... Message-ID: changeset 9d64e53f9ebb in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=9d64e53f9ebb author: Pavel Tisnovsky date: Tue Aug 03 18:27:40 2010 +0200 Added new tests for rendering dashed circles and ellipses, refactoring of tests which render scaled shapes. diffstat: 11 files changed, 367 insertions(+), 180 deletions(-) Makefile | 2 TODO | 8 - src/org/gfxtest/framework/GfxTest.java | 137 +++++++++++++++----- src/org/gfxtest/testsuites/DashedCircles.java | 93 +++++++++++++ src/org/gfxtest/testsuites/DashedEllipses.java | 93 +++++++++++++ src/org/gfxtest/testsuites/DashedRectangles.java | 72 ++-------- src/org/gfxtest/testsuites/Normal3DRectangles.java | 13 + src/org/gfxtest/testsuites/NormalRectangles.java | 1 src/org/gfxtest/testsuites/ScaledLines.java | 44 +++--- src/org/gfxtest/testsuites/ScaledPolylines.java | 44 +----- src/org/gfxtest/testsuites/ScaledRectangles.java | 40 +---- diffs (truncated from 761 to 500 lines): diff -r f42b6b6ff41f -r 9d64e53f9ebb Makefile --- a/Makefile Tue Aug 03 14:47:06 2010 +0200 +++ b/Makefile Tue Aug 03 18:27:40 2010 +0200 @@ -86,6 +86,8 @@ TESTSUITE_CLASSES = \ $(CLASSES)/$(TESTSUITE_DIR)/ScaledLines.class \ $(CLASSES)/$(TESTSUITE_DIR)/ScaledPolylines.class \ $(CLASSES)/$(TESTSUITE_DIR)/ScaledRectangles.class \ + $(CLASSES)/$(TESTSUITE_DIR)/DashedCircles.class \ + $(CLASSES)/$(TESTSUITE_DIR)/DashedEllipses.class \ $(CLASSES)/$(TESTSUITE_DIR)/DashedLines.class \ $(CLASSES)/$(TESTSUITE_DIR)/DashedPolylines.class \ $(CLASSES)/$(TESTSUITE_DIR)/DashedRectangles.class diff -r f42b6b6ff41f -r 9d64e53f9ebb TODO --- a/TODO Tue Aug 03 14:47:06 2010 +0200 +++ b/TODO Tue Aug 03 18:27:40 2010 +0200 @@ -1,8 +0,0 @@ -DashedRectangles.java -FilledEllipses.java -Normal3DRectangles.java -NormalEllipses.java -NormalLines.java -ScaledLines.java -ScaledPolylines.java -ScaledRectangles.java diff -r f42b6b6ff41f -r 9d64e53f9ebb src/org/gfxtest/framework/GfxTest.java --- a/src/org/gfxtest/framework/GfxTest.java Tue Aug 03 14:47:06 2010 +0200 +++ b/src/org/gfxtest/framework/GfxTest.java Tue Aug 03 18:27:40 2010 +0200 @@ -52,6 +52,7 @@ public abstract class GfxTest protected Log log = null; protected String suiteName = null; protected static final int CROSS_SIZE = 20; + protected int currentTestNumber = 0; /** * Minor radius for circles, ellipses etc. @@ -100,9 +101,19 @@ public abstract class GfxTest protected static final float[] DEFAULT_WIDTH = { 1.0f }; /** - * All line or curve widths. + * All line or curve widths used by test cases. */ protected static final float[] ALL_WIDTHS = { 1.0f, 2.0f, 5.0f, 10.0f, 20.0f, 40.0f }; + + /** + * Default scale. + */ + protected static final float[] DEFAULT_SCALE = { 1.0f }; + + /** + * All scales used by test cases. + */ + protected static final float[] ALL_SCALES = { 0.5f, 1.0f, 10.0f, 20.0f, 40.0f }; /** * Default ellipse eccentricity. @@ -112,7 +123,8 @@ public abstract class GfxTest /** * Values used for rendering ellipses and similar geometric shapes. */ - protected static final float[] ECCENTRICITIES = {1/3.0f, 1/2.5f, 1/2.0f, 1/1.5f, 1.0f, 1.5f, 2.0f, 2.5f, 3.0f}; + //protected static final float[] ECCENTRICITIES = {1/3.0f, 1/2.5f, 1/2.0f, 1/1.5f, 1.0f, 1.5f, 2.0f, 2.5f, 3.0f}; + protected static final float[] ECCENTRICITIES = {1/3.0f, 1/1.5f, 1.0f, 1.5f, 3.0f}; /** * Default pattern. @@ -233,43 +245,107 @@ public abstract class GfxTest { int[] caps = changeCap ? ALL_CAP_STYLES : DEFAULT_CAP_STYLE; int[] joins = changeJoin ? ALL_JOIN_STYLES : DEFAULT_JOIN_STYLE; + float[] scales = changeScale ? ALL_SCALES : DEFAULT_SCALE; float[] widths = changeWidth ? ALL_WIDTHS : DEFAULT_WIDTH; float[] eccentricities = changeEccentricity ? ECCENTRICITIES : DEFAULT_ECCENTRICITY; float[] dash1patterns = changeDash ? ALL_DASH_PATTERNS : DEFAULT_DASH_PATTERN; float[] dash2patterns = changeDash ? ALL_DASH_PATTERNS : DEFAULT_DASH_PATTERN; - int testNumber = 0; + + this.currentTestNumber = 0; + drawEntityUsingVariousCapStyles(configuration, minArcWidth, maxArcWidth, minArcHeight, maxArcHeight, caps, joins, + scales, widths, eccentricities, dash1patterns, dash2patterns); + } + + private void drawEntityUsingVariousCapStyles(Configuration configuration, int minArcWidth, int maxArcWidth, + int minArcHeight, int maxArcHeight, int[] caps, int[] joins, float[] scales, float[] widths, + float[] eccentricities, float[] dash1patterns, float[] dash2patterns) + { for (int cap : caps) { - for (int join : joins) + drawEntityUsingVariousJoinStyles(configuration, minArcWidth, maxArcWidth, minArcHeight, maxArcHeight, joins, + scales, widths, eccentricities, dash1patterns, dash2patterns, cap); + } + } + + private void drawEntityUsingVariousJoinStyles(Configuration configuration, int minArcWidth, int maxArcWidth, + int minArcHeight, int maxArcHeight, int[] joins, float[] scales, float[] widths, float[] eccentricities, + float[] dash1patterns, float[] dash2patterns, int cap) + { + for (int join : joins) + { + drawEntityUsingVarioustrokeWidths(configuration, minArcWidth, maxArcWidth, minArcHeight, maxArcHeight, scales, + widths, eccentricities, dash1patterns, dash2patterns, cap, join); + } + } + + private void drawEntityUsingVarioustrokeWidths(Configuration configuration, int minArcWidth, int maxArcWidth, + int minArcHeight, int maxArcHeight, float[] scales, float[] widths, float[] eccentricities, + float[] dash1patterns, float[] dash2patterns, int cap, int join) + { + for (float width : widths) + { + drawEntityUsingVariousScales(configuration, minArcWidth, maxArcWidth, minArcHeight, maxArcHeight, scales, + eccentricities, dash1patterns, dash2patterns, cap, join, width); + } + } + + private void drawEntityUsingVariousScales(Configuration configuration, int minArcWidth, int maxArcWidth, + int minArcHeight, int maxArcHeight, float[] scales, float[] eccentricities, float[] dash1patterns, + float[] dash2patterns, int cap, int join, float width) + { + for (float scale : scales) + { + drawEntityUsingVariousEccentricities(configuration, minArcWidth, maxArcWidth, minArcHeight, maxArcHeight, + eccentricities, dash1patterns, dash2patterns, cap, join, width, scale); + } + } + + private void drawEntityUsingVariousEccentricities(Configuration configuration, int minArcWidth, int maxArcWidth, + int minArcHeight, int maxArcHeight, float[] eccentricities, float[] dash1patterns, float[] dash2patterns, + int cap, int join, float width, float scale) + { + for (float eccentricity : eccentricities) + { + drawEntityUsingVariousArcSizes(configuration, minArcWidth, maxArcWidth, minArcHeight, maxArcHeight, + dash1patterns, dash2patterns, cap, join, width, scale, eccentricity); + } + } + + private void drawEntityUsingVariousArcSizes(Configuration configuration, int minArcWidth, int maxArcWidth, + int minArcHeight, int maxArcHeight, float[] dash1patterns, float[] dash2patterns, int cap, int join, + float width, float scale, float eccentricity) + { + for (int arcHeight = minArcHeight; arcHeight <= maxArcHeight; arcHeight += ARC_STEP) + { + for (int arcWidth = minArcWidth; arcWidth <= maxArcWidth; arcWidth += ARC_STEP) { - for (float width : widths) - { - for (float eccentricity : eccentricities) - { - for (int arcHeight = minArcHeight; arcHeight <= maxArcHeight; arcHeight += ARC_STEP) - { - for (int arcWidth = minArcWidth; arcWidth <= maxArcWidth; arcWidth += ARC_STEP) - { - for (float dash1 : dash1patterns) - { - for (float dash2 : dash2patterns) - { - /* - * TODO: add support to various scales - * and dashes - */ - EntityRenderingStyle entityRenderingStyle = new EntityRenderingStyle(cap, join, - width, 1.0f, dash1, dash2, arcHeight, arcWidth, false, eccentricity); - performOneTest(configuration, testNumber, entityRenderingStyle); - testNumber++; - } - } - } - } - } - } + drawEntityUsingVariousDashPatterns(configuration, dash1patterns, dash2patterns, cap, join, width, + scale, eccentricity, arcHeight, arcWidth); } } + } + + private void drawEntityUsingVariousDashPatterns(Configuration configuration, float[] dash1patterns, + float[] dash2patterns, int cap, int join, float width, float scale, float eccentricity, int arcHeight, + int arcWidth) + { + for (float dash1 : dash1patterns) + { + for (float dash2 : dash2patterns) + { + setStyleAndDrawEntity(configuration, cap, join, width, scale, eccentricity, arcHeight, arcWidth, dash1, dash2); + } + } + } + + private void setStyleAndDrawEntity(Configuration configuration, int cap, int join, float width, float scale, + float eccentricity, int arcHeight, int arcWidth, float dash1, float dash2) + { + EntityRenderingStyle entityRenderingStyle = new EntityRenderingStyle(cap, + join, width, scale, dash1, dash2, arcHeight, arcWidth, false, + eccentricity); + performOneTest(configuration, this.currentTestNumber, entityRenderingStyle); + this.currentTestNumber++; } private void performOneTest(Configuration configuration, int testNumber, EntityRenderingStyle entityRenderingStyle) @@ -298,6 +374,7 @@ public abstract class GfxTest this.log.logSet("cap", entityRenderingStyle.getCap()); this.log.logSet("join", entityRenderingStyle.getJoin()); this.log.logSet("width", entityRenderingStyle.getWidth()); + this.log.logSet("scale", entityRenderingStyle.getScale()); float[] dash = entityRenderingStyle.getDash(); this.log.logSet("dash", "[" + dash[0] + ", " + dash[1] + "]"); this.log.logSet("arc width", entityRenderingStyle.getArcWidth()); diff -r f42b6b6ff41f -r 9d64e53f9ebb src/org/gfxtest/testsuites/DashedCircles.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/DashedCircles.java Tue Aug 03 18:27:40 2010 +0200 @@ -0,0 +1,93 @@ +/* + Java gfx-test framework + + Copyright (C) 2010 Red Hat + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea 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 for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. +*/ + +package org.gfxtest.testsuites; + +import java.awt.*; + +import org.gfxtest.framework.*; +import org.gfxtest.framework.annotations.*; + +/** + * This test renders various empty ellipses using identity transformation matrix. + * + * @author Pavel Tisnovsky + */ + at TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.CIRCLE) + at RenderStyle(RenderStyles.DASH) + at Transformation(Transformations.NONE) +public class DashedCircles extends GfxTest +{ + + @Override + protected void drawEntity(TestImage image, Graphics2D graphics, int testNumber, EntityRenderingStyle entityRenderingStyle) + { + graphics.setStroke(new BasicStroke(entityRenderingStyle.getWidth(), entityRenderingStyle.getCap(), entityRenderingStyle.getJoin(), 1.0f, entityRenderingStyle.getDash(), 0.0f)); + int xc = image.getCenterX(); + int yc = image.getCenterY(); + double rmaj = (xc > yc ? yc : xc) - (MAJOR_RADIUS - MINOR_RADIUS); + + for (float m = 0.0f; m < 1.0f; m += 1.0 / 16.0) + { + Color color = new Color(Color.HSBtoRGB(m, 1.0f, 1.0f)); + graphics.setColor(color); + double angle = Math.PI * 2 * m; + int x = (int) (xc + rmaj * Math.cos(angle)); + int y = (int) (yc + rmaj * Math.sin(angle)); + float radius = MINOR_RADIUS + m * (MAJOR_RADIUS - MINOR_RADIUS); + int rx = (int)(radius * entityRenderingStyle.getEccentricity()); + int ry = (int)(radius / entityRenderingStyle.getEccentricity()); + graphics.drawOval(x - rx, y - ry, rx << 1, ry << 1); + } + drawCross(graphics, xc, yc, CROSS_SIZE); + } + + @Override + protected void runOtherTests(Configuration configuration) + { + drawEntityWithVariousStyles(configuration, false, false, true, false, true, false); + } + + public static void main(String[] args) + { + new DashedCircles().runTestSuite(args); + } +} diff -r f42b6b6ff41f -r 9d64e53f9ebb src/org/gfxtest/testsuites/DashedEllipses.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/testsuites/DashedEllipses.java Tue Aug 03 18:27:40 2010 +0200 @@ -0,0 +1,93 @@ +/* + Java gfx-test framework + + Copyright (C) 2010 Red Hat + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea 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 for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. +*/ + +package org.gfxtest.testsuites; + +import java.awt.*; + +import org.gfxtest.framework.*; +import org.gfxtest.framework.annotations.*; + +/** + * This test renders various empty ellipses using identity transformation matrix. + * + * @author Pavel Tisnovsky + */ + at TestType(TestTypes.RENDER_TEST) + at GraphicsPrimitive(GraphicsPrimitives.ELLIPSE) + at RenderStyle(RenderStyles.DASH) + at Transformation(Transformations.NONE) +public class DashedEllipses extends GfxTest +{ + + @Override + protected void drawEntity(TestImage image, Graphics2D graphics, int testNumber, EntityRenderingStyle entityRenderingStyle) + { + graphics.setStroke(new BasicStroke(entityRenderingStyle.getWidth(), entityRenderingStyle.getCap(), entityRenderingStyle.getJoin(), 1.0f, entityRenderingStyle.getDash(), 0.0f)); + int xc = image.getCenterX(); + int yc = image.getCenterY(); + double rmaj = (xc > yc ? yc : xc) - (MAJOR_RADIUS - MINOR_RADIUS); + + for (float m = 0.0f; m < 1.0f; m += 1.0 / 16.0) + { + Color color = new Color(Color.HSBtoRGB(m, 1.0f, 1.0f)); + graphics.setColor(color); + double angle = Math.PI * 2 * m; + int x = (int) (xc + rmaj * Math.cos(angle)); + int y = (int) (yc + rmaj * Math.sin(angle)); + float radius = MINOR_RADIUS + m * (MAJOR_RADIUS - MINOR_RADIUS); + int rx = (int)(radius * entityRenderingStyle.getEccentricity()); + int ry = (int)(radius / entityRenderingStyle.getEccentricity()); + graphics.drawOval(x - rx, y - ry, rx << 1, ry << 1); + } + drawCross(graphics, xc, yc, CROSS_SIZE); + } + + @Override + protected void runOtherTests(Configuration configuration) + { + drawEntityWithVariousStyles(configuration, false, false, true, false, true, true); + } + + public static void main(String[] args) + { + new DashedEllipses().runTestSuite(args); + } +} diff -r f42b6b6ff41f -r 9d64e53f9ebb src/org/gfxtest/testsuites/DashedRectangles.java --- a/src/org/gfxtest/testsuites/DashedRectangles.java Tue Aug 03 14:47:06 2010 +0200 +++ b/src/org/gfxtest/testsuites/DashedRectangles.java Tue Aug 03 18:27:40 2010 +0200 @@ -41,8 +41,6 @@ package org.gfxtest.testsuites; package org.gfxtest.testsuites; import java.awt.*; -import java.awt.geom.AffineTransform; -import java.io.IOException; import org.gfxtest.framework.*; import org.gfxtest.framework.annotations.*; @@ -58,63 +56,33 @@ import org.gfxtest.framework.annotations @Transformation(Transformations.NONE) public class DashedRectangles extends GfxTest { - private static final float DEFAULT_SCALE = 20.0f; - private void drawRectangle(TestImage image, Graphics2D graphics, float scale, int cap, int join, float[] dash) + @Override + protected void drawEntity(TestImage image, Graphics2D graphics, int testNumber, EntityRenderingStyle entityRenderingStyle) { - graphics.setColor(Color.BLACK); - graphics.setStroke(new BasicStroke(1, // width - cap, // cap - join, // join - 1.0f, - dash, // dash - 0.0f)); // dash phase - graphics.scale(scale, scale); - int x1 = (int) (OFFSET / scale); - int y1 = (int) (OFFSET / scale); - int x2 = (int) ((image.getWidth() - OFFSET) / scale); - int y2 = (int) ((image.getHeight() - OFFSET) / scale); - graphics.drawRect(x1, y1, x2 - x1, y2 - y1); + graphics.setStroke(new BasicStroke(entityRenderingStyle.getWidth(), entityRenderingStyle.getCap(), entityRenderingStyle.getJoin(), 1.0f, entityRenderingStyle.getDash(), 0.0f)); + int xc = image.getCenterX(); + int yc = image.getCenterY(); - graphics.setTransform(new AffineTransform()); - drawCross(graphics, OFFSET, OFFSET, CROSS_SIZE); - drawCross(graphics, image.getWidth() - OFFSET, image.getHeight() - OFFSET, CROSS_SIZE); + double rmaj = (xc > yc ? yc : xc) - (MAJOR_RADIUS - MINOR_RADIUS); + + for (float m = 1.0f; m >= 0.0f; m -= 1.0 / 16.0) + { + Color color = new Color(Color.HSBtoRGB(m, 1.0f, 1.0f)); + graphics.setColor(color); + double angle = Math.PI * 2 * m; + int x = (int) (xc + rmaj * Math.cos(angle)); + int y = (int) (yc + rmaj * Math.sin(angle)); + int radius = (int)(MINOR_RADIUS + m * (MAJOR_RADIUS - MINOR_RADIUS)); + graphics.drawRect(x - radius, y - radius, radius << 1, radius << 1); + } + drawCross(graphics, xc, yc, CROSS_SIZE); } + @Override protected void runOtherTests(Configuration configuration) { - int[] caps = { BasicStroke.CAP_SQUARE, BasicStroke.CAP_BUTT, BasicStroke.CAP_ROUND }; - int[] joins = { BasicStroke.JOIN_BEVEL, BasicStroke.JOIN_MITER, BasicStroke.CAP_ROUND }; - int testNumber = 0; - for (int join : joins) - { - for (int cap : caps) - { - for (float dash1 = 0.25f; dash1 <= 4.0; dash1 *= 2.0) - { - for (float dash2 = 0.25f; dash2 <= 4.0; dash2 *= 2.0) - { - String testName = "test" + testNumber; - log.logBegin(testName); - TestImage image = new TestImage(configuration); - Graphics2D graphics = (Graphics2D) image.getGraphics(); - drawRectangle(image, graphics, DEFAULT_SCALE, cap, join, new float[] - { dash1, dash2 }); - graphics.dispose(); - try - { - image.writeImage(configuration, suiteName, testName); - } - catch (IOException e) - { - e.printStackTrace(); - } - log.logEnd(testName); - testNumber++; - } - } - } - } + drawEntityWithVariousStyles(configuration, true, true, true, false, true); } public static void main(String[] args) From ahughes at redhat.com Tue Aug 3 10:06:23 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 3 Aug 2010 18:06:23 +0100 Subject: --with-openjdk bootstrap In-Reply-To: <4C575B90.2000703@linuxfromscratch.org> References: <4C546F47.2010205@linuxfromscratch.org> <20100801152940.GI11762@rivendell.middle-earth.co.uk> <4C55B575.6020901@linuxfromscratch.org> <20100802154415.GA32613@rivendell.middle-earth.co.uk> <4C575B90.2000703@linuxfromscratch.org> Message-ID: <20100803170623.GG32613@rivendell.middle-earth.co.uk> On 18:58 Mon 02 Aug , DJ Lucas wrote: > On 08/02/2010 10:44 AM, Dr Andrew John Hughes wrote: > > > It's been a long while since I went through LFS, but I remember I used > > to just build the initial gcc with gcj at the time. Maybe that would be > > an option for some users? IcedTea shouldn't require much more than that. > > You can disable Rhino using --without-rhino. > > Yes that would be possible. I'm also not sure if it is possible to > build now without the symlinks provided by the gcj-compat package. I've > honestly never tried it. Is gcj and the third party jars all that are > required now? > It should be. Sadly, theory and practice are not always the same. If you do run into problems, please let us know the details so we can fix the issue. > >> I just figured I'd ask first before duplicating work that is already > >> done (and am glad that I did). I'm going to take a look at the > >> --with-gcj-home option first, since that can be beneficial for more than > >> myself, and see if I can get that going, but I'll be poking around in 7 > >> now as well, provide a local patch for the book if needs be. :-) > >> > > > > Let us know how you get on. The eventual plan is to separate the options, > > so you'd have --disable-bootstrap and --with-jdk-home as in IcedTea7. > > Funny, prior to that response, I was going to ask if --with-java-home > and --enable-bootstrap options would be useful to the project. :-) > > I'll probably go ahead and go for the changes that you've already put > into 7 for a local patch (for my own use at first). I want the option > of providing a fully self contained JDK (as has always been, though I > will loose a lot of the educational value), and I'll want it for 1.8.1 > and then 1.9. Seems a good place where I could help out a little. I > imagine that it'll be too raw for 1.9 this close to a release, not sure > about after the fact for the branch though. > You're right, we don't want such major build changes going into 1.9. Once it branches, I'll make the changes to HEAD. > Given the time since those changes were made (July of 2009) and the > number of changes since (plus I've still got to find when --with-icedtea > came into the mix), I doubt that a true 'backport' by taking the > unaltered commits is possible (though I certainly could be wrong). I > figure single stepping through commits to configure.ac from the time > that --with-icedtea went in will get me to most, if not all, of the > needed changes. I'll be happy to break it down into pieces as I go > (I'll need to do this anyway). Is there any more accounting info other > than the changeset numbers needed for a backport when the time comes for > 1.10 (or 1.9.1 if deemed safe)? > I wouldn't recommend a literal backport of changesets. Not only are the changes to IcedTea7 about a year old, after which both 6 and 7 have had more changes, but the two had already diverged pretty far by the point too (for good reason in some places). It'd be much easier to take the ideas from IcedTea7 and apply them to IcedTea6 as it stands today. As I say, I'll do this to IcedTea6 after 1.9 branches off on Thursday, and you can then take those changes and apply them locally to 1.8 & 1.9 as you wish. As to --with-icedtea, that option was there from the start. As far as I'm aware, early versions of IcedTea had --with-gcj-home, with-icedtea, --with-icedtea-home, --with-openjdk-home and --with-openjdk (!). On 6, we've managed to merge the latter four into just --with-openjdk already, so the final step is to merge --with-gcj-home and --with-openjdk into --with-jdk-home and create a separate option, --disable-bootstrap for bootstrapping (rather than having it implicit in --with-openjdk). > Again, thank you very much for the suggestions and help so far, and > everyone involved for this project as a whole. > No problem. I hope you find something that works for you. > -- DJ Lucas > > -- > This message has been scanned for viruses and > dangerous content, and is believed to be clean. > Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From andrew at icedtea.classpath.org Tue Aug 3 16:46:26 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 03 Aug 2010 23:46:26 +0000 Subject: /hg/icedtea6: Backport latest XRender pipeline. Message-ID: changeset 9da4f50c13c0 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9da4f50c13c0 author: Andrew John Hughes date: Wed Aug 04 00:46:09 2010 +0100 Backport latest XRender pipeline. 2010-08-03 Andrew John Hughes Backport latest XRender pipeline. * patches/xrender/icedtea-000.patch, * patches/xrender/icedtea-001.patch, * patches/xrender/icedtea-002.patch, * patches/xrender/icedtea-003.patch, * patches/xrender/icedtea-004.patch, * patches/xrender/icedtea-005.patch, * patches/xrender/icedtea-006.patch, * patches/xrender/icedtea-007.patch, * patches/xrender/icedtea-008.patch, * patches/xrender/icedtea-009.patch: Removed. * Makefile.am: Add new patches. * patches/ecj/javah.patch: Backported from IcedTea7 to handle issues with gjavah's generation of headers for the OpenGL pipeline. * patches/ecj/needs-6.patch: Sets source & target to 6 for awt and xawt during the bootstrap build as these now have classes containing @Override. See OpenJDK6 b20 fix for javax.swing & Nimbus. * patches/openjdk/6307603-xrender-01.patch, * patches/openjdk/6725214-direct3d-01.patch, * patches/openjdk/6961633-xrender-02.patch: Backports from OpenJDK7. The XRender fixes build heavily on changes made by 6725214 for the Direct3D pipeline. diffstat: 17 files changed, 58422 insertions(+), 12871 deletions(-) ChangeLog | 31 Makefile.am | 13 patches/ecj/javah.patch | 92 patches/ecj/needs-6.patch | 24 patches/openjdk/6307603-xrender-01.patch | 9013 +++++ patches/openjdk/6725214-direct3d-01.patch |49210 +++++++++++++++++++++++++++++ patches/openjdk/6961633-xrender-02.patch | 44 patches/xrender/icedtea-000.patch | 426 patches/xrender/icedtea-001.patch | 5320 --- patches/xrender/icedtea-002.patch | 5199 --- patches/xrender/icedtea-003.patch | 78 patches/xrender/icedtea-004.patch | 86 patches/xrender/icedtea-005.patch | 18 patches/xrender/icedtea-006.patch | 295 patches/xrender/icedtea-007.patch | 1143 patches/xrender/icedtea-008.patch | 131 patches/xrender/icedtea-009.patch | 170 diffs (truncated from 71377 to 500 lines): diff -r fe41bee26224 -r 9da4f50c13c0 ChangeLog --- a/ChangeLog Mon Aug 02 22:34:02 2010 +0100 +++ b/ChangeLog Wed Aug 04 00:46:09 2010 +0100 @@ -1,3 +1,34 @@ 2010-08-02 Andrew John Hughes + + Backport latest XRender pipeline. + * patches/xrender/icedtea-000.patch, + * patches/xrender/icedtea-001.patch, + * patches/xrender/icedtea-002.patch, + * patches/xrender/icedtea-003.patch, + * patches/xrender/icedtea-004.patch, + * patches/xrender/icedtea-005.patch, + * patches/xrender/icedtea-006.patch, + * patches/xrender/icedtea-007.patch, + * patches/xrender/icedtea-008.patch, + * patches/xrender/icedtea-009.patch: + Removed. + * Makefile.am: Add new patches. + * patches/ecj/javah.patch: + Backported from IcedTea7 to handle issues + with gjavah's generation of headers for the + OpenGL pipeline. + * patches/ecj/needs-6.patch: + Sets source & target to 6 for awt and xawt + during the bootstrap build as these now + have classes containing @Override. See + OpenJDK6 b20 fix for javax.swing & Nimbus. + * patches/openjdk/6307603-xrender-01.patch, + * patches/openjdk/6725214-direct3d-01.patch, + * patches/openjdk/6961633-xrender-02.patch: + Backports from OpenJDK7. The XRender fixes + build heavily on changes made by 6725214 for + the Direct3D pipeline. + 2010-08-02 Andrew John Hughes * NEWS: Updated with font fixes. diff -r fe41bee26224 -r 9da4f50c13c0 Makefile.am --- a/Makefile.am Mon Aug 02 22:34:02 2010 +0100 +++ b/Makefile.am Wed Aug 04 00:46:09 2010 +0100 @@ -321,11 +321,9 @@ endif endif if ENABLE_XRENDER -# match against $(abs_top_srcdir) and then remove it again, -# because stamps/patch.stamp target will also add it -XRENDER_PATCHES = patches/xrender/icedtea-???.patch -XRENDER_PATCH_FILES = $(sort $(wildcard $(abs_top_srcdir)/$(XRENDER_PATCHES))) -ICEDTEA_PATCHES += $(sort $(subst $(abs_top_srcdir)/,,$(XRENDER_PATCH_FILES))) +ICEDTEA_PATCHES += patches/openjdk/6725214-direct3d-01.patch \ + patches/openjdk/6307603-xrender-01.patch \ + patches/openjdk/6961633-xrender-02.patch endif if ENABLE_NIO2 @@ -359,6 +357,11 @@ if DTDTYPE_QNAME if DTDTYPE_QNAME ICEDTEA_ECJ_PATCHES += \ patches/ecj/icedtea-jaxws-getdtdtype.patch +endif +if ENABLE_XRENDER +ICEDTEA_ECJ_PATCHES += \ + patches/ecj/needs-6.patch \ + patches/ecj/javah.patch endif ICEDTEA_ECJ_PATCHES += $(DISTRIBUTION_ECJ_PATCHES) diff -r fe41bee26224 -r 9da4f50c13c0 patches/ecj/javah.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/javah.patch Wed Aug 04 00:46:09 2010 +0100 @@ -0,0 +1,92 @@ +diff -Nru openjdk-boot.orig/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk +--- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2009-12-13 20:37:41.000000000 +0000 ++++ openjdk-ecj/jdk/make/common/Rules.gmk 2009-12-13 21:11:04.000000000 +0000 +@@ -303,7 +303,11 @@ + $(prep-target) + @$(ECHO) "# Running javah:" + $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \ +- $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner)) ++ $(CLASSES.export) ++ $(foreach innerclass,$(subst $$,\$$,$(EXPORTED_inner)), \ ++ $(JAVAH_CMD) \ ++ -o $(CLASSHDRDIR)/$(subst .,_,$(subst \$$,_,$(innerclass))).h \ ++ $(innerclass)) + @$(java-vm-cleanup) + @$(TOUCH) $@ + +diff -Nru openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk +--- openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-12-04 23:26:35.000000000 +0000 ++++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2009-12-13 21:11:04.000000000 +0000 +@@ -189,3 +189,5 @@ + java/awt/dnd/DnDConstants.java \ + sun/awt/CausedFocusEvent.java + ++EXPORTED_inner = \ ++ sun.java2d.opengl.OGLContext$$OGLContextCaps +diff -Nru openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h +--- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-12-04 23:33:16.000000000 +0000 ++++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-12-13 21:11:04.000000000 +0000 +@@ -27,6 +27,7 @@ + #define OGLContext_h_Included + + #include "sun_java2d_pipe_BufferedContext.h" ++#include "sun_java2d_pipe_hw_ContextCapabilities.h" + #include "sun_java2d_opengl_OGLContext.h" + #include "sun_java2d_opengl_OGLContext_OGLContextCaps.h" + +@@ -100,39 +101,39 @@ + * See OGLContext.java for more on these flags. + */ + #define CAPS_EMPTY \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EMPTY ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_EMPTY + #define CAPS_RT_PLAIN_ALPHA \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_PLAIN_ALPHA ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_PLAIN_ALPHA + #define CAPS_RT_TEXTURE_ALPHA \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_TEXTURE_ALPHA ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_TEXTURE_ALPHA + #define CAPS_RT_TEXTURE_OPAQUE \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_TEXTURE_OPAQUE ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_TEXTURE_OPAQUE + #define CAPS_MULTITEXTURE \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_MULTITEXTURE ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_MULTITEXTURE + #define CAPS_TEXNONPOW2 \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_TEXNONPOW2 ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_TEXNONPOW2 + #define CAPS_TEXNONSQUARE \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_TEXNONSQUARE ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_TEXNONSQUARE + #define CAPS_PS20 \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_PS20 ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_PS20 + #define CAPS_PS30 \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_PS30 ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_PS30 + #define LAST_SHARED_CAP \ + sun_java2d_opengl_OGLContext_OGLContextCaps_LAST_SHARED_CAP + #define CAPS_EXT_FBOBJECT \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_FBOBJECT ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_FBOBJECT + #define CAPS_STORED_ALPHA \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_STORED_ALPHA ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_STORED_ALPHA + #define CAPS_DOUBLEBUFFERED \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_DOUBLEBUFFERED ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_DOUBLEBUFFERED + #define CAPS_EXT_LCD_SHADER \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_LCD_SHADER ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_LCD_SHADER + #define CAPS_EXT_BIOP_SHADER \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_BIOP_SHADER ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_BIOP_SHADER + #define CAPS_EXT_GRAD_SHADER \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_GRAD_SHADER ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_GRAD_SHADER + #define CAPS_EXT_TEXRECT \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_TEXRECT ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_TEXRECT + + /** + * Evaluates to true if the given capability bitmask is present for the diff -r fe41bee26224 -r 9da4f50c13c0 patches/ecj/needs-6.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/needs-6.patch Wed Aug 04 00:46:09 2010 +0100 @@ -0,0 +1,24 @@ +diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/Makefile openjdk-ecj/jdk/make/sun/awt/Makefile +--- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2010-08-03 23:52:42.084667732 +0100 ++++ openjdk-ecj/jdk/make/sun/awt/Makefile 2010-08-03 23:53:10.308917593 +0100 +@@ -34,6 +34,8 @@ + VIS_NEEDED=true + + include $(BUILDDIR)/common/Defs.gmk ++LANGUAGE_VERSION = -source 6 ++CLASS_VERSION = -target 6 + + # + # Use highest optimization level +diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile openjdk-ecj/jdk/make/sun/xawt/Makefile +--- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2010-08-03 23:52:56.420668143 +0100 ++++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2010-08-03 23:53:18.494167931 +0100 +@@ -31,6 +31,8 @@ + PRODUCT = sun + + include $(BUILDDIR)/common/Defs.gmk ++LANGUAGE_VERSION = -source 6 ++CLASS_VERSION = -target 6 + + GEN_DIR=$(GENSRCDIR)/sun/awt/X11 + diff -r fe41bee26224 -r 9da4f50c13c0 patches/openjdk/6307603-xrender-01.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6307603-xrender-01.patch Wed Aug 04 00:46:09 2010 +0100 @@ -0,0 +1,9013 @@ +diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers openjdk/jdk/make/sun/awt/mapfile-mawt-vers +--- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers 2010-08-03 23:14:59.000000000 +0100 ++++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers 2010-08-03 23:17:50.464917097 +0100 +@@ -311,6 +311,7 @@ + Java_sun_awt_X11GraphicsEnvironment_initGLX; + Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama; + Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint; ++ Java_sun_awt_X11GraphicsEnvironment_initXRender; + #Java_sun_awt_motif_MEmbedCanvasPeer_initXEmbedServer; + #Java_sun_awt_motif_MEmbedCanvasPeer_destroyXEmbedServer; + #Java_sun_awt_motif_MEmbedCanvasPeer_isXEmbedActive; +@@ -405,17 +406,52 @@ + Java_sun_java2d_x11_X11SurfaceData_initIDs; + Java_sun_java2d_x11_X11SurfaceData_initOps; + Java_sun_java2d_x11_X11SurfaceData_initSurface; +- Java_sun_java2d_x11_X11SurfaceData_isDrawableValid; + Java_sun_java2d_x11_X11SurfaceData_isDgaAvailable; +- Java_sun_java2d_x11_X11SurfaceData_setInvalid; +- Java_sun_java2d_x11_X11SurfaceData_flushNativeSurface; +- Java_sun_java2d_x11_X11SurfaceData_XCreateGC; +- Java_sun_java2d_x11_X11SurfaceData_XResetClip; +- Java_sun_java2d_x11_X11SurfaceData_XSetClip; + Java_sun_java2d_x11_X11SurfaceData_XSetCopyMode; + Java_sun_java2d_x11_X11SurfaceData_XSetXorMode; + Java_sun_java2d_x11_X11SurfaceData_XSetForeground; +- Java_sun_java2d_x11_X11SurfaceData_XSetGraphicsExposures; ++ ++ Java_sun_java2d_x11_XSurfaceData_initOps; ++ Java_sun_java2d_x11_XSurfaceData_XCreateGC; ++ Java_sun_java2d_x11_XSurfaceData_XResetClip; ++ Java_sun_java2d_x11_XSurfaceData_XSetClip; ++ Java_sun_java2d_x11_XSurfaceData_flushNativeSurface; ++ Java_sun_java2d_x11_XSurfaceData_isDrawableValid; ++ Java_sun_java2d_x11_XSurfaceData_setInvalid; ++ Java_sun_java2d_x11_XSurfaceData_XSetGraphicsExposures; ++ Java_sun_java2d_xr_XRSurfaceData_initXRPicture; ++ Java_sun_java2d_xr_XRSurfaceData_initIDs; ++ Java_sun_java2d_xr_XRSurfaceData_XRInitSurface; ++ Java_sun_java2d_xr_XRBackendNative_initIDs; ++ Java_sun_java2d_xr_XIDGenerator_bufferXIDs; ++ Java_sun_java2d_xr_XRBackendNative_freeGC; ++ Java_sun_java2d_xr_XRBackendNative_createGC; ++ Java_sun_java2d_xr_XRBackendNative_createPixmap; ++ Java_sun_java2d_xr_XRBackendNative_createPictureNative; ++ Java_sun_java2d_xr_XRBackendNative_freePicture; ++ Java_sun_java2d_xr_XRBackendNative_freePixmap; ++ Java_sun_java2d_xr_XRBackendNative_setPictureRepeat; ++ Java_sun_java2d_xr_XRBackendNative_setGCExposures; ++ Java_sun_java2d_xr_XRBackendNative_setGCForeground; ++ Java_sun_java2d_xr_XRBackendNative_copyArea; ++ Java_sun_java2d_xr_XRBackendNative_renderComposite; ++ Java_sun_java2d_xr_XRBackendNative_renderRectangle; ++ Java_sun_java2d_xr_XRBackendNative_XRenderRectanglesNative; ++ Java_sun_java2d_xr_XRBackendNative_XRSetTransformNative; ++ Java_sun_java2d_xr_XRBackendNative_XRCreateLinearGradientPaintNative; ++ Java_sun_java2d_xr_XRBackendNative_XRCreateRadialGradientPaintNative; ++ Java_sun_java2d_xr_XRBackendNative_setFilter; ++ Java_sun_java2d_xr_XRBackendNative_XRSetClipNative; ++ Java_sun_java2d_xr_XRBackendNative_putMaskNative; ++ Java_sun_java2d_xr_XRBackendNative_XRAddGlyphsNative; ++ Java_sun_java2d_xr_XRBackendNative_XRFreeGlyphsNative; ++ Java_sun_java2d_xr_XRBackendNative_XRenderCreateGlyphSetNative; ++ Java_sun_java2d_xr_XRBackendNative_XRenderCompositeTextNative; ++ Java_sun_java2d_xr_XRBackendNative_setGCMode; ++ Java_sun_java2d_xr_XRBackendNative_GCRectanglesNative; ++ Java_sun_java2d_xr_XRUtils_initFormatPtrs; ++ Java_sun_java2d_xr_XRBackendNative_renderCompositeTrapezoidsNative; ++ XRT_DrawGlyphList; + + Java_sun_java2d_opengl_OGLContext_getOGLIdString; + Java_sun_java2d_opengl_OGLMaskFill_maskFill; +diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux openjdk/jdk/make/sun/awt/mapfile-vers-linux +--- openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux 2010-08-03 23:14:59.000000000 +0100 ++++ openjdk/jdk/make/sun/awt/mapfile-vers-linux 2010-08-03 23:17:50.464917097 +0100 +@@ -425,6 +425,7 @@ + Java_sun_awt_X11GraphicsEnvironment_initDisplay; + Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama; + Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint; ++ Java_sun_awt_X11GraphicsEnvironment_initXRender; + + + +diff -Nru openjdk.orig/jdk/make/sun/headless/mapfile-vers openjdk/jdk/make/sun/headless/mapfile-vers +--- openjdk.orig/jdk/make/sun/headless/mapfile-vers 2010-08-03 23:14:59.000000000 +0100 ++++ openjdk/jdk/make/sun/headless/mapfile-vers 2010-08-03 23:17:50.476916584 +0100 +@@ -46,17 +46,20 @@ + Java_sun_java2d_x11_X11Renderer_XFillRoundRect; + Java_sun_java2d_x11_X11Renderer_devCopyArea; + Java_sun_java2d_x11_X11SurfaceData_initIDs; +- Java_sun_java2d_x11_X11SurfaceData_initOps; +- Java_sun_java2d_x11_X11SurfaceData_isDrawableValid; + Java_sun_java2d_x11_X11SurfaceData_initSurface; +- Java_sun_java2d_x11_X11SurfaceData_setInvalid; +- Java_sun_java2d_x11_X11SurfaceData_XCreateGC; +- Java_sun_java2d_x11_X11SurfaceData_XResetClip; +- Java_sun_java2d_x11_X11SurfaceData_XSetClip; + Java_sun_java2d_x11_X11SurfaceData_XSetCopyMode; + Java_sun_java2d_x11_X11SurfaceData_XSetXorMode; + Java_sun_java2d_x11_X11SurfaceData_XSetForeground; + ++ Java_sun_java2d_x11_XSurfaceData_initOps; ++ Java_sun_java2d_x11_XSurfaceData_XCreateGC; ++ Java_sun_java2d_x11_XSurfaceData_XResetClip; ++ Java_sun_java2d_x11_XSurfaceData_XSetClip; ++ Java_sun_java2d_x11_XSurfaceData_flushNativeSurface; ++ Java_sun_java2d_x11_XSurfaceData_isDrawableValid; ++ Java_sun_java2d_x11_XSurfaceData_setInvalid; ++ Java_sun_java2d_x11_XSurfaceData_XSetGraphicsExposures; ++ + X11SurfaceData_GetOps; + Java_java_awt_Font_initIDs; + Java_sun_font_FontManager_getFontConfig; +diff -Nru openjdk.orig/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile +--- openjdk.orig/jdk/make/sun/jawt/Makefile 2010-08-03 23:14:58.000000000 +0100 ++++ openjdk/jdk/make/sun/jawt/Makefile 2010-08-03 23:17:50.480916320 +0100 +@@ -118,7 +118,7 @@ + # Libraries to link in. + # + ifeq ($(PLATFORM), solaris) +-OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt ++OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender + endif # PLATFORM + + ifeq ($(PLATFORM), linux) +diff -Nru openjdk.orig/jdk/make/sun/xawt/FILES_c_unix.gmk openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk +--- openjdk.orig/jdk/make/sun/xawt/FILES_c_unix.gmk 2010-06-21 22:15:09.000000000 +0100 ++++ openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk 2010-08-03 23:17:50.480916320 +0100 +@@ -78,4 +78,7 @@ + awt_Plugin.c \ + gtk2_interface.c \ + swing_GTKEngine.c \ +- swing_GTKStyle.c ++ swing_GTKStyle.c \ ++ XRSurfaceData.c \ ++ XRBackendNative.c ++ +diff -Nru openjdk.orig/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile +--- openjdk.orig/jdk/make/sun/xawt/Makefile 2010-06-21 22:15:09.000000000 +0100 ++++ openjdk/jdk/make/sun/xawt/Makefile 2010-08-03 23:17:50.480916320 +0100 +@@ -48,6 +48,11 @@ + + LDFLAGS += -L$(OPENWIN_LIB) + ++# For Xrender extension. ++ifeq ($(PLATFORM), solaris) ++LDFLAGS += -L/usr/openwin/sfw/lib$(ISA_DIR) -R/usr/openwin/sfw/lib$(ISA_DIR) ++endif ++ + ifeq ($(PLATFORM), linux) + LDFLAGS += -lpthread + dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) +@@ -86,7 +91,7 @@ + vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl + vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11 + +-OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -ldl \ ++OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -lXrender -ldl \ + $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi + + ifeq ($(PLATFORM), solaris) +@@ -120,7 +125,7 @@ + -I$(PLATFORM_SRC)/native/sun/awt/medialib \ + -I$(PLATFORM_SRC)/native/sun/font \ + -I$(SHARE_SRC)/native/sun/awt \ +- -I$(PLATFORM_SRC)/native/sun/awt ++ -I$(PLATFORM_SRC)/native/sun/awt + + ifeq ($(PLATFORM), linux) + # Allows for builds on Debian GNU Linux, X11 is in a different place +diff -Nru openjdk.orig/jdk/make/sun/xawt/mapfile-vers openjdk/jdk/make/sun/xawt/mapfile-vers +--- openjdk.orig/jdk/make/sun/xawt/mapfile-vers 2010-08-03 23:14:59.000000000 +0100 ++++ openjdk/jdk/make/sun/xawt/mapfile-vers 2010-08-03 23:17:50.480916320 +0100 +@@ -184,6 +184,7 @@ + Java_sun_font_FontManager_populateFontFileNameMap; + Java_sun_awt_X11GraphicsEnvironment_initDisplay; + Java_sun_awt_X11GraphicsEnvironment_initGLX; ++ Java_sun_awt_X11GraphicsEnvironment_initXRender; + Java_sun_awt_X11GraphicsEnvironment_checkShmExt; + Java_sun_awt_X11GraphicsEnvironment_getNumScreens; + Java_sun_awt_X11GraphicsEnvironment_getDefaultScreenNum; +@@ -332,20 +333,51 @@ + Java_sun_java2d_x11_X11Renderer_XFillRect; + Java_sun_java2d_x11_X11Renderer_XFillRoundRect; + Java_sun_java2d_x11_X11Renderer_devCopyArea; +- Java_sun_java2d_x11_X11SurfaceData_setInvalid; + Java_sun_java2d_x11_X11SurfaceData_initIDs; +- Java_sun_java2d_x11_X11SurfaceData_isDrawableValid; + Java_sun_java2d_x11_X11SurfaceData_isDgaAvailable; +- Java_sun_java2d_x11_X11SurfaceData_initOps; + Java_sun_java2d_x11_X11SurfaceData_initSurface; +- Java_sun_java2d_x11_X11SurfaceData_flushNativeSurface; +- Java_sun_java2d_x11_X11SurfaceData_XCreateGC; +- Java_sun_java2d_x11_X11SurfaceData_XResetClip; +- Java_sun_java2d_x11_X11SurfaceData_XSetClip; + Java_sun_java2d_x11_X11SurfaceData_XSetCopyMode; + Java_sun_java2d_x11_X11SurfaceData_XSetXorMode; + Java_sun_java2d_x11_X11SurfaceData_XSetForeground; +- Java_sun_java2d_x11_X11SurfaceData_XSetGraphicsExposures; ++ ++ Java_sun_java2d_x11_XSurfaceData_initOps; ++ Java_sun_java2d_x11_XSurfaceData_XCreateGC; ++ Java_sun_java2d_x11_XSurfaceData_XResetClip; ++ Java_sun_java2d_x11_XSurfaceData_XSetClip; ++ Java_sun_java2d_x11_XSurfaceData_flushNativeSurface; ++ Java_sun_java2d_x11_XSurfaceData_isDrawableValid; ++ Java_sun_java2d_x11_XSurfaceData_setInvalid; ++ Java_sun_java2d_x11_XSurfaceData_XSetGraphicsExposures; ++ Java_sun_java2d_xr_XRSurfaceData_initXRPicture; ++ Java_sun_java2d_xr_XRSurfaceData_initIDs; ++ Java_sun_java2d_xr_XRSurfaceData_XRInitSurface; ++ Java_sun_java2d_xr_XRBackendNative_initIDs; ++ Java_sun_java2d_xr_XRBackendNative_freeGC; ++ Java_sun_java2d_xr_XRBackendNative_createGC; ++ Java_sun_java2d_xr_XRBackendNative_createPixmap; ++ Java_sun_java2d_xr_XRBackendNative_createPictureNative; ++ Java_sun_java2d_xr_XRBackendNative_freePicture; ++ Java_sun_java2d_xr_XRBackendNative_freePixmap; ++ Java_sun_java2d_xr_XRBackendNative_setPictureRepeat; ++ Java_sun_java2d_xr_XRBackendNative_setGCExposures; ++ Java_sun_java2d_xr_XRBackendNative_setGCForeground; ++ Java_sun_java2d_xr_XRBackendNative_copyArea; ++ Java_sun_java2d_xr_XRBackendNative_renderComposite; ++ Java_sun_java2d_xr_XRBackendNative_renderRectangle; ++ Java_sun_java2d_xr_XRBackendNative_XRenderRectanglesNative; ++ Java_sun_java2d_xr_XRBackendNative_XRSetTransformNative; ++ Java_sun_java2d_xr_XRBackendNative_XRCreateLinearGradientPaintNative; ++ Java_sun_java2d_xr_XRBackendNative_XRCreateRadialGradientPaintNative; ++ Java_sun_java2d_xr_XRBackendNative_setFilter; ++ Java_sun_java2d_xr_XRBackendNative_XRSetClipNative; ++ Java_sun_java2d_xr_XRBackendNative_putMaskNative; ++ Java_sun_java2d_xr_XRBackendNative_XRAddGlyphsNative; ++ Java_sun_java2d_xr_XRBackendNative_XRFreeGlyphsNative; ++ Java_sun_java2d_xr_XRBackendNative_XRenderCreateGlyphSetNative; ++ Java_sun_java2d_xr_XRBackendNative_XRenderCompositeTextNative; ++ Java_sun_java2d_xr_XRBackendNative_setGCMode; ++ Java_sun_java2d_xr_XRBackendNative_GCRectanglesNative; ++ Java_sun_java2d_xr_XRBackendNative_renderCompositeTrapezoidsNative; + + Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1arrow; + Java_com_sun_java_swing_plaf_gtk_GTKEngine_native_1paint_1box; +diff -Nru openjdk.orig/jdk/src/share/classes/sun/font/GlyphDisposedListener.java openjdk/jdk/src/share/classes/sun/font/GlyphDisposedListener.java +--- openjdk.orig/jdk/src/share/classes/sun/font/GlyphDisposedListener.java 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/share/classes/sun/font/GlyphDisposedListener.java 2010-08-03 23:17:50.480916320 +0100 +@@ -0,0 +1,32 @@ ++/* ++ * Copyright 2010 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.font; ++ ++import java.util.*; ++ ++public interface GlyphDisposedListener { ++ public void glyphDisposed(ArrayList glyphs); ++} +diff -Nru openjdk.orig/jdk/src/share/classes/sun/font/StrikeCache.java openjdk/jdk/src/share/classes/sun/font/StrikeCache.java +--- openjdk.orig/jdk/src/share/classes/sun/font/StrikeCache.java 2010-08-03 23:14:59.000000000 +0100 ++++ openjdk/jdk/src/share/classes/sun/font/StrikeCache.java 2010-08-03 23:25:03.054323484 +0100 +@@ -31,6 +31,7 @@ + import java.lang.ref.ReferenceQueue; + import java.lang.ref.SoftReference; + import java.lang.ref.WeakReference; ++import java.util.ArrayList; + + import sun.java2d.Disposer; + import sun.java2d.pipe.BufferedContext; +@@ -66,6 +67,9 @@ + + static ReferenceQueue refQueue = Disposer.getQueue(); + ++ static ArrayList disposeListeners = new ArrayList(1); ++ ++ + /* Reference objects may have their referents cleared when GC chooses. + * During application client start-up there is typically at least one + * GC which causes the hotspot VM to clear soft (not just weak) references +@@ -108,6 +112,8 @@ + static int topLeftXOffset; + static int topLeftYOffset; + static int pixelDataOffset; ++ static int cacheCellOffset; ++ static int managedOffset; + static long invisibleGlyphPtr; From bugzilla-daemon at icedtea.classpath.org Wed Aug 4 03:50:30 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Aug 2010 10:50:30 +0000 Subject: [Bug 529] New: OpenJDK Shark VM warning: there may be trouble ahead Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=529 Summary: OpenJDK Shark VM warning: there may be trouble ahead Product: IcedTea Version: 6-hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Shark AssignedTo: unassigned at icedtea.classpath.org ReportedBy: xerxes at zafena.se When running a debug build of shark on ia32 i have spotted "OpenJDK Shark VM warning: there may be trouble ahead" several times in the jtreg logs. Some tests seems to triggerts more warnings than others, complete list attached below: langtools OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead Passed: com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead Passed: com/sun/javadoc/DocRootSlash/DocRootSlash.java OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead Passed: tools/javac/api/6437999/T6437999.java OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead Passed: tools/javac/BadOptimization/DeadCode4.java OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead Passed: tools/javac/generics/rare/Rare10.java jdk OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead Passed: com/sun/crypto/provider/Cipher/DES/PaddingTest.java OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead java/nio/channels/Channels/Basic.java None of the tests that triggers the warning have failed, actually all tests have passed so... Whats the trouble? I have testes Shark using icedtea6 hg tip ?ndring: 2202:3fdbfd1baf5e m?rke: tip anv?ndare: Xerxes R?nby datum: Thu Jul 29 13:33:33 2010 +0200 kortfattat: PR525: Shark made not entrant deopt sigsegv regression after bump to b20 and hs17 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Wed Aug 4 03:57:04 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Aug 2010 10:57:04 +0000 Subject: [Bug 529] OpenJDK Shark VM warning: there may be trouble ahead Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=529 ------- Comment #1 from xerxes at zafena.se 2010-08-04 10:57 ------- Testcase: The DES test seems to be a good candidate to reproduce this bug cd openjdk/jdk/test/com/sun/crypto/provider/Cipher/DES/ javac PaddingTest.java /home/xerxes/icedtea6-shark-b20/openjdk.build/bin/java PaddingTest =============================== DES ECB PKCS5Padding plain0 test child exited with 0 ... =============================== DES OFB NoPadding plain5 test child exited with 0 =============================== DES PCBC PKCS5Padding plain5 test OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead OpenJDK Shark VM warning: there may be trouble ahead child exited with 0 =============================== DES PCBC NoPadding plain5 test =============================== DESede ECB PKCS5Padding plain5 test child exited with 0 ... -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From omajid at redhat.com Wed Aug 4 14:46:47 2010 From: omajid at redhat.com (Omair Majid) Date: Wed, 04 Aug 2010 17:46:47 -0400 Subject: [RFC] netx: search for main method in superclasses of the main class Message-ID: <4C59DFC7.1010203@redhat.com> Hi, The attached patch makes netx search for the main method in the superclasses of the main class. This patch allows JOSM [1] to work with Netx. Some applications like JOSM declare a main class which does not contain a main method - the main method is declared in a superclass instead. The tar file attached contains a simple example of such an application. With the current version of netx, it throws an exception, saying that the main method can not be found. The attached patch moves some the method lookup code into a findMainMethod() which also loops through the superclasses looking for the main method if it is not found in the declared main class. Any comments or concerns? Cheers, Omair [1] http://josm.openstreetmap.de/download/josm.jnlp -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-jnlp-main-class-search-parents.patch Type: text/x-patch Size: 4150 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100804/53aaf4fb/icedtea6-jnlp-main-class-search-parents.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: main-inheritance-test.tar.gz Type: application/x-gzip Size: 2492 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100804/53aaf4fb/main-inheritance-test.tar.gz From xranby at icedtea.classpath.org Thu Aug 5 02:36:56 2010 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Thu, 05 Aug 2010 09:36:56 +0000 Subject: /hg/icedtea: Match Shark in icedtea6, makes OSR work by removing... Message-ID: changeset f4d94ae8a6ae in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f4d94ae8a6ae author: Xerxes R?nby date: Thu Aug 05 11:35:15 2010 +0200 Match Shark in icedtea6, makes OSR work by removing vestigal check. 2010-08-05 Xerxes R?nby * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp (SharkOSREntryCacher::process_monitor): Match Shark in icedtea6, makes OSR work by removing vestigal check. diffstat: 2 files changed, 6 insertions(+), 3 deletions(-) ChangeLog | 6 ++++++ ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 3 --- diffs (26 lines): diff -r a90ef7cbbb61 -r f4d94ae8a6ae ChangeLog --- a/ChangeLog Thu Jul 29 11:27:27 2010 +0100 +++ b/ChangeLog Thu Aug 05 11:35:15 2010 +0200 @@ -1,3 +1,9 @@ 2010-07-29 Andrew John Hughes + + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp + (SharkOSREntryCacher::process_monitor): Match Shark in icedtea6, + makes OSR work by removing vestigal check. + 2010-07-29 Andrew John Hughes * NEWS: Add 1.14 section. diff -r a90ef7cbbb61 -r f4d94ae8a6ae ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp --- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Thu Jul 29 11:27:27 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp Thu Aug 05 11:35:15 2010 +0200 @@ -179,9 +179,6 @@ void SharkOSREntryCacher::process_monito void SharkOSREntryCacher::process_monitor(int index, int box_offset, int obj_offset) { - if (max_monitors() > 1) - Unimplemented(); // XXX which order will they be in? - // Copy the monitor from the OSR buffer to the frame int src_offset = max_locals() + index * 2; builder()->CreateStore( From xranby at icedtea.classpath.org Thu Aug 5 02:45:56 2010 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Thu, 05 Aug 2010 09:45:56 +0000 Subject: /hg/icedtea: Update NEWS for Shark OSR fix. Message-ID: changeset e93b9abe3db7 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e93b9abe3db7 author: Xerxes R?nby date: Thu Aug 05 11:44:14 2010 +0200 Update NEWS for Shark OSR fix. 2010-08-05 Xerxes R?nby * NEWS: Updated for Shark OSR fix. diffstat: 2 files changed, 7 insertions(+) ChangeLog | 4 ++++ NEWS | 3 +++ diffs (22 lines): diff -r f4d94ae8a6ae -r e93b9abe3db7 ChangeLog --- a/ChangeLog Thu Aug 05 11:35:15 2010 +0200 +++ b/ChangeLog Thu Aug 05 11:44:14 2010 +0200 @@ -1,3 +1,7 @@ 2010-08-05 Xerxes R??nby + + * NEWS: Updated for Shark OSR fix. + 2010-08-05 Xerxes R??nby * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp diff -r f4d94ae8a6ae -r e93b9abe3db7 NEWS --- a/NEWS Thu Aug 05 11:35:15 2010 +0200 +++ b/NEWS Thu Aug 05 11:44:14 2010 +0200 @@ -1,4 +1,7 @@ New in release 1.14 (XXXX-XX-XX) New in release 1.14 (XXXX-XX-XX) + +* Zero/Shark + - Match Shark in icedtea6, makes OSR work by removing vestigal check. New in release 1.13 (2010-07-29) From ahughes at redhat.com Thu Aug 5 04:30:10 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 5 Aug 2010 12:30:10 +0100 Subject: [RFC] netx: search for main method in superclasses of the main class In-Reply-To: <4C59DFC7.1010203@redhat.com> References: <4C59DFC7.1010203@redhat.com> Message-ID: <20100805113010.GG6867@rivendell.middle-earth.co.uk> On 17:46 Wed 04 Aug , Omair Majid wrote: > Hi, > > The attached patch makes netx search for the main method in the > superclasses of the main class. This patch allows JOSM [1] to work with > Netx. > > Some applications like JOSM declare a main class which does not contain > a main method - the main method is declared in a superclass instead. The > tar file attached contains a simple example of such an application. With > the current version of netx, it throws an exception, saying that the > main method can not be found. The attached patch moves some the method > lookup code into a findMainMethod() which also loops through the > superclasses looking for the main method if it is not found in the > declared main class. > > Any comments or concerns? > > Cheers, > Omair > > [1] http://josm.openstreetmap.de/download/josm.jnlp > Using getMethod rather than getDeclaredMethod: http://download.oracle.com/javase/6/docs/api/java/lang/Class.html#getMethod%28java.lang.String,%20java.lang.Class...%29 would perform the looping over the superclasses and superinterfaces; 'Let C be the class represented by this object: 1. C is searched for any matching methods. If no matching method is found, the algorithm of step 1 is invoked recursively on the superclass of C. 2. If no method was found in step 1 above, the superinterfaces of C are searched for a matching method. If any such method is found, it is reflected.' -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From xranby at icedtea.classpath.org Thu Aug 5 04:47:36 2010 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Thu, 05 Aug 2010 11:47:36 +0000 Subject: /hg/icedtea6: 2 new changesets Message-ID: changeset 5be68dd68632 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5be68dd68632 author: Gary Benson date: Wed May 12 11:16:47 2010 +0100 LLVM 2.7 non-product fixes changeset 87f0c2edefcf in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=87f0c2edefcf author: Xerxes R?nby date: Thu Aug 05 13:45:36 2010 +0200 Updated NEWS and ChangeLog with LLVM 2.7 non-product fixes. 2010-08-05 Gary Benson * NEWS: Updated with LLVM 2.7 non-product fixes. * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Prevent LLVM headers to define DEBUG. * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp (SharkBuilder::CreateDump): Make non-product debug code LLVM 2.7 API compatible. diffstat: 4 files changed, 31 insertions(+), 2 deletions(-) ChangeLog | 9 +++++++++ NEWS | 1 + ports/hotspot/src/share/vm/shark/llvmHeaders.hpp | 15 ++++++++++++++- ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 8 +++++++- diffs (80 lines): diff -r 9da4f50c13c0 -r 87f0c2edefcf ChangeLog --- a/ChangeLog Wed Aug 04 00:46:09 2010 +0100 +++ b/ChangeLog Thu Aug 05 13:45:36 2010 +0200 @@ -1,3 +1,12 @@ 2010-08-03 Andrew John Hughes + + * NEWS: Updated with LLVM 2.7 non-product fixes. + * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: + Prevent LLVM headers to define DEBUG. + * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp + (SharkBuilder::CreateDump): Make non-product debug code + LLVM 2.7 API compatible. + 2010-08-03 Andrew John Hughes Backport latest XRender pipeline. diff -r 9da4f50c13c0 -r 87f0c2edefcf NEWS --- a/NEWS Wed Aug 04 00:46:09 2010 +0100 +++ b/NEWS Thu Aug 05 13:45:36 2010 +0200 @@ -701,6 +701,7 @@ New in release 1.9 (2010-XX-XX): - Fix stack leak in Shark - PR494: Shark fails to catch Exception using catch (Throwable e) - PR525: Shark made not entrant deopt sigsegv regression after bump to b20 and hs17. + - LLVM 2.7 non-product fixes. * NetX - Do not use Look and Feel related methods for setting up security dialogs - Minor fixes to JNLPRandomAccessFile diff -r 9da4f50c13c0 -r 87f0c2edefcf ports/hotspot/src/share/vm/shark/llvmHeaders.hpp --- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp Wed Aug 04 00:46:09 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp Thu Aug 05 13:45:36 2010 +0200 @@ -1,6 +1,6 @@ /* * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2008, 2009 Red Hat, Inc. + * Copyright 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,11 @@ #ifdef assert #undef assert +#endif + +#ifdef DEBUG + #define SHARK_DEBUG + #undef DEBUG #endif #include @@ -67,3 +72,11 @@ #else #define assert(p, msg) #endif + +#ifdef DEBUG + #undef DEBUG +#endif +#ifdef SHARK_DEBUG + #define DEBUG + #undef SHARK_DEBUG +#endif diff -r 9da4f50c13c0 -r 87f0c2edefcf ports/hotspot/src/share/vm/shark/sharkBuilder.cpp --- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Wed Aug 04 00:46:09 2010 +0100 +++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu Aug 05 13:45:36 2010 +0200 @@ -498,7 +498,13 @@ CallInst* SharkBuilder::CreateDump(Value if (isa(value->getType())) value = CreatePtrToInt(value, SharkType::intptr_type()); - else if (value->getType()->isInteger()) + else if (value->getType()-> +#if SHARK_LLVM_VERSION >= 27 + isIntegerTy() +#else + isInteger() +#endif + ) value = CreateIntCast(value, SharkType::intptr_type(), false); else Unimplemented(); From xranby at icedtea.classpath.org Thu Aug 5 04:59:29 2010 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Thu, 05 Aug 2010 11:59:29 +0000 Subject: /hg/icedtea: 2 new changesets Message-ID: changeset dfb6b319b123 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=dfb6b319b123 author: Gary Benson date: Wed May 12 11:16:47 2010 +0100 LLVM 2.7 non-product fixes changeset 56af4f9369ca in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=56af4f9369ca author: Xerxes R?nby date: Thu Aug 05 13:57:44 2010 +0200 Updated NEWS and ChangeLog with LLVM 2.7 non-product fixes. 2010-08-05 Gary Benson * NEWS: Updated with LLVM 2.7 non-product fixes. * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Prevent LLVM headers to define DEBUG. * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp (SharkBuilder::CreateDump): Make non-product debug code LLVM 2.7 API compatible. diffstat: 4 files changed, 31 insertions(+), 2 deletions(-) ChangeLog | 9 +++++++++ NEWS | 1 + ports/hotspot/src/share/vm/shark/llvmHeaders.hpp | 15 ++++++++++++++- ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 8 +++++++- diffs (80 lines): diff -r e93b9abe3db7 -r 56af4f9369ca ChangeLog --- a/ChangeLog Thu Aug 05 11:44:14 2010 +0200 +++ b/ChangeLog Thu Aug 05 13:57:44 2010 +0200 @@ -1,3 +1,12 @@ 2010-08-05 Xerxes R??nby + + * NEWS: Updated with LLVM 2.7 non-product fixes. + * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: + Prevent LLVM headers to define DEBUG. + * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp + (SharkBuilder::CreateDump): Make non-product debug code + LLVM 2.7 API compatible. + 2010-08-05 Xerxes R??nby * NEWS: Updated for Shark OSR fix. diff -r e93b9abe3db7 -r 56af4f9369ca NEWS --- a/NEWS Thu Aug 05 11:44:14 2010 +0200 +++ b/NEWS Thu Aug 05 13:57:44 2010 +0200 @@ -2,6 +2,7 @@ New in release 1.14 (XXXX-XX-XX) * Zero/Shark - Match Shark in icedtea6, makes OSR work by removing vestigal check. + - LLVM 2.7 non-product fixes. New in release 1.13 (2010-07-29) diff -r e93b9abe3db7 -r 56af4f9369ca ports/hotspot/src/share/vm/shark/llvmHeaders.hpp --- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp Thu Aug 05 11:44:14 2010 +0200 +++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp Thu Aug 05 13:57:44 2010 +0200 @@ -1,6 +1,6 @@ /* * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved. - * Copyright 2008, 2009 Red Hat, Inc. + * Copyright 2008, 2009, 2010 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,6 +25,11 @@ #ifdef assert #undef assert +#endif + +#ifdef DEBUG + #define SHARK_DEBUG + #undef DEBUG #endif #include @@ -67,3 +72,11 @@ #else #define assert(p, msg) #endif + +#ifdef DEBUG + #undef DEBUG +#endif +#ifdef SHARK_DEBUG + #define DEBUG + #undef SHARK_DEBUG +#endif diff -r e93b9abe3db7 -r 56af4f9369ca ports/hotspot/src/share/vm/shark/sharkBuilder.cpp --- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu Aug 05 11:44:14 2010 +0200 +++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu Aug 05 13:57:44 2010 +0200 @@ -498,7 +498,13 @@ CallInst* SharkBuilder::CreateDump(Value if (isa(value->getType())) value = CreatePtrToInt(value, SharkType::intptr_type()); - else if (value->getType()->isInteger()) + else if (value->getType()-> +#if SHARK_LLVM_VERSION >= 27 + isIntegerTy() +#else + isInteger() +#endif + ) value = CreateIntCast(value, SharkType::intptr_type(), false); else Unimplemented(); From xranby at icedtea.classpath.org Thu Aug 5 05:13:57 2010 From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org) Date: Thu, 05 Aug 2010 12:13:57 +0000 Subject: /hg/icedtea: 2 new changesets Message-ID: changeset 64780a32846a in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=64780a32846a author: Xerxes R?nby date: Fri Nov 06 13:03:15 2009 +0100 Correct suffix for the llvm.atomic.cmp.swap intrinsic. 2009-11-06 Xerxes R?nby * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp (SharkBuilder::cmpxchg_int): Correct suffix for the llvm.atomic.cmp.swap intrinsic. (SharkBuilder::cmpxchg_ptr): Likewise. changeset 90b892525f1b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=90b892525f1b author: Xerxes R?nby date: Thu Aug 05 14:12:08 2010 +0200 Updated NEWS with correct suffix for the llvm.atomic.cmp.swap intrinsic fixes. 2010-08-05 Xerxes R?nby * NEWS: Updated with correct suffix for the llvm.atomic.cmp.swap intrinsic fixes. diffstat: 3 files changed, 15 insertions(+), 2 deletions(-) ChangeLog | 12 ++++++++++++ NEWS | 1 + ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 4 ++-- diffs (51 lines): diff -r 56af4f9369ca -r 90b892525f1b ChangeLog --- a/ChangeLog Thu Aug 05 13:57:44 2010 +0200 +++ b/ChangeLog Thu Aug 05 14:12:08 2010 +0200 @@ -1,3 +1,15 @@ 2010-08-05 Gary Benson + + * NEWS: Updated with correct suffix for the + llvm.atomic.cmp.swap intrinsic fixes. + +2010-08-05 Xerxes R??nby + + * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp + (SharkBuilder::cmpxchg_int): Correct suffix for the + llvm.atomic.cmp.swap intrinsic. + (SharkBuilder::cmpxchg_ptr): Likewise. + 2010-08-05 Gary Benson * NEWS: Updated with LLVM 2.7 non-product fixes. diff -r 56af4f9369ca -r 90b892525f1b NEWS --- a/NEWS Thu Aug 05 13:57:44 2010 +0200 +++ b/NEWS Thu Aug 05 14:12:08 2010 +0200 @@ -3,6 +3,7 @@ New in release 1.14 (XXXX-XX-XX) * Zero/Shark - Match Shark in icedtea6, makes OSR work by removing vestigal check. - LLVM 2.7 non-product fixes. + - Correct suffix for the llvm.atomic.cmp.swap intrinsic. New in release 1.13 (2010-07-29) diff -r 56af4f9369ca -r 90b892525f1b ports/hotspot/src/share/vm/shark/sharkBuilder.cpp --- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu Aug 05 13:57:44 2010 +0200 +++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Thu Aug 05 14:12:08 2010 +0200 @@ -369,7 +369,7 @@ Value* SharkBuilder::cmpxchg_int() { #ifdef ARM (address) zero_cmpxchg_int, #else - "llvm.atomic.cmp.swap.i32", + "llvm.atomic.cmp.swap.i32.p0i32", #endif // ARM "Iii", "i"); } @@ -387,7 +387,7 @@ Value* SharkBuilder::cmpxchg_ptr() { #ifdef ARM (address) zero_cmpxchg_ptr, #else - "llvm.atomic.cmp.swap.i" LP64_ONLY("64") NOT_LP64("32"), + "llvm.atomic.cmp.swap.i" LP64_ONLY("64") NOT_LP64("32") ".p0i" LP64_ONLY("64") NOT_LP64("32"), #endif // ARM "Xxx", "x"); } From xerxes at zafena.se Thu Aug 5 05:39:55 2010 From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=) Date: Thu, 05 Aug 2010 14:39:55 +0200 Subject: Shark hg repositories are now in harmony. Message-ID: <4C5AB11B.3070802@zafena.se> Hi all! I have harmonized all the three different Shark hg repositories in use by back-porting changes in between them. The three different shark repositories are: http://icedtea.classpath.org/hg/shark/hotspot This are the current "main" Shark hg repository where Gary does his work and makes sure that shark are ready to be included upstream into OpenJDK. This repository are targets the latest Hotspot hs19. http://icedtea.classpath.org/hg/icedtea This are the icedtea 7 hg repository containing the version of Shark fixed to work with Hotspot hs18 and OpenJDK 7. Today i have back-ported and pushed a fix to icedtea6 from the "main" shark repository to make Shark build with LLVM 2.7 on non-product builds. http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009915.html I have also pushed some changes to make it in sync with the icedtea6 hg. http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009911.html - Match Shark in icedtea6, makes OSR work by removing vestigal check. http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009916.html - Match Shark in icedtea6, Correct suffix for the llvm.atomic.cmp.swap intrinsic. http://icedtea.classpath.org/hg/icedtea6 This are the icedtea6 hg repository containing the version of Shark that currently gets packaged and used by various linux distributions. This repository are fixed to work with Hotspot hs17. Today i have backported and pushed a fix to icedtea6 from the "main" shark repository to make Shark build with LLVM 2.7 on non-product builds. http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009914.html With these fixes in place all Shark hg repository HEAD's are now in harmony, they can bootstrap them self nicely and runs rock stable. Cheers and have a great day! Xerxes From gbenson at redhat.com Thu Aug 5 05:48:30 2010 From: gbenson at redhat.com (Gary Benson) Date: Thu, 5 Aug 2010 13:48:30 +0100 Subject: Shark hg repositories are now in harmony. In-Reply-To: <4C5AB11B.3070802@zafena.se> References: <4C5AB11B.3070802@zafena.se> Message-ID: <20100805124830.GC3799@redhat.com> Xerxes R?nby wrote: > Hi all! > > I have harmonized all the three different Shark hg repositories in > use by back-porting changes in between them. [snip] > With these fixes in place all Shark hg repository HEAD's are now in > harmony, they can bootstrap them self nicely and runs rock stable. Awesome work, thank you Xerxes! Cheers, Gary -- http://gbenson.net/ From omajid at redhat.com Thu Aug 5 06:55:06 2010 From: omajid at redhat.com (Omair Majid) Date: Thu, 05 Aug 2010 09:55:06 -0400 Subject: [RFC] netx: search for main method in superclasses of the main class In-Reply-To: <20100805113010.GG6867@rivendell.middle-earth.co.uk> References: <4C59DFC7.1010203@redhat.com> <20100805113010.GG6867@rivendell.middle-earth.co.uk> Message-ID: <4C5AC2BA.6030609@redhat.com> On 08/05/2010 07:30 AM, Dr Andrew John Hughes wrote: > On 17:46 Wed 04 Aug , Omair Majid wrote: >> Hi, >> >> The attached patch makes netx search for the main method in the >> superclasses of the main class. This patch allows JOSM [1] to work with >> Netx. >> >> Some applications like JOSM declare a main class which does not contain >> a main method - the main method is declared in a superclass instead. The >> tar file attached contains a simple example of such an application. With >> the current version of netx, it throws an exception, saying that the >> main method can not be found. The attached patch moves some the method >> lookup code into a findMainMethod() which also loops through the >> superclasses looking for the main method if it is not found in the >> declared main class. >> >> Any comments or concerns? >> >> Cheers, >> Omair >> >> [1] http://josm.openstreetmap.de/download/josm.jnlp >> > > Using getMethod rather than getDeclaredMethod: > > http://download.oracle.com/javase/6/docs/api/java/lang/Class.html#getMethod%28java.lang.String,%20java.lang.Class...%29 > > would perform the looping over the superclasses and superinterfaces; > > 'Let C be the class represented by this object: > > 1. C is searched for any matching methods. If no matching method is found, the algorithm of step 1 is invoked recursively on the superclass of C. > 2. If no method was found in step 1 above, the superinterfaces of C are searched for a matching method. If any such method is found, it is reflected.' > Thanks, that makes the patch alot simpler :) Attaching the updated patch. Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-jnlp-main-class-search-parents.patch Type: text/x-patch Size: 634 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100805/34638d20/icedtea6-jnlp-main-class-search-parents.patch From dbhole at redhat.com Thu Aug 5 07:17:36 2010 From: dbhole at redhat.com (Deepak Bhole) Date: Thu, 5 Aug 2010 10:17:36 -0400 Subject: [RFC] netx: search for main method in superclasses of the main class In-Reply-To: <4C5AC2BA.6030609@redhat.com> References: <4C59DFC7.1010203@redhat.com> <20100805113010.GG6867@rivendell.middle-earth.co.uk> <4C5AC2BA.6030609@redhat.com> Message-ID: <20100805141735.GB32209@redhat.com> * Omair Majid [2010-08-05 09:55]: > On 08/05/2010 07:30 AM, Dr Andrew John Hughes wrote: > >On 17:46 Wed 04 Aug , Omair Majid wrote: > >>Hi, > >> > >>The attached patch makes netx search for the main method in the > >>superclasses of the main class. This patch allows JOSM [1] to work with > >>Netx. > >> > >>Some applications like JOSM declare a main class which does not contain > >>a main method - the main method is declared in a superclass instead. The > >>tar file attached contains a simple example of such an application. With > >>the current version of netx, it throws an exception, saying that the > >>main method can not be found. The attached patch moves some the method > >>lookup code into a findMainMethod() which also loops through the > >>superclasses looking for the main method if it is not found in the > >>declared main class. > >> > >>Any comments or concerns? > >> > >>Cheers, > >>Omair > >> > >>[1] http://josm.openstreetmap.de/download/josm.jnlp > >> > > > >Using getMethod rather than getDeclaredMethod: > > > >http://download.oracle.com/javase/6/docs/api/java/lang/Class.html#getMethod%28java.lang.String,%20java.lang.Class...%29 > > > >would perform the looping over the superclasses and superinterfaces; > > > >'Let C be the class represented by this object: > > > > 1. C is searched for any matching methods. If no matching method is found, the algorithm of step 1 is invoked recursively on the superclass of C. > > 2. If no method was found in step 1 above, the superinterfaces of C are searched for a matching method. If any such method is found, it is reflected.' > > > > Thanks, that makes the patch alot simpler :) Attaching the updated patch. > Hah! :) Approved for commit into 1.7, 1.8 and HEAD. Deepak > Cheers, > Omair > diff -r 9da4f50c13c0 netx/net/sourceforge/jnlp/Launcher.java > --- a/netx/net/sourceforge/jnlp/Launcher.java Wed Aug 04 00:46:09 2010 +0100 > +++ b/netx/net/sourceforge/jnlp/Launcher.java Thu Aug 05 09:53:20 2010 -0400 > @@ -441,7 +441,7 @@ > > Class mainClass = app.getClassLoader().loadClass(mainName); > > - Method main = mainClass.getDeclaredMethod("main", new Class[] {String[].class} ); > + Method main = mainClass.getMethod("main", new Class[] {String[].class} ); > String args[] = file.getApplication().getArguments(); > > SwingUtilities.invokeAndWait(new Runnable() { From ahughes at redhat.com Thu Aug 5 08:43:48 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 5 Aug 2010 16:43:48 +0100 Subject: Shark hg repositories are now in harmony. In-Reply-To: <4C5AB11B.3070802@zafena.se> References: <4C5AB11B.3070802@zafena.se> Message-ID: On 5 August 2010 13:39, Xerxes R?nby wrote: > Hi all! > > I have harmonized all the three different Shark hg repositories in use > by back-porting changes in between them. Thanks for doing this. > The three different shark repositories are: > > http://icedtea.classpath.org/hg/shark/hotspot > This are the current "main" Shark hg repository where Gary does his work > and makes sure that shark are ready to be included upstream into OpenJDK. > This repository are targets the latest Hotspot hs19. > > http://icedtea.classpath.org/hg/icedtea > This are the icedtea 7 hg repository containing the version of Shark > fixed to work with Hotspot hs18 and OpenJDK 7. > Today i have back-ported and pushed a fix to icedtea6 from the "main" > shark repository to make Shark build with LLVM 2.7 on non-product builds. > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009915.html > I have also pushed some changes to make it in sync with the icedtea6 hg. > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009911.html > - Match Shark in icedtea6, makes OSR work by removing vestigal check. > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009916.html > - Match Shark in icedtea6, Correct suffix for the llvm.atomic.cmp.swap > intrinsic. > Does this actually build now? It's never worked for me before. Please be aware that IcedTea7 will be bumping up to the latest OpenJDK7 now 1.13 is out. > http://icedtea.classpath.org/hg/icedtea6 > This are the icedtea6 hg repository containing the version of Shark that > currently gets packaged and used by various linux distributions. Does Shark get packaged? I wasn't aware of this. > This repository are fixed to work with Hotspot hs17. > Today i have backported and pushed a fix to icedtea6 from the "main" > shark repository to make Shark build with LLVM 2.7 on non-product builds. > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009914.html > > With these fixes in place all Shark hg repository HEAD's are now in > harmony, they can bootstrap them self nicely and runs rock stable. > > Cheers and have a great day! You too! Great work. > Xerxes > > > > > > > > > > > -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA? 7927 142C 2591 94EF D9D8 From andrew at icedtea.classpath.org Thu Aug 5 08:58:41 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 05 Aug 2010 15:58:41 +0000 Subject: /hg/icedtea6: D560056: Avoid failure when net.ipv6.bindv6only is... Message-ID: changeset 6530d2aa9076 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6530d2aa9076 author: Andrew John Hughes date: Thu Aug 05 16:58:30 2010 +0100 D560056: Avoid failure when net.ipv6.bindv6only is set to 1. 2010-08-05 Andrew John Hughes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560056 * Makefile.am: Add new patch. * NEWS: Add bug fix and key for bug URLs. * patches/ipv4-mapped-ipv6-addresses.patch: New patch and test case from Torsten Werner . * THANKYOU: Updated. diffstat: 5 files changed, 195 insertions(+), 1 deletion(-) ChangeLog | 10 + Makefile.am | 3 NEWS | 11 + THANKYOU | 1 patches/ipv4-mapped-ipv6-addresses.patch | 171 ++++++++++++++++++++++++++++++ diffs (239 lines): diff -r 87f0c2edefcf -r 6530d2aa9076 ChangeLog --- a/ChangeLog Thu Aug 05 13:45:36 2010 +0200 +++ b/ChangeLog Thu Aug 05 16:58:30 2010 +0100 @@ -1,3 +1,13 @@ 2010-08-05 Gary Benson + + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560056 + * Makefile.am: Add new patch. + * NEWS: Add bug fix and key for bug URLs. + * patches/ipv4-mapped-ipv6-addresses.patch: + New patch and test case from Torsten Werner + . + * THANKYOU: Updated. + 2010-08-05 Gary Benson * NEWS: Updated with LLVM 2.7 non-product fixes. diff -r 87f0c2edefcf -r 6530d2aa9076 Makefile.am --- a/Makefile.am Thu Aug 05 13:45:36 2010 +0200 +++ b/Makefile.am Thu Aug 05 16:58:30 2010 +0100 @@ -287,7 +287,8 @@ ICEDTEA_PATCHES = \ patches/openjdk/6668231-ssl_cert.patch \ patches/openjdk/6967533-pre_epoch.patch \ patches/fonts-rhel.patch \ - patches/fonts-gentoo.patch + patches/fonts-gentoo.patch \ + patches/ipv4-mapped-ipv6-addresses.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r 87f0c2edefcf -r 6530d2aa9076 NEWS --- a/NEWS Thu Aug 05 13:45:36 2010 +0200 +++ b/NEWS Thu Aug 05 16:58:30 2010 +0100 @@ -1,3 +1,13 @@ New in release 1.9 (2010-XX-XX): +Key: + +SX - http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6969395 +PRX - http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=X +RHX - https://bugzilla.redhat.com/show_bug.cgi?id=X +DX - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=X +GX - http://bugs.gentoo.org/show_bug.cgi?id=X + +CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY + New in release 1.9 (2010-XX-XX): * Updated to OpenJDK6 b20 with HotSpot 17. @@ -693,6 +703,7 @@ New in release 1.9 (2010-XX-XX): * Fixes: - Provide font configuration for RHEL 6. - G266295: Provide font configuration for Gentoo. + - D560056: Avoid failure when net.ipv6.bindv6only is set to 1. * Zero/Shark - Update Shark for LLVM 2.8 API change r100304 - Shark calling static jni methods jclass argument fix. diff -r 87f0c2edefcf -r 6530d2aa9076 THANKYOU --- a/THANKYOU Thu Aug 05 13:45:36 2010 +0200 +++ b/THANKYOU Thu Aug 05 16:58:30 2010 +0100 @@ -6,3 +6,4 @@ us know. Please keep this list in alphab Alon Bar-Lev (alon.barlev at gmail.com) C. K. Jester-Young (cky944 at gmail.com) +Torsten Werner (mail.twerner at googlemail.com) \ No newline at end of file diff -r 87f0c2edefcf -r 6530d2aa9076 patches/ipv4-mapped-ipv6-addresses.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ipv4-mapped-ipv6-addresses.patch Thu Aug 05 16:58:30 2010 +0100 @@ -0,0 +1,171 @@ +diff -ruN openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c openjdk/jdk/src/solaris/native/java/net/linux_close.c +--- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c 2010-02-17 04:14:47.000000000 +0100 ++++ openjdk/jdk/src/solaris/native/java/net/linux_close.c 2010-03-27 20:24:26.000000000 +0100 +@@ -37,6 +37,8 @@ + + #include + ++#include "net_util.h" ++ + /* + * Stack allocated by thread when doing blocking operation + */ +@@ -301,9 +303,16 @@ + BLOCKING_IO_RETURN_INT( s, accept(s, addr, addrlen) ); + } + +-int NET_Connect(int s, struct sockaddr *addr, int addrlen) { ++static int NET_Connect_final(int s, struct sockaddr *addr, int addrlen) { + BLOCKING_IO_RETURN_INT( s, connect(s, addr, addrlen) ); + } ++int NET_Connect(int s, struct sockaddr *addr, int addrlen) { ++ int rv = check_ipv4mapped_address(s, addr); ++ if (rv < 0) { ++ return rv; ++ } ++ return NET_Connect_final(s, addr, addrlen); ++} + + #ifndef USE_SELECT + int NET_Poll(struct pollfd *ufds, unsigned int nfds, int timeout) { +diff -ruN openjdk.orig/jdk/src/solaris/native/java/net/net_util_md.c openjdk/jdk/src/solaris/native/java/net/net_util_md.c +--- openjdk.orig/jdk/src/solaris/native/java/net/net_util_md.c 2010-02-17 04:14:47.000000000 +0100 ++++ openjdk/jdk/src/solaris/native/java/net/net_util_md.c 2010-03-27 19:44:32.000000000 +0100 +@@ -1215,6 +1215,39 @@ + return setsockopt(fd, level, opt, arg, len); + } + ++/* ++ * Check for IPv4 mapped or unspecified IPv6 addresses and disable ++ * IPV6_V6ONLY in such cases. This function is called from NET_Bind and ++ * NET_Connect and fixes ++ * http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6342561 . ++ */ ++int ++check_ipv4mapped_address(int fd, struct sockaddr *him) ++{ ++#if defined(AF_INET6) ++ if (ipv6_available()) { ++ struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)him; ++ /* switch off IPV6_V6ONLY if needed */ ++ if (IN6_IS_ADDR_V4MAPPED(& him6->sin6_addr) || ++ IN6_IS_ADDR_UNSPECIFIED(& him6->sin6_addr)) { ++ int value = 42; ++ int len = sizeof(value); ++ int rv = getsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, ++ &value, &len); ++ if (rv < 0) { ++ return rv; ++ } ++ if (value > 0) { ++ value = 0; ++ return setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, ++ &value, sizeof(value)); ++ } ++ } ++ } ++#endif ++ return 0; ++} ++ + /* + * Wrapper for bind system call - performs any necessary pre/post + * processing to deal with OS specific issues :- +@@ -1251,6 +1284,11 @@ + } + #endif + ++ rv = check_ipv4mapped_address(fd, him); ++ if (rv < 0) { ++ return rv; ++ } ++ + #if defined(__solaris__) && defined(AF_INET6) + /* + * Solaris 8/9 have seperate IPv4 and IPv6 port spaces so we +diff -ruN openjdk.orig/jdk/src/solaris/native/java/net/net_util_md.h openjdk/jdk/src/solaris/native/java/net/net_util_md.h +--- openjdk.orig/jdk/src/solaris/native/java/net/net_util_md.h 2010-02-17 04:14:47.000000000 +0100 ++++ openjdk/jdk/src/solaris/native/java/net/net_util_md.h 2010-03-27 20:24:26.000000000 +0100 +@@ -36,6 +36,7 @@ + #include + #endif + ++extern int check_ipv4mapped_address(int fd, struct sockaddr *him); + + #ifdef __linux__ + extern int NET_Timeout(int s, long timeout); +diff -ruN openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c +--- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-03-27 20:23:58.000000000 +0100 ++++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-03-27 20:24:26.000000000 +0100 +@@ -401,8 +401,9 @@ + */ + SET_NONBLOCKING(fd); + +- /* no need to use NET_Connect as non-blocking */ +- connect_rv = connect(fd, (struct sockaddr *)&him, len); ++ /* no need to use NET_Connect as non-blocking; BUT! We want to ++ * support IPv4 mapped IPv6 adresses. */ ++ connect_rv = NET_Connect(fd, (struct sockaddr *)&him, len); + + /* connection not established immediately */ + if (connect_rv != 0) { +--- /dev/null 2010-08-03 19:26:41.444667773 +0100 ++++ openjdk/jdk/test/java/net/Socket/Bindv6Only.java 2010-08-05 15:41:55.000000000 +0100 +@@ -0,0 +1,57 @@ ++// test for IPv6 related issues in Sun's JDK for Linux ++ ++// before running the test you need to execute ++// sudo sysctl -w net.ipv6.bindv6only=1 ++ ++// Author: Torsten Werner ++// public domain ++ ++// Adapted for JTreg by Andrew John Hughes ++ ++/* ++ * @test ++ * @bug 6342561 ++ * @summary Socket doesn't work with net.ipv6.bindv6only turned on ++ * @library ../../.. ++ */ ++ ++import java.io.*; ++import java.net.*; ++ ++public class Bindv6Only { ++ ++ public static void main(String [] args) throws IOException { ++ InetAddress localAddress = null; ++ InetAddress remoteAddress = null; ++ localAddress = InetAddress.getByName(InetAddress.getLocalHost().getHostName()); ++ remoteAddress = InetAddress.getByName(TestEnv.getProperty("host")); ++ ++ int remotePort = 7; ++ Socket testSocket = null; ++ ++ System.out.print("Test #1... "); ++ try { ++ testSocket = new Socket(remoteAddress, remotePort, localAddress, 0); ++ System.out.println("passed."); ++ } catch (IOException e) { ++ throw new ++ RuntimeException("Failed to connect from specified local address", e); ++ } ++ ++ System.out.print("Test #2... "); ++ try { ++ testSocket = new Socket(remoteAddress, remotePort, null, 0); ++ System.out.println("passed."); ++ } catch (IOException e) { ++ throw new RuntimeException("Failed to connect from localhost", e); ++ } ++ ++ System.out.print("Test #3... "); ++ try { ++ testSocket = new Socket(remoteAddress, remotePort); ++ System.out.println("passed."); ++ } catch (IOException e) { ++ throw new RuntimeException("Failed to connect from default local address and port."); ++ } ++ } ++} From omajid at icedtea.classpath.org Thu Aug 5 14:41:19 2010 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 05 Aug 2010 21:41:19 +0000 Subject: /hg/icedtea6: netx: use getMethod instead of getDeclaredMethod t... Message-ID: changeset e9de4114620e in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e9de4114620e author: Omair Majid date: Thu Aug 05 17:40:41 2010 -0400 netx: use getMethod instead of getDeclaredMethod to find main method 2010-08-05 Omair Majid * NEWS: Update with netx bugfix. * netx/net/sourceforge/jnlp/Launcher.java (launchApplication): Replace use of getDeclaredMethod with getMethod. Fixes applications that have a main-class that inherits main(String[]). diffstat: 3 files changed, 10 insertions(+), 1 deletion(-) ChangeLog | 8 ++++++++ NEWS | 1 + netx/net/sourceforge/jnlp/Launcher.java | 2 +- diffs (38 lines): diff -r 6530d2aa9076 -r e9de4114620e ChangeLog --- a/ChangeLog Thu Aug 05 16:58:30 2010 +0100 +++ b/ChangeLog Thu Aug 05 17:40:41 2010 -0400 @@ -1,3 +1,11 @@ 2010-08-05 Andrew John Hughes + + * NEWS: Update with netx bugfix. + * netx/net/sourceforge/jnlp/Launcher.java + (launchApplication): Replace use of getDeclaredMethod with + getMethod. Fixes applications that have a main-class that + inherits main(String[]). + 2010-08-05 Andrew John Hughes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560056 diff -r 6530d2aa9076 -r e9de4114620e NEWS --- a/NEWS Thu Aug 05 16:58:30 2010 +0100 +++ b/NEWS Thu Aug 05 17:40:41 2010 -0400 @@ -717,6 +717,7 @@ New in release 1.9 (2010-XX-XX): - Do not use Look and Feel related methods for setting up security dialogs - Minor fixes to JNLPRandomAccessFile - Fix browser command in BasicService.showDocument(URL) + - Run programs that inherit main(String[]) in their main-class New in release 1.8.1 (2010-07-28): diff -r 6530d2aa9076 -r e9de4114620e netx/net/sourceforge/jnlp/Launcher.java --- a/netx/net/sourceforge/jnlp/Launcher.java Thu Aug 05 16:58:30 2010 +0100 +++ b/netx/net/sourceforge/jnlp/Launcher.java Thu Aug 05 17:40:41 2010 -0400 @@ -441,7 +441,7 @@ public class Launcher { Class mainClass = app.getClassLoader().loadClass(mainName); - Method main = mainClass.getDeclaredMethod("main", new Class[] {String[].class} ); + Method main = mainClass.getMethod("main", new Class[] {String[].class} ); String args[] = file.getApplication().getArguments(); SwingUtilities.invokeAndWait(new Runnable() { From omajid at icedtea.classpath.org Thu Aug 5 14:46:20 2010 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 05 Aug 2010 21:46:20 +0000 Subject: /hg/release/icedtea6-1.8: netx: use getMethod instead of getDecl... Message-ID: changeset c2fdeca9dbb7 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=c2fdeca9dbb7 author: Omair Majid date: Thu Aug 05 17:45:47 2010 -0400 netx: use getMethod instead of getDeclaredMethod to find main method 2010-08-05 Omair Majid * NEWS: Update with netx bugfix. * netx/net/sourceforge/jnlp/Launcher.java (launchApplication): Replace use of getDeclaredMethod with getMethod. Fixes applications that have a main-class that inherits main(String[]). diffstat: 3 files changed, 10 insertions(+), 1 deletion(-) ChangeLog | 8 ++++++++ NEWS | 1 + netx/net/sourceforge/jnlp/Launcher.java | 2 +- diffs (38 lines): diff -r 846a4c007c96 -r c2fdeca9dbb7 ChangeLog --- a/ChangeLog Fri Jul 30 16:04:20 2010 -0400 +++ b/ChangeLog Thu Aug 05 17:45:47 2010 -0400 @@ -1,3 +1,11 @@ 2010-07-30 Man Lung Wong + + * NEWS: Update with netx bugfix. + * netx/net/sourceforge/jnlp/Launcher.java + (launchApplication): Replace use of getDeclaredMethod with + getMethod. Fixes applications that have a main-class that + inherits main(String[]). + 2010-07-30 Man Lung Wong * netx/net/sourceforge/jnlp/Launcher.java (launchApplication): Make sure an Event Dispatch Thread diff -r 846a4c007c96 -r c2fdeca9dbb7 NEWS --- a/NEWS Fri Jul 30 16:04:20 2010 -0400 +++ b/NEWS Thu Aug 05 17:45:47 2010 -0400 @@ -2,6 +2,7 @@ New in release 1.8.2 (XXXX-XX-XX): - NetX: - Fix browser command in BasicService.showDocument(URL) + - Run programs that inherit main(String[]) in their main-class New in release 1.8.1 (2010-07-28): diff -r 846a4c007c96 -r c2fdeca9dbb7 netx/net/sourceforge/jnlp/Launcher.java --- a/netx/net/sourceforge/jnlp/Launcher.java Fri Jul 30 16:04:20 2010 -0400 +++ b/netx/net/sourceforge/jnlp/Launcher.java Thu Aug 05 17:45:47 2010 -0400 @@ -441,7 +441,7 @@ public class Launcher { Class mainClass = app.getClassLoader().loadClass(mainName); - Method main = mainClass.getDeclaredMethod("main", new Class[] {String[].class} ); + Method main = mainClass.getMethod("main", new Class[] {String[].class} ); String args[] = file.getApplication().getArguments(); SwingUtilities.invokeAndWait(new Runnable() { From omajid at icedtea.classpath.org Thu Aug 5 14:52:27 2010 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Thu, 05 Aug 2010 21:52:27 +0000 Subject: /hg/release/icedtea6-1.7: netx: use getMethod instead of getDecl... Message-ID: changeset c5c7cfebb101 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=c5c7cfebb101 author: Omair Majid date: Thu Aug 05 17:52:08 2010 -0400 netx: use getMethod instead of getDeclaredMethod to find main method 2010-08-05 Omair Majid * NEWS: Update with netx bugfix. * rt/net/sourceforge/jnlp/Launcher.java (launchApplication): Replace use of getDeclaredMethod with getMethod. Fixes applications that have a main-class that inherits main(String[]). diffstat: 3 files changed, 10 insertions(+), 1 deletion(-) ChangeLog | 8 ++++++++ NEWS | 1 + rt/net/sourceforge/jnlp/Launcher.java | 2 +- diffs (38 lines): diff -r 9e75f57aae29 -r c5c7cfebb101 ChangeLog --- a/ChangeLog Fri Jul 30 16:06:02 2010 -0400 +++ b/ChangeLog Thu Aug 05 17:52:08 2010 -0400 @@ -1,3 +1,11 @@ 2010-07-30 Man Lung Wong + + * NEWS: Update with netx bugfix. + * rt/net/sourceforge/jnlp/Launcher.java + (launchApplication): Replace use of getDeclaredMethod with + getMethod. Fixes applications that have a main-class that + inherits main(String[]). + 2010-07-30 Man Lung Wong * netx/net/sourceforge/jnlp/Launcher.java (launchApplication): Make sure an Event Dispatch Thread diff -r 9e75f57aae29 -r c5c7cfebb101 NEWS --- a/NEWS Fri Jul 30 16:06:02 2010 -0400 +++ b/NEWS Thu Aug 05 17:52:08 2010 -0400 @@ -2,6 +2,7 @@ New in release 1.7.5 (XXXX-XX-XX): * NetX - Fix browser command in BasicService.showDocument(URL) + - Run programs that inherit main(String[]) in their main-class New in release 1.7.4 (2010-07-28): diff -r 9e75f57aae29 -r c5c7cfebb101 rt/net/sourceforge/jnlp/Launcher.java --- a/rt/net/sourceforge/jnlp/Launcher.java Fri Jul 30 16:06:02 2010 -0400 +++ b/rt/net/sourceforge/jnlp/Launcher.java Thu Aug 05 17:52:08 2010 -0400 @@ -441,7 +441,7 @@ public class Launcher { Class mainClass = app.getClassLoader().loadClass(mainName); - Method main = mainClass.getDeclaredMethod("main", new Class[] {String[].class} ); + Method main = mainClass.getMethod("main", new Class[] {String[].class} ); String args[] = file.getApplication().getArguments(); SwingUtilities.invokeAndWait(new Runnable() { From omajid at redhat.com Thu Aug 5 14:55:30 2010 From: omajid at redhat.com (Omair Majid) Date: Thu, 05 Aug 2010 17:55:30 -0400 Subject: [RFC] netx: search for main method in superclasses of the main class In-Reply-To: <20100805141735.GB32209@redhat.com> References: <4C59DFC7.1010203@redhat.com> <20100805113010.GG6867@rivendell.middle-earth.co.uk> <4C5AC2BA.6030609@redhat.com> <20100805141735.GB32209@redhat.com> Message-ID: <4C5B3352.1040204@redhat.com> On 08/05/2010 10:17 AM, Deepak Bhole wrote: > * Omair Majid [2010-08-05 09:55]: >> On 08/05/2010 07:30 AM, Dr Andrew John Hughes wrote: >>> On 17:46 Wed 04 Aug , Omair Majid wrote: >>>> Hi, >>>> >>>> The attached patch makes netx search for the main method in the >>>> superclasses of the main class. This patch allows JOSM [1] to work with >>>> Netx. >>>> >>>> Some applications like JOSM declare a main class which does not contain >>>> a main method - the main method is declared in a superclass instead. The >>>> tar file attached contains a simple example of such an application. With >>>> the current version of netx, it throws an exception, saying that the >>>> main method can not be found. The attached patch moves some the method >>>> lookup code into a findMainMethod() which also loops through the >>>> superclasses looking for the main method if it is not found in the >>>> declared main class. >>>> >>>> Any comments or concerns? >>>> >>>> Cheers, >>>> Omair >>>> >>>> [1] http://josm.openstreetmap.de/download/josm.jnlp >>>> >>> >>> Using getMethod rather than getDeclaredMethod: >>> >>> http://download.oracle.com/javase/6/docs/api/java/lang/Class.html#getMethod%28java.lang.String,%20java.lang.Class...%29 >>> >>> would perform the looping over the superclasses and superinterfaces; >>> >>> 'Let C be the class represented by this object: >>> >>> 1. C is searched for any matching methods. If no matching method is found, the algorithm of step 1 is invoked recursively on the superclass of C. >>> 2. If no method was found in step 1 above, the superinterfaces of C are searched for a matching method. If any such method is found, it is reflected.' >>> >> >> Thanks, that makes the patch alot simpler :) Attaching the updated patch. >> > > Hah! :) Approved for commit into 1.7, 1.8 and HEAD. > Pushed as: changeset e9de4114620e in /hg/icedtea6 changeset c2fdeca9dbb7 in /hg/release/icedtea6-1.8 changeset c5c7cfebb101 in /hg/release/icedtea6-1.7 Cheers, Omair From ahughes at redhat.com Thu Aug 5 15:28:03 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 5 Aug 2010 23:28:03 +0100 Subject: [PATCH FOR TESTING] Separation of plugin and NetX into separate JARs In-Reply-To: <20100805193038.GB2505@redhat.com> References: <20100805175048.GI6867@rivendell.middle-earth.co.uk> <20100805193038.GB2505@redhat.com> Message-ID: <20100805222803.GJ6867@rivendell.middle-earth.co.uk> On 15:30 Thu 05 Aug , Deepak Bhole wrote: > * Dr Andrew John Hughes [2010-08-05 13:50]: > > The attached patch changes the IcedTea build to produce two > > jar files (netx.jar and plugin.jar) in the JDK images for NetX > > and the plugin respectively, rather than adding their classes to > > rt.jar. > > > > Deepak et. al., can you please test this, make any needed changes to > > the plugin/NetX and commit? > > > > While the patch produces a plugin.jar and a netx.jar, they are not in > the bootclasspath. As a result, an error happens when something like > javaws is invoked: > > $ $JAVA_HOME/bin/javaws http://www.sweethome3d.com/SweetHome3D.jnlp > Exception in thread "main" java.lang.NoClassDefFoundError: > net/sourceforge/jnlp/runtime/Boot > Yes, I expected something like this. That's what I need you to fix. > Cheers, > Deepak > > > 2010-08-05 Andrew John Hughes > > > > Produce separate JAR files for NetX and the > > plugin (netx.jar and plugin.jar) rather than > > integrating their code into rt.jar. > > * patches/extensions/liveconnect-dist.patch, > > * patches/extensions/netx-dist.patch: > > Remove unneeded patches to OpenJDK build to > > integrate NetX and the plugin's Java code. > > * Makefile.am: > > (ICEDTEA_ENV): Drop ALT_NETX_DIST and > > ALT_LIVECONNECT_DIST. > > (.PHONY): Add new clean targets. > > (icedtea): Remove unneeded NetX and plugin > > dependencies and copying. > > (icedtea-debug): Likewise. > > (icedtea-against-icedtea): Depend on add-plugin > > and add-netx. > > (clean-icedtea-against-icedtea): Depend on clean-add-netx > > and clean-add-plugin. > > (icedtea-debug-against-icedtea): Depend on add-plugin-debug > > and add-netx-debug. > > (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug > > and clean-add-plugin-debug. > > (add-plugin): Copy the plugin library and jar file into the jdk images. > > (clean-add-plugin): Revert add-plugin. > > (add-plugin-debug): Equivalent of add-plugin for the debug build. > > (clean-add-plugin-debug): Revert add-plugin-debug. > > (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the > > jdk images. > > (clean-add-netx): Revert add-netx. > > (add-netx-debug): Equivalent of add-netx for the debug build. > > (clean-add-netx-debug): Revert add-netx-debug. > > (icedtea-ecj): Remove plugin and NetX dependencies. > > > > Thanks, > > -- > > Andrew :) > > > > Free Java Software Engineer > > Red Hat, Inc. (http://www.redhat.com) > > > > Support Free Java! > > Contribute to GNU Classpath and the OpenJDK > > http://www.gnu.org/software/classpath > > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > > > diff -r 6530d2aa9076 ChangeLog > > --- a/ChangeLog Thu Aug 05 16:58:30 2010 +0100 > > +++ b/ChangeLog Thu Aug 05 18:48:29 2010 +0100 > > @@ -1,3 +1,38 @@ > > +2010-08-05 Andrew John Hughes > > + > > + Produce separate JAR files for NetX and the > > + plugin (netx.jar and plugin.jar) rather than > > + integrating their code into rt.jar. > > + * patches/extensions/liveconnect-dist.patch, > > + * patches/extensions/netx-dist.patch: > > + Remove unneeded patches to OpenJDK build to > > + integrate NetX and the plugin's Java code. > > + * Makefile.am: > > + (ICEDTEA_ENV): Drop ALT_NETX_DIST and > > + ALT_LIVECONNECT_DIST. > > + (.PHONY): Add new clean targets. > > + (icedtea): Remove unneeded NetX and plugin > > + dependencies and copying. > > + (icedtea-debug): Likewise. > > + (icedtea-against-icedtea): Depend on add-plugin > > + and add-netx. > > + (clean-icedtea-against-icedtea): Depend on clean-add-netx > > + and clean-add-plugin. > > + (icedtea-debug-against-icedtea): Depend on add-plugin-debug > > + and add-netx-debug. > > + (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug > > + and clean-add-plugin-debug. > > + (add-plugin): Copy the plugin library and jar file into the jdk images. > > + (clean-add-plugin): Revert add-plugin. > > + (add-plugin-debug): Equivalent of add-plugin for the debug build. > > + (clean-add-plugin-debug): Revert add-plugin-debug. > > + (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the > > + jdk images. > > + (clean-add-netx): Revert add-netx. > > + (add-netx-debug): Equivalent of add-netx for the debug build. > > + (clean-add-netx-debug): Revert add-netx-debug. > > + (icedtea-ecj): Remove plugin and NetX dependencies. > > + > > 2010-08-05 Andrew John Hughes > > > > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560056 > > diff -r 6530d2aa9076 Makefile.am > > --- a/Makefile.am Thu Aug 05 16:58:30 2010 +0100 > > +++ b/Makefile.am Thu Aug 05 18:48:29 2010 +0100 > > @@ -273,7 +273,6 @@ > > patches/libpng.patch \ > > patches/shark.patch \ > > patches/extensions/netx.patch \ > > - patches/extensions/netx-dist.patch \ > > patches/extensions/netx-umask.patch \ > > patches/icedtea-jtreg-httpTest.patch \ > > patches/arm.patch \ > > @@ -297,8 +296,7 @@ > > > > if ENABLE_PLUGIN > > ICEDTEA_PATCHES += \ > > - patches/extensions/liveconnect.patch \ > > - patches/extensions/liveconnect-dist.patch > > + patches/extensions/liveconnect.patch > > endif > > > > if BUILD_CACAO > > @@ -433,8 +431,6 @@ > > DEBUG_BINARIES="true" \ > > ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ > > VERBOSE="$(VERBOSE)" \ > > - ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ > > - ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \ > > ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" > > > > if WITH_CACAO > > @@ -560,7 +556,8 @@ > > clean-icedtea-against-ecj clean-cacao clean-add-cacao clean-add-cacao-debug \ > > clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \ > > clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \ > > - clean-rewriter clean-rewrite-rhino > > + clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \ > > + clean-add-plugin clean-add-plugin-debug > > > > env: > > @echo 'unset JAVA_HOME' > > @@ -1207,9 +1204,7 @@ > > # If you change anything here in the icedtea target, please make sure > > # you change it in the icedtea-debug target as well. > > stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > > - stamps/rewrite-rhino.stamp > > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > > $(ARCH_PREFIX) $(MAKE) \ > > $(ICEDTEA_ENV) \ > > -C openjdk \ > > @@ -1218,12 +1213,6 @@ > > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext > > -if ENABLE_PLUGIN > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > -endif > > if ENABLE_PULSE_JAVA > > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > > $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > @@ -1236,10 +1225,6 @@ > > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > > $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > > endif > > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > - $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > if ZERO_BUILD > > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg > > endif > > @@ -1283,9 +1268,7 @@ > > rm -f stamps/icedtea.stamp > > > > stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ > > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > > - stamps/rewrite-rhino.stamp > > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > > $(ARCH_PREFIX) $(MAKE) \ > > $(ICEDTEA_ENV) \ > > -C openjdk \ > > @@ -1294,12 +1277,6 @@ > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext > > -if ENABLE_PLUGIN > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > -endif > > if ENABLE_PULSE_JAVA > > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > @@ -1312,10 +1289,6 @@ > > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > > $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > > endif > > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > if ZERO_BUILD > > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg > > endif > > @@ -1360,27 +1333,109 @@ > > rm -f stamps/icedtea-debug.stamp > > > > stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > - stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp > > + stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp stamps/add-plugin.stamp \ > > + stamps/add-netx.stamp > > mkdir -p stamps > > touch stamps/icedtea-against-icedtea.stamp > > > > -clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao > > +clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx > > rm -f stamps/icedtea-against-icedtea.stamp > > > > stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > - stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp > > + stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \ > > + stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp > > mkdir -p stamps > > touch stamps/icedtea-debug-against-icedtea.stamp > > > > -clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug > > +clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug clean-add-plugin-debug \ > > + clean-add-netx-debug > > rm -f stamps/icedtea-debug-against-icedtea.stamp > > > > +stamps/add-plugin.stamp: stamps/plugin.stamp > > +if ENABLE_PLUGIN > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > +endif > > + touch stamps/add-plugin.stamp > > + > > +clean-add-plugin: > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > + rm -f stamps/add-plugin.stamp > > + > > +stamps/add-plugin-debug.stamp: stamps/plugin.stamp > > +if ENABLE_PLUGIN > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > +endif > > + touch stamps/add-plugin-debug.stamp > > + > > +clean-add-plugin-debug: > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > + rm -f stamps/add-plugin-debug.stamp > > + > > +stamps/add-netx.stamp: stamps/netx-dist.stamp extra-lib/about.jar > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib > > + touch stamps/add-netx.stamp > > + > > +clean-add-netx: > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > > + rm -f stamps/add-netx.stamp > > + > > +stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib > > + touch stamps/add-netx-debug.stamp > > + > > +clean-add-netx-debug: > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > > + rm -f stamps/add-netx-debug.stamp > > + > > # OpenJDK ecj Targets > > # =================== > > > > stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ > > - stamps/netx-dist.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \ > > - stamps/rewrite-rhino.stamp stamps/plugin.stamp > > + $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp > > $(ARCH_PREFIX) $(MAKE) \ > > $(ICEDTEA_ENV_ECJ) \ > > -C openjdk-ecj/ \ > > diff -r 6530d2aa9076 patches/extensions/liveconnect-dist.patch > > --- a/patches/extensions/liveconnect-dist.patch Thu Aug 05 16:58:30 2010 +0100 > > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > > @@ -1,76 +0,0 @@ > > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk > > ---- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 > > -+++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-11-11 02:53:36.000000000 +0000 > > -@@ -0,0 +1,28 @@ > > -+# > > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > > -+# > > -+ > > -+# The specific packages that come from or go to rt.jar and tools.jar > > -+IMPORT_RT_PACKAGES += \ > > -+ netscape/javascript \ > > -+ sun/applet > > -+ > > -+IMPORT_TOOLS_PACKAGES += > > -+ > > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:52:44.000000000 +0000 > > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:57:32.000000000 +0000 > > -@@ -49,6 +49,9 @@ > > - ifndef NETX_DIST > > - include $(BUILDDIR)/common/internal/Defs-netx.gmk > > - endif > > -+ifndef LIVECONNECT_DIST > > -+ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk > > -+endif > > - > > - # Clean up these lists so empty lists are empty > > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > > -@@ -123,6 +126,7 @@ > > - $(call import-one-sources,JAXP_DIST,$1) > > - $(call import-one-sources,JAXWS_DIST,$1) > > - $(call import-one-sources,NETX_DIST,$1) > > -+$(call import-one-sources,LIVECONNECT_DIST,$1) > > - endef > > - > > - # Import all component docs into directory $1 (optional) > > -@@ -162,6 +166,7 @@ > > - $(call import-one-classes,JAXP_DIST,$1) > > - $(call import-one-classes,JAXWS_DIST,$1) > > - $(call import-one-classes,NETX_DIST,$1) > > -+$(call import-one-classes,LIVECONNECT_DIST,$1) > > - endef > > - > > - # Clean up import files > > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-11-11 02:52:44.000000000 +0000 > > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-11-11 02:13:22.000000000 +0000 > > -@@ -365,6 +365,11 @@ > > - else > > - NETX_DIST = > > - endif > > -+ifdef ALT_LIVECONNECT_DIST > > -+ LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST)) > > -+else > > -+ LIVECONNECT_DIST = > > -+endif > > - > > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > > diff -r 6530d2aa9076 patches/extensions/netx-dist.patch > > --- a/patches/extensions/netx-dist.patch Thu Aug 05 16:58:30 2010 +0100 > > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > > @@ -1,86 +0,0 @@ > > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-netx.gmk openjdk/jdk/make/common/internal/Defs-netx.gmk > > ---- openjdk.orig/jdk/make/common/internal/Defs-netx.gmk 1970-01-01 01:00:00.000000000 +0100 > > -+++ openjdk/jdk/make/common/internal/Defs-netx.gmk 2009-05-28 09:18:45.000000000 +0100 > > -@@ -0,0 +1,38 @@ > > -+# > > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > > -+# > > -+ > > -+# The specific packages that come from or go to rt.jar and tools.jar > > -+IMPORT_RT_PACKAGES += \ > > -+ net/sourceforge/jnlp \ > > -+ net/sourceforge/jnlp/tools \ > > -+ net/sourceforge/jnlp/runtime \ > > -+ net/sourceforge/jnlp/util \ > > -+ net/sourceforge/jnlp/services \ > > -+ net/sourceforge/jnlp/security \ > > -+ net/sourceforge/jnlp/security/viewer \ > > -+ net/sourceforge/jnlp/cache \ > > -+ net/sourceforge/jnlp/event \ > > -+ net/sourceforge/jnlp/resources \ > > -+ net/sourceforge/nanoxml \ > > -+ javax/jnlp > > -+ > > -+IMPORT_TOOLS_PACKAGES += > > -+ > > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100 > > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:10:56.000000000 +0100 > > -@@ -46,6 +46,9 @@ > > - ifndef JAXWS_DIST > > - include $(BUILDDIR)/common/internal/Defs-jaxws.gmk > > - endif > > -+ifndef NETX_DIST > > -+ include $(BUILDDIR)/common/internal/Defs-netx.gmk > > -+endif > > - > > - # Clean up these lists so empty lists are empty > > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > > -@@ -119,6 +122,7 @@ > > - $(call import-one-sources,CORBA_DIST,$1) > > - $(call import-one-sources,JAXP_DIST,$1) > > - $(call import-one-sources,JAXWS_DIST,$1) > > -+$(call import-one-sources,NETX_DIST,$1) > > - endef > > - > > - # Import all component docs into directory $1 (optional) > > -@@ -157,6 +161,7 @@ > > - $(call import-one-classes,CORBA_DIST,$1) > > - $(call import-one-classes,JAXP_DIST,$1) > > - $(call import-one-classes,JAXWS_DIST,$1) > > -+$(call import-one-classes,NETX_DIST,$1) > > - endef > > - > > - # Clean up import files > > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100 > > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-29 02:11:18.000000000 +0100 > > -@@ -344,6 +344,11 @@ > > - else > > - JAXWS_DIST = > > - endif > > -+ifdef ALT_NETX_DIST > > -+ NETX_DIST := $(call FullPath,$(ALT_NETX_DIST)) > > -+else > > -+ NETX_DIST = > > -+endif > > - > > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From andrew at icedtea.classpath.org Thu Aug 5 16:09:44 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 05 Aug 2010 23:09:44 +0000 Subject: /hg/icedtea6: S6795060: VM crash on Linux in ICU layout library ... Message-ID: changeset ad637c9154cf in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ad637c9154cf author: Andrew John Hughes date: Fri Aug 06 00:09:35 2010 +0100 S6795060: VM crash on Linux in ICU layout library when processing \u0DDD (Sinhalese) 2010-08-05 Andrew John Hughes * Makefile.am: Add new patch. * NEWS: Updated. * patches/openjdk/6795060-icu_crash.patch: Fixes VM crash on Linux in ICU layout library when processing \u0DDD (Sinhalese) diffstat: 4 files changed, 108 insertions(+), 3 deletions(-) ChangeLog | 12 +++ Makefile.am | 3 NEWS | 1 patches/openjdk/6795060-icu_crash.patch | 95 +++++++++++++++++++++++++++++++ diffs (146 lines): diff -r e9de4114620e -r ad637c9154cf ChangeLog --- a/ChangeLog Thu Aug 05 17:40:41 2010 -0400 +++ b/ChangeLog Fri Aug 06 00:09:35 2010 +0100 @@ -1,9 +1,17 @@ 2010-08-05 Omair Majid + + * Makefile.am: Add new patch. + * NEWS: Updated. + * patches/openjdk/6795060-icu_crash.patch: + Fixes VM crash on Linux in ICU layout library + when processing \u0DDD (Sinhalese) + 2010-08-05 Omair Majid * NEWS: Update with netx bugfix. * netx/net/sourceforge/jnlp/Launcher.java - (launchApplication): Replace use of getDeclaredMethod with - getMethod. Fixes applications that have a main-class that + (launchApplication): Replace use of getDeclaredMethod with + getMethod. Fixes applications that have a main-class that inherits main(String[]). 2010-08-05 Andrew John Hughes diff -r e9de4114620e -r ad637c9154cf Makefile.am --- a/Makefile.am Thu Aug 05 17:40:41 2010 -0400 +++ b/Makefile.am Fri Aug 06 00:09:35 2010 +0100 @@ -288,7 +288,8 @@ ICEDTEA_PATCHES = \ patches/openjdk/6967533-pre_epoch.patch \ patches/fonts-rhel.patch \ patches/fonts-gentoo.patch \ - patches/ipv4-mapped-ipv6-addresses.patch + patches/ipv4-mapped-ipv6-addresses.patch \ + patches/openjdk/6795060-icu_crash.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r e9de4114620e -r ad637c9154cf NEWS --- a/NEWS Thu Aug 05 17:40:41 2010 -0400 +++ b/NEWS Fri Aug 06 00:09:35 2010 +0100 @@ -700,6 +700,7 @@ New in release 1.9 (2010-XX-XX): * Backports: - S6961732: FontMetrics.getLeading() may be negative in freetype-based OpenJDK builds - S6967533: ExceptionInInitializerError on systems with uninitialized clock + - S6795060: VM crash on Linux in ICU layout library when processing \u0DDD (Sinhalese) * Fixes: - Provide font configuration for RHEL 6. - G266295: Provide font configuration for Gentoo. diff -r e9de4114620e -r ad637c9154cf patches/openjdk/6795060-icu_crash.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6795060-icu_crash.patch Fri Aug 06 00:09:35 2010 +0100 @@ -0,0 +1,95 @@ +# HG changeset patch +# User srl +# Date 1280876869 -3600 +# Node ID 80a618f36d003b3e64fe8dd86f723d980db0d0bc +# Parent ea703df7276249b3080412d77bf4c3efc1b623a8 +6795060: VM crash on Linux in ICU layout library when processing \u0DDD (Sinhalese) +Reviewed-by: igor, prr + +diff -r ea703df72762 -r 80a618f36d00 src/share/native/sun/font/layout/IndicClassTables.cpp +--- openjdk.orig/jdk/src/share/native/sun/font/layout/IndicClassTables.cpp Mon Jul 26 13:05:38 2010 -0700 ++++ openjdk/jdk/src/share/native/sun/font/layout/IndicClassTables.cpp Wed Aug 04 00:07:49 2010 +0100 +@@ -279,7 +279,7 @@ + + static const IndicClassTable mlymClassTable = {0x0D00, 0x0D6F, 3, MLYM_SCRIPT_FLAGS, mlymCharClasses, mlymSplitTable}; + +-static const IndicClassTable sinhClassTable = {0x0D80, 0x0DF4, 3, SINH_SCRIPT_FLAGS, sinhCharClasses, sinhSplitTable}; ++static const IndicClassTable sinhClassTable = {0x0D80, 0x0DF4, 4, SINH_SCRIPT_FLAGS, sinhCharClasses, sinhSplitTable}; + + // + // IndicClassTable addresses +diff -r ea703df72762 -r 80a618f36d00 test/java/awt/font/TextLayout/TestSinhalaChar.java +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ openjdk/jdk/test/java/awt/font/TextLayout/TestSinhalaChar.java Wed Aug 04 00:07:49 2010 +0100 +@@ -0,0 +1,71 @@ ++/* ++ * Copyright (c) 2009, Oracle and/or its affiliates. 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. ++ * ++ * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ * ++ */ ++ ++/* @test @(#)TestSinhalaChar.java ++ * @summary verify lack of crash on U+0DDD. ++ * @bug 6795060 ++ */ ++ ++import javax.swing.*; ++import javax.swing.border.LineBorder; ++import java.awt.*; ++import java.awt.event.ActionEvent; ++ ++public class TestSinhalaChar { ++ public static void main(String[] args) { ++ SwingUtilities.invokeLater(new Runnable() { ++ public void run() { ++ new TestSinhalaChar().run(); ++ } ++ }); ++ } ++ public static boolean AUTOMATIC_TEST=true; // true; run test automatically, else manually at button push ++ ++ private void run() { ++ JFrame frame = new JFrame("Test Character (no crash = PASS)"); ++ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); ++ JPanel panel = new JPanel(); ++ final JLabel label = new JLabel("(empty)"); ++ label.setSize(400, 100); ++ label.setBorder(new LineBorder(Color.black)); ++ label.setFont(new Font("Lucida Bright", Font.PLAIN, 12)); ++ if(AUTOMATIC_TEST) { /* run the test automatically (else, manually) */ ++ label.setText(Character.toString('\u0DDD')); ++ } else { ++ JButton button = new JButton("Set Char x0DDD"); ++ button.addActionListener(new AbstractAction() { ++ public void actionPerformed(ActionEvent actionEvent) { ++ label.setText(Character.toString('\u0DDD')); ++ } ++ }); ++ panel.add(button); ++ } ++ panel.add(label); ++ ++ frame.getContentPane().add(panel); ++ frame.pack(); ++ frame.setVisible(true); ++ } ++} ++ From tmarble at info9.net Thu Aug 5 18:57:46 2010 From: tmarble at info9.net (Tom Marble) Date: Thu, 05 Aug 2010 20:57:46 -0500 Subject: OpenJDK on hppa (reprise) Message-ID: <4C5B6C1A.9040602@info9.net> All: Back in January there were some threads on this and specifically about the direction of stack growth [0] (cross posted [1] [2]). The Debian Java team has decided that as we need to support this architecture and thus I wanted to see if any others have attacked this or have any other tips about how difficult it may be to convince Zero to cooperate? To avoid the cross-posting problem I have set Reply-To: (and would kindly request followups to) hotspot-dev. Thanks! --Tom [0] http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-January/thread.html#7886 [1] http://mail.openjdk.java.net/pipermail/hotspot-dev/2010-January/thread.html#2529 [2] http://lists.debian.org/debian-java/2010/01/threads.html#00002 From aph at redhat.com Fri Aug 6 02:33:02 2010 From: aph at redhat.com (Andrew Haley) Date: Fri, 06 Aug 2010 10:33:02 +0100 Subject: OpenJDK on hppa (reprise) In-Reply-To: <4C5B6C1A.9040602@info9.net> References: <4C5B6C1A.9040602@info9.net> Message-ID: <4C5BD6CE.1020705@redhat.com> On 08/06/2010 02:57 AM, Tom Marble wrote: > Back in January there were some threads on this and specifically > about the direction of stack growth [0] (cross posted [1] [2]). > > The Debian Java team has decided that as we need to support this > architecture and thus I wanted to see if any others have attacked > this or have any other tips about how difficult it may be to > convince Zero to cooperate? > > To avoid the cross-posting problem I have set Reply-To: (and > would kindly request followups to) hotspot-dev. I think it's pretty easy, from what I've seen. It just needs someone who has a machine and cares about hppa to make the changes. Andrew. From gbenson at redhat.com Fri Aug 6 02:58:53 2010 From: gbenson at redhat.com (Gary Benson) Date: Fri, 6 Aug 2010 10:58:53 +0100 Subject: OpenJDK on hppa (reprise) In-Reply-To: <4C5B6C1A.9040602@info9.net> References: <4C5B6C1A.9040602@info9.net> Message-ID: <20100806095853.GA3685@redhat.com> Tom Marble wrote: > Back in January there were some threads on this and specifically > about the direction of stack growth [0] (cross posted [1] [2]). > > The Debian Java team has decided that as we need to support this > architecture and thus I wanted to see if any others have attacked > this or have any other tips about how difficult it may be to > convince Zero to cooperate? What happened in January was some people talked about difficulties that *might* arise *if* they tried to make Zero work on HPPA. To actually make Zero work on HPPA what needs to happen is that somebody with a machine needs to grab a copy of OpenJDK and try to build and run it. I'm available by email and on #openjdk to help people with any issues they have with Zero and Shark on any platform. Cheers, Gary -- http://gbenson.net/ From andrew at icedtea.classpath.org Fri Aug 6 03:52:19 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 06 Aug 2010 10:52:19 +0000 Subject: /hg/icedtea6: G244901: Skip test_gamma on hardened (PaX-enabled)... Message-ID: changeset cb463b94b82d in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cb463b94b82d author: Andrew John Hughes date: Fri Aug 06 11:52:12 2010 +0100 G244901: Skip test_gamma on hardened (PaX-enabled) kernels 2010-08-06 Andrew John Hughes Fix build on PAX-enabled kernels. https://bugs.gentoo.org/244901 * Makefile.am: (ICEDTEA_PATCHES): Add test_gamma patch if PAX is enabled. (ICEDTEA_ECJ_PATCHES): Add test_gamma patch if PAX not enabled (and thus not already patched). * NEWS: Mention new bug fix. * acinclude.m4: (IT_CHECK_FOR_PAX): Check for a PaX-enabled kernel. * configure.ac: Call above macro. * patches/ecj/icedtea-hotspot.patch: Remove test_gamma segment into separate patch. * patches/ecj/no-test_gamma.patch: test_gamma patch for non- PaX-enabled kernels (i.e. bootstrap build only). * patches/no-test_gamma.patch: test_gamma patch for PaX- enabled kernels. diffstat: 8 files changed, 137 insertions(+), 46 deletions(-) ChangeLog | 21 ++++++++++++++++ Makefile.am | 10 ++++++++ NEWS | 1 acinclude.m4 | 12 +++++++++ configure.ac | 1 patches/ecj/icedtea-hotspot.patch | 46 ------------------------------------- patches/ecj/no-test_gamma.patch | 46 +++++++++++++++++++++++++++++++++++++ patches/no-test_gamma.patch | 46 +++++++++++++++++++++++++++++++++++++ diffs (257 lines): diff -r ad637c9154cf -r cb463b94b82d ChangeLog --- a/ChangeLog Fri Aug 06 00:09:35 2010 +0100 +++ b/ChangeLog Fri Aug 06 11:52:12 2010 +0100 @@ -1,3 +1,24 @@ 2010-08-05 Andrew John Hughes + + Fix build on PAX-enabled kernels. + https://bugs.gentoo.org/244901 + * Makefile.am: + (ICEDTEA_PATCHES): Add test_gamma patch + if PAX is enabled. + (ICEDTEA_ECJ_PATCHES): Add test_gamma patch + if PAX not enabled (and thus not already patched). + * NEWS: Mention new bug fix. + * acinclude.m4: + (IT_CHECK_FOR_PAX): Check for a PaX-enabled kernel. + * configure.ac: Call above macro. + * patches/ecj/icedtea-hotspot.patch: Remove + test_gamma segment into separate patch. + * patches/ecj/no-test_gamma.patch: test_gamma + patch for non-PaX-enabled kernels (i.e. bootstrap + build only). + * patches/no-test_gamma.patch: test_gamma patch + for PaX-enabled kernels. + 2010-08-05 Andrew John Hughes * Makefile.am: Add new patch. diff -r ad637c9154cf -r cb463b94b82d Makefile.am --- a/Makefile.am Fri Aug 06 00:09:35 2010 +0100 +++ b/Makefile.am Fri Aug 06 11:52:12 2010 +0100 @@ -344,6 +344,10 @@ ICEDTEA_PATCHES += patches/icedtea-nss-n ICEDTEA_PATCHES += patches/icedtea-nss-not-enabled-config.patch endif +if HAS_PAX +ICEDTEA_PATCHES += patches/no-test_gamma.patch +endif + ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES) # Bootstrapping patches @@ -356,14 +360,20 @@ ICEDTEA_ECJ_PATCHES = patches/ecj/icedte patches/ecj/bootver.patch \ patches/ecj/getannotation-cast.patch \ patches/ecj/override.patch + if DTDTYPE_QNAME ICEDTEA_ECJ_PATCHES += \ patches/ecj/icedtea-jaxws-getdtdtype.patch endif + if ENABLE_XRENDER ICEDTEA_ECJ_PATCHES += \ patches/ecj/needs-6.patch \ patches/ecj/javah.patch +endif + +if !HAS_PAX +ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch endif ICEDTEA_ECJ_PATCHES += $(DISTRIBUTION_ECJ_PATCHES) diff -r ad637c9154cf -r cb463b94b82d NEWS --- a/NEWS Fri Aug 06 00:09:35 2010 +0100 +++ b/NEWS Fri Aug 06 11:52:12 2010 +0100 @@ -705,6 +705,7 @@ New in release 1.9 (2010-XX-XX): - Provide font configuration for RHEL 6. - G266295: Provide font configuration for Gentoo. - D560056: Avoid failure when net.ipv6.bindv6only is set to 1. + - G244901: Skip test_gamma on hardened (PaX-enabled) kernels * Zero/Shark - Update Shark for LLVM 2.8 API change r100304 - Shark calling static jni methods jclass argument fix. diff -r ad637c9154cf -r cb463b94b82d acinclude.m4 --- a/acinclude.m4 Fri Aug 06 00:09:35 2010 +0100 +++ b/acinclude.m4 Fri Aug 06 11:52:12 2010 +0100 @@ -1543,3 +1543,15 @@ AC_SUBST(NSS_LIBDIR) AC_SUBST(NSS_LIBDIR) AC_CONFIG_FILES([nss.cfg]) ]) + +AC_DEFUN_ONCE([IT_CHECK_FOR_PAX],[ +AC_CACHE_CHECK([if a PaX-enabled kernel is running], it_cv_pax, [ +if grep '^PaX:' /proc/self/status >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_pax=yes; +else + it_cv_pax=no; +fi +]) +AM_CONDITIONAL([HAS_PAX], test x"${it_cv_pax}" = "xyes") +AC_PROVIDE([$0])dnl +]) diff -r ad637c9154cf -r cb463b94b82d configure.ac --- a/configure.ac Fri Aug 06 00:09:35 2010 +0100 +++ b/configure.ac Fri Aug 06 11:52:12 2010 +0100 @@ -52,6 +52,7 @@ IT_CHECK_NUMBER_OF_PARALLEL_JOBS IT_CHECK_NUMBER_OF_PARALLEL_JOBS IT_CP_SUPPORTS_REFLINK IT_CAN_HARDLINK_TO_SOURCE_TREE +IT_CHECK_FOR_PAX AC_MSG_CHECKING([for an Ant home directory]) AC_ARG_WITH([ant-home], diff -r ad637c9154cf -r cb463b94b82d patches/ecj/icedtea-hotspot.patch --- a/patches/ecj/icedtea-hotspot.patch Fri Aug 06 00:09:35 2010 +0100 +++ b/patches/ecj/icedtea-hotspot.patch Fri Aug 06 11:52:12 2010 +0100 @@ -1,49 +1,3 @@ diff -Nru openjdk-ecj.orig/hotspot/make/ -diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile ---- openjdk-ecj.orig/hotspot/make/linux/Makefile 2010-03-29 21:34:14.000000000 +0100 -+++ openjdk-ecj/hotspot/make/linux/Makefile 2010-03-29 21:40:39.000000000 +0100 -@@ -287,42 +287,36 @@ - - $(TARGETS_C2): $(SUBDIRS_C2) - cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_TIERED): $(SUBDIRS_TIERED) - cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_C1): $(SUBDIRS_C1) - cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_CORE): $(SUBDIRS_CORE) - cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_ZERO): $(SUBDIRS_ZERO) - cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_SHARK): $(SUBDIRS_SHARK) - cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install - endif diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make --- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2010-03-29 21:34:15.000000000 +0100 +++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2010-03-29 21:41:28.000000000 +0100 diff -r ad637c9154cf -r cb463b94b82d patches/ecj/no-test_gamma.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/no-test_gamma.patch Fri Aug 06 11:52:12 2010 +0100 @@ -0,0 +1,46 @@ +diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile +--- openjdk-ecj.orig/hotspot/make/linux/Makefile 2010-03-29 21:34:14.000000000 +0100 ++++ openjdk-ecj/hotspot/make/linux/Makefile 2010-03-29 21:40:39.000000000 +0100 +@@ -287,42 +287,36 @@ + + $(TARGETS_C2): $(SUBDIRS_C2) + cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_TIERED): $(SUBDIRS_TIERED) + cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_C1): $(SUBDIRS_C1) + cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_CORE): $(SUBDIRS_CORE) + cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_ZERO): $(SUBDIRS_ZERO) + cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_SHARK): $(SUBDIRS_SHARK) + cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install + endif diff -r ad637c9154cf -r cb463b94b82d patches/no-test_gamma.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/no-test_gamma.patch Fri Aug 06 11:52:12 2010 +0100 @@ -0,0 +1,46 @@ +diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile +--- openjdk.orig/hotspot/make/linux/Makefile 2010-03-29 21:34:14.000000000 +0100 ++++ openjdk/hotspot/make/linux/Makefile 2010-03-29 21:40:39.000000000 +0100 +@@ -287,42 +287,36 @@ + + $(TARGETS_C2): $(SUBDIRS_C2) + cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_TIERED): $(SUBDIRS_TIERED) + cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_C1): $(SUBDIRS_C1) + cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_CORE): $(SUBDIRS_CORE) + cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_ZERO): $(SUBDIRS_ZERO) + cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_SHARK): $(SUBDIRS_SHARK) + cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install + endif From andrew at icedtea.classpath.org Fri Aug 6 03:54:00 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 06 Aug 2010 10:54:00 +0000 Subject: /hg/icedtea6: Added tag icedtea6-1.9-branchpoint for changeset c... Message-ID: changeset da8128c0b021 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=da8128c0b021 author: Andrew John Hughes date: Fri Aug 06 11:53:49 2010 +0100 Added tag icedtea6-1.9-branchpoint for changeset cb463b94b82d diffstat: 1 file changed, 1 insertion(+) .hgtags | 1 + diffs (8 lines): diff -r cb463b94b82d -r da8128c0b021 .hgtags --- a/.hgtags Fri Aug 06 11:52:12 2010 +0100 +++ b/.hgtags Fri Aug 06 11:53:49 2010 +0100 @@ -18,3 +18,4 @@ 9420faca6468e1c75e9bfa73b31246ba0b73a77d 9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea-1.6-branchpoint 8826d5735e2ca97ecdb35e7c977785d3e5b99556 icedtea-1.7-branchpoint 9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea6-1.8-branchpoint +cb463b94b82da269ea089c481ed5e39700525a8a icedtea6-1.9-branchpoint From ahughes at redhat.com Fri Aug 6 03:59:35 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 6 Aug 2010 11:59:35 +0100 Subject: 1.9 has now branched Message-ID: <20100806105935.GL6867@rivendell.middle-earth.co.uk> The 1.9 branch has now been created. See http://icedtea.classpath.org/hg/release/icedtea6-1.9/shortlog Patches to HEAD will now form part of the IcedTea6 1.10 release series. * PATCHES TO THE RELEASE BRANCH REQUIRE APPROVAL BY AT LEAST ONE OTHER DEVELOPER * * PATCHES TO THE RELEASE BRANCH ARE FOR BUG FIXES ONLY -- NO NEW FEATURES * Current blockers before release: PR398: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=398 (SPARC build) The release will proceed once all blockers are fixed. Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From tomas.hurka at googlemail.com Fri Aug 6 06:40:02 2010 From: tomas.hurka at googlemail.com (Tomas Hurka) Date: Fri, 6 Aug 2010 15:40:02 +0200 Subject: VisualVM 1.3 patch Message-ID: <5EA84020-F426-46B0-9B83-F1889553057F@googlemail.com> Hi Andrew, attached is a patch to update VisualVM to the latest (1.3). The patch is done against new VisualVM mercurial repository (http://icedtea.classpath.org/hg/visualvm). Can somebody commit these changes for me? Note that VisualVM 1.3 requires NetBeans Platform 6.9, which is currently available only in rawhide repo. Bye, -- Tomas Hurka NetBeans Profiler http://profiler.netbeans.org VisualVM http://visualvm.dev.java.net Software Engineer, Developer Platforms Group Sun Microsystems, Praha Czech Republic -------------- next part -------------- A non-text attachment was scrubbed... Name: visualvm_13.patch Type: application/octet-stream Size: 3626 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100806/487569fe/visualvm_13.patch -------------- next part -------------- From ahughes at redhat.com Fri Aug 6 07:52:58 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 6 Aug 2010 15:52:58 +0100 Subject: VisualVM 1.3 patch In-Reply-To: <5EA84020-F426-46B0-9B83-F1889553057F@googlemail.com> References: <5EA84020-F426-46B0-9B83-F1889553057F@googlemail.com> Message-ID: <20100806145258.GM6867@rivendell.middle-earth.co.uk> On 15:40 Fri 06 Aug , Tomas Hurka wrote: > Hi Andrew, > attached is a patch to update VisualVM to the latest (1.3). The patch is done against new VisualVM mercurial repository (http://icedtea.classpath.org/hg/visualvm). Can somebody commit these changes for me? > > Note that VisualVM 1.3 requires NetBeans Platform 6.9, which is currently available only in rawhide repo. > I'll commit this. Given 1.3 is so new, I think adding a configure switch to select the required version might be a better idea than a straight replacement. Mark, can you set Tomas up with write access to the repo. so he can commit future patches? > Bye, > -- > Tomas Hurka > NetBeans Profiler http://profiler.netbeans.org > VisualVM http://visualvm.dev.java.net > Software Engineer, Developer Platforms Group > Sun Microsystems, Praha Czech Republic > Thanks for this, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Fri Aug 6 07:54:45 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 6 Aug 2010 15:54:45 +0100 Subject: [ahughes@redhat.com: [PATCH FOR TESTING] Separation of plugin and NetX into separate JARs] Message-ID: <20100806145445.GN6867@rivendell.middle-earth.co.uk> Forwarding due to distro-pkg-dev not being on icedtea.classpath.org (bad list...) ----- Forwarded message from Dr Andrew John Hughes ----- Date: Thu, 5 Aug 2010 18:50:48 +0100 From: Dr Andrew John Hughes To: dbhole at redhat.com Subject: [PATCH FOR TESTING] Separation of plugin and NetX into separate JARs User-Agent: Mutt/1.5.20 (2009-06-14) The attached patch changes the IcedTea build to produce two jar files (netx.jar and plugin.jar) in the JDK images for NetX and the plugin respectively, rather than adding their classes to rt.jar. Deepak et. al., can you please test this, make any needed changes to the plugin/NetX and commit? 2010-08-05 Andrew John Hughes Produce separate JAR files for NetX and the plugin (netx.jar and plugin.jar) rather than integrating their code into rt.jar. * patches/extensions/liveconnect-dist.patch, * patches/extensions/netx-dist.patch: Remove unneeded patches to OpenJDK build to integrate NetX and the plugin's Java code. * Makefile.am: (ICEDTEA_ENV): Drop ALT_NETX_DIST and ALT_LIVECONNECT_DIST. (.PHONY): Add new clean targets. (icedtea): Remove unneeded NetX and plugin dependencies and copying. (icedtea-debug): Likewise. (icedtea-against-icedtea): Depend on add-plugin and add-netx. (clean-icedtea-against-icedtea): Depend on clean-add-netx and clean-add-plugin. (icedtea-debug-against-icedtea): Depend on add-plugin-debug and add-netx-debug. (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug and clean-add-plugin-debug. (add-plugin): Copy the plugin library and jar file into the jdk images. (clean-add-plugin): Revert add-plugin. (add-plugin-debug): Equivalent of add-plugin for the debug build. (clean-add-plugin-debug): Revert add-plugin-debug. (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the jdk images. (clean-add-netx): Revert add-netx. (add-netx-debug): Equivalent of add-netx for the debug build. (clean-add-netx-debug): Revert add-netx-debug. (icedtea-ecj): Remove plugin and NetX dependencies. Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 ----- End forwarded message ----- -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 -------------- next part -------------- diff -r 6530d2aa9076 ChangeLog --- a/ChangeLog Thu Aug 05 16:58:30 2010 +0100 +++ b/ChangeLog Thu Aug 05 18:48:29 2010 +0100 @@ -1,3 +1,38 @@ +2010-08-05 Andrew John Hughes + + Produce separate JAR files for NetX and the + plugin (netx.jar and plugin.jar) rather than + integrating their code into rt.jar. + * patches/extensions/liveconnect-dist.patch, + * patches/extensions/netx-dist.patch: + Remove unneeded patches to OpenJDK build to + integrate NetX and the plugin's Java code. + * Makefile.am: + (ICEDTEA_ENV): Drop ALT_NETX_DIST and + ALT_LIVECONNECT_DIST. + (.PHONY): Add new clean targets. + (icedtea): Remove unneeded NetX and plugin + dependencies and copying. + (icedtea-debug): Likewise. + (icedtea-against-icedtea): Depend on add-plugin + and add-netx. + (clean-icedtea-against-icedtea): Depend on clean-add-netx + and clean-add-plugin. + (icedtea-debug-against-icedtea): Depend on add-plugin-debug + and add-netx-debug. + (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug + and clean-add-plugin-debug. + (add-plugin): Copy the plugin library and jar file into the jdk images. + (clean-add-plugin): Revert add-plugin. + (add-plugin-debug): Equivalent of add-plugin for the debug build. + (clean-add-plugin-debug): Revert add-plugin-debug. + (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the + jdk images. + (clean-add-netx): Revert add-netx. + (add-netx-debug): Equivalent of add-netx for the debug build. + (clean-add-netx-debug): Revert add-netx-debug. + (icedtea-ecj): Remove plugin and NetX dependencies. + 2010-08-05 Andrew John Hughes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560056 diff -r 6530d2aa9076 Makefile.am --- a/Makefile.am Thu Aug 05 16:58:30 2010 +0100 +++ b/Makefile.am Thu Aug 05 18:48:29 2010 +0100 @@ -273,7 +273,6 @@ patches/libpng.patch \ patches/shark.patch \ patches/extensions/netx.patch \ - patches/extensions/netx-dist.patch \ patches/extensions/netx-umask.patch \ patches/icedtea-jtreg-httpTest.patch \ patches/arm.patch \ @@ -297,8 +296,7 @@ if ENABLE_PLUGIN ICEDTEA_PATCHES += \ - patches/extensions/liveconnect.patch \ - patches/extensions/liveconnect-dist.patch + patches/extensions/liveconnect.patch endif if BUILD_CACAO @@ -433,8 +431,6 @@ DEBUG_BINARIES="true" \ ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ VERBOSE="$(VERBOSE)" \ - ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ - ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \ ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" if WITH_CACAO @@ -560,7 +556,8 @@ clean-icedtea-against-ecj clean-cacao clean-add-cacao clean-add-cacao-debug \ clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \ clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \ - clean-rewriter clean-rewrite-rhino + clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \ + clean-add-plugin clean-add-plugin-debug env: @echo 'unset JAVA_HOME' @@ -1207,9 +1204,7 @@ # If you change anything here in the icedtea target, please make sure # you change it in the icedtea-debug target as well. stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ - stamps/rewrite-rhino.stamp + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk \ @@ -1218,12 +1213,6 @@ mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext -if ENABLE_PLUGIN - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) -endif if ENABLE_PULSE_JAVA cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) @@ -1236,10 +1225,6 @@ (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) endif - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ - $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif @@ -1283,9 +1268,7 @@ rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ - stamps/rewrite-rhino.stamp + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk \ @@ -1294,12 +1277,6 @@ mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext -if ENABLE_PLUGIN - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) -endif if ENABLE_PULSE_JAVA cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) @@ -1312,10 +1289,6 @@ (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) endif - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib ; \ - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif @@ -1360,27 +1333,109 @@ rm -f stamps/icedtea-debug.stamp stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ - stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp + stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp stamps/add-plugin.stamp \ + stamps/add-netx.stamp mkdir -p stamps touch stamps/icedtea-against-icedtea.stamp -clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao +clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx rm -f stamps/icedtea-against-icedtea.stamp stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ - stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp + stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \ + stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp mkdir -p stamps touch stamps/icedtea-debug-against-icedtea.stamp -clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug +clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug clean-add-plugin-debug \ + clean-add-netx-debug rm -f stamps/icedtea-debug-against-icedtea.stamp +stamps/add-plugin.stamp: stamps/plugin.stamp +if ENABLE_PLUGIN + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar +endif + touch stamps/add-plugin.stamp + +clean-add-plugin: + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar + rm -f stamps/add-plugin.stamp + +stamps/add-plugin-debug.stamp: stamps/plugin.stamp +if ENABLE_PLUGIN + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar +endif + touch stamps/add-plugin-debug.stamp + +clean-add-plugin-debug: + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar + rm -f stamps/add-plugin-debug.stamp + +stamps/add-netx.stamp: stamps/netx-dist.stamp extra-lib/about.jar + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib + touch stamps/add-netx.stamp + +clean-add-netx: + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar + rm -f stamps/add-netx.stamp + +stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib + touch stamps/add-netx-debug.stamp + +clean-add-netx-debug: + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar + rm -f stamps/add-netx-debug.stamp + # OpenJDK ecj Targets # =================== stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ - stamps/netx-dist.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \ - stamps/rewrite-rhino.stamp stamps/plugin.stamp + $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV_ECJ) \ -C openjdk-ecj/ \ diff -r 6530d2aa9076 patches/extensions/liveconnect-dist.patch --- a/patches/extensions/liveconnect-dist.patch Thu Aug 05 16:58:30 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk ---- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-11-11 02:53:36.000000000 +0000 -@@ -0,0 +1,28 @@ -+# -+# Copyright 2009 Red Hat, 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. Red Hat 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. -+# -+ -+# The specific packages that come from or go to rt.jar and tools.jar -+IMPORT_RT_PACKAGES += \ -+ netscape/javascript \ -+ sun/applet -+ -+IMPORT_TOOLS_PACKAGES += -+ -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:52:44.000000000 +0000 -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:57:32.000000000 +0000 -@@ -49,6 +49,9 @@ - ifndef NETX_DIST - include $(BUILDDIR)/common/internal/Defs-netx.gmk - endif -+ifndef LIVECONNECT_DIST -+ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk -+endif - - # Clean up these lists so empty lists are empty - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) -@@ -123,6 +126,7 @@ - $(call import-one-sources,JAXP_DIST,$1) - $(call import-one-sources,JAXWS_DIST,$1) - $(call import-one-sources,NETX_DIST,$1) -+$(call import-one-sources,LIVECONNECT_DIST,$1) - endef - - # Import all component docs into directory $1 (optional) -@@ -162,6 +166,7 @@ - $(call import-one-classes,JAXP_DIST,$1) - $(call import-one-classes,JAXWS_DIST,$1) - $(call import-one-classes,NETX_DIST,$1) -+$(call import-one-classes,LIVECONNECT_DIST,$1) - endef - - # Clean up import files -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-11-11 02:52:44.000000000 +0000 -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-11-11 02:13:22.000000000 +0000 -@@ -365,6 +365,11 @@ - else - NETX_DIST = - endif -+ifdef ALT_LIVECONNECT_DIST -+ LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST)) -+else -+ LIVECONNECT_DIST = -+endif - - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH diff -r 6530d2aa9076 patches/extensions/netx-dist.patch --- a/patches/extensions/netx-dist.patch Thu Aug 05 16:58:30 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,86 +0,0 @@ -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-netx.gmk openjdk/jdk/make/common/internal/Defs-netx.gmk ---- openjdk.orig/jdk/make/common/internal/Defs-netx.gmk 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/make/common/internal/Defs-netx.gmk 2009-05-28 09:18:45.000000000 +0100 -@@ -0,0 +1,38 @@ -+# -+# Copyright 2009 Red Hat, 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. Red Hat 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. -+# -+ -+# The specific packages that come from or go to rt.jar and tools.jar -+IMPORT_RT_PACKAGES += \ -+ net/sourceforge/jnlp \ -+ net/sourceforge/jnlp/tools \ -+ net/sourceforge/jnlp/runtime \ -+ net/sourceforge/jnlp/util \ -+ net/sourceforge/jnlp/services \ -+ net/sourceforge/jnlp/security \ -+ net/sourceforge/jnlp/security/viewer \ -+ net/sourceforge/jnlp/cache \ -+ net/sourceforge/jnlp/event \ -+ net/sourceforge/jnlp/resources \ -+ net/sourceforge/nanoxml \ -+ javax/jnlp -+ -+IMPORT_TOOLS_PACKAGES += -+ -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100 -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:10:56.000000000 +0100 -@@ -46,6 +46,9 @@ - ifndef JAXWS_DIST - include $(BUILDDIR)/common/internal/Defs-jaxws.gmk - endif -+ifndef NETX_DIST -+ include $(BUILDDIR)/common/internal/Defs-netx.gmk -+endif - - # Clean up these lists so empty lists are empty - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) -@@ -119,6 +122,7 @@ - $(call import-one-sources,CORBA_DIST,$1) - $(call import-one-sources,JAXP_DIST,$1) - $(call import-one-sources,JAXWS_DIST,$1) -+$(call import-one-sources,NETX_DIST,$1) - endef - - # Import all component docs into directory $1 (optional) -@@ -157,6 +161,7 @@ - $(call import-one-classes,CORBA_DIST,$1) - $(call import-one-classes,JAXP_DIST,$1) - $(call import-one-classes,JAXWS_DIST,$1) -+$(call import-one-classes,NETX_DIST,$1) - endef - - # Clean up import files -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-29 02:11:18.000000000 +0100 -@@ -344,6 +344,11 @@ - else - JAXWS_DIST = - endif -+ifdef ALT_NETX_DIST -+ NETX_DIST := $(call FullPath,$(ALT_NETX_DIST)) -+else -+ NETX_DIST = -+endif - - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH From andrew at icedtea.classpath.org Fri Aug 6 12:08:25 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 06 Aug 2010 19:08:25 +0000 Subject: /hg/icedtea6: Bump to 1.10. Message-ID: changeset a570f4fed326 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a570f4fed326 author: Andrew John Hughes date: Fri Aug 06 20:08:18 2010 +0100 Bump to 1.10. 2010-08-06 Andrew John Hughes * configure.ac: Bump to 1.10. * NEWS: Add 1.10 section. diffstat: 3 files changed, 8 insertions(+), 1 deletion(-) ChangeLog | 5 +++++ NEWS | 2 ++ configure.ac | 2 +- diffs (33 lines): diff -r da8128c0b021 -r a570f4fed326 ChangeLog --- a/ChangeLog Fri Aug 06 11:53:49 2010 +0100 +++ b/ChangeLog Fri Aug 06 20:08:18 2010 +0100 @@ -1,3 +1,8 @@ 2010-08-06 Andrew John Hughes + + * configure.ac: Bump to 1.10. + * NEWS: Add 1.10 section. + 2010-08-06 Andrew John Hughes Fix build on PAX-enabled kernels. diff -r da8128c0b021 -r a570f4fed326 NEWS --- a/NEWS Fri Aug 06 11:53:49 2010 +0100 +++ b/NEWS Fri Aug 06 20:08:18 2010 +0100 @@ -7,6 +7,8 @@ GX - http://bugs.gentoo.org/show_bug.cg GX - http://bugs.gentoo.org/show_bug.cgi?id=X CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY + +New in release 1.10 (2010-XX-XX): New in release 1.9 (2010-XX-XX): diff -r da8128c0b021 -r a570f4fed326 configure.ac --- a/configure.ac Fri Aug 06 11:53:49 2010 +0100 +++ b/configure.ac Fri Aug 06 20:08:18 2010 +0100 @@ -1,4 +1,4 @@ AC_INIT([icedtea6],[1.9pre],[distro-pkg- -AC_INIT([icedtea6],[1.9pre],[distro-pkg-dev at openjdk.java.net]) +AC_INIT([icedtea6],[1.10pre],[distro-pkg-dev at openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile]) From dbhole at redhat.com Fri Aug 6 12:22:31 2010 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 6 Aug 2010 15:22:31 -0400 Subject: [PATCH FOR TESTING] Separation of plugin and NetX into separate JARs In-Reply-To: <20100805222803.GJ6867@rivendell.middle-earth.co.uk> References: <20100805175048.GI6867@rivendell.middle-earth.co.uk> <20100805193038.GB2505@redhat.com> <20100805222803.GJ6867@rivendell.middle-earth.co.uk> Message-ID: <20100806192231.GB16822@redhat.com> * Dr Andrew John Hughes [2010-08-05 18:28]: > On 15:30 Thu 05 Aug , Deepak Bhole wrote: > > * Dr Andrew John Hughes [2010-08-05 13:50]: > > > The attached patch changes the IcedTea build to produce two > > > jar files (netx.jar and plugin.jar) in the JDK images for NetX > > > and the plugin respectively, rather than adding their classes to > > > rt.jar. > > > > > > Deepak et. al., can you please test this, make any needed changes to > > > the plugin/NetX and commit? > > > > > > > While the patch produces a plugin.jar and a netx.jar, they are not in > > the bootclasspath. As a result, an error happens when something like > > javaws is invoked: > > > > $ $JAVA_HOME/bin/javaws http://www.sweethome3d.com/SweetHome3D.jnlp > > Exception in thread "main" java.lang.NoClassDefFoundError: > > net/sourceforge/jnlp/runtime/Boot > > > > Yes, I expected something like this. That's what I need you to fix. > Ah, in that case ... :) New patch attached. It addresses the issue. Cheers, Deepak > > Cheers, > > Deepak > > > > > 2010-08-05 Andrew John Hughes > > > > > > Produce separate JAR files for NetX and the > > > plugin (netx.jar and plugin.jar) rather than > > > integrating their code into rt.jar. > > > * patches/extensions/liveconnect-dist.patch, > > > * patches/extensions/netx-dist.patch: > > > Remove unneeded patches to OpenJDK build to > > > integrate NetX and the plugin's Java code. > > > * Makefile.am: > > > (ICEDTEA_ENV): Drop ALT_NETX_DIST and > > > ALT_LIVECONNECT_DIST. > > > (.PHONY): Add new clean targets. > > > (icedtea): Remove unneeded NetX and plugin > > > dependencies and copying. > > > (icedtea-debug): Likewise. > > > (icedtea-against-icedtea): Depend on add-plugin > > > and add-netx. > > > (clean-icedtea-against-icedtea): Depend on clean-add-netx > > > and clean-add-plugin. > > > (icedtea-debug-against-icedtea): Depend on add-plugin-debug > > > and add-netx-debug. > > > (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug > > > and clean-add-plugin-debug. > > > (add-plugin): Copy the plugin library and jar file into the jdk images. > > > (clean-add-plugin): Revert add-plugin. > > > (add-plugin-debug): Equivalent of add-plugin for the debug build. > > > (clean-add-plugin-debug): Revert add-plugin-debug. > > > (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the > > > jdk images. > > > (clean-add-netx): Revert add-netx. > > > (add-netx-debug): Equivalent of add-netx for the debug build. > > > (clean-add-netx-debug): Revert add-netx-debug. > > > (icedtea-ecj): Remove plugin and NetX dependencies. > > > > > > Thanks, > > > -- > > > Andrew :) > > > > > > Free Java Software Engineer > > > Red Hat, Inc. (http://www.redhat.com) > > > > > > Support Free Java! > > > Contribute to GNU Classpath and the OpenJDK > > > http://www.gnu.org/software/classpath > > > http://openjdk.java.net > > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > > > > > diff -r 6530d2aa9076 ChangeLog > > > --- a/ChangeLog Thu Aug 05 16:58:30 2010 +0100 > > > +++ b/ChangeLog Thu Aug 05 18:48:29 2010 +0100 > > > @@ -1,3 +1,38 @@ > > > +2010-08-05 Andrew John Hughes > > > + > > > + Produce separate JAR files for NetX and the > > > + plugin (netx.jar and plugin.jar) rather than > > > + integrating their code into rt.jar. > > > + * patches/extensions/liveconnect-dist.patch, > > > + * patches/extensions/netx-dist.patch: > > > + Remove unneeded patches to OpenJDK build to > > > + integrate NetX and the plugin's Java code. > > > + * Makefile.am: > > > + (ICEDTEA_ENV): Drop ALT_NETX_DIST and > > > + ALT_LIVECONNECT_DIST. > > > + (.PHONY): Add new clean targets. > > > + (icedtea): Remove unneeded NetX and plugin > > > + dependencies and copying. > > > + (icedtea-debug): Likewise. > > > + (icedtea-against-icedtea): Depend on add-plugin > > > + and add-netx. > > > + (clean-icedtea-against-icedtea): Depend on clean-add-netx > > > + and clean-add-plugin. > > > + (icedtea-debug-against-icedtea): Depend on add-plugin-debug > > > + and add-netx-debug. > > > + (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug > > > + and clean-add-plugin-debug. > > > + (add-plugin): Copy the plugin library and jar file into the jdk images. > > > + (clean-add-plugin): Revert add-plugin. > > > + (add-plugin-debug): Equivalent of add-plugin for the debug build. > > > + (clean-add-plugin-debug): Revert add-plugin-debug. > > > + (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the > > > + jdk images. > > > + (clean-add-netx): Revert add-netx. > > > + (add-netx-debug): Equivalent of add-netx for the debug build. > > > + (clean-add-netx-debug): Revert add-netx-debug. > > > + (icedtea-ecj): Remove plugin and NetX dependencies. > > > + > > > 2010-08-05 Andrew John Hughes > > > > > > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560056 > > > diff -r 6530d2aa9076 Makefile.am > > > --- a/Makefile.am Thu Aug 05 16:58:30 2010 +0100 > > > +++ b/Makefile.am Thu Aug 05 18:48:29 2010 +0100 > > > @@ -273,7 +273,6 @@ > > > patches/libpng.patch \ > > > patches/shark.patch \ > > > patches/extensions/netx.patch \ > > > - patches/extensions/netx-dist.patch \ > > > patches/extensions/netx-umask.patch \ > > > patches/icedtea-jtreg-httpTest.patch \ > > > patches/arm.patch \ > > > @@ -297,8 +296,7 @@ > > > > > > if ENABLE_PLUGIN > > > ICEDTEA_PATCHES += \ > > > - patches/extensions/liveconnect.patch \ > > > - patches/extensions/liveconnect-dist.patch > > > + patches/extensions/liveconnect.patch > > > endif > > > > > > if BUILD_CACAO > > > @@ -433,8 +431,6 @@ > > > DEBUG_BINARIES="true" \ > > > ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ > > > VERBOSE="$(VERBOSE)" \ > > > - ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ > > > - ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \ > > > ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" > > > > > > if WITH_CACAO > > > @@ -560,7 +556,8 @@ > > > clean-icedtea-against-ecj clean-cacao clean-add-cacao clean-add-cacao-debug \ > > > clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \ > > > clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \ > > > - clean-rewriter clean-rewrite-rhino > > > + clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \ > > > + clean-add-plugin clean-add-plugin-debug > > > > > > env: > > > @echo 'unset JAVA_HOME' > > > @@ -1207,9 +1204,7 @@ > > > # If you change anything here in the icedtea target, please make sure > > > # you change it in the icedtea-debug target as well. > > > stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > > > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > > > - stamps/rewrite-rhino.stamp > > > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > > > $(ARCH_PREFIX) $(MAKE) \ > > > $(ICEDTEA_ENV) \ > > > -C openjdk \ > > > @@ -1218,12 +1213,6 @@ > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext > > > -if ENABLE_PLUGIN > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > -endif > > > if ENABLE_PULSE_JAVA > > > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > > > $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > @@ -1236,10 +1225,6 @@ > > > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > > > $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > > > endif > > > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > - $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > > > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > if ZERO_BUILD > > > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg > > > endif > > > @@ -1283,9 +1268,7 @@ > > > rm -f stamps/icedtea.stamp > > > > > > stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > > > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > > > - stamps/rewrite-rhino.stamp > > > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > > > $(ARCH_PREFIX) $(MAKE) \ > > > $(ICEDTEA_ENV) \ > > > -C openjdk \ > > > @@ -1294,12 +1277,6 @@ > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext > > > -if ENABLE_PLUGIN > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > -endif > > > if ENABLE_PULSE_JAVA > > > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > > > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > @@ -1312,10 +1289,6 @@ > > > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > > > $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > > > endif > > > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > > > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > if ZERO_BUILD > > > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg > > > endif > > > @@ -1360,27 +1333,109 @@ > > > rm -f stamps/icedtea-debug.stamp > > > > > > stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > - stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp > > > + stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp stamps/add-plugin.stamp \ > > > + stamps/add-netx.stamp > > > mkdir -p stamps > > > touch stamps/icedtea-against-icedtea.stamp > > > > > > -clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao > > > +clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx > > > rm -f stamps/icedtea-against-icedtea.stamp > > > > > > stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > - stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp > > > + stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \ > > > + stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp > > > mkdir -p stamps > > > touch stamps/icedtea-debug-against-icedtea.stamp > > > > > > -clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug > > > +clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug clean-add-plugin-debug \ > > > + clean-add-netx-debug > > > rm -f stamps/icedtea-debug-against-icedtea.stamp > > > > > > +stamps/add-plugin.stamp: stamps/plugin.stamp > > > +if ENABLE_PLUGIN > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > +endif > > > + touch stamps/add-plugin.stamp > > > + > > > +clean-add-plugin: > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > + rm -f stamps/add-plugin.stamp > > > + > > > +stamps/add-plugin-debug.stamp: stamps/plugin.stamp > > > +if ENABLE_PLUGIN > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > +endif > > > + touch stamps/add-plugin-debug.stamp > > > + > > > +clean-add-plugin-debug: > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > + rm -f stamps/add-plugin-debug.stamp > > > + > > > +stamps/add-netx.stamp: stamps/netx-dist.stamp extra-lib/about.jar > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib > > > + touch stamps/add-netx.stamp > > > + > > > +clean-add-netx: > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > > > + rm -f stamps/add-netx.stamp > > > + > > > +stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib > > > + touch stamps/add-netx-debug.stamp > > > + > > > +clean-add-netx-debug: > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > > > + rm -f stamps/add-netx-debug.stamp > > > + > > > # OpenJDK ecj Targets > > > # =================== > > > > > > stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ > > > - stamps/netx-dist.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \ > > > - stamps/rewrite-rhino.stamp stamps/plugin.stamp > > > + $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp > > > $(ARCH_PREFIX) $(MAKE) \ > > > $(ICEDTEA_ENV_ECJ) \ > > > -C openjdk-ecj/ \ > > > diff -r 6530d2aa9076 patches/extensions/liveconnect-dist.patch > > > --- a/patches/extensions/liveconnect-dist.patch Thu Aug 05 16:58:30 2010 +0100 > > > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > > > @@ -1,76 +0,0 @@ > > > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk > > > ---- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 > > > -+++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-11-11 02:53:36.000000000 +0000 > > > -@@ -0,0 +1,28 @@ > > > -+# > > > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > > > -+# > > > -+ > > > -+# The specific packages that come from or go to rt.jar and tools.jar > > > -+IMPORT_RT_PACKAGES += \ > > > -+ netscape/javascript \ > > > -+ sun/applet > > > -+ > > > -+IMPORT_TOOLS_PACKAGES += > > > -+ > > > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > > > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:52:44.000000000 +0000 > > > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:57:32.000000000 +0000 > > > -@@ -49,6 +49,9 @@ > > > - ifndef NETX_DIST > > > - include $(BUILDDIR)/common/internal/Defs-netx.gmk > > > - endif > > > -+ifndef LIVECONNECT_DIST > > > -+ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk > > > -+endif > > > - > > > - # Clean up these lists so empty lists are empty > > > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > > > -@@ -123,6 +126,7 @@ > > > - $(call import-one-sources,JAXP_DIST,$1) > > > - $(call import-one-sources,JAXWS_DIST,$1) > > > - $(call import-one-sources,NETX_DIST,$1) > > > -+$(call import-one-sources,LIVECONNECT_DIST,$1) > > > - endef > > > - > > > - # Import all component docs into directory $1 (optional) > > > -@@ -162,6 +166,7 @@ > > > - $(call import-one-classes,JAXP_DIST,$1) > > > - $(call import-one-classes,JAXWS_DIST,$1) > > > - $(call import-one-classes,NETX_DIST,$1) > > > -+$(call import-one-classes,LIVECONNECT_DIST,$1) > > > - endef > > > - > > > - # Clean up import files > > > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > > > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-11-11 02:52:44.000000000 +0000 > > > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-11-11 02:13:22.000000000 +0000 > > > -@@ -365,6 +365,11 @@ > > > - else > > > - NETX_DIST = > > > - endif > > > -+ifdef ALT_LIVECONNECT_DIST > > > -+ LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST)) > > > -+else > > > -+ LIVECONNECT_DIST = > > > -+endif > > > - > > > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > > > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > > > diff -r 6530d2aa9076 patches/extensions/netx-dist.patch > > > --- a/patches/extensions/netx-dist.patch Thu Aug 05 16:58:30 2010 +0100 > > > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > > > @@ -1,86 +0,0 @@ > > > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-netx.gmk openjdk/jdk/make/common/internal/Defs-netx.gmk > > > ---- openjdk.orig/jdk/make/common/internal/Defs-netx.gmk 1970-01-01 01:00:00.000000000 +0100 > > > -+++ openjdk/jdk/make/common/internal/Defs-netx.gmk 2009-05-28 09:18:45.000000000 +0100 > > > -@@ -0,0 +1,38 @@ > > > -+# > > > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > > > -+# > > > -+ > > > -+# The specific packages that come from or go to rt.jar and tools.jar > > > -+IMPORT_RT_PACKAGES += \ > > > -+ net/sourceforge/jnlp \ > > > -+ net/sourceforge/jnlp/tools \ > > > -+ net/sourceforge/jnlp/runtime \ > > > -+ net/sourceforge/jnlp/util \ > > > -+ net/sourceforge/jnlp/services \ > > > -+ net/sourceforge/jnlp/security \ > > > -+ net/sourceforge/jnlp/security/viewer \ > > > -+ net/sourceforge/jnlp/cache \ > > > -+ net/sourceforge/jnlp/event \ > > > -+ net/sourceforge/jnlp/resources \ > > > -+ net/sourceforge/nanoxml \ > > > -+ javax/jnlp > > > -+ > > > -+IMPORT_TOOLS_PACKAGES += > > > -+ > > > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > > > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100 > > > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:10:56.000000000 +0100 > > > -@@ -46,6 +46,9 @@ > > > - ifndef JAXWS_DIST > > > - include $(BUILDDIR)/common/internal/Defs-jaxws.gmk > > > - endif > > > -+ifndef NETX_DIST > > > -+ include $(BUILDDIR)/common/internal/Defs-netx.gmk > > > -+endif > > > - > > > - # Clean up these lists so empty lists are empty > > > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > > > -@@ -119,6 +122,7 @@ > > > - $(call import-one-sources,CORBA_DIST,$1) > > > - $(call import-one-sources,JAXP_DIST,$1) > > > - $(call import-one-sources,JAXWS_DIST,$1) > > > -+$(call import-one-sources,NETX_DIST,$1) > > > - endef > > > - > > > - # Import all component docs into directory $1 (optional) > > > -@@ -157,6 +161,7 @@ > > > - $(call import-one-classes,CORBA_DIST,$1) > > > - $(call import-one-classes,JAXP_DIST,$1) > > > - $(call import-one-classes,JAXWS_DIST,$1) > > > -+$(call import-one-classes,NETX_DIST,$1) > > > - endef > > > - > > > - # Clean up import files > > > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > > > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100 > > > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-29 02:11:18.000000000 +0100 > > > -@@ -344,6 +344,11 @@ > > > - else > > > - JAXWS_DIST = > > > - endif > > > -+ifdef ALT_NETX_DIST > > > -+ NETX_DIST := $(call FullPath,$(ALT_NETX_DIST)) > > > -+else > > > -+ NETX_DIST = > > > -+endif > > > - > > > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > > > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > > > > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 -------------- next part -------------- A non-text attachment was scrubbed... Name: plugin-jars-new.diff Type: text/x-diff Size: 22875 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100806/ea1805a6/plugin-jars-new.diff From ahughes at redhat.com Fri Aug 6 12:39:17 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 6 Aug 2010 20:39:17 +0100 Subject: [PATCH FOR TESTING] Separation of plugin and NetX into separate JARs In-Reply-To: <20100806192231.GB16822@redhat.com> References: <20100805175048.GI6867@rivendell.middle-earth.co.uk> <20100805193038.GB2505@redhat.com> <20100805222803.GJ6867@rivendell.middle-earth.co.uk> <20100806192231.GB16822@redhat.com> Message-ID: <20100806193917.GQ6867@rivendell.middle-earth.co.uk> On 15:22 Fri 06 Aug , Deepak Bhole wrote: > * Dr Andrew John Hughes [2010-08-05 18:28]: > > On 15:30 Thu 05 Aug , Deepak Bhole wrote: > > > * Dr Andrew John Hughes [2010-08-05 13:50]: > > > > The attached patch changes the IcedTea build to produce two > > > > jar files (netx.jar and plugin.jar) in the JDK images for NetX > > > > and the plugin respectively, rather than adding their classes to > > > > rt.jar. > > > > > > > > Deepak et. al., can you please test this, make any needed changes to > > > > the plugin/NetX and commit? > > > > > > > > > > While the patch produces a plugin.jar and a netx.jar, they are not in > > > the bootclasspath. As a result, an error happens when something like > > > javaws is invoked: > > > > > > $ $JAVA_HOME/bin/javaws http://www.sweethome3d.com/SweetHome3D.jnlp > > > Exception in thread "main" java.lang.NoClassDefFoundError: > > > net/sourceforge/jnlp/runtime/Boot > > > > > > > Yes, I expected something like this. That's what I need you to fix. > > > > Ah, in that case ... :) > > New patch attached. It addresses the issue. > Thanks. Does java actually fail if the bootclasspath contains JAR files that don't exist? If not, could we not just have one patch that adds all three JAR files? > Cheers, > Deepak > > > > Cheers, > > > Deepak > > > > > > > 2010-08-05 Andrew John Hughes > > > > > > > > Produce separate JAR files for NetX and the > > > > plugin (netx.jar and plugin.jar) rather than > > > > integrating their code into rt.jar. > > > > * patches/extensions/liveconnect-dist.patch, > > > > * patches/extensions/netx-dist.patch: > > > > Remove unneeded patches to OpenJDK build to > > > > integrate NetX and the plugin's Java code. > > > > * Makefile.am: > > > > (ICEDTEA_ENV): Drop ALT_NETX_DIST and > > > > ALT_LIVECONNECT_DIST. > > > > (.PHONY): Add new clean targets. > > > > (icedtea): Remove unneeded NetX and plugin > > > > dependencies and copying. > > > > (icedtea-debug): Likewise. > > > > (icedtea-against-icedtea): Depend on add-plugin > > > > and add-netx. > > > > (clean-icedtea-against-icedtea): Depend on clean-add-netx > > > > and clean-add-plugin. > > > > (icedtea-debug-against-icedtea): Depend on add-plugin-debug > > > > and add-netx-debug. > > > > (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug > > > > and clean-add-plugin-debug. > > > > (add-plugin): Copy the plugin library and jar file into the jdk images. > > > > (clean-add-plugin): Revert add-plugin. > > > > (add-plugin-debug): Equivalent of add-plugin for the debug build. > > > > (clean-add-plugin-debug): Revert add-plugin-debug. > > > > (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the > > > > jdk images. > > > > (clean-add-netx): Revert add-netx. > > > > (add-netx-debug): Equivalent of add-netx for the debug build. > > > > (clean-add-netx-debug): Revert add-netx-debug. > > > > (icedtea-ecj): Remove plugin and NetX dependencies. > > > > > > > > Thanks, > > > > -- > > > > Andrew :) > > > > > > > > Free Java Software Engineer > > > > Red Hat, Inc. (http://www.redhat.com) > > > > > > > > Support Free Java! > > > > Contribute to GNU Classpath and the OpenJDK > > > > http://www.gnu.org/software/classpath > > > > http://openjdk.java.net > > > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > > > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > > > > > > > diff -r 6530d2aa9076 ChangeLog > > > > --- a/ChangeLog Thu Aug 05 16:58:30 2010 +0100 > > > > +++ b/ChangeLog Thu Aug 05 18:48:29 2010 +0100 > > > > @@ -1,3 +1,38 @@ > > > > +2010-08-05 Andrew John Hughes > > > > + > > > > + Produce separate JAR files for NetX and the > > > > + plugin (netx.jar and plugin.jar) rather than > > > > + integrating their code into rt.jar. > > > > + * patches/extensions/liveconnect-dist.patch, > > > > + * patches/extensions/netx-dist.patch: > > > > + Remove unneeded patches to OpenJDK build to > > > > + integrate NetX and the plugin's Java code. > > > > + * Makefile.am: > > > > + (ICEDTEA_ENV): Drop ALT_NETX_DIST and > > > > + ALT_LIVECONNECT_DIST. > > > > + (.PHONY): Add new clean targets. > > > > + (icedtea): Remove unneeded NetX and plugin > > > > + dependencies and copying. > > > > + (icedtea-debug): Likewise. > > > > + (icedtea-against-icedtea): Depend on add-plugin > > > > + and add-netx. > > > > + (clean-icedtea-against-icedtea): Depend on clean-add-netx > > > > + and clean-add-plugin. > > > > + (icedtea-debug-against-icedtea): Depend on add-plugin-debug > > > > + and add-netx-debug. > > > > + (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug > > > > + and clean-add-plugin-debug. > > > > + (add-plugin): Copy the plugin library and jar file into the jdk images. > > > > + (clean-add-plugin): Revert add-plugin. > > > > + (add-plugin-debug): Equivalent of add-plugin for the debug build. > > > > + (clean-add-plugin-debug): Revert add-plugin-debug. > > > > + (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the > > > > + jdk images. > > > > + (clean-add-netx): Revert add-netx. > > > > + (add-netx-debug): Equivalent of add-netx for the debug build. > > > > + (clean-add-netx-debug): Revert add-netx-debug. > > > > + (icedtea-ecj): Remove plugin and NetX dependencies. > > > > + > > > > 2010-08-05 Andrew John Hughes > > > > > > > > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560056 > > > > diff -r 6530d2aa9076 Makefile.am > > > > --- a/Makefile.am Thu Aug 05 16:58:30 2010 +0100 > > > > +++ b/Makefile.am Thu Aug 05 18:48:29 2010 +0100 > > > > @@ -273,7 +273,6 @@ > > > > patches/libpng.patch \ > > > > patches/shark.patch \ > > > > patches/extensions/netx.patch \ > > > > - patches/extensions/netx-dist.patch \ > > > > patches/extensions/netx-umask.patch \ > > > > patches/icedtea-jtreg-httpTest.patch \ > > > > patches/arm.patch \ > > > > @@ -297,8 +296,7 @@ > > > > > > > > if ENABLE_PLUGIN > > > > ICEDTEA_PATCHES += \ > > > > - patches/extensions/liveconnect.patch \ > > > > - patches/extensions/liveconnect-dist.patch > > > > + patches/extensions/liveconnect.patch > > > > endif > > > > > > > > if BUILD_CACAO > > > > @@ -433,8 +431,6 @@ > > > > DEBUG_BINARIES="true" \ > > > > ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ > > > > VERBOSE="$(VERBOSE)" \ > > > > - ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ > > > > - ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \ > > > > ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" > > > > > > > > if WITH_CACAO > > > > @@ -560,7 +556,8 @@ > > > > clean-icedtea-against-ecj clean-cacao clean-add-cacao clean-add-cacao-debug \ > > > > clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \ > > > > clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \ > > > > - clean-rewriter clean-rewrite-rhino > > > > + clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \ > > > > + clean-add-plugin clean-add-plugin-debug > > > > > > > > env: > > > > @echo 'unset JAVA_HOME' > > > > @@ -1207,9 +1204,7 @@ > > > > # If you change anything here in the icedtea target, please make sure > > > > # you change it in the icedtea-debug target as well. > > > > stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > > > > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > > > > - stamps/rewrite-rhino.stamp > > > > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > > > > $(ARCH_PREFIX) $(MAKE) \ > > > > $(ICEDTEA_ENV) \ > > > > -C openjdk \ > > > > @@ -1218,12 +1213,6 @@ > > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext > > > > -if ENABLE_PLUGIN > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > -endif > > > > if ENABLE_PULSE_JAVA > > > > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > > > > $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > @@ -1236,10 +1225,6 @@ > > > > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > > > > $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > > > > endif > > > > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > - $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > > > > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > if ZERO_BUILD > > > > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg > > > > endif > > > > @@ -1283,9 +1268,7 @@ > > > > rm -f stamps/icedtea.stamp > > > > > > > > stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > > > > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > > > > - stamps/rewrite-rhino.stamp > > > > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > > > > $(ARCH_PREFIX) $(MAKE) \ > > > > $(ICEDTEA_ENV) \ > > > > -C openjdk \ > > > > @@ -1294,12 +1277,6 @@ > > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext > > > > -if ENABLE_PLUGIN > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > -endif > > > > if ENABLE_PULSE_JAVA > > > > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > > > > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > @@ -1312,10 +1289,6 @@ > > > > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > > > > $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > > > > endif > > > > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > > > > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > if ZERO_BUILD > > > > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg > > > > endif > > > > @@ -1360,27 +1333,109 @@ > > > > rm -f stamps/icedtea-debug.stamp > > > > > > > > stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > - stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp > > > > + stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp stamps/add-plugin.stamp \ > > > > + stamps/add-netx.stamp > > > > mkdir -p stamps > > > > touch stamps/icedtea-against-icedtea.stamp > > > > > > > > -clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao > > > > +clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx > > > > rm -f stamps/icedtea-against-icedtea.stamp > > > > > > > > stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > - stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp > > > > + stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \ > > > > + stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp > > > > mkdir -p stamps > > > > touch stamps/icedtea-debug-against-icedtea.stamp > > > > > > > > -clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug > > > > +clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug clean-add-plugin-debug \ > > > > + clean-add-netx-debug > > > > rm -f stamps/icedtea-debug-against-icedtea.stamp > > > > > > > > +stamps/add-plugin.stamp: stamps/plugin.stamp > > > > +if ENABLE_PLUGIN > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > +endif > > > > + touch stamps/add-plugin.stamp > > > > + > > > > +clean-add-plugin: > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > + rm -f stamps/add-plugin.stamp > > > > + > > > > +stamps/add-plugin-debug.stamp: stamps/plugin.stamp > > > > +if ENABLE_PLUGIN > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > +endif > > > > + touch stamps/add-plugin-debug.stamp > > > > + > > > > +clean-add-plugin-debug: > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > + rm -f stamps/add-plugin-debug.stamp > > > > + > > > > +stamps/add-netx.stamp: stamps/netx-dist.stamp extra-lib/about.jar > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib > > > > + touch stamps/add-netx.stamp > > > > + > > > > +clean-add-netx: > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > > > > + rm -f stamps/add-netx.stamp > > > > + > > > > +stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib > > > > + touch stamps/add-netx-debug.stamp > > > > + > > > > +clean-add-netx-debug: > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > > > > + rm -f stamps/add-netx-debug.stamp > > > > + > > > > # OpenJDK ecj Targets > > > > # =================== > > > > > > > > stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ > > > > - stamps/netx-dist.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \ > > > > - stamps/rewrite-rhino.stamp stamps/plugin.stamp > > > > + $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp > > > > $(ARCH_PREFIX) $(MAKE) \ > > > > $(ICEDTEA_ENV_ECJ) \ > > > > -C openjdk-ecj/ \ > > > > diff -r 6530d2aa9076 patches/extensions/liveconnect-dist.patch > > > > --- a/patches/extensions/liveconnect-dist.patch Thu Aug 05 16:58:30 2010 +0100 > > > > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > > > > @@ -1,76 +0,0 @@ > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk > > > > ---- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 > > > > -+++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-11-11 02:53:36.000000000 +0000 > > > > -@@ -0,0 +1,28 @@ > > > > -+# > > > > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > > > > -+# > > > > -+ > > > > -+# The specific packages that come from or go to rt.jar and tools.jar > > > > -+IMPORT_RT_PACKAGES += \ > > > > -+ netscape/javascript \ > > > > -+ sun/applet > > > > -+ > > > > -+IMPORT_TOOLS_PACKAGES += > > > > -+ > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > > > > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:52:44.000000000 +0000 > > > > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:57:32.000000000 +0000 > > > > -@@ -49,6 +49,9 @@ > > > > - ifndef NETX_DIST > > > > - include $(BUILDDIR)/common/internal/Defs-netx.gmk > > > > - endif > > > > -+ifndef LIVECONNECT_DIST > > > > -+ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk > > > > -+endif > > > > - > > > > - # Clean up these lists so empty lists are empty > > > > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > > > > -@@ -123,6 +126,7 @@ > > > > - $(call import-one-sources,JAXP_DIST,$1) > > > > - $(call import-one-sources,JAXWS_DIST,$1) > > > > - $(call import-one-sources,NETX_DIST,$1) > > > > -+$(call import-one-sources,LIVECONNECT_DIST,$1) > > > > - endef > > > > - > > > > - # Import all component docs into directory $1 (optional) > > > > -@@ -162,6 +166,7 @@ > > > > - $(call import-one-classes,JAXP_DIST,$1) > > > > - $(call import-one-classes,JAXWS_DIST,$1) > > > > - $(call import-one-classes,NETX_DIST,$1) > > > > -+$(call import-one-classes,LIVECONNECT_DIST,$1) > > > > - endef > > > > - > > > > - # Clean up import files > > > > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > > > > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-11-11 02:52:44.000000000 +0000 > > > > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-11-11 02:13:22.000000000 +0000 > > > > -@@ -365,6 +365,11 @@ > > > > - else > > > > - NETX_DIST = > > > > - endif > > > > -+ifdef ALT_LIVECONNECT_DIST > > > > -+ LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST)) > > > > -+else > > > > -+ LIVECONNECT_DIST = > > > > -+endif > > > > - > > > > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > > > > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > > > > diff -r 6530d2aa9076 patches/extensions/netx-dist.patch > > > > --- a/patches/extensions/netx-dist.patch Thu Aug 05 16:58:30 2010 +0100 > > > > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > > > > @@ -1,86 +0,0 @@ > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-netx.gmk openjdk/jdk/make/common/internal/Defs-netx.gmk > > > > ---- openjdk.orig/jdk/make/common/internal/Defs-netx.gmk 1970-01-01 01:00:00.000000000 +0100 > > > > -+++ openjdk/jdk/make/common/internal/Defs-netx.gmk 2009-05-28 09:18:45.000000000 +0100 > > > > -@@ -0,0 +1,38 @@ > > > > -+# > > > > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > > > > -+# > > > > -+ > > > > -+# The specific packages that come from or go to rt.jar and tools.jar > > > > -+IMPORT_RT_PACKAGES += \ > > > > -+ net/sourceforge/jnlp \ > > > > -+ net/sourceforge/jnlp/tools \ > > > > -+ net/sourceforge/jnlp/runtime \ > > > > -+ net/sourceforge/jnlp/util \ > > > > -+ net/sourceforge/jnlp/services \ > > > > -+ net/sourceforge/jnlp/security \ > > > > -+ net/sourceforge/jnlp/security/viewer \ > > > > -+ net/sourceforge/jnlp/cache \ > > > > -+ net/sourceforge/jnlp/event \ > > > > -+ net/sourceforge/jnlp/resources \ > > > > -+ net/sourceforge/nanoxml \ > > > > -+ javax/jnlp > > > > -+ > > > > -+IMPORT_TOOLS_PACKAGES += > > > > -+ > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > > > > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100 > > > > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:10:56.000000000 +0100 > > > > -@@ -46,6 +46,9 @@ > > > > - ifndef JAXWS_DIST > > > > - include $(BUILDDIR)/common/internal/Defs-jaxws.gmk > > > > - endif > > > > -+ifndef NETX_DIST > > > > -+ include $(BUILDDIR)/common/internal/Defs-netx.gmk > > > > -+endif > > > > - > > > > - # Clean up these lists so empty lists are empty > > > > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > > > > -@@ -119,6 +122,7 @@ > > > > - $(call import-one-sources,CORBA_DIST,$1) > > > > - $(call import-one-sources,JAXP_DIST,$1) > > > > - $(call import-one-sources,JAXWS_DIST,$1) > > > > -+$(call import-one-sources,NETX_DIST,$1) > > > > - endef > > > > - > > > > - # Import all component docs into directory $1 (optional) > > > > -@@ -157,6 +161,7 @@ > > > > - $(call import-one-classes,CORBA_DIST,$1) > > > > - $(call import-one-classes,JAXP_DIST,$1) > > > > - $(call import-one-classes,JAXWS_DIST,$1) > > > > -+$(call import-one-classes,NETX_DIST,$1) > > > > - endef > > > > - > > > > - # Clean up import files > > > > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > > > > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100 > > > > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-29 02:11:18.000000000 +0100 > > > > -@@ -344,6 +344,11 @@ > > > > - else > > > > - JAXWS_DIST = > > > > - endif > > > > -+ifdef ALT_NETX_DIST > > > > -+ NETX_DIST := $(call FullPath,$(ALT_NETX_DIST)) > > > > -+else > > > > -+ NETX_DIST = > > > > -+endif > > > > - > > > > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > > > > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > > > > > > > -- > > Andrew :) > > > > Free Java Software Engineer > > Red Hat, Inc. (http://www.redhat.com) > > > > Support Free Java! > > Contribute to GNU Classpath and the OpenJDK > > http://www.gnu.org/software/classpath > > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From dbhole at redhat.com Fri Aug 6 12:57:02 2010 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 6 Aug 2010 15:57:02 -0400 Subject: [PATCH FOR TESTING] Separation of plugin and NetX into separate JARs In-Reply-To: <20100806193917.GQ6867@rivendell.middle-earth.co.uk> References: <20100805175048.GI6867@rivendell.middle-earth.co.uk> <20100805193038.GB2505@redhat.com> <20100805222803.GJ6867@rivendell.middle-earth.co.uk> <20100806192231.GB16822@redhat.com> <20100806193917.GQ6867@rivendell.middle-earth.co.uk> Message-ID: <20100806195702.GD16822@redhat.com> * Dr Andrew John Hughes [2010-08-06 15:39]: > On 15:22 Fri 06 Aug , Deepak Bhole wrote: > > * Dr Andrew John Hughes [2010-08-05 18:28]: > > > On 15:30 Thu 05 Aug , Deepak Bhole wrote: > > > > * Dr Andrew John Hughes [2010-08-05 13:50]: > > > > > The attached patch changes the IcedTea build to produce two > > > > > jar files (netx.jar and plugin.jar) in the JDK images for NetX > > > > > and the plugin respectively, rather than adding their classes to > > > > > rt.jar. > > > > > > > > > > Deepak et. al., can you please test this, make any needed changes to > > > > > the plugin/NetX and commit? > > > > > > > > > > > > > While the patch produces a plugin.jar and a netx.jar, they are not in > > > > the bootclasspath. As a result, an error happens when something like > > > > javaws is invoked: > > > > > > > > $ $JAVA_HOME/bin/javaws http://www.sweethome3d.com/SweetHome3D.jnlp > > > > Exception in thread "main" java.lang.NoClassDefFoundError: > > > > net/sourceforge/jnlp/runtime/Boot > > > > > > > > > > Yes, I expected something like this. That's what I need you to fix. > > > > > > > Ah, in that case ... :) > > > > New patch attached. It addresses the issue. > > > > Thanks. Does java actually fail if the bootclasspath contains JAR files > that don't exist? If not, could we not just have one patch that adds all > three JAR files? > Good point! I Just tried it. It works fine even if the jars are not there. I have made the changes and am testing them now. Will post the patch as soon as it is tested. Thanks, Deepak > > Cheers, > > Deepak > > > > > > Cheers, > > > > Deepak > > > > > > > > > 2010-08-05 Andrew John Hughes > > > > > > > > > > Produce separate JAR files for NetX and the > > > > > plugin (netx.jar and plugin.jar) rather than > > > > > integrating their code into rt.jar. > > > > > * patches/extensions/liveconnect-dist.patch, > > > > > * patches/extensions/netx-dist.patch: > > > > > Remove unneeded patches to OpenJDK build to > > > > > integrate NetX and the plugin's Java code. > > > > > * Makefile.am: > > > > > (ICEDTEA_ENV): Drop ALT_NETX_DIST and > > > > > ALT_LIVECONNECT_DIST. > > > > > (.PHONY): Add new clean targets. > > > > > (icedtea): Remove unneeded NetX and plugin > > > > > dependencies and copying. > > > > > (icedtea-debug): Likewise. > > > > > (icedtea-against-icedtea): Depend on add-plugin > > > > > and add-netx. > > > > > (clean-icedtea-against-icedtea): Depend on clean-add-netx > > > > > and clean-add-plugin. > > > > > (icedtea-debug-against-icedtea): Depend on add-plugin-debug > > > > > and add-netx-debug. > > > > > (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug > > > > > and clean-add-plugin-debug. > > > > > (add-plugin): Copy the plugin library and jar file into the jdk images. > > > > > (clean-add-plugin): Revert add-plugin. > > > > > (add-plugin-debug): Equivalent of add-plugin for the debug build. > > > > > (clean-add-plugin-debug): Revert add-plugin-debug. > > > > > (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the > > > > > jdk images. > > > > > (clean-add-netx): Revert add-netx. > > > > > (add-netx-debug): Equivalent of add-netx for the debug build. > > > > > (clean-add-netx-debug): Revert add-netx-debug. > > > > > (icedtea-ecj): Remove plugin and NetX dependencies. > > > > > > > > > > Thanks, > > > > > -- > > > > > Andrew :) > > > > > > > > > > Free Java Software Engineer > > > > > Red Hat, Inc. (http://www.redhat.com) > > > > > > > > > > Support Free Java! > > > > > Contribute to GNU Classpath and the OpenJDK > > > > > http://www.gnu.org/software/classpath > > > > > http://openjdk.java.net > > > > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > > > > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > > > > > > > > > diff -r 6530d2aa9076 ChangeLog > > > > > --- a/ChangeLog Thu Aug 05 16:58:30 2010 +0100 > > > > > +++ b/ChangeLog Thu Aug 05 18:48:29 2010 +0100 > > > > > @@ -1,3 +1,38 @@ > > > > > +2010-08-05 Andrew John Hughes > > > > > + > > > > > + Produce separate JAR files for NetX and the > > > > > + plugin (netx.jar and plugin.jar) rather than > > > > > + integrating their code into rt.jar. > > > > > + * patches/extensions/liveconnect-dist.patch, > > > > > + * patches/extensions/netx-dist.patch: > > > > > + Remove unneeded patches to OpenJDK build to > > > > > + integrate NetX and the plugin's Java code. > > > > > + * Makefile.am: > > > > > + (ICEDTEA_ENV): Drop ALT_NETX_DIST and > > > > > + ALT_LIVECONNECT_DIST. > > > > > + (.PHONY): Add new clean targets. > > > > > + (icedtea): Remove unneeded NetX and plugin > > > > > + dependencies and copying. > > > > > + (icedtea-debug): Likewise. > > > > > + (icedtea-against-icedtea): Depend on add-plugin > > > > > + and add-netx. > > > > > + (clean-icedtea-against-icedtea): Depend on clean-add-netx > > > > > + and clean-add-plugin. > > > > > + (icedtea-debug-against-icedtea): Depend on add-plugin-debug > > > > > + and add-netx-debug. > > > > > + (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug > > > > > + and clean-add-plugin-debug. > > > > > + (add-plugin): Copy the plugin library and jar file into the jdk images. > > > > > + (clean-add-plugin): Revert add-plugin. > > > > > + (add-plugin-debug): Equivalent of add-plugin for the debug build. > > > > > + (clean-add-plugin-debug): Revert add-plugin-debug. > > > > > + (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the > > > > > + jdk images. > > > > > + (clean-add-netx): Revert add-netx. > > > > > + (add-netx-debug): Equivalent of add-netx for the debug build. > > > > > + (clean-add-netx-debug): Revert add-netx-debug. > > > > > + (icedtea-ecj): Remove plugin and NetX dependencies. > > > > > + > > > > > 2010-08-05 Andrew John Hughes > > > > > > > > > > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560056 > > > > > diff -r 6530d2aa9076 Makefile.am > > > > > --- a/Makefile.am Thu Aug 05 16:58:30 2010 +0100 > > > > > +++ b/Makefile.am Thu Aug 05 18:48:29 2010 +0100 > > > > > @@ -273,7 +273,6 @@ > > > > > patches/libpng.patch \ > > > > > patches/shark.patch \ > > > > > patches/extensions/netx.patch \ > > > > > - patches/extensions/netx-dist.patch \ > > > > > patches/extensions/netx-umask.patch \ > > > > > patches/icedtea-jtreg-httpTest.patch \ > > > > > patches/arm.patch \ > > > > > @@ -297,8 +296,7 @@ > > > > > > > > > > if ENABLE_PLUGIN > > > > > ICEDTEA_PATCHES += \ > > > > > - patches/extensions/liveconnect.patch \ > > > > > - patches/extensions/liveconnect-dist.patch > > > > > + patches/extensions/liveconnect.patch > > > > > endif > > > > > > > > > > if BUILD_CACAO > > > > > @@ -433,8 +431,6 @@ > > > > > DEBUG_BINARIES="true" \ > > > > > ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ > > > > > VERBOSE="$(VERBOSE)" \ > > > > > - ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ > > > > > - ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \ > > > > > ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" > > > > > > > > > > if WITH_CACAO > > > > > @@ -560,7 +556,8 @@ > > > > > clean-icedtea-against-ecj clean-cacao clean-add-cacao clean-add-cacao-debug \ > > > > > clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \ > > > > > clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \ > > > > > - clean-rewriter clean-rewrite-rhino > > > > > + clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \ > > > > > + clean-add-plugin clean-add-plugin-debug > > > > > > > > > > env: > > > > > @echo 'unset JAVA_HOME' > > > > > @@ -1207,9 +1204,7 @@ > > > > > # If you change anything here in the icedtea target, please make sure > > > > > # you change it in the icedtea-debug target as well. > > > > > stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > > > > > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > > > > > - stamps/rewrite-rhino.stamp > > > > > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > > > > > $(ARCH_PREFIX) $(MAKE) \ > > > > > $(ICEDTEA_ENV) \ > > > > > -C openjdk \ > > > > > @@ -1218,12 +1213,6 @@ > > > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > > > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext > > > > > -if ENABLE_PLUGIN > > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > -endif > > > > > if ENABLE_PULSE_JAVA > > > > > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > > > > > $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > @@ -1236,10 +1225,6 @@ > > > > > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > > > > > $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > > > > > endif > > > > > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > - $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > > > > > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > > if ZERO_BUILD > > > > > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg > > > > > endif > > > > > @@ -1283,9 +1268,7 @@ > > > > > rm -f stamps/icedtea.stamp > > > > > > > > > > stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > > > > > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > > > > > - stamps/rewrite-rhino.stamp > > > > > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > > > > > $(ARCH_PREFIX) $(MAKE) \ > > > > > $(ICEDTEA_ENV) \ > > > > > -C openjdk \ > > > > > @@ -1294,12 +1277,6 @@ > > > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > > > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext > > > > > -if ENABLE_PLUGIN > > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > -endif > > > > > if ENABLE_PULSE_JAVA > > > > > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > > > > > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > @@ -1312,10 +1289,6 @@ > > > > > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > > > > > $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > > > > > endif > > > > > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > > > > > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > > if ZERO_BUILD > > > > > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg > > > > > endif > > > > > @@ -1360,27 +1333,109 @@ > > > > > rm -f stamps/icedtea-debug.stamp > > > > > > > > > > stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > > - stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp > > > > > + stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp stamps/add-plugin.stamp \ > > > > > + stamps/add-netx.stamp > > > > > mkdir -p stamps > > > > > touch stamps/icedtea-against-icedtea.stamp > > > > > > > > > > -clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao > > > > > +clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx > > > > > rm -f stamps/icedtea-against-icedtea.stamp > > > > > > > > > > stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > > - stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp > > > > > + stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \ > > > > > + stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp > > > > > mkdir -p stamps > > > > > touch stamps/icedtea-debug-against-icedtea.stamp > > > > > > > > > > -clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug > > > > > +clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug clean-add-plugin-debug \ > > > > > + clean-add-netx-debug > > > > > rm -f stamps/icedtea-debug-against-icedtea.stamp > > > > > > > > > > +stamps/add-plugin.stamp: stamps/plugin.stamp > > > > > +if ENABLE_PLUGIN > > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > > +endif > > > > > + touch stamps/add-plugin.stamp > > > > > + > > > > > +clean-add-plugin: > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > > + rm -f stamps/add-plugin.stamp > > > > > + > > > > > +stamps/add-plugin-debug.stamp: stamps/plugin.stamp > > > > > +if ENABLE_PLUGIN > > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > > +endif > > > > > + touch stamps/add-plugin-debug.stamp > > > > > + > > > > > +clean-add-plugin-debug: > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > > + rm -f stamps/add-plugin-debug.stamp > > > > > + > > > > > +stamps/add-netx.stamp: stamps/netx-dist.stamp extra-lib/about.jar > > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib > > > > > + touch stamps/add-netx.stamp > > > > > + > > > > > +clean-add-netx: > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > > > > > + rm -f stamps/add-netx.stamp > > > > > + > > > > > +stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar > > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib > > > > > + touch stamps/add-netx-debug.stamp > > > > > + > > > > > +clean-add-netx-debug: > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > > > > > + rm -f stamps/add-netx-debug.stamp > > > > > + > > > > > # OpenJDK ecj Targets > > > > > # =================== > > > > > > > > > > stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ > > > > > - stamps/netx-dist.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \ > > > > > - stamps/rewrite-rhino.stamp stamps/plugin.stamp > > > > > + $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp > > > > > $(ARCH_PREFIX) $(MAKE) \ > > > > > $(ICEDTEA_ENV_ECJ) \ > > > > > -C openjdk-ecj/ \ > > > > > diff -r 6530d2aa9076 patches/extensions/liveconnect-dist.patch > > > > > --- a/patches/extensions/liveconnect-dist.patch Thu Aug 05 16:58:30 2010 +0100 > > > > > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > > > > > @@ -1,76 +0,0 @@ > > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk > > > > > ---- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 > > > > > -+++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-11-11 02:53:36.000000000 +0000 > > > > > -@@ -0,0 +1,28 @@ > > > > > -+# > > > > > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > > > > > -+# > > > > > -+ > > > > > -+# The specific packages that come from or go to rt.jar and tools.jar > > > > > -+IMPORT_RT_PACKAGES += \ > > > > > -+ netscape/javascript \ > > > > > -+ sun/applet > > > > > -+ > > > > > -+IMPORT_TOOLS_PACKAGES += > > > > > -+ > > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > > > > > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:52:44.000000000 +0000 > > > > > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:57:32.000000000 +0000 > > > > > -@@ -49,6 +49,9 @@ > > > > > - ifndef NETX_DIST > > > > > - include $(BUILDDIR)/common/internal/Defs-netx.gmk > > > > > - endif > > > > > -+ifndef LIVECONNECT_DIST > > > > > -+ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk > > > > > -+endif > > > > > - > > > > > - # Clean up these lists so empty lists are empty > > > > > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > > > > > -@@ -123,6 +126,7 @@ > > > > > - $(call import-one-sources,JAXP_DIST,$1) > > > > > - $(call import-one-sources,JAXWS_DIST,$1) > > > > > - $(call import-one-sources,NETX_DIST,$1) > > > > > -+$(call import-one-sources,LIVECONNECT_DIST,$1) > > > > > - endef > > > > > - > > > > > - # Import all component docs into directory $1 (optional) > > > > > -@@ -162,6 +166,7 @@ > > > > > - $(call import-one-classes,JAXP_DIST,$1) > > > > > - $(call import-one-classes,JAXWS_DIST,$1) > > > > > - $(call import-one-classes,NETX_DIST,$1) > > > > > -+$(call import-one-classes,LIVECONNECT_DIST,$1) > > > > > - endef > > > > > - > > > > > - # Clean up import files > > > > > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > > > > > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-11-11 02:52:44.000000000 +0000 > > > > > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-11-11 02:13:22.000000000 +0000 > > > > > -@@ -365,6 +365,11 @@ > > > > > - else > > > > > - NETX_DIST = > > > > > - endif > > > > > -+ifdef ALT_LIVECONNECT_DIST > > > > > -+ LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST)) > > > > > -+else > > > > > -+ LIVECONNECT_DIST = > > > > > -+endif > > > > > - > > > > > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > > > > > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > > > > > diff -r 6530d2aa9076 patches/extensions/netx-dist.patch > > > > > --- a/patches/extensions/netx-dist.patch Thu Aug 05 16:58:30 2010 +0100 > > > > > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > > > > > @@ -1,86 +0,0 @@ > > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-netx.gmk openjdk/jdk/make/common/internal/Defs-netx.gmk > > > > > ---- openjdk.orig/jdk/make/common/internal/Defs-netx.gmk 1970-01-01 01:00:00.000000000 +0100 > > > > > -+++ openjdk/jdk/make/common/internal/Defs-netx.gmk 2009-05-28 09:18:45.000000000 +0100 > > > > > -@@ -0,0 +1,38 @@ > > > > > -+# > > > > > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > > > > > -+# > > > > > -+ > > > > > -+# The specific packages that come from or go to rt.jar and tools.jar > > > > > -+IMPORT_RT_PACKAGES += \ > > > > > -+ net/sourceforge/jnlp \ > > > > > -+ net/sourceforge/jnlp/tools \ > > > > > -+ net/sourceforge/jnlp/runtime \ > > > > > -+ net/sourceforge/jnlp/util \ > > > > > -+ net/sourceforge/jnlp/services \ > > > > > -+ net/sourceforge/jnlp/security \ > > > > > -+ net/sourceforge/jnlp/security/viewer \ > > > > > -+ net/sourceforge/jnlp/cache \ > > > > > -+ net/sourceforge/jnlp/event \ > > > > > -+ net/sourceforge/jnlp/resources \ > > > > > -+ net/sourceforge/nanoxml \ > > > > > -+ javax/jnlp > > > > > -+ > > > > > -+IMPORT_TOOLS_PACKAGES += > > > > > -+ > > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > > > > > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100 > > > > > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:10:56.000000000 +0100 > > > > > -@@ -46,6 +46,9 @@ > > > > > - ifndef JAXWS_DIST > > > > > - include $(BUILDDIR)/common/internal/Defs-jaxws.gmk > > > > > - endif > > > > > -+ifndef NETX_DIST > > > > > -+ include $(BUILDDIR)/common/internal/Defs-netx.gmk > > > > > -+endif > > > > > - > > > > > - # Clean up these lists so empty lists are empty > > > > > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > > > > > -@@ -119,6 +122,7 @@ > > > > > - $(call import-one-sources,CORBA_DIST,$1) > > > > > - $(call import-one-sources,JAXP_DIST,$1) > > > > > - $(call import-one-sources,JAXWS_DIST,$1) > > > > > -+$(call import-one-sources,NETX_DIST,$1) > > > > > - endef > > > > > - > > > > > - # Import all component docs into directory $1 (optional) > > > > > -@@ -157,6 +161,7 @@ > > > > > - $(call import-one-classes,CORBA_DIST,$1) > > > > > - $(call import-one-classes,JAXP_DIST,$1) > > > > > - $(call import-one-classes,JAXWS_DIST,$1) > > > > > -+$(call import-one-classes,NETX_DIST,$1) > > > > > - endef > > > > > - > > > > > - # Clean up import files > > > > > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > > > > > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100 > > > > > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-29 02:11:18.000000000 +0100 > > > > > -@@ -344,6 +344,11 @@ > > > > > - else > > > > > - JAXWS_DIST = > > > > > - endif > > > > > -+ifdef ALT_NETX_DIST > > > > > -+ NETX_DIST := $(call FullPath,$(ALT_NETX_DIST)) > > > > > -+else > > > > > -+ NETX_DIST = > > > > > -+endif > > > > > - > > > > > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > > > > > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > > > > > > > > > > -- > > > Andrew :) > > > > > > Free Java Software Engineer > > > Red Hat, Inc. (http://www.redhat.com) > > > > > > Support Free Java! > > > Contribute to GNU Classpath and the OpenJDK > > > http://www.gnu.org/software/classpath > > > http://openjdk.java.net > > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > > > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From dbhole at redhat.com Fri Aug 6 14:34:36 2010 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 6 Aug 2010 17:34:36 -0400 Subject: [PATCH FOR TESTING] Separation of plugin and NetX into separate JARs In-Reply-To: <20100806195702.GD16822@redhat.com> References: <20100805175048.GI6867@rivendell.middle-earth.co.uk> <20100805193038.GB2505@redhat.com> <20100805222803.GJ6867@rivendell.middle-earth.co.uk> <20100806192231.GB16822@redhat.com> <20100806193917.GQ6867@rivendell.middle-earth.co.uk> <20100806195702.GD16822@redhat.com> Message-ID: <20100806213435.GF16822@redhat.com> * Deepak Bhole [2010-08-06 15:57]: > * Dr Andrew John Hughes [2010-08-06 15:39]: > > On 15:22 Fri 06 Aug , Deepak Bhole wrote: > > > * Dr Andrew John Hughes [2010-08-05 18:28]: > > > > On 15:30 Thu 05 Aug , Deepak Bhole wrote: > > > > > * Dr Andrew John Hughes [2010-08-05 13:50]: > > > > > > The attached patch changes the IcedTea build to produce two > > > > > > jar files (netx.jar and plugin.jar) in the JDK images for NetX > > > > > > and the plugin respectively, rather than adding their classes to > > > > > > rt.jar. > > > > > > > > > > > > Deepak et. al., can you please test this, make any needed changes to > > > > > > the plugin/NetX and commit? > > > > > > > > > > > > > > > > While the patch produces a plugin.jar and a netx.jar, they are not in > > > > > the bootclasspath. As a result, an error happens when something like > > > > > javaws is invoked: > > > > > > > > > > $ $JAVA_HOME/bin/javaws http://www.sweethome3d.com/SweetHome3D.jnlp > > > > > Exception in thread "main" java.lang.NoClassDefFoundError: > > > > > net/sourceforge/jnlp/runtime/Boot > > > > > > > > > > > > > Yes, I expected something like this. That's what I need you to fix. > > > > > > > > > > Ah, in that case ... :) > > > > > > New patch attached. It addresses the issue. > > > > > > > Thanks. Does java actually fail if the bootclasspath contains JAR files > > that don't exist? If not, could we not just have one patch that adds all > > three JAR files? > > > > Good point! I Just tried it. It works fine even if the jars are not > there. I have made the changes and am testing them now. Will post the > patch as soon as it is tested. > New file attached. Cheers, Deepak > Thanks, > Deepak > > > > Cheers, > > > Deepak > > > > > > > > Cheers, > > > > > Deepak > > > > > > > > > > > 2010-08-05 Andrew John Hughes > > > > > > > > > > > > Produce separate JAR files for NetX and the > > > > > > plugin (netx.jar and plugin.jar) rather than > > > > > > integrating their code into rt.jar. > > > > > > * patches/extensions/liveconnect-dist.patch, > > > > > > * patches/extensions/netx-dist.patch: > > > > > > Remove unneeded patches to OpenJDK build to > > > > > > integrate NetX and the plugin's Java code. > > > > > > * Makefile.am: > > > > > > (ICEDTEA_ENV): Drop ALT_NETX_DIST and > > > > > > ALT_LIVECONNECT_DIST. > > > > > > (.PHONY): Add new clean targets. > > > > > > (icedtea): Remove unneeded NetX and plugin > > > > > > dependencies and copying. > > > > > > (icedtea-debug): Likewise. > > > > > > (icedtea-against-icedtea): Depend on add-plugin > > > > > > and add-netx. > > > > > > (clean-icedtea-against-icedtea): Depend on clean-add-netx > > > > > > and clean-add-plugin. > > > > > > (icedtea-debug-against-icedtea): Depend on add-plugin-debug > > > > > > and add-netx-debug. > > > > > > (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug > > > > > > and clean-add-plugin-debug. > > > > > > (add-plugin): Copy the plugin library and jar file into the jdk images. > > > > > > (clean-add-plugin): Revert add-plugin. > > > > > > (add-plugin-debug): Equivalent of add-plugin for the debug build. > > > > > > (clean-add-plugin-debug): Revert add-plugin-debug. > > > > > > (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the > > > > > > jdk images. > > > > > > (clean-add-netx): Revert add-netx. > > > > > > (add-netx-debug): Equivalent of add-netx for the debug build. > > > > > > (clean-add-netx-debug): Revert add-netx-debug. > > > > > > (icedtea-ecj): Remove plugin and NetX dependencies. > > > > > > > > > > > > Thanks, > > > > > > -- > > > > > > Andrew :) > > > > > > > > > > > > Free Java Software Engineer > > > > > > Red Hat, Inc. (http://www.redhat.com) > > > > > > > > > > > > Support Free Java! > > > > > > Contribute to GNU Classpath and the OpenJDK > > > > > > http://www.gnu.org/software/classpath > > > > > > http://openjdk.java.net > > > > > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > > > > > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > > > > > > > > > > > diff -r 6530d2aa9076 ChangeLog > > > > > > --- a/ChangeLog Thu Aug 05 16:58:30 2010 +0100 > > > > > > +++ b/ChangeLog Thu Aug 05 18:48:29 2010 +0100 > > > > > > @@ -1,3 +1,38 @@ > > > > > > +2010-08-05 Andrew John Hughes > > > > > > + > > > > > > + Produce separate JAR files for NetX and the > > > > > > + plugin (netx.jar and plugin.jar) rather than > > > > > > + integrating their code into rt.jar. > > > > > > + * patches/extensions/liveconnect-dist.patch, > > > > > > + * patches/extensions/netx-dist.patch: > > > > > > + Remove unneeded patches to OpenJDK build to > > > > > > + integrate NetX and the plugin's Java code. > > > > > > + * Makefile.am: > > > > > > + (ICEDTEA_ENV): Drop ALT_NETX_DIST and > > > > > > + ALT_LIVECONNECT_DIST. > > > > > > + (.PHONY): Add new clean targets. > > > > > > + (icedtea): Remove unneeded NetX and plugin > > > > > > + dependencies and copying. > > > > > > + (icedtea-debug): Likewise. > > > > > > + (icedtea-against-icedtea): Depend on add-plugin > > > > > > + and add-netx. > > > > > > + (clean-icedtea-against-icedtea): Depend on clean-add-netx > > > > > > + and clean-add-plugin. > > > > > > + (icedtea-debug-against-icedtea): Depend on add-plugin-debug > > > > > > + and add-netx-debug. > > > > > > + (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug > > > > > > + and clean-add-plugin-debug. > > > > > > + (add-plugin): Copy the plugin library and jar file into the jdk images. > > > > > > + (clean-add-plugin): Revert add-plugin. > > > > > > + (add-plugin-debug): Equivalent of add-plugin for the debug build. > > > > > > + (clean-add-plugin-debug): Revert add-plugin-debug. > > > > > > + (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the > > > > > > + jdk images. > > > > > > + (clean-add-netx): Revert add-netx. > > > > > > + (add-netx-debug): Equivalent of add-netx for the debug build. > > > > > > + (clean-add-netx-debug): Revert add-netx-debug. > > > > > > + (icedtea-ecj): Remove plugin and NetX dependencies. > > > > > > + > > > > > > 2010-08-05 Andrew John Hughes > > > > > > > > > > > > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560056 > > > > > > diff -r 6530d2aa9076 Makefile.am > > > > > > --- a/Makefile.am Thu Aug 05 16:58:30 2010 +0100 > > > > > > +++ b/Makefile.am Thu Aug 05 18:48:29 2010 +0100 > > > > > > @@ -273,7 +273,6 @@ > > > > > > patches/libpng.patch \ > > > > > > patches/shark.patch \ > > > > > > patches/extensions/netx.patch \ > > > > > > - patches/extensions/netx-dist.patch \ > > > > > > patches/extensions/netx-umask.patch \ > > > > > > patches/icedtea-jtreg-httpTest.patch \ > > > > > > patches/arm.patch \ > > > > > > @@ -297,8 +296,7 @@ > > > > > > > > > > > > if ENABLE_PLUGIN > > > > > > ICEDTEA_PATCHES += \ > > > > > > - patches/extensions/liveconnect.patch \ > > > > > > - patches/extensions/liveconnect-dist.patch > > > > > > + patches/extensions/liveconnect.patch > > > > > > endif > > > > > > > > > > > > if BUILD_CACAO > > > > > > @@ -433,8 +431,6 @@ > > > > > > DEBUG_BINARIES="true" \ > > > > > > ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ > > > > > > VERBOSE="$(VERBOSE)" \ > > > > > > - ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ > > > > > > - ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \ > > > > > > ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" > > > > > > > > > > > > if WITH_CACAO > > > > > > @@ -560,7 +556,8 @@ > > > > > > clean-icedtea-against-ecj clean-cacao clean-add-cacao clean-add-cacao-debug \ > > > > > > clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \ > > > > > > clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \ > > > > > > - clean-rewriter clean-rewrite-rhino > > > > > > + clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \ > > > > > > + clean-add-plugin clean-add-plugin-debug > > > > > > > > > > > > env: > > > > > > @echo 'unset JAVA_HOME' > > > > > > @@ -1207,9 +1204,7 @@ > > > > > > # If you change anything here in the icedtea target, please make sure > > > > > > # you change it in the icedtea-debug target as well. > > > > > > stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > > > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > > > > > > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > > > > > > - stamps/rewrite-rhino.stamp > > > > > > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > > > > > > $(ARCH_PREFIX) $(MAKE) \ > > > > > > $(ICEDTEA_ENV) \ > > > > > > -C openjdk \ > > > > > > @@ -1218,12 +1213,6 @@ > > > > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > > > > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext > > > > > > -if ENABLE_PLUGIN > > > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > -endif > > > > > > if ENABLE_PULSE_JAVA > > > > > > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > > > > > > $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > @@ -1236,10 +1225,6 @@ > > > > > > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > > > > > > $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > > > > > > endif > > > > > > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > - $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > > > > > > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > > > if ZERO_BUILD > > > > > > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg > > > > > > endif > > > > > > @@ -1283,9 +1268,7 @@ > > > > > > rm -f stamps/icedtea.stamp > > > > > > > > > > > > stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > > > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > > > > > > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > > > > > > - stamps/rewrite-rhino.stamp > > > > > > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > > > > > > $(ARCH_PREFIX) $(MAKE) \ > > > > > > $(ICEDTEA_ENV) \ > > > > > > -C openjdk \ > > > > > > @@ -1294,12 +1277,6 @@ > > > > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > > > > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext > > > > > > -if ENABLE_PLUGIN > > > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > -endif > > > > > > if ENABLE_PULSE_JAVA > > > > > > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > > > > > > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > @@ -1312,10 +1289,6 @@ > > > > > > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > > > > > > $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > > > > > > endif > > > > > > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > > > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > > > > > > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > > > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > > > if ZERO_BUILD > > > > > > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg > > > > > > endif > > > > > > @@ -1360,27 +1333,109 @@ > > > > > > rm -f stamps/icedtea-debug.stamp > > > > > > > > > > > > stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > > > - stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp > > > > > > + stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp stamps/add-plugin.stamp \ > > > > > > + stamps/add-netx.stamp > > > > > > mkdir -p stamps > > > > > > touch stamps/icedtea-against-icedtea.stamp > > > > > > > > > > > > -clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao > > > > > > +clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx > > > > > > rm -f stamps/icedtea-against-icedtea.stamp > > > > > > > > > > > > stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > > > - stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp > > > > > > + stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \ > > > > > > + stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp > > > > > > mkdir -p stamps > > > > > > touch stamps/icedtea-debug-against-icedtea.stamp > > > > > > > > > > > > -clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug > > > > > > +clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug clean-add-plugin-debug \ > > > > > > + clean-add-netx-debug > > > > > > rm -f stamps/icedtea-debug-against-icedtea.stamp > > > > > > > > > > > > +stamps/add-plugin.stamp: stamps/plugin.stamp > > > > > > +if ENABLE_PLUGIN > > > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > > > +endif > > > > > > + touch stamps/add-plugin.stamp > > > > > > + > > > > > > +clean-add-plugin: > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > > > + rm -f stamps/add-plugin.stamp > > > > > > + > > > > > > +stamps/add-plugin-debug.stamp: stamps/plugin.stamp > > > > > > +if ENABLE_PLUGIN > > > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > > > +endif > > > > > > + touch stamps/add-plugin-debug.stamp > > > > > > + > > > > > > +clean-add-plugin-debug: > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > > > + rm -f stamps/add-plugin-debug.stamp > > > > > > + > > > > > > +stamps/add-netx.stamp: stamps/netx-dist.stamp extra-lib/about.jar > > > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib > > > > > > + touch stamps/add-netx.stamp > > > > > > + > > > > > > +clean-add-netx: > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > > > > > > + rm -f stamps/add-netx.stamp > > > > > > + > > > > > > +stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar > > > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib > > > > > > + touch stamps/add-netx-debug.stamp > > > > > > + > > > > > > +clean-add-netx-debug: > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > > > > > > + rm -f stamps/add-netx-debug.stamp > > > > > > + > > > > > > # OpenJDK ecj Targets > > > > > > # =================== > > > > > > > > > > > > stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ > > > > > > - stamps/netx-dist.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \ > > > > > > - stamps/rewrite-rhino.stamp stamps/plugin.stamp > > > > > > + $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp > > > > > > $(ARCH_PREFIX) $(MAKE) \ > > > > > > $(ICEDTEA_ENV_ECJ) \ > > > > > > -C openjdk-ecj/ \ > > > > > > diff -r 6530d2aa9076 patches/extensions/liveconnect-dist.patch > > > > > > --- a/patches/extensions/liveconnect-dist.patch Thu Aug 05 16:58:30 2010 +0100 > > > > > > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > > > > > > @@ -1,76 +0,0 @@ > > > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk > > > > > > ---- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 > > > > > > -+++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-11-11 02:53:36.000000000 +0000 > > > > > > -@@ -0,0 +1,28 @@ > > > > > > -+# > > > > > > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > > > > > > -+# > > > > > > -+ > > > > > > -+# The specific packages that come from or go to rt.jar and tools.jar > > > > > > -+IMPORT_RT_PACKAGES += \ > > > > > > -+ netscape/javascript \ > > > > > > -+ sun/applet > > > > > > -+ > > > > > > -+IMPORT_TOOLS_PACKAGES += > > > > > > -+ > > > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > > > > > > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:52:44.000000000 +0000 > > > > > > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:57:32.000000000 +0000 > > > > > > -@@ -49,6 +49,9 @@ > > > > > > - ifndef NETX_DIST > > > > > > - include $(BUILDDIR)/common/internal/Defs-netx.gmk > > > > > > - endif > > > > > > -+ifndef LIVECONNECT_DIST > > > > > > -+ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk > > > > > > -+endif > > > > > > - > > > > > > - # Clean up these lists so empty lists are empty > > > > > > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > > > > > > -@@ -123,6 +126,7 @@ > > > > > > - $(call import-one-sources,JAXP_DIST,$1) > > > > > > - $(call import-one-sources,JAXWS_DIST,$1) > > > > > > - $(call import-one-sources,NETX_DIST,$1) > > > > > > -+$(call import-one-sources,LIVECONNECT_DIST,$1) > > > > > > - endef > > > > > > - > > > > > > - # Import all component docs into directory $1 (optional) > > > > > > -@@ -162,6 +166,7 @@ > > > > > > - $(call import-one-classes,JAXP_DIST,$1) > > > > > > - $(call import-one-classes,JAXWS_DIST,$1) > > > > > > - $(call import-one-classes,NETX_DIST,$1) > > > > > > -+$(call import-one-classes,LIVECONNECT_DIST,$1) > > > > > > - endef > > > > > > - > > > > > > - # Clean up import files > > > > > > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > > > > > > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-11-11 02:52:44.000000000 +0000 > > > > > > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-11-11 02:13:22.000000000 +0000 > > > > > > -@@ -365,6 +365,11 @@ > > > > > > - else > > > > > > - NETX_DIST = > > > > > > - endif > > > > > > -+ifdef ALT_LIVECONNECT_DIST > > > > > > -+ LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST)) > > > > > > -+else > > > > > > -+ LIVECONNECT_DIST = > > > > > > -+endif > > > > > > - > > > > > > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > > > > > > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > > > > > > diff -r 6530d2aa9076 patches/extensions/netx-dist.patch > > > > > > --- a/patches/extensions/netx-dist.patch Thu Aug 05 16:58:30 2010 +0100 > > > > > > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > > > > > > @@ -1,86 +0,0 @@ > > > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-netx.gmk openjdk/jdk/make/common/internal/Defs-netx.gmk > > > > > > ---- openjdk.orig/jdk/make/common/internal/Defs-netx.gmk 1970-01-01 01:00:00.000000000 +0100 > > > > > > -+++ openjdk/jdk/make/common/internal/Defs-netx.gmk 2009-05-28 09:18:45.000000000 +0100 > > > > > > -@@ -0,0 +1,38 @@ > > > > > > -+# > > > > > > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > > > > > > -+# > > > > > > -+ > > > > > > -+# The specific packages that come from or go to rt.jar and tools.jar > > > > > > -+IMPORT_RT_PACKAGES += \ > > > > > > -+ net/sourceforge/jnlp \ > > > > > > -+ net/sourceforge/jnlp/tools \ > > > > > > -+ net/sourceforge/jnlp/runtime \ > > > > > > -+ net/sourceforge/jnlp/util \ > > > > > > -+ net/sourceforge/jnlp/services \ > > > > > > -+ net/sourceforge/jnlp/security \ > > > > > > -+ net/sourceforge/jnlp/security/viewer \ > > > > > > -+ net/sourceforge/jnlp/cache \ > > > > > > -+ net/sourceforge/jnlp/event \ > > > > > > -+ net/sourceforge/jnlp/resources \ > > > > > > -+ net/sourceforge/nanoxml \ > > > > > > -+ javax/jnlp > > > > > > -+ > > > > > > -+IMPORT_TOOLS_PACKAGES += > > > > > > -+ > > > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > > > > > > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100 > > > > > > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:10:56.000000000 +0100 > > > > > > -@@ -46,6 +46,9 @@ > > > > > > - ifndef JAXWS_DIST > > > > > > - include $(BUILDDIR)/common/internal/Defs-jaxws.gmk > > > > > > - endif > > > > > > -+ifndef NETX_DIST > > > > > > -+ include $(BUILDDIR)/common/internal/Defs-netx.gmk > > > > > > -+endif > > > > > > - > > > > > > - # Clean up these lists so empty lists are empty > > > > > > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > > > > > > -@@ -119,6 +122,7 @@ > > > > > > - $(call import-one-sources,CORBA_DIST,$1) > > > > > > - $(call import-one-sources,JAXP_DIST,$1) > > > > > > - $(call import-one-sources,JAXWS_DIST,$1) > > > > > > -+$(call import-one-sources,NETX_DIST,$1) > > > > > > - endef > > > > > > - > > > > > > - # Import all component docs into directory $1 (optional) > > > > > > -@@ -157,6 +161,7 @@ > > > > > > - $(call import-one-classes,CORBA_DIST,$1) > > > > > > - $(call import-one-classes,JAXP_DIST,$1) > > > > > > - $(call import-one-classes,JAXWS_DIST,$1) > > > > > > -+$(call import-one-classes,NETX_DIST,$1) > > > > > > - endef > > > > > > - > > > > > > - # Clean up import files > > > > > > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > > > > > > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100 > > > > > > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-29 02:11:18.000000000 +0100 > > > > > > -@@ -344,6 +344,11 @@ > > > > > > - else > > > > > > - JAXWS_DIST = > > > > > > - endif > > > > > > -+ifdef ALT_NETX_DIST > > > > > > -+ NETX_DIST := $(call FullPath,$(ALT_NETX_DIST)) > > > > > > -+else > > > > > > -+ NETX_DIST = > > > > > > -+endif > > > > > > - > > > > > > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > > > > > > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > > > > > > > > > > > > > -- > > > > Andrew :) > > > > > > > > Free Java Software Engineer > > > > Red Hat, Inc. (http://www.redhat.com) > > > > > > > > Support Free Java! > > > > Contribute to GNU Classpath and the OpenJDK > > > > http://www.gnu.org/software/classpath > > > > http://openjdk.java.net > > > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > > > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > > > > > > -- > > Andrew :) > > > > Free Java Software Engineer > > Red Hat, Inc. (http://www.redhat.com) > > > > Support Free Java! > > Contribute to GNU Classpath and the OpenJDK > > http://www.gnu.org/software/classpath > > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 -------------- next part -------------- A non-text attachment was scrubbed... Name: plugin-jars-new.diff Type: text/x-diff Size: 20640 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100806/5d37673d/plugin-jars-new.diff From ahughes at redhat.com Fri Aug 6 16:14:45 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Sat, 7 Aug 2010 00:14:45 +0100 Subject: [PATCH FOR TESTING] Separation of plugin and NetX into separate JARs In-Reply-To: <20100806213435.GF16822@redhat.com> References: <20100805175048.GI6867@rivendell.middle-earth.co.uk> <20100805193038.GB2505@redhat.com> <20100805222803.GJ6867@rivendell.middle-earth.co.uk> <20100806192231.GB16822@redhat.com> <20100806193917.GQ6867@rivendell.middle-earth.co.uk> <20100806195702.GD16822@redhat.com> <20100806213435.GF16822@redhat.com> Message-ID: <20100806231445.GR6867@rivendell.middle-earth.co.uk> On 17:34 Fri 06 Aug , Deepak Bhole wrote: > * Deepak Bhole [2010-08-06 15:57]: > > * Dr Andrew John Hughes [2010-08-06 15:39]: > > > On 15:22 Fri 06 Aug , Deepak Bhole wrote: > > > > * Dr Andrew John Hughes [2010-08-05 18:28]: > > > > > On 15:30 Thu 05 Aug , Deepak Bhole wrote: > > > > > > * Dr Andrew John Hughes [2010-08-05 13:50]: > > > > > > > The attached patch changes the IcedTea build to produce two > > > > > > > jar files (netx.jar and plugin.jar) in the JDK images for NetX > > > > > > > and the plugin respectively, rather than adding their classes to > > > > > > > rt.jar. > > > > > > > > > > > > > > Deepak et. al., can you please test this, make any needed changes to > > > > > > > the plugin/NetX and commit? > > > > > > > > > > > > > > > > > > > While the patch produces a plugin.jar and a netx.jar, they are not in > > > > > > the bootclasspath. As a result, an error happens when something like > > > > > > javaws is invoked: > > > > > > > > > > > > $ $JAVA_HOME/bin/javaws http://www.sweethome3d.com/SweetHome3D.jnlp > > > > > > Exception in thread "main" java.lang.NoClassDefFoundError: > > > > > > net/sourceforge/jnlp/runtime/Boot > > > > > > > > > > > > > > > > Yes, I expected something like this. That's what I need you to fix. > > > > > > > > > > > > > Ah, in that case ... :) > > > > > > > > New patch attached. It addresses the issue. > > > > > > > > > > Thanks. Does java actually fail if the bootclasspath contains JAR files > > > that don't exist? If not, could we not just have one patch that adds all > > > three JAR files? > > > > > > > Good point! I Just tried it. It works fine even if the jars are not > > there. I have made the changes and am testing them now. Will post the > > patch as soon as it is tested. > > > > New file attached. > Looks good. Couple of niggles: * Drop the 'icedtea' prefix on the patch name. It's fine as update-bootclasspath.patch. I'm planning to do a mass rename of the old ones for 1.10 as the prefix is redundant. * You haven't credited yourself in the ChangeLog :-) The new changes should be under your name. Ok to commit to HEAD and 1.9 branch with those changes. Thanks for testing. > Cheers, > Deepak > > > Thanks, > > Deepak > > > > > > Cheers, > > > > Deepak > > > > > > > > > > Cheers, > > > > > > Deepak > > > > > > > > > > > > > 2010-08-05 Andrew John Hughes > > > > > > > > > > > > > > Produce separate JAR files for NetX and the > > > > > > > plugin (netx.jar and plugin.jar) rather than > > > > > > > integrating their code into rt.jar. > > > > > > > * patches/extensions/liveconnect-dist.patch, > > > > > > > * patches/extensions/netx-dist.patch: > > > > > > > Remove unneeded patches to OpenJDK build to > > > > > > > integrate NetX and the plugin's Java code. > > > > > > > * Makefile.am: > > > > > > > (ICEDTEA_ENV): Drop ALT_NETX_DIST and > > > > > > > ALT_LIVECONNECT_DIST. > > > > > > > (.PHONY): Add new clean targets. > > > > > > > (icedtea): Remove unneeded NetX and plugin > > > > > > > dependencies and copying. > > > > > > > (icedtea-debug): Likewise. > > > > > > > (icedtea-against-icedtea): Depend on add-plugin > > > > > > > and add-netx. > > > > > > > (clean-icedtea-against-icedtea): Depend on clean-add-netx > > > > > > > and clean-add-plugin. > > > > > > > (icedtea-debug-against-icedtea): Depend on add-plugin-debug > > > > > > > and add-netx-debug. > > > > > > > (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug > > > > > > > and clean-add-plugin-debug. > > > > > > > (add-plugin): Copy the plugin library and jar file into the jdk images. > > > > > > > (clean-add-plugin): Revert add-plugin. > > > > > > > (add-plugin-debug): Equivalent of add-plugin for the debug build. > > > > > > > (clean-add-plugin-debug): Revert add-plugin-debug. > > > > > > > (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the > > > > > > > jdk images. > > > > > > > (clean-add-netx): Revert add-netx. > > > > > > > (add-netx-debug): Equivalent of add-netx for the debug build. > > > > > > > (clean-add-netx-debug): Revert add-netx-debug. > > > > > > > (icedtea-ecj): Remove plugin and NetX dependencies. > > > > > > > > > > > > > > Thanks, > > > > > > > -- > > > > > > > Andrew :) > > > > > > > > > > > > > > Free Java Software Engineer > > > > > > > Red Hat, Inc. (http://www.redhat.com) > > > > > > > > > > > > > > Support Free Java! > > > > > > > Contribute to GNU Classpath and the OpenJDK > > > > > > > http://www.gnu.org/software/classpath > > > > > > > http://openjdk.java.net > > > > > > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > > > > > > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > > > > > > > > > > > > > diff -r 6530d2aa9076 ChangeLog > > > > > > > --- a/ChangeLog Thu Aug 05 16:58:30 2010 +0100 > > > > > > > +++ b/ChangeLog Thu Aug 05 18:48:29 2010 +0100 > > > > > > > @@ -1,3 +1,38 @@ > > > > > > > +2010-08-05 Andrew John Hughes > > > > > > > + > > > > > > > + Produce separate JAR files for NetX and the > > > > > > > + plugin (netx.jar and plugin.jar) rather than > > > > > > > + integrating their code into rt.jar. > > > > > > > + * patches/extensions/liveconnect-dist.patch, > > > > > > > + * patches/extensions/netx-dist.patch: > > > > > > > + Remove unneeded patches to OpenJDK build to > > > > > > > + integrate NetX and the plugin's Java code. > > > > > > > + * Makefile.am: > > > > > > > + (ICEDTEA_ENV): Drop ALT_NETX_DIST and > > > > > > > + ALT_LIVECONNECT_DIST. > > > > > > > + (.PHONY): Add new clean targets. > > > > > > > + (icedtea): Remove unneeded NetX and plugin > > > > > > > + dependencies and copying. > > > > > > > + (icedtea-debug): Likewise. > > > > > > > + (icedtea-against-icedtea): Depend on add-plugin > > > > > > > + and add-netx. > > > > > > > + (clean-icedtea-against-icedtea): Depend on clean-add-netx > > > > > > > + and clean-add-plugin. > > > > > > > + (icedtea-debug-against-icedtea): Depend on add-plugin-debug > > > > > > > + and add-netx-debug. > > > > > > > + (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug > > > > > > > + and clean-add-plugin-debug. > > > > > > > + (add-plugin): Copy the plugin library and jar file into the jdk images. > > > > > > > + (clean-add-plugin): Revert add-plugin. > > > > > > > + (add-plugin-debug): Equivalent of add-plugin for the debug build. > > > > > > > + (clean-add-plugin-debug): Revert add-plugin-debug. > > > > > > > + (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the > > > > > > > + jdk images. > > > > > > > + (clean-add-netx): Revert add-netx. > > > > > > > + (add-netx-debug): Equivalent of add-netx for the debug build. > > > > > > > + (clean-add-netx-debug): Revert add-netx-debug. > > > > > > > + (icedtea-ecj): Remove plugin and NetX dependencies. > > > > > > > + > > > > > > > 2010-08-05 Andrew John Hughes > > > > > > > > > > > > > > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560056 > > > > > > > diff -r 6530d2aa9076 Makefile.am > > > > > > > --- a/Makefile.am Thu Aug 05 16:58:30 2010 +0100 > > > > > > > +++ b/Makefile.am Thu Aug 05 18:48:29 2010 +0100 > > > > > > > @@ -273,7 +273,6 @@ > > > > > > > patches/libpng.patch \ > > > > > > > patches/shark.patch \ > > > > > > > patches/extensions/netx.patch \ > > > > > > > - patches/extensions/netx-dist.patch \ > > > > > > > patches/extensions/netx-umask.patch \ > > > > > > > patches/icedtea-jtreg-httpTest.patch \ > > > > > > > patches/arm.patch \ > > > > > > > @@ -297,8 +296,7 @@ > > > > > > > > > > > > > > if ENABLE_PLUGIN > > > > > > > ICEDTEA_PATCHES += \ > > > > > > > - patches/extensions/liveconnect.patch \ > > > > > > > - patches/extensions/liveconnect-dist.patch > > > > > > > + patches/extensions/liveconnect.patch > > > > > > > endif > > > > > > > > > > > > > > if BUILD_CACAO > > > > > > > @@ -433,8 +431,6 @@ > > > > > > > DEBUG_BINARIES="true" \ > > > > > > > ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ > > > > > > > VERBOSE="$(VERBOSE)" \ > > > > > > > - ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ > > > > > > > - ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \ > > > > > > > ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" > > > > > > > > > > > > > > if WITH_CACAO > > > > > > > @@ -560,7 +556,8 @@ > > > > > > > clean-icedtea-against-ecj clean-cacao clean-add-cacao clean-add-cacao-debug \ > > > > > > > clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \ > > > > > > > clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \ > > > > > > > - clean-rewriter clean-rewrite-rhino > > > > > > > + clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \ > > > > > > > + clean-add-plugin clean-add-plugin-debug > > > > > > > > > > > > > > env: > > > > > > > @echo 'unset JAVA_HOME' > > > > > > > @@ -1207,9 +1204,7 @@ > > > > > > > # If you change anything here in the icedtea target, please make sure > > > > > > > # you change it in the icedtea-debug target as well. > > > > > > > stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > > > > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > > > > > > > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > > > > > > > - stamps/rewrite-rhino.stamp > > > > > > > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > > > > > > > $(ARCH_PREFIX) $(MAKE) \ > > > > > > > $(ICEDTEA_ENV) \ > > > > > > > -C openjdk \ > > > > > > > @@ -1218,12 +1213,6 @@ > > > > > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > > > > > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext > > > > > > > -if ENABLE_PLUGIN > > > > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > > - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > > -endif > > > > > > > if ENABLE_PULSE_JAVA > > > > > > > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > > > > > > > $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > > @@ -1236,10 +1225,6 @@ > > > > > > > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > > > > > > > $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > > > > > > > endif > > > > > > > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > > - $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > > > > > > > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > > > > if ZERO_BUILD > > > > > > > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg > > > > > > > endif > > > > > > > @@ -1283,9 +1268,7 @@ > > > > > > > rm -f stamps/icedtea.stamp > > > > > > > > > > > > > > stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > > > > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > > > > > > > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > > > > > > > - stamps/rewrite-rhino.stamp > > > > > > > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > > > > > > > $(ARCH_PREFIX) $(MAKE) \ > > > > > > > $(ICEDTEA_ENV) \ > > > > > > > -C openjdk \ > > > > > > > @@ -1294,12 +1277,6 @@ > > > > > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > > > > > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext > > > > > > > -if ENABLE_PLUGIN > > > > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > > -endif > > > > > > > if ENABLE_PULSE_JAVA > > > > > > > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > > > > > > > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > > @@ -1312,10 +1289,6 @@ > > > > > > > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > > > > > > > $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > > > > > > > endif > > > > > > > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > > > > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > > > > > > > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > > > > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > > > > if ZERO_BUILD > > > > > > > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg > > > > > > > endif > > > > > > > @@ -1360,27 +1333,109 @@ > > > > > > > rm -f stamps/icedtea-debug.stamp > > > > > > > > > > > > > > stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > > > > - stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp > > > > > > > + stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp stamps/add-plugin.stamp \ > > > > > > > + stamps/add-netx.stamp > > > > > > > mkdir -p stamps > > > > > > > touch stamps/icedtea-against-icedtea.stamp > > > > > > > > > > > > > > -clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao > > > > > > > +clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx > > > > > > > rm -f stamps/icedtea-against-icedtea.stamp > > > > > > > > > > > > > > stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > > > > - stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp > > > > > > > + stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \ > > > > > > > + stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp > > > > > > > mkdir -p stamps > > > > > > > touch stamps/icedtea-debug-against-icedtea.stamp > > > > > > > > > > > > > > -clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug > > > > > > > +clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug clean-add-plugin-debug \ > > > > > > > + clean-add-netx-debug > > > > > > > rm -f stamps/icedtea-debug-against-icedtea.stamp > > > > > > > > > > > > > > +stamps/add-plugin.stamp: stamps/plugin.stamp > > > > > > > +if ENABLE_PLUGIN > > > > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > > > > +endif > > > > > > > + touch stamps/add-plugin.stamp > > > > > > > + > > > > > > > +clean-add-plugin: > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > > > > + rm -f stamps/add-plugin.stamp > > > > > > > + > > > > > > > +stamps/add-plugin-debug.stamp: stamps/plugin.stamp > > > > > > > +if ENABLE_PLUGIN > > > > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > > > > +endif > > > > > > > + touch stamps/add-plugin-debug.stamp > > > > > > > + > > > > > > > +clean-add-plugin-debug: > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > > > > + rm -f stamps/add-plugin-debug.stamp > > > > > > > + > > > > > > > +stamps/add-netx.stamp: stamps/netx-dist.stamp extra-lib/about.jar > > > > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib > > > > > > > + touch stamps/add-netx.stamp > > > > > > > + > > > > > > > +clean-add-netx: > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > > > > > > > + rm -f stamps/add-netx.stamp > > > > > > > + > > > > > > > +stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar > > > > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib > > > > > > > + touch stamps/add-netx-debug.stamp > > > > > > > + > > > > > > > +clean-add-netx-debug: > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > > > > > > > + rm -f stamps/add-netx-debug.stamp > > > > > > > + > > > > > > > # OpenJDK ecj Targets > > > > > > > # =================== > > > > > > > > > > > > > > stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ > > > > > > > - stamps/netx-dist.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \ > > > > > > > - stamps/rewrite-rhino.stamp stamps/plugin.stamp > > > > > > > + $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp > > > > > > > $(ARCH_PREFIX) $(MAKE) \ > > > > > > > $(ICEDTEA_ENV_ECJ) \ > > > > > > > -C openjdk-ecj/ \ > > > > > > > diff -r 6530d2aa9076 patches/extensions/liveconnect-dist.patch > > > > > > > --- a/patches/extensions/liveconnect-dist.patch Thu Aug 05 16:58:30 2010 +0100 > > > > > > > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > > > > > > > @@ -1,76 +0,0 @@ > > > > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk > > > > > > > ---- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 > > > > > > > -+++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-11-11 02:53:36.000000000 +0000 > > > > > > > -@@ -0,0 +1,28 @@ > > > > > > > -+# > > > > > > > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > > > > > > > -+# > > > > > > > -+ > > > > > > > -+# The specific packages that come from or go to rt.jar and tools.jar > > > > > > > -+IMPORT_RT_PACKAGES += \ > > > > > > > -+ netscape/javascript \ > > > > > > > -+ sun/applet > > > > > > > -+ > > > > > > > -+IMPORT_TOOLS_PACKAGES += > > > > > > > -+ > > > > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > > > > > > > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:52:44.000000000 +0000 > > > > > > > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:57:32.000000000 +0000 > > > > > > > -@@ -49,6 +49,9 @@ > > > > > > > - ifndef NETX_DIST > > > > > > > - include $(BUILDDIR)/common/internal/Defs-netx.gmk > > > > > > > - endif > > > > > > > -+ifndef LIVECONNECT_DIST > > > > > > > -+ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk > > > > > > > -+endif > > > > > > > - > > > > > > > - # Clean up these lists so empty lists are empty > > > > > > > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > > > > > > > -@@ -123,6 +126,7 @@ > > > > > > > - $(call import-one-sources,JAXP_DIST,$1) > > > > > > > - $(call import-one-sources,JAXWS_DIST,$1) > > > > > > > - $(call import-one-sources,NETX_DIST,$1) > > > > > > > -+$(call import-one-sources,LIVECONNECT_DIST,$1) > > > > > > > - endef > > > > > > > - > > > > > > > - # Import all component docs into directory $1 (optional) > > > > > > > -@@ -162,6 +166,7 @@ > > > > > > > - $(call import-one-classes,JAXP_DIST,$1) > > > > > > > - $(call import-one-classes,JAXWS_DIST,$1) > > > > > > > - $(call import-one-classes,NETX_DIST,$1) > > > > > > > -+$(call import-one-classes,LIVECONNECT_DIST,$1) > > > > > > > - endef > > > > > > > - > > > > > > > - # Clean up import files > > > > > > > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > > > > > > > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-11-11 02:52:44.000000000 +0000 > > > > > > > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-11-11 02:13:22.000000000 +0000 > > > > > > > -@@ -365,6 +365,11 @@ > > > > > > > - else > > > > > > > - NETX_DIST = > > > > > > > - endif > > > > > > > -+ifdef ALT_LIVECONNECT_DIST > > > > > > > -+ LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST)) > > > > > > > -+else > > > > > > > -+ LIVECONNECT_DIST = > > > > > > > -+endif > > > > > > > - > > > > > > > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > > > > > > > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > > > > > > > diff -r 6530d2aa9076 patches/extensions/netx-dist.patch > > > > > > > --- a/patches/extensions/netx-dist.patch Thu Aug 05 16:58:30 2010 +0100 > > > > > > > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > > > > > > > @@ -1,86 +0,0 @@ > > > > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-netx.gmk openjdk/jdk/make/common/internal/Defs-netx.gmk > > > > > > > ---- openjdk.orig/jdk/make/common/internal/Defs-netx.gmk 1970-01-01 01:00:00.000000000 +0100 > > > > > > > -+++ openjdk/jdk/make/common/internal/Defs-netx.gmk 2009-05-28 09:18:45.000000000 +0100 > > > > > > > -@@ -0,0 +1,38 @@ > > > > > > > -+# > > > > > > > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > > > > > > > -+# > > > > > > > -+ > > > > > > > -+# The specific packages that come from or go to rt.jar and tools.jar > > > > > > > -+IMPORT_RT_PACKAGES += \ > > > > > > > -+ net/sourceforge/jnlp \ > > > > > > > -+ net/sourceforge/jnlp/tools \ > > > > > > > -+ net/sourceforge/jnlp/runtime \ > > > > > > > -+ net/sourceforge/jnlp/util \ > > > > > > > -+ net/sourceforge/jnlp/services \ > > > > > > > -+ net/sourceforge/jnlp/security \ > > > > > > > -+ net/sourceforge/jnlp/security/viewer \ > > > > > > > -+ net/sourceforge/jnlp/cache \ > > > > > > > -+ net/sourceforge/jnlp/event \ > > > > > > > -+ net/sourceforge/jnlp/resources \ > > > > > > > -+ net/sourceforge/nanoxml \ > > > > > > > -+ javax/jnlp > > > > > > > -+ > > > > > > > -+IMPORT_TOOLS_PACKAGES += > > > > > > > -+ > > > > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > > > > > > > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100 > > > > > > > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:10:56.000000000 +0100 > > > > > > > -@@ -46,6 +46,9 @@ > > > > > > > - ifndef JAXWS_DIST > > > > > > > - include $(BUILDDIR)/common/internal/Defs-jaxws.gmk > > > > > > > - endif > > > > > > > -+ifndef NETX_DIST > > > > > > > -+ include $(BUILDDIR)/common/internal/Defs-netx.gmk > > > > > > > -+endif > > > > > > > - > > > > > > > - # Clean up these lists so empty lists are empty > > > > > > > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > > > > > > > -@@ -119,6 +122,7 @@ > > > > > > > - $(call import-one-sources,CORBA_DIST,$1) > > > > > > > - $(call import-one-sources,JAXP_DIST,$1) > > > > > > > - $(call import-one-sources,JAXWS_DIST,$1) > > > > > > > -+$(call import-one-sources,NETX_DIST,$1) > > > > > > > - endef > > > > > > > - > > > > > > > - # Import all component docs into directory $1 (optional) > > > > > > > -@@ -157,6 +161,7 @@ > > > > > > > - $(call import-one-classes,CORBA_DIST,$1) > > > > > > > - $(call import-one-classes,JAXP_DIST,$1) > > > > > > > - $(call import-one-classes,JAXWS_DIST,$1) > > > > > > > -+$(call import-one-classes,NETX_DIST,$1) > > > > > > > - endef > > > > > > > - > > > > > > > - # Clean up import files > > > > > > > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > > > > > > > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100 > > > > > > > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-29 02:11:18.000000000 +0100 > > > > > > > -@@ -344,6 +344,11 @@ > > > > > > > - else > > > > > > > - JAXWS_DIST = > > > > > > > - endif > > > > > > > -+ifdef ALT_NETX_DIST > > > > > > > -+ NETX_DIST := $(call FullPath,$(ALT_NETX_DIST)) > > > > > > > -+else > > > > > > > -+ NETX_DIST = > > > > > > > -+endif > > > > > > > - > > > > > > > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > > > > > > > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > > > > > > > > > > > > > > > > -- > > > > > Andrew :) > > > > > > > > > > Free Java Software Engineer > > > > > Red Hat, Inc. (http://www.redhat.com) > > > > > > > > > > Support Free Java! > > > > > Contribute to GNU Classpath and the OpenJDK > > > > > http://www.gnu.org/software/classpath > > > > > http://openjdk.java.net > > > > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > > > > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > > > > > > > > > -- > > > Andrew :) > > > > > > Free Java Software Engineer > > > Red Hat, Inc. (http://www.redhat.com) > > > > > > Support Free Java! > > > Contribute to GNU Classpath and the OpenJDK > > > http://www.gnu.org/software/classpath > > > http://openjdk.java.net > > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > diff -r da8128c0b021 ChangeLog > --- a/ChangeLog Fri Aug 06 11:53:49 2010 +0100 > +++ b/ChangeLog Fri Aug 06 17:31:39 2010 -0400 > @@ -1,3 +1,40 @@ > +2010-08-05 Andrew John Hughes > + > + Produce separate JAR files for NetX and the > + plugin (netx.jar and plugin.jar) rather than > + integrating their code into rt.jar. > + * patches/extensions/liveconnect-dist.patch, > + * patches/extensions/netx-dist.patch: > + Remove unneeded patches to OpenJDK build to > + integrate NetX and the plugin's Java code. > + * patches/icedtea-update-bootclasspath.patch: New patch. Adds netx, > + rhino and plugin jars to the bootclasspath. > + * Makefile.am: > + (ICEDTEA_ENV): Drop ALT_NETX_DIST and > + ALT_LIVECONNECT_DIST. > + (.PHONY): Add new clean targets. > + (icedtea): Remove unneeded NetX and plugin > + dependencies and copying. Add icedtea-update-bootclasspath.patch. > + (icedtea-debug): Likewise. > + (icedtea-against-icedtea): Depend on add-plugin > + and add-netx. > + (clean-icedtea-against-icedtea): Depend on clean-add-netx > + and clean-add-plugin. > + (icedtea-debug-against-icedtea): Depend on add-plugin-debug > + and add-netx-debug. > + (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug > + and clean-add-plugin-debug. > + (add-plugin): Copy the plugin library and jar file into the jdk images. > + (clean-add-plugin): Revert add-plugin. > + (add-plugin-debug): Equivalent of add-plugin for the debug build. > + (clean-add-plugin-debug): Revert add-plugin-debug. > + (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the > + jdk images. > + (clean-add-netx): Revert add-netx. > + (add-netx-debug): Equivalent of add-netx for the debug build. > + (clean-add-netx-debug): Revert add-netx-debug. > + (icedtea-ecj): Remove plugin and NetX dependencies. > + > 2010-08-06 Andrew John Hughes > > Fix build on PAX-enabled kernels. > diff -r da8128c0b021 Makefile.am > --- a/Makefile.am Fri Aug 06 11:53:49 2010 +0100 > +++ b/Makefile.am Fri Aug 06 17:31:39 2010 -0400 > @@ -270,10 +270,10 @@ > patches/icedtea-parisc.patch \ > patches/icedtea-sh4-support.patch \ > patches/icedtea-policy-evaluation.patch \ > + patches/icedtea-update-bootclasspath.patch \ > patches/libpng.patch \ > patches/shark.patch \ > patches/extensions/netx.patch \ > - patches/extensions/netx-dist.patch \ > patches/extensions/netx-umask.patch \ > patches/icedtea-jtreg-httpTest.patch \ > patches/arm.patch \ > @@ -298,8 +298,7 @@ > > if ENABLE_PLUGIN > ICEDTEA_PATCHES += \ > - patches/extensions/liveconnect.patch \ > - patches/extensions/liveconnect-dist.patch > + patches/extensions/liveconnect.patch > endif > > if BUILD_CACAO > @@ -444,8 +443,6 @@ > DEBUG_BINARIES="true" \ > ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ > VERBOSE="$(VERBOSE)" \ > - ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ > - ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \ > ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" > > if WITH_CACAO > @@ -571,7 +568,8 @@ > clean-icedtea-against-ecj clean-cacao clean-add-cacao clean-add-cacao-debug \ > clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \ > clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \ > - clean-rewriter clean-rewrite-rhino > + clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \ > + clean-add-plugin clean-add-plugin-debug > > env: > @echo 'unset JAVA_HOME' > @@ -1218,9 +1216,7 @@ > # If you change anything here in the icedtea target, please make sure > # you change it in the icedtea-debug target as well. > stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > - stamps/rewrite-rhino.stamp > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > $(ARCH_PREFIX) $(MAKE) \ > $(ICEDTEA_ENV) \ > -C openjdk \ > @@ -1229,12 +1225,6 @@ > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext > -if ENABLE_PLUGIN > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > -endif > if ENABLE_PULSE_JAVA > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > @@ -1247,10 +1237,6 @@ > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > endif > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > - $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > if ZERO_BUILD > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg > endif > @@ -1294,9 +1280,7 @@ > rm -f stamps/icedtea.stamp > > stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > - stamps/rewrite-rhino.stamp > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > $(ARCH_PREFIX) $(MAKE) \ > $(ICEDTEA_ENV) \ > -C openjdk \ > @@ -1305,12 +1289,6 @@ > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext > -if ENABLE_PLUGIN > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > -endif > if ENABLE_PULSE_JAVA > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > @@ -1323,10 +1301,6 @@ > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > endif > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > if ZERO_BUILD > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg > endif > @@ -1371,27 +1345,109 @@ > rm -f stamps/icedtea-debug.stamp > > stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > - stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp > + stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp stamps/add-plugin.stamp \ > + stamps/add-netx.stamp > mkdir -p stamps > touch stamps/icedtea-against-icedtea.stamp > > -clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao > +clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx > rm -f stamps/icedtea-against-icedtea.stamp > > stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > - stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp > + stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \ > + stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp > mkdir -p stamps > touch stamps/icedtea-debug-against-icedtea.stamp > > -clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug > +clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug clean-add-plugin-debug \ > + clean-add-netx-debug > rm -f stamps/icedtea-debug-against-icedtea.stamp > > +stamps/add-plugin.stamp: stamps/plugin.stamp > +if ENABLE_PLUGIN > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > +endif > + touch stamps/add-plugin.stamp > + > +clean-add-plugin: > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > + rm -f stamps/add-plugin.stamp > + > +stamps/add-plugin-debug.stamp: stamps/plugin.stamp > +if ENABLE_PLUGIN > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > +endif > + touch stamps/add-plugin-debug.stamp > + > +clean-add-plugin-debug: > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > + rm -f stamps/add-plugin-debug.stamp > + > +stamps/add-netx.stamp: stamps/netx-dist.stamp extra-lib/about.jar > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > + $(BUILD_OUTPUT_DIR)/j2re-image/lib > + touch stamps/add-netx.stamp > + > +clean-add-netx: > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > + rm -f stamps/add-netx.stamp > + > +stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib > + touch stamps/add-netx-debug.stamp > + > +clean-add-netx-debug: > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > + rm -f stamps/add-netx-debug.stamp > + > # OpenJDK ecj Targets > # =================== > > stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ > - stamps/netx-dist.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \ > - stamps/rewrite-rhino.stamp stamps/plugin.stamp > + $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp > $(ARCH_PREFIX) $(MAKE) \ > $(ICEDTEA_ENV_ECJ) \ > -C openjdk-ecj/ \ > diff -r da8128c0b021 patches/extensions/liveconnect-dist.patch > --- a/patches/extensions/liveconnect-dist.patch Fri Aug 06 11:53:49 2010 +0100 > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > @@ -1,76 +0,0 @@ > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk > ---- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 > -+++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-11-11 02:53:36.000000000 +0000 > -@@ -0,0 +1,28 @@ > -+# > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > -+# > -+ > -+# The specific packages that come from or go to rt.jar and tools.jar > -+IMPORT_RT_PACKAGES += \ > -+ netscape/javascript \ > -+ sun/applet > -+ > -+IMPORT_TOOLS_PACKAGES += > -+ > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:52:44.000000000 +0000 > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:57:32.000000000 +0000 > -@@ -49,6 +49,9 @@ > - ifndef NETX_DIST > - include $(BUILDDIR)/common/internal/Defs-netx.gmk > - endif > -+ifndef LIVECONNECT_DIST > -+ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk > -+endif > - > - # Clean up these lists so empty lists are empty > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > -@@ -123,6 +126,7 @@ > - $(call import-one-sources,JAXP_DIST,$1) > - $(call import-one-sources,JAXWS_DIST,$1) > - $(call import-one-sources,NETX_DIST,$1) > -+$(call import-one-sources,LIVECONNECT_DIST,$1) > - endef > - > - # Import all component docs into directory $1 (optional) > -@@ -162,6 +166,7 @@ > - $(call import-one-classes,JAXP_DIST,$1) > - $(call import-one-classes,JAXWS_DIST,$1) > - $(call import-one-classes,NETX_DIST,$1) > -+$(call import-one-classes,LIVECONNECT_DIST,$1) > - endef > - > - # Clean up import files > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-11-11 02:52:44.000000000 +0000 > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-11-11 02:13:22.000000000 +0000 > -@@ -365,6 +365,11 @@ > - else > - NETX_DIST = > - endif > -+ifdef ALT_LIVECONNECT_DIST > -+ LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST)) > -+else > -+ LIVECONNECT_DIST = > -+endif > - > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > diff -r da8128c0b021 patches/extensions/netx-dist.patch > --- a/patches/extensions/netx-dist.patch Fri Aug 06 11:53:49 2010 +0100 > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > @@ -1,86 +0,0 @@ > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-netx.gmk openjdk/jdk/make/common/internal/Defs-netx.gmk > ---- openjdk.orig/jdk/make/common/internal/Defs-netx.gmk 1970-01-01 01:00:00.000000000 +0100 > -+++ openjdk/jdk/make/common/internal/Defs-netx.gmk 2009-05-28 09:18:45.000000000 +0100 > -@@ -0,0 +1,38 @@ > -+# > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > -+# > -+ > -+# The specific packages that come from or go to rt.jar and tools.jar > -+IMPORT_RT_PACKAGES += \ > -+ net/sourceforge/jnlp \ > -+ net/sourceforge/jnlp/tools \ > -+ net/sourceforge/jnlp/runtime \ > -+ net/sourceforge/jnlp/util \ > -+ net/sourceforge/jnlp/services \ > -+ net/sourceforge/jnlp/security \ > -+ net/sourceforge/jnlp/security/viewer \ > -+ net/sourceforge/jnlp/cache \ > -+ net/sourceforge/jnlp/event \ > -+ net/sourceforge/jnlp/resources \ > -+ net/sourceforge/nanoxml \ > -+ javax/jnlp > -+ > -+IMPORT_TOOLS_PACKAGES += > -+ > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100 > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:10:56.000000000 +0100 > -@@ -46,6 +46,9 @@ > - ifndef JAXWS_DIST > - include $(BUILDDIR)/common/internal/Defs-jaxws.gmk > - endif > -+ifndef NETX_DIST > -+ include $(BUILDDIR)/common/internal/Defs-netx.gmk > -+endif > - > - # Clean up these lists so empty lists are empty > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > -@@ -119,6 +122,7 @@ > - $(call import-one-sources,CORBA_DIST,$1) > - $(call import-one-sources,JAXP_DIST,$1) > - $(call import-one-sources,JAXWS_DIST,$1) > -+$(call import-one-sources,NETX_DIST,$1) > - endef > - > - # Import all component docs into directory $1 (optional) > -@@ -157,6 +161,7 @@ > - $(call import-one-classes,CORBA_DIST,$1) > - $(call import-one-classes,JAXP_DIST,$1) > - $(call import-one-classes,JAXWS_DIST,$1) > -+$(call import-one-classes,NETX_DIST,$1) > - endef > - > - # Clean up import files > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100 > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-29 02:11:18.000000000 +0100 > -@@ -344,6 +344,11 @@ > - else > - JAXWS_DIST = > - endif > -+ifdef ALT_NETX_DIST > -+ NETX_DIST := $(call FullPath,$(ALT_NETX_DIST)) > -+else > -+ NETX_DIST = > -+endif > - > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > diff -r da8128c0b021 patches/icedtea-rhino.patch > --- a/patches/icedtea-rhino.patch Fri Aug 06 11:53:49 2010 +0100 > +++ b/patches/icedtea-rhino.patch Fri Aug 06 17:31:39 2010 -0400 > @@ -1,13 +1,3 @@ > ---- openjdk/hotspot/src/share/vm/runtime/os.cpp.orig 2008-11-22 00:11:18.000000000 +0000 > -+++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2008-12-03 21:16:14.000000000 +0000 > -@@ -886,6 +886,7 @@ > - "%/lib/jsse.jar:" > - "%/lib/jce.jar:" > - "%/lib/charsets.jar:" > -+ "%/lib/rhino.jar:" > - "%/classes"; > - char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); > - if (sysclasspath == NULL) return false; > --- openjdk/jdk/make/com/sun/script/Makefile.orig 2008-11-25 09:01:10.000000000 +0000 > +++ openjdk/jdk/make/com/sun/script/Makefile 2008-12-03 21:13:14.000000000 +0000 > @@ -31,6 +31,8 @@ > diff -r da8128c0b021 patches/icedtea-update-bootclasspath.patch > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/icedtea-update-bootclasspath.patch Fri Aug 06 17:31:39 2010 -0400 > @@ -0,0 +1,13 @@ > +diff -ur openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/share/vm/runtime/os.cpp > +--- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp 2010-06-21 17:12:21.000000000 -0400 > ++++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2010-08-06 15:48:48.338599142 -0400 > +@@ -884,6 +884,9 @@ > + "%/lib/jsse.jar:" > + "%/lib/jce.jar:" > + "%/lib/charsets.jar:" > ++ "%/lib/netx.jar:" > ++ "%/lib/plugin.jar:" > ++ "%/lib/rhino.jar:" > + "%/classes"; > + char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); > + if (sysclasspath == NULL) return false; -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From xerxes at zafena.se Sat Aug 7 07:04:21 2010 From: xerxes at zafena.se (Xerxes Ranby) Date: Sat, 07 Aug 2010 16:04:21 +0200 Subject: Shark hg repositories are now in harmony. In-Reply-To: References: <4C5AB11B.3070802@zafena.se> Message-ID: <4C5D67E5.1040302@zafena.se> On 2010-08-05 17:43, Dr Andrew John Hughes wrote: > On 5 August 2010 13:39, Xerxes R?nby wrote: > >> Hi all! >> >> I have harmonized all the three different Shark hg repositories in use >> by back-porting changes in between them. >> > Thanks for doing this. > > >> The three different shark repositories are: >> >> http://icedtea.classpath.org/hg/shark/hotspot >> This are the current "main" Shark hg repository where Gary does his work >> and makes sure that shark are ready to be included upstream into OpenJDK. >> This repository are targets the latest Hotspot hs19. >> >> http://icedtea.classpath.org/hg/icedtea >> This are the icedtea 7 hg repository containing the version of Shark >> fixed to work with Hotspot hs18 and OpenJDK 7. >> Today i have back-ported and pushed a fix to icedtea6 from the "main" >> shark repository to make Shark build with LLVM 2.7 on non-product builds. >> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009915.html >> I have also pushed some changes to make it in sync with the icedtea6 hg. >> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009911.html >> - Match Shark in icedtea6, makes OSR work by removing vestigal check. >> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009916.html >> - Match Shark in icedtea6, Correct suffix for the llvm.atomic.cmp.swap >> intrinsic. >> >> > Does this actually build now? It's never worked for me before. > Yes it does build! I have done sucessfull full bootstrap builds of icedtea 7 + shark on ia32 and amd64 using Ubuntu 10.04. For these two builds I have built Shark in combination with the Ubuntu supplied LLVM 2.7 package. This are how i configured my build on amd64: $ hg clone http://icedtea.classpath.org/hg/icedtea $ mkdir icedtea-shark $ cd icedtea icedtea$ ./autogen.sh icedtea$ cd ../icedtea-shark icedtea-shark$ ../icedtea/configure --enable-shark --with-parallel-jobs=4 icedtea-shark$ time make ... and 96min later after processing docs etc... IcedTea is served: /media/_/icedtea-shark/openjdk.build ... icedtea-shark$ ./openjdk.build/j2sdk-image/bin/java -version java version "1.7.0_89-icedtea" OpenJDK Runtime Environment (IcedTea7 1.14-pre+r90b892525f1b) (Ubuntu build 1.7.0_89-icedtea-b89) OpenJDK 64-Bit Shark VM (build 18.0-b02, mixed mode) > Please be aware that IcedTea7 will be bumping up to the latest > OpenJDK7 now 1.13 is out. > > Thanks,Ii will keep this in mind and backport any fixes needed from the "main" Shark hg if the get a new Hotspot. Will we get a new Hotspot hs19 after the bump? >> http://icedtea.classpath.org/hg/icedtea6 >> This are the icedtea6 hg repository containing the version of Shark that >> currently gets packaged and used by various linux distributions. >> > Does Shark get packaged? I wasn't aware of this. > For what i know, the following distributions package Shark: Debian, Ubuntu http://packages.debian.org/search?keywords=openjdk-6-jre-zero for amd64 armel i386 and powerpc ?ngstrom. http://www.angstrom-distribution.org/repo/?pkgname=openjdk-6-shark-vm-shark I have also started to see some Shark success reports where users starts to recommend the use of Shark on small embedded servers. http://plugcomputer.org/plugforum/index.php?topic=1633.0 > >> This repository are fixed to work with Hotspot hs17. >> Today i have backported and pushed a fix to icedtea6 from the "main" >> shark repository to make Shark build with LLVM 2.7 on non-product builds. >> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009914.html >> >> With these fixes in place all Shark hg repository HEAD's are now in >> harmony, they can bootstrap them self nicely and runs rock stable. >> >> Cheers and have a great day! >> > You too! Great work. > > >> Xerxes >> From doko at ubuntu.com Sat Aug 7 12:10:13 2010 From: doko at ubuntu.com (Matthias Klose) Date: Sat, 07 Aug 2010 21:10:13 +0200 Subject: OpenJDK on hppa (reprise) In-Reply-To: <20100806095853.GA3685@redhat.com> References: <4C5B6C1A.9040602@info9.net> <20100806095853.GA3685@redhat.com> Message-ID: <4C5DAF95.1030206@ubuntu.com> On 06.08.2010 11:58, Gary Benson wrote: > Tom Marble wrote: >> Back in January there were some threads on this and specifically >> about the direction of stack growth [0] (cross posted [1] [2]). >> >> The Debian Java team has decided that as we need to support this >> architecture and thus I wanted to see if any others have attacked >> this or have any other tips about how difficult it may be to >> convince Zero to cooperate? > > What happened in January was some people talked about difficulties > that *might* arise *if* they tried to make Zero work on HPPA. > > To actually make Zero work on HPPA what needs to happen is that > somebody with a machine needs to grab a copy of OpenJDK and try > to build and run it. > > I'm available by email and on #openjdk to help people with any > issues they have with Zero and Shark on any platform. Debian developers do have access to such machines. Please email me if somebody outside of Debian wants access to such a machine. Matthias From bugzilla-daemon at icedtea.classpath.org Mon Aug 9 00:38:03 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Aug 2010 07:38:03 +0000 Subject: [Bug 515] cacao+Icedtea6 on ARM build failure on S390 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=515 stefan at complang.tuwien.ac.at changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|unassigned at icedtea.classpath|doko at ubuntu.com |.org | Status|ASSIGNED |NEW ------- Comment #2 from stefan at complang.tuwien.ac.at 2010-08-09 07:38 ------- It's fixed in CACAO, an upgrade to this changeset would be good: http://mips.complang.tuwien.ac.at/hg/cacao/rev/e321b101a9ee -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Aug 9 00:39:01 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 09 Aug 2010 07:39:01 +0000 Subject: [Bug 513] cacao+Icedtea6 on ARM build failure on armv7l with --enable-softfloat Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=513 stefan at complang.tuwien.ac.at changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|unassigned at icedtea.classpath|doko at ubuntu.com |.org | Status|ASSIGNED |NEW ------- Comment #6 from stefan at complang.tuwien.ac.at 2010-08-09 07:39 ------- Fixed in CACAO. See bug #515. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You are the assignee for the bug, or are watching the assignee. From omajid at redhat.com Mon Aug 9 07:09:23 2010 From: omajid at redhat.com (Omair Majid) Date: Mon, 09 Aug 2010 10:09:23 -0400 Subject: [RFC] backport opentype font support from openjdk6 to icedtea6 1.9 Message-ID: <4C600C13.2080404@redhat.com> Hi, I would like to backport OpenType font support from OpenJDK6 to Icedtea6-1.9. Patches corresponding to the following two changesets will need to be added to icedtea6: http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/b577c70564b8 http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/acb763ebef95 Any thoughts? Cheers, Omair From omajid at redhat.com Mon Aug 9 08:08:20 2010 From: omajid at redhat.com (Omair Majid) Date: Mon, 09 Aug 2010 11:08:20 -0400 Subject: [RFC] netx: add 1.6 to supported jnlp versions Message-ID: <4C6019E4.6020800@redhat.com> Hi, Some webstart applications like JForex [1] claim to use version 1.6 of the jnlp specification, even though it is not listed in the developers guide [2]: "The spec attribute can be 1.0, 1.5.0, or 6.0 or can use the wildcards such as 1.0+." The attached patch make netx work with a version of 1.6 as well. Ok to commit? Cheers, Omair [1] https://www.dukascopy.com/client/demo/jclient/jforex.jnlp [2]http://download.oracle.com/javase/6/docs/technotes/guides/javaws/developersguide/syntax.html -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-jnlp-supported-versions.patch Type: text/x-patch Size: 559 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100809/dbe2f253/icedtea6-jnlp-supported-versions.patch From ptisnovs at icedtea.classpath.org Mon Aug 9 08:11:11 2010 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 09 Aug 2010 15:11:11 +0000 Subject: /hg/gfx-test: Removed sample images because it could be created ... Message-ID: changeset ec9ff0e79e84 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=ec9ff0e79e84 author: Pavel Tisnovsky date: Mon Aug 09 17:11:20 2010 +0200 Removed sample images because it could be created on local machines, changed Makefile to automatically create sample images and to generate reports for each test case in its own directory. diffstat: 2 files changed, 65 insertions(+), 125 deletions(-) Makefile | 75 ++++++++++++++-- src/org/gfxtest/testsuites/NormalPolygon.java | 115 ------------------------- diffs (truncated from 1460 to 500 lines): diff -r 9d64e53f9ebb -r ec9ff0e79e84 Makefile --- a/Makefile Tue Aug 03 18:27:40 2010 +0200 +++ b/Makefile Mon Aug 09 17:11:20 2010 +0200 @@ -39,13 +39,14 @@ SOURCEPATH=src SOURCEPATH=src CLASSES=build OUTPUT=output +SAMPLES=samples RESULTS=results FRAMEWORK_DIR=org/gfxtest/framework TESTSUITE_DIR=org/gfxtest/testsuites TEST_PACKAGE=org.gfxtest.testsuites -RUN_OPTIONS=-w=640 -h=480 -t=rgb -o=$(OUTPUT) -#JAVA=/usr/java/default/bin/java -JAVA=java +RUN_OPTIONS=-w=640 -h=480 -t=rgb +TESTED_JAVA=/usr/java/default/bin/java +REFERENCE_JAVA=/usr/java/default/bin/java JAVAC=javac FRAMEWORK_CLASSES = \ @@ -92,10 +93,38 @@ TESTSUITE_CLASSES = \ $(CLASSES)/$(TESTSUITE_DIR)/DashedPolylines.class \ $(CLASSES)/$(TESTSUITE_DIR)/DashedRectangles.class +COMPARE_RESULTS = \ + $(RESULTS)/BlankImage \ + $(RESULTS)/NormalArcs \ + $(RESULTS)/NormalLines \ + $(RESULTS)/NormalCircles \ + $(RESULTS)/NormalEllipses \ + $(RESULTS)/NormalPolygons \ + $(RESULTS)/NormalPolylines \ + $(RESULTS)/NormalRectangles \ + $(RESULTS)/NormalRoundRectangles \ + $(RESULTS)/Normal3DRectangles \ + $(RESULTS)/FilledArcs \ + $(RESULTS)/FilledCircles \ + $(RESULTS)/FilledEllipses \ + $(RESULTS)/FilledRectangles \ + $(RESULTS)/FilledRoundRectangles \ + $(RESULTS)/FilledPolygons \ + $(RESULTS)/ScaledLines \ + $(RESULTS)/ScaledPolylines \ + $(RESULTS)/ScaledRectangles \ + $(RESULTS)/DashedCircles \ + $(RESULTS)/DashedEllipses \ + $(RESULTS)/DashedLines \ + $(RESULTS)/DashedPolylines \ + $(RESULTS)/DashedRectangles + # targets for all test suites TESTSUITES = $(shell ls -1 src/org/gfxtest/testsuites | sed -n -e 's/\([A-Za-z0-9]*\)\.java/\1/p') -all: build runtests compareresults +SAMPLE_IMAGES = $(shell ls -1 src/org/gfxtest/testsuites | sed -n -e 's/\([A-Za-z0-9]*\)\.java/samples\/\1/p') + +all: build sample_images runtests compareresults build: $(CLASSES)/stamp $(OUTPUT)/stamp gfxtest.jar @@ -111,6 +140,10 @@ test_suites: $(TESTSUITE_CLASSES) mkdir -p $(OUTPUT) touch $(OUTPUT)/stamp +$(SAMPLES)/stamp: + mkdir -p $(SAMPLES) + touch $(SAMPLES)/stamp + $(CLASSES)/$(FRAMEWORK_DIR)/%.class: $(SOURCEPATH)/$(FRAMEWORK_DIR)/%.java $(JAVAC) -d $(CLASSES) -sourcepath src/ $< @@ -120,18 +153,33 @@ gfxtest.jar: $(FRAMEWORK_CLASSES) $(TEST gfxtest.jar: $(FRAMEWORK_CLASSES) $(TESTSUITE_CLASSES) jar cvf gfxtest.jar -C $(CLASSES) . +sample_images: gfxtest.jar $(SAMPLE_IMAGES) + runtests: gfxtest.jar $(TESTSUITES) # multiple targets - one for each test suite $(TESTSUITES): gfxtest.jar - $(JAVA) -cp gfxtest.jar $(TEST_PACKAGE).$@ $(RUN_OPTIONS) + mkdir -p $(OUTPUT)/$@ + $(TESTED_JAVA) -cp gfxtest.jar $(TEST_PACKAGE).$@ $(RUN_OPTIONS) -o=$(OUTPUT)/$@ -compareresults: - mkdir -p $(RESULTS) +$(SAMPLE_IMAGES): gfxtest.jar + mkdir -p $@ + $(REFERENCE_JAVA) -cp gfxtest.jar $(TEST_PACKAGE).$(subst samples/,,$@) $(RUN_OPTIONS) -o=$@ + +# for output/NormalLines the internal macros are set: +# $@ - results/NormalLines +# $< - output/NormalLines +# $* - NormalLines +$(RESULTS)/%: $(OUTPUT)/% + mkdir -p $@ + java -jar Lupic.jar -s1=$(SAMPLES)/$* -s2=$< -m=masks -b=bitmap-masks -o=$@ --html --html-results --xml-results --diff-images --struct-diff-images + +compare-results: compareresults + +compareresults: $(COMPARE_RESULTS) mkdir -p masks - java -jar Lupic.jar -s1=samples -s2=output -m=masks -b=bitmap-masks -o=results --html --html-results --xml-results --diff-images --struct-diff-images -cleanall: clean clean-results +cleanall: clean clean-output clean-results clean-samples clean-all: cleanall @@ -139,7 +187,14 @@ clean: rm -rf $(CLASSES) rm -f gfxtest.jar +cleanresults: clean-results + +clean-output: + rm -rf $(OUTPUT) + clean-results: - rm -rf $(OUTPUT) rm -rf $(RESULTS) +clean-samples: + rm -rf $(SAMPLES) + diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/BlankImage_test0.png Binary file samples/BlankImage_test0.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/BlankImage_test1.png Binary file samples/BlankImage_test1.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/BlankImage_test2.png Binary file samples/BlankImage_test2.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/BlankImage_test3.png Binary file samples/BlankImage_test3.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/BlankImage_test4.png Binary file samples/BlankImage_test4.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/BlankImage_test5.png Binary file samples/BlankImage_test5.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/BlankImage_test6.png Binary file samples/BlankImage_test6.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test0.png Binary file samples/DashedLines_test0.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test1.png Binary file samples/DashedLines_test1.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test10.png Binary file samples/DashedLines_test10.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test11.png Binary file samples/DashedLines_test11.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test12.png Binary file samples/DashedLines_test12.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test13.png Binary file samples/DashedLines_test13.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test14.png Binary file samples/DashedLines_test14.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test15.png Binary file samples/DashedLines_test15.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test16.png Binary file samples/DashedLines_test16.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test17.png Binary file samples/DashedLines_test17.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test18.png Binary file samples/DashedLines_test18.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test19.png Binary file samples/DashedLines_test19.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test2.png Binary file samples/DashedLines_test2.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test20.png Binary file samples/DashedLines_test20.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test21.png Binary file samples/DashedLines_test21.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test22.png Binary file samples/DashedLines_test22.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test23.png Binary file samples/DashedLines_test23.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test24.png Binary file samples/DashedLines_test24.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test25.png Binary file samples/DashedLines_test25.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test26.png Binary file samples/DashedLines_test26.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test27.png Binary file samples/DashedLines_test27.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test28.png Binary file samples/DashedLines_test28.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test29.png Binary file samples/DashedLines_test29.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test3.png Binary file samples/DashedLines_test3.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test30.png Binary file samples/DashedLines_test30.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test31.png Binary file samples/DashedLines_test31.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test32.png Binary file samples/DashedLines_test32.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test33.png Binary file samples/DashedLines_test33.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test34.png Binary file samples/DashedLines_test34.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test35.png Binary file samples/DashedLines_test35.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test36.png Binary file samples/DashedLines_test36.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test37.png Binary file samples/DashedLines_test37.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test38.png Binary file samples/DashedLines_test38.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test39.png Binary file samples/DashedLines_test39.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test4.png Binary file samples/DashedLines_test4.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test40.png Binary file samples/DashedLines_test40.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test41.png Binary file samples/DashedLines_test41.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test42.png Binary file samples/DashedLines_test42.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test43.png Binary file samples/DashedLines_test43.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test44.png Binary file samples/DashedLines_test44.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test45.png Binary file samples/DashedLines_test45.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test46.png Binary file samples/DashedLines_test46.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test47.png Binary file samples/DashedLines_test47.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test48.png Binary file samples/DashedLines_test48.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test49.png Binary file samples/DashedLines_test49.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test5.png Binary file samples/DashedLines_test5.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test50.png Binary file samples/DashedLines_test50.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test51.png Binary file samples/DashedLines_test51.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test52.png Binary file samples/DashedLines_test52.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test53.png Binary file samples/DashedLines_test53.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test54.png Binary file samples/DashedLines_test54.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test55.png Binary file samples/DashedLines_test55.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test56.png Binary file samples/DashedLines_test56.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test57.png Binary file samples/DashedLines_test57.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test58.png Binary file samples/DashedLines_test58.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test59.png Binary file samples/DashedLines_test59.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test6.png Binary file samples/DashedLines_test6.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test60.png Binary file samples/DashedLines_test60.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test61.png Binary file samples/DashedLines_test61.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test62.png Binary file samples/DashedLines_test62.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test63.png Binary file samples/DashedLines_test63.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test64.png Binary file samples/DashedLines_test64.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test65.png Binary file samples/DashedLines_test65.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test66.png Binary file samples/DashedLines_test66.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test67.png Binary file samples/DashedLines_test67.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test68.png Binary file samples/DashedLines_test68.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test69.png Binary file samples/DashedLines_test69.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test7.png Binary file samples/DashedLines_test7.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test70.png Binary file samples/DashedLines_test70.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test71.png Binary file samples/DashedLines_test71.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test72.png Binary file samples/DashedLines_test72.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test73.png Binary file samples/DashedLines_test73.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test74.png Binary file samples/DashedLines_test74.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test8.png Binary file samples/DashedLines_test8.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedLines_test9.png Binary file samples/DashedLines_test9.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test0.png Binary file samples/DashedPolylines_test0.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test1.png Binary file samples/DashedPolylines_test1.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test10.png Binary file samples/DashedPolylines_test10.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test100.png Binary file samples/DashedPolylines_test100.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test101.png Binary file samples/DashedPolylines_test101.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test102.png Binary file samples/DashedPolylines_test102.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test103.png Binary file samples/DashedPolylines_test103.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test104.png Binary file samples/DashedPolylines_test104.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test105.png Binary file samples/DashedPolylines_test105.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test106.png Binary file samples/DashedPolylines_test106.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test107.png Binary file samples/DashedPolylines_test107.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test108.png Binary file samples/DashedPolylines_test108.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test109.png Binary file samples/DashedPolylines_test109.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test11.png Binary file samples/DashedPolylines_test11.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test110.png Binary file samples/DashedPolylines_test110.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test111.png Binary file samples/DashedPolylines_test111.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test112.png Binary file samples/DashedPolylines_test112.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test113.png Binary file samples/DashedPolylines_test113.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test114.png Binary file samples/DashedPolylines_test114.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test115.png Binary file samples/DashedPolylines_test115.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test116.png Binary file samples/DashedPolylines_test116.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test117.png Binary file samples/DashedPolylines_test117.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test118.png Binary file samples/DashedPolylines_test118.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test119.png Binary file samples/DashedPolylines_test119.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test12.png Binary file samples/DashedPolylines_test12.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test120.png Binary file samples/DashedPolylines_test120.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test121.png Binary file samples/DashedPolylines_test121.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test122.png Binary file samples/DashedPolylines_test122.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test123.png Binary file samples/DashedPolylines_test123.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test124.png Binary file samples/DashedPolylines_test124.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test125.png Binary file samples/DashedPolylines_test125.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test126.png Binary file samples/DashedPolylines_test126.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test127.png Binary file samples/DashedPolylines_test127.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test128.png Binary file samples/DashedPolylines_test128.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test129.png Binary file samples/DashedPolylines_test129.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test13.png Binary file samples/DashedPolylines_test13.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test130.png Binary file samples/DashedPolylines_test130.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test131.png Binary file samples/DashedPolylines_test131.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test132.png Binary file samples/DashedPolylines_test132.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test133.png Binary file samples/DashedPolylines_test133.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test134.png Binary file samples/DashedPolylines_test134.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test135.png Binary file samples/DashedPolylines_test135.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test136.png Binary file samples/DashedPolylines_test136.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test137.png Binary file samples/DashedPolylines_test137.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test138.png Binary file samples/DashedPolylines_test138.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test139.png Binary file samples/DashedPolylines_test139.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test14.png Binary file samples/DashedPolylines_test14.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test140.png Binary file samples/DashedPolylines_test140.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test141.png Binary file samples/DashedPolylines_test141.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test142.png Binary file samples/DashedPolylines_test142.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test143.png Binary file samples/DashedPolylines_test143.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test144.png Binary file samples/DashedPolylines_test144.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test145.png Binary file samples/DashedPolylines_test145.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test146.png Binary file samples/DashedPolylines_test146.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test147.png Binary file samples/DashedPolylines_test147.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test148.png Binary file samples/DashedPolylines_test148.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test149.png Binary file samples/DashedPolylines_test149.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test15.png Binary file samples/DashedPolylines_test15.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test150.png Binary file samples/DashedPolylines_test150.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test151.png Binary file samples/DashedPolylines_test151.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test152.png Binary file samples/DashedPolylines_test152.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test153.png Binary file samples/DashedPolylines_test153.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test154.png Binary file samples/DashedPolylines_test154.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test155.png Binary file samples/DashedPolylines_test155.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test156.png Binary file samples/DashedPolylines_test156.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test157.png Binary file samples/DashedPolylines_test157.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test158.png Binary file samples/DashedPolylines_test158.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test159.png Binary file samples/DashedPolylines_test159.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test16.png Binary file samples/DashedPolylines_test16.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test160.png Binary file samples/DashedPolylines_test160.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test161.png Binary file samples/DashedPolylines_test161.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test162.png Binary file samples/DashedPolylines_test162.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test163.png Binary file samples/DashedPolylines_test163.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test164.png Binary file samples/DashedPolylines_test164.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test165.png Binary file samples/DashedPolylines_test165.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test166.png Binary file samples/DashedPolylines_test166.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test167.png Binary file samples/DashedPolylines_test167.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test168.png Binary file samples/DashedPolylines_test168.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test169.png Binary file samples/DashedPolylines_test169.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test17.png Binary file samples/DashedPolylines_test17.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test170.png Binary file samples/DashedPolylines_test170.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test171.png Binary file samples/DashedPolylines_test171.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test172.png Binary file samples/DashedPolylines_test172.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test173.png Binary file samples/DashedPolylines_test173.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test174.png Binary file samples/DashedPolylines_test174.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test175.png Binary file samples/DashedPolylines_test175.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test176.png Binary file samples/DashedPolylines_test176.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test177.png Binary file samples/DashedPolylines_test177.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test178.png Binary file samples/DashedPolylines_test178.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test179.png Binary file samples/DashedPolylines_test179.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test18.png Binary file samples/DashedPolylines_test18.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test180.png Binary file samples/DashedPolylines_test180.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test181.png Binary file samples/DashedPolylines_test181.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test182.png Binary file samples/DashedPolylines_test182.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test183.png Binary file samples/DashedPolylines_test183.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test184.png Binary file samples/DashedPolylines_test184.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test185.png Binary file samples/DashedPolylines_test185.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test186.png Binary file samples/DashedPolylines_test186.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test187.png Binary file samples/DashedPolylines_test187.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test188.png Binary file samples/DashedPolylines_test188.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test189.png Binary file samples/DashedPolylines_test189.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test19.png Binary file samples/DashedPolylines_test19.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test190.png Binary file samples/DashedPolylines_test190.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test191.png Binary file samples/DashedPolylines_test191.png has changed diff -r 9d64e53f9ebb -r ec9ff0e79e84 samples/DashedPolylines_test192.png From dbhole at redhat.com Mon Aug 9 08:21:10 2010 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 9 Aug 2010 11:21:10 -0400 Subject: [RFC] netx: add 1.6 to supported jnlp versions In-Reply-To: <4C6019E4.6020800@redhat.com> References: <4C6019E4.6020800@redhat.com> Message-ID: <20100809152110.GB23631@redhat.com> * Omair Majid [2010-08-09 11:08]: > Hi, > > Some webstart applications like JForex [1] claim to use version 1.6 > of the jnlp specification, even though it is not listed in the > developers guide [2]: "The spec attribute can be 1.0, 1.5.0, or 6.0 > or can use the wildcards such as 1.0+." > > The attached patch make netx work with a version of 1.6 as well. > > Ok to commit? > > Cheers, > Omair > > > [1] https://www.dukascopy.com/client/demo/jclient/jforex.jnlp > [2]http://download.oracle.com/javase/6/docs/technotes/guides/javaws/developersguide/syntax.html > diff -r a570f4fed326 netx/net/sourceforge/jnlp/Parser.java > --- a/netx/net/sourceforge/jnlp/Parser.java Fri Aug 06 20:08:18 2010 +0100 > +++ b/netx/net/sourceforge/jnlp/Parser.java Mon Aug 09 10:57:48 2010 -0400 > @@ -72,7 +72,7 @@ > > > /** the supported JNLP file versions */ > - private static Version supportedVersions = new Version("1.0 1.5 6.0"); > + private static Version supportedVersions = new Version("1.0 1.5 1.6 6.0"); > > // fix: some descriptors need to use the jnlp file at a later > // date and having file ref lets us pass it to their Okay to commit to 1.7, 1.8 and HEAD. Cheers, Deepak From omajid at icedtea.classpath.org Mon Aug 9 08:27:47 2010 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Mon, 09 Aug 2010 15:27:47 +0000 Subject: /hg/release/icedtea6-1.7: netx: support JNLP spec 1.6 Message-ID: changeset daffd234afbd in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=daffd234afbd author: Omair Majid date: Mon Aug 09 11:26:49 2010 -0400 netx: support JNLP spec 1.6 2010-08-09 Omair Majid * NEWS: Update for this fix. * rt/net/sourceforge/jnlp/Parser.java: Add 1.6 to supportedVersions. diffstat: 3 files changed, 7 insertions(+), 1 deletion(-) ChangeLog | 5 +++++ NEWS | 1 + rt/net/sourceforge/jnlp/Parser.java | 2 +- diffs (35 lines): diff -r c5c7cfebb101 -r daffd234afbd ChangeLog --- a/ChangeLog Thu Aug 05 17:52:08 2010 -0400 +++ b/ChangeLog Mon Aug 09 11:26:49 2010 -0400 @@ -1,3 +1,8 @@ 2010-08-05 Omair Majid + + * NEWS: Update for this fix. + * rt/net/sourceforge/jnlp/Parser.java: Add 1.6 to supportedVersions. + 2010-08-05 Omair Majid * NEWS: Update with netx bugfix. diff -r c5c7cfebb101 -r daffd234afbd NEWS --- a/NEWS Thu Aug 05 17:52:08 2010 -0400 +++ b/NEWS Mon Aug 09 11:26:49 2010 -0400 @@ -3,6 +3,7 @@ New in release 1.7.5 (XXXX-XX-XX): * NetX - Fix browser command in BasicService.showDocument(URL) - Run programs that inherit main(String[]) in their main-class + - Work with JNLP files that use spec version 1.6 New in release 1.7.4 (2010-07-28): diff -r c5c7cfebb101 -r daffd234afbd rt/net/sourceforge/jnlp/Parser.java --- a/rt/net/sourceforge/jnlp/Parser.java Thu Aug 05 17:52:08 2010 -0400 +++ b/rt/net/sourceforge/jnlp/Parser.java Mon Aug 09 11:26:49 2010 -0400 @@ -72,7 +72,7 @@ class Parser { /** the supported JNLP file versions */ - private static Version supportedVersions = new Version("1.0 1.5 6.0"); + private static Version supportedVersions = new Version("1.0 1.5 1.6 6.0"); // fix: some descriptors need to use the jnlp file at a later // date and having file ref lets us pass it to their From omajid at icedtea.classpath.org Mon Aug 9 08:31:06 2010 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Mon, 09 Aug 2010 15:31:06 +0000 Subject: /hg/release/icedtea6-1.8: netx: Support JNLP spec 1.6 Message-ID: changeset 4a022b4a3319 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=4a022b4a3319 author: Omair Majid date: Mon Aug 09 11:30:52 2010 -0400 netx: Support JNLP spec 1.6 2010-08-09 Omair Majid * NEWS: Update with support for spec 1.6 * netx/net/sourceforge/jnlp/Parser.java: Add 1.6 to supportedVersions. diffstat: 3 files changed, 7 insertions(+), 1 deletion(-) ChangeLog | 5 +++++ NEWS | 1 + netx/net/sourceforge/jnlp/Parser.java | 2 +- diffs (35 lines): diff -r c2fdeca9dbb7 -r 4a022b4a3319 ChangeLog --- a/ChangeLog Thu Aug 05 17:45:47 2010 -0400 +++ b/ChangeLog Mon Aug 09 11:30:52 2010 -0400 @@ -1,3 +1,8 @@ 2010-08-05 Omair Majid + + * NEWS: Update with support for spec 1.6 + * netx/net/sourceforge/jnlp/Parser.java: Add 1.6 to supportedVersions. + 2010-08-05 Omair Majid * NEWS: Update with netx bugfix. diff -r c2fdeca9dbb7 -r 4a022b4a3319 NEWS --- a/NEWS Thu Aug 05 17:45:47 2010 -0400 +++ b/NEWS Mon Aug 09 11:30:52 2010 -0400 @@ -3,6 +3,7 @@ New in release 1.8.2 (XXXX-XX-XX): - NetX: - Fix browser command in BasicService.showDocument(URL) - Run programs that inherit main(String[]) in their main-class + - Run JNLP files that use 1.6 as the spec version New in release 1.8.1 (2010-07-28): diff -r c2fdeca9dbb7 -r 4a022b4a3319 netx/net/sourceforge/jnlp/Parser.java --- a/netx/net/sourceforge/jnlp/Parser.java Thu Aug 05 17:45:47 2010 -0400 +++ b/netx/net/sourceforge/jnlp/Parser.java Mon Aug 09 11:30:52 2010 -0400 @@ -72,7 +72,7 @@ class Parser { /** the supported JNLP file versions */ - private static Version supportedVersions = new Version("1.0 1.5 6.0"); + private static Version supportedVersions = new Version("1.0 1.5 1.6 6.0"); // fix: some descriptors need to use the jnlp file at a later // date and having file ref lets us pass it to their From omajid at icedtea.classpath.org Mon Aug 9 08:37:29 2010 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Mon, 09 Aug 2010 15:37:29 +0000 Subject: /hg/release/icedtea6-1.9: netx: support JNLP spec version 1.6 Message-ID: changeset 82f743a92f73 in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=82f743a92f73 author: Omair Majid date: Mon Aug 09 11:37:09 2010 -0400 netx: support JNLP spec version 1.6 2010-08-09 Omair Majid * NEWS: Update with support for 1.6 spec. * netx/net/sourceforge/jnlp/Parser.java: Add 1.6 to supportedVersions. diffstat: 3 files changed, 7 insertions(+), 1 deletion(-) ChangeLog | 5 +++++ NEWS | 1 + netx/net/sourceforge/jnlp/Parser.java | 2 +- diffs (35 lines): diff -r cb463b94b82d -r 82f743a92f73 ChangeLog --- a/ChangeLog Fri Aug 06 11:52:12 2010 +0100 +++ b/ChangeLog Mon Aug 09 11:37:09 2010 -0400 @@ -1,3 +1,8 @@ 2010-08-06 Andrew John Hughes + + * NEWS: Update with support for 1.6 spec. + * netx/net/sourceforge/jnlp/Parser.java: Add 1.6 to supportedVersions. + 2010-08-06 Andrew John Hughes Fix build on PAX-enabled kernels. diff -r cb463b94b82d -r 82f743a92f73 NEWS --- a/NEWS Fri Aug 06 11:52:12 2010 +0100 +++ b/NEWS Mon Aug 09 11:37:09 2010 -0400 @@ -720,6 +720,7 @@ New in release 1.9 (2010-XX-XX): - Minor fixes to JNLPRandomAccessFile - Fix browser command in BasicService.showDocument(URL) - Run programs that inherit main(String[]) in their main-class + - Run JNLP files that use spec version 1.6 New in release 1.8.1 (2010-07-28): diff -r cb463b94b82d -r 82f743a92f73 netx/net/sourceforge/jnlp/Parser.java --- a/netx/net/sourceforge/jnlp/Parser.java Fri Aug 06 11:52:12 2010 +0100 +++ b/netx/net/sourceforge/jnlp/Parser.java Mon Aug 09 11:37:09 2010 -0400 @@ -72,7 +72,7 @@ class Parser { /** the supported JNLP file versions */ - private static Version supportedVersions = new Version("1.0 1.5 6.0"); + private static Version supportedVersions = new Version("1.0 1.5 1.6 6.0"); // fix: some descriptors need to use the jnlp file at a later // date and having file ref lets us pass it to their From omajid at icedtea.classpath.org Mon Aug 9 08:40:45 2010 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Mon, 09 Aug 2010 15:40:45 +0000 Subject: /hg/icedtea6: netx: support JNLP spec version 1.6 Message-ID: changeset b8fc04b080aa in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b8fc04b080aa author: Omair Majid date: Mon Aug 09 11:40:33 2010 -0400 netx: support JNLP spec version 1.6 2010-08-09 Omair Majid * NEWS: Update with support for 1.6 spec. * netx/net/sourceforge/jnlp/Parser.java: Add 1.6 to supportedVersions. diffstat: 3 files changed, 7 insertions(+), 1 deletion(-) ChangeLog | 5 +++++ NEWS | 1 + netx/net/sourceforge/jnlp/Parser.java | 2 +- diffs (35 lines): diff -r a570f4fed326 -r b8fc04b080aa ChangeLog --- a/ChangeLog Fri Aug 06 20:08:18 2010 +0100 +++ b/ChangeLog Mon Aug 09 11:40:33 2010 -0400 @@ -1,3 +1,8 @@ 2010-08-06 Andrew John Hughes + + * NEWS: Update with support for JNLP spec 1.6 + * net/sourceforge/jnlp/Parser.java: Add 1.6 to supportedVersions. + 2010-08-06 Andrew John Hughes * configure.ac: Bump to 1.10. diff -r a570f4fed326 -r b8fc04b080aa NEWS --- a/NEWS Fri Aug 06 20:08:18 2010 +0100 +++ b/NEWS Mon Aug 09 11:40:33 2010 -0400 @@ -722,6 +722,7 @@ New in release 1.9 (2010-XX-XX): - Minor fixes to JNLPRandomAccessFile - Fix browser command in BasicService.showDocument(URL) - Run programs that inherit main(String[]) in their main-class + - Run JNLP file that use spec version 1.6 New in release 1.8.1 (2010-07-28): diff -r a570f4fed326 -r b8fc04b080aa netx/net/sourceforge/jnlp/Parser.java --- a/netx/net/sourceforge/jnlp/Parser.java Fri Aug 06 20:08:18 2010 +0100 +++ b/netx/net/sourceforge/jnlp/Parser.java Mon Aug 09 11:40:33 2010 -0400 @@ -72,7 +72,7 @@ class Parser { /** the supported JNLP file versions */ - private static Version supportedVersions = new Version("1.0 1.5 6.0"); + private static Version supportedVersions = new Version("1.0 1.5 1.6 6.0"); // fix: some descriptors need to use the jnlp file at a later // date and having file ref lets us pass it to their From omajid at redhat.com Mon Aug 9 08:42:24 2010 From: omajid at redhat.com (Omair Majid) Date: Mon, 09 Aug 2010 11:42:24 -0400 Subject: [RFC] netx: add 1.6 to supported jnlp versions In-Reply-To: <20100809152110.GB23631@redhat.com> References: <4C6019E4.6020800@redhat.com> <20100809152110.GB23631@redhat.com> Message-ID: <4C6021E0.1010100@redhat.com> On 08/09/2010 11:21 AM, Deepak Bhole wrote: > * Omair Majid [2010-08-09 11:08]: >> Hi, >> >> Some webstart applications like JForex [1] claim to use version 1.6 >> of the jnlp specification, even though it is not listed in the >> developers guide [2]: "The spec attribute can be 1.0, 1.5.0, or 6.0 >> or can use the wildcards such as 1.0+." >> >> The attached patch make netx work with a version of 1.6 as well. >> >> Ok to commit? >> >> Cheers, >> Omair >> >> >> [1] https://www.dukascopy.com/client/demo/jclient/jforex.jnlp >> [2]http://download.oracle.com/javase/6/docs/technotes/guides/javaws/developersguide/syntax.html > >> diff -r a570f4fed326 netx/net/sourceforge/jnlp/Parser.java >> --- a/netx/net/sourceforge/jnlp/Parser.java Fri Aug 06 20:08:18 2010 +0100 >> +++ b/netx/net/sourceforge/jnlp/Parser.java Mon Aug 09 10:57:48 2010 -0400 >> @@ -72,7 +72,7 @@ >> >> >> /** the supported JNLP file versions */ >> - private static Version supportedVersions = new Version("1.0 1.5 6.0"); >> + private static Version supportedVersions = new Version("1.0 1.5 1.6 6.0"); >> >> // fix: some descriptors need to use the jnlp file at a later >> // date and having file ref lets us pass it to their > > > > Okay to commit to 1.7, 1.8 and HEAD. > Pushed as: changeset daffd234afbd in /hg/release/icedtea6-1.7 changeset 4a022b4a3319 in /hg/release/icedtea6-1.8 changeset 82f743a92f73 in /hg/release/icedtea6-1.9 changeset b8fc04b080aa in /hg/icedtea6 Cheers, Omair From dbhole at icedtea.classpath.org Mon Aug 9 14:10:42 2010 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Mon, 09 Aug 2010 21:10:42 +0000 Subject: /hg/icedtea6: Apply patch (modified from original by Andrew Hugh... Message-ID: changeset 0974e80c4a6e in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0974e80c4a6e author: Deepak Bhole date: Mon Aug 09 17:08:38 2010 -0400 Apply patch (modified from original by Andrew Hughes) to move plugin and netx classes from rt.jar into plugin.jar and netx.jar. diffstat: 7 files changed, 151 insertions(+), 210 deletions(-) ChangeLog | 43 +++++++++ Makefile.am | 132 ++++++++++++++++++++--------- NEWS | 1 patches/extensions/liveconnect-dist.patch | 76 ---------------- patches/extensions/netx-dist.patch | 86 ------------------ patches/icedtea-rhino.patch | 10 -- patches/update-bootclasspath.patch | 13 ++ diffs (495 lines): diff -r b8fc04b080aa -r 0974e80c4a6e ChangeLog --- a/ChangeLog Mon Aug 09 11:40:33 2010 -0400 +++ b/ChangeLog Mon Aug 09 17:08:38 2010 -0400 @@ -1,3 +1,46 @@ 2010-08-09 Omair Majid + + * Makefile.am: + (icedtea):Add update-bootclasspath.patch. + dependencies and copying. Add icedtea-update-bootclasspath.patch. + * patches/update-bootclasspath.patch: New patch. Adds netx, + rhino and plugin jars to the bootclasspath. + +2010-08-09 Andrew John Hughes + + Produce separate JAR files for NetX and the + plugin (netx.jar and plugin.jar) rather than + integrating their code into rt.jar. + * patches/extensions/liveconnect-dist.patch, + * patches/extensions/netx-dist.patch: + Remove unneeded patches to OpenJDK build to + integrate NetX and the plugin's Java code. + * Makefile.am: + (ICEDTEA_ENV): Drop ALT_NETX_DIST and + ALT_LIVECONNECT_DIST. + (.PHONY): Add new clean targets. + (icedtea): Remove unneeded NetX and plugin + dependencies and copying. + (icedtea-debug): Likewise. + (icedtea-against-icedtea): Depend on add-plugin + and add-netx. + (clean-icedtea-against-icedtea): Depend on clean-add-netx + and clean-add-plugin. + (icedtea-debug-against-icedtea): Depend on add-plugin-debug + and add-netx-debug. + (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug + and clean-add-plugin-debug. + (add-plugin): Copy the plugin library and jar file into the jdk images. + (clean-add-plugin): Revert add-plugin. + (add-plugin-debug): Equivalent of add-plugin for the debug build. + (clean-add-plugin-debug): Revert add-plugin-debug. + (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the + jdk images. + (clean-add-netx): Revert add-netx. + (add-netx-debug): Equivalent of add-netx for the debug build. + (clean-add-netx-debug): Revert add-netx-debug. + (icedtea-ecj): Remove plugin and NetX dependencies. + 2010-08-09 Omair Majid * NEWS: Update with support for JNLP spec 1.6 diff -r b8fc04b080aa -r 0974e80c4a6e Makefile.am --- a/Makefile.am Mon Aug 09 11:40:33 2010 -0400 +++ b/Makefile.am Mon Aug 09 17:08:38 2010 -0400 @@ -270,10 +270,10 @@ ICEDTEA_PATCHES = \ patches/icedtea-parisc.patch \ patches/icedtea-sh4-support.patch \ patches/icedtea-policy-evaluation.patch \ + patches/update-bootclasspath.patch \ patches/libpng.patch \ patches/shark.patch \ patches/extensions/netx.patch \ - patches/extensions/netx-dist.patch \ patches/extensions/netx-umask.patch \ patches/icedtea-jtreg-httpTest.patch \ patches/arm.patch \ @@ -298,8 +298,7 @@ endif if ENABLE_PLUGIN ICEDTEA_PATCHES += \ - patches/extensions/liveconnect.patch \ - patches/extensions/liveconnect-dist.patch + patches/extensions/liveconnect.patch endif if BUILD_CACAO @@ -444,8 +443,6 @@ ICEDTEA_ENV = \ DEBUG_BINARIES="true" \ ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ VERBOSE="$(VERBOSE)" \ - ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ - ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \ ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" if WITH_CACAO @@ -571,7 +568,8 @@ install: clean-icedtea-against-ecj clean-cacao clean-add-cacao clean-add-cacao-debug \ clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \ clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \ - clean-rewriter clean-rewrite-rhino + clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \ + clean-add-plugin clean-add-plugin-debug env: @echo 'unset JAVA_HOME' @@ -1218,9 +1216,7 @@ clean-bootstrap-directory-symlink: # If you change anything here in the icedtea target, please make sure # you change it in the icedtea-debug target as well. stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ - stamps/rewrite-rhino.stamp + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk \ @@ -1229,12 +1225,6 @@ stamps/icedtea.stamp: stamps/bootstrap-d mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext -if ENABLE_PLUGIN - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) -endif if ENABLE_PULSE_JAVA cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) @@ -1247,10 +1237,6 @@ if ENABLE_PULSE_JAVA (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) endif - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ - $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif @@ -1294,9 +1280,7 @@ clean-icedtea: rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ - stamps/rewrite-rhino.stamp + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk \ @@ -1305,12 +1289,6 @@ stamps/icedtea-debug.stamp: stamps/boots mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext -if ENABLE_PLUGIN - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) -endif if ENABLE_PULSE_JAVA cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) @@ -1323,10 +1301,6 @@ if ENABLE_PULSE_JAVA (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) endif - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib ; \ - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif @@ -1371,27 +1345,109 @@ clean-icedtea-debug: rm -f stamps/icedtea-debug.stamp stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ - stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp + stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp stamps/add-plugin.stamp \ + stamps/add-netx.stamp mkdir -p stamps touch stamps/icedtea-against-icedtea.stamp -clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao +clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx rm -f stamps/icedtea-against-icedtea.stamp stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ - stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp + stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \ + stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp mkdir -p stamps touch stamps/icedtea-debug-against-icedtea.stamp -clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug +clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug clean-add-plugin-debug \ + clean-add-netx-debug rm -f stamps/icedtea-debug-against-icedtea.stamp + +stamps/add-plugin.stamp: stamps/plugin.stamp +if ENABLE_PLUGIN + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar +endif + touch stamps/add-plugin.stamp + +clean-add-plugin: + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar + rm -f stamps/add-plugin.stamp + +stamps/add-plugin-debug.stamp: stamps/plugin.stamp +if ENABLE_PLUGIN + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar +endif + touch stamps/add-plugin-debug.stamp + +clean-add-plugin-debug: + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar + rm -f stamps/add-plugin-debug.stamp + +stamps/add-netx.stamp: stamps/netx-dist.stamp extra-lib/about.jar + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib + touch stamps/add-netx.stamp + +clean-add-netx: + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar + rm -f stamps/add-netx.stamp + +stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib + touch stamps/add-netx-debug.stamp + +clean-add-netx-debug: + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar + rm -f stamps/add-netx-debug.stamp # OpenJDK ecj Targets # =================== stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ - stamps/netx-dist.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \ - stamps/rewrite-rhino.stamp stamps/plugin.stamp + $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV_ECJ) \ -C openjdk-ecj/ \ diff -r b8fc04b080aa -r 0974e80c4a6e NEWS --- a/NEWS Mon Aug 09 11:40:33 2010 -0400 +++ b/NEWS Mon Aug 09 17:08:38 2010 -0400 @@ -723,6 +723,7 @@ New in release 1.9 (2010-XX-XX): - Fix browser command in BasicService.showDocument(URL) - Run programs that inherit main(String[]) in their main-class - Run JNLP file that use spec version 1.6 +* Plugin and NetX classes have been moved from rt.jar into 2 jars, netx.jar and plugin.jar New in release 1.8.1 (2010-07-28): diff -r b8fc04b080aa -r 0974e80c4a6e patches/extensions/liveconnect-dist.patch --- a/patches/extensions/liveconnect-dist.patch Mon Aug 09 11:40:33 2010 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk ---- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-11-11 02:53:36.000000000 +0000 -@@ -0,0 +1,28 @@ -+# -+# Copyright 2009 Red Hat, 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. Red Hat 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. -+# -+ -+# The specific packages that come from or go to rt.jar and tools.jar -+IMPORT_RT_PACKAGES += \ -+ netscape/javascript \ -+ sun/applet -+ -+IMPORT_TOOLS_PACKAGES += -+ -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:52:44.000000000 +0000 -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:57:32.000000000 +0000 -@@ -49,6 +49,9 @@ - ifndef NETX_DIST - include $(BUILDDIR)/common/internal/Defs-netx.gmk - endif -+ifndef LIVECONNECT_DIST -+ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk -+endif - - # Clean up these lists so empty lists are empty - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) -@@ -123,6 +126,7 @@ - $(call import-one-sources,JAXP_DIST,$1) - $(call import-one-sources,JAXWS_DIST,$1) - $(call import-one-sources,NETX_DIST,$1) -+$(call import-one-sources,LIVECONNECT_DIST,$1) - endef - - # Import all component docs into directory $1 (optional) -@@ -162,6 +166,7 @@ - $(call import-one-classes,JAXP_DIST,$1) - $(call import-one-classes,JAXWS_DIST,$1) - $(call import-one-classes,NETX_DIST,$1) -+$(call import-one-classes,LIVECONNECT_DIST,$1) - endef - - # Clean up import files -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-11-11 02:52:44.000000000 +0000 -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-11-11 02:13:22.000000000 +0000 -@@ -365,6 +365,11 @@ - else - NETX_DIST = - endif -+ifdef ALT_LIVECONNECT_DIST -+ LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST)) -+else -+ LIVECONNECT_DIST = -+endif - - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH diff -r b8fc04b080aa -r 0974e80c4a6e patches/extensions/netx-dist.patch --- a/patches/extensions/netx-dist.patch Mon Aug 09 11:40:33 2010 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,86 +0,0 @@ -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-netx.gmk openjdk/jdk/make/common/internal/Defs-netx.gmk ---- openjdk.orig/jdk/make/common/internal/Defs-netx.gmk 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/make/common/internal/Defs-netx.gmk 2009-05-28 09:18:45.000000000 +0100 -@@ -0,0 +1,38 @@ -+# -+# Copyright 2009 Red Hat, 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. Red Hat 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. -+# -+ -+# The specific packages that come from or go to rt.jar and tools.jar -+IMPORT_RT_PACKAGES += \ -+ net/sourceforge/jnlp \ -+ net/sourceforge/jnlp/tools \ -+ net/sourceforge/jnlp/runtime \ -+ net/sourceforge/jnlp/util \ -+ net/sourceforge/jnlp/services \ -+ net/sourceforge/jnlp/security \ -+ net/sourceforge/jnlp/security/viewer \ -+ net/sourceforge/jnlp/cache \ -+ net/sourceforge/jnlp/event \ -+ net/sourceforge/jnlp/resources \ -+ net/sourceforge/nanoxml \ -+ javax/jnlp -+ -+IMPORT_TOOLS_PACKAGES += -+ -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100 -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:10:56.000000000 +0100 -@@ -46,6 +46,9 @@ - ifndef JAXWS_DIST - include $(BUILDDIR)/common/internal/Defs-jaxws.gmk - endif -+ifndef NETX_DIST -+ include $(BUILDDIR)/common/internal/Defs-netx.gmk -+endif - - # Clean up these lists so empty lists are empty - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) -@@ -119,6 +122,7 @@ - $(call import-one-sources,CORBA_DIST,$1) - $(call import-one-sources,JAXP_DIST,$1) - $(call import-one-sources,JAXWS_DIST,$1) -+$(call import-one-sources,NETX_DIST,$1) - endef - - # Import all component docs into directory $1 (optional) -@@ -157,6 +161,7 @@ - $(call import-one-classes,CORBA_DIST,$1) - $(call import-one-classes,JAXP_DIST,$1) - $(call import-one-classes,JAXWS_DIST,$1) -+$(call import-one-classes,NETX_DIST,$1) - endef - - # Clean up import files -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-29 02:11:18.000000000 +0100 -@@ -344,6 +344,11 @@ - else - JAXWS_DIST = - endif -+ifdef ALT_NETX_DIST -+ NETX_DIST := $(call FullPath,$(ALT_NETX_DIST)) -+else -+ NETX_DIST = -+endif - - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH diff -r b8fc04b080aa -r 0974e80c4a6e patches/icedtea-rhino.patch --- a/patches/icedtea-rhino.patch Mon Aug 09 11:40:33 2010 -0400 +++ b/patches/icedtea-rhino.patch Mon Aug 09 17:08:38 2010 -0400 @@ -1,13 +1,3 @@ ---- openjdk/hotspot/src/share/vm/runtime/os.cpp.orig 2008-11-22 00:11:18.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2008-12-03 21:16:14.000000000 +0000 -@@ -886,6 +886,7 @@ - "%/lib/jsse.jar:" - "%/lib/jce.jar:" - "%/lib/charsets.jar:" -+ "%/lib/rhino.jar:" - "%/classes"; - char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); - if (sysclasspath == NULL) return false; --- openjdk/jdk/make/com/sun/script/Makefile.orig 2008-11-25 09:01:10.000000000 +0000 +++ openjdk/jdk/make/com/sun/script/Makefile 2008-12-03 21:13:14.000000000 +0000 @@ -31,6 +31,8 @@ diff -r b8fc04b080aa -r 0974e80c4a6e patches/update-bootclasspath.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/update-bootclasspath.patch Mon Aug 09 17:08:38 2010 -0400 @@ -0,0 +1,13 @@ +diff -ur openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/share/vm/runtime/os.cpp +--- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp 2010-06-21 17:12:21.000000000 -0400 ++++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2010-08-06 15:48:48.338599142 -0400 +@@ -884,6 +884,9 @@ + "%/lib/jsse.jar:" + "%/lib/jce.jar:" + "%/lib/charsets.jar:" ++ "%/lib/netx.jar:" ++ "%/lib/plugin.jar:" ++ "%/lib/rhino.jar:" + "%/classes"; + char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); + if (sysclasspath == NULL) return false; From dbhole at icedtea.classpath.org Mon Aug 9 14:27:04 2010 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Mon, 09 Aug 2010 21:27:04 +0000 Subject: /hg/release/icedtea6-1.9: Apply patch (modified from original by... Message-ID: changeset 7816c6d7a641 in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=7816c6d7a641 author: Deepak Bhole date: Mon Aug 09 17:08:38 2010 -0400 Apply patch (modified from original by Andrew Hughes) to move plugin and netx classes from rt.jar into plugin.jar and netx.jar. diffstat: 7 files changed, 151 insertions(+), 210 deletions(-) ChangeLog | 43 +++++++++ Makefile.am | 132 ++++++++++++++++++++--------- NEWS | 1 patches/extensions/liveconnect-dist.patch | 76 ---------------- patches/extensions/netx-dist.patch | 86 ------------------ patches/icedtea-rhino.patch | 10 -- patches/update-bootclasspath.patch | 13 ++ diffs (495 lines): diff -r 82f743a92f73 -r 7816c6d7a641 ChangeLog --- a/ChangeLog Mon Aug 09 11:37:09 2010 -0400 +++ b/ChangeLog Mon Aug 09 17:08:38 2010 -0400 @@ -1,3 +1,46 @@ 2010-08-09 Omair Majid + + * Makefile.am: + (icedtea):Add update-bootclasspath.patch. + dependencies and copying. Add icedtea-update-bootclasspath.patch. + * patches/update-bootclasspath.patch: New patch. Adds netx, + rhino and plugin jars to the bootclasspath. + +2010-08-09 Andrew John Hughes + + Produce separate JAR files for NetX and the + plugin (netx.jar and plugin.jar) rather than + integrating their code into rt.jar. + * patches/extensions/liveconnect-dist.patch, + * patches/extensions/netx-dist.patch: + Remove unneeded patches to OpenJDK build to + integrate NetX and the plugin's Java code. + * Makefile.am: + (ICEDTEA_ENV): Drop ALT_NETX_DIST and + ALT_LIVECONNECT_DIST. + (.PHONY): Add new clean targets. + (icedtea): Remove unneeded NetX and plugin + dependencies and copying. + (icedtea-debug): Likewise. + (icedtea-against-icedtea): Depend on add-plugin + and add-netx. + (clean-icedtea-against-icedtea): Depend on clean-add-netx + and clean-add-plugin. + (icedtea-debug-against-icedtea): Depend on add-plugin-debug + and add-netx-debug. + (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug + and clean-add-plugin-debug. + (add-plugin): Copy the plugin library and jar file into the jdk images. + (clean-add-plugin): Revert add-plugin. + (add-plugin-debug): Equivalent of add-plugin for the debug build. + (clean-add-plugin-debug): Revert add-plugin-debug. + (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the + jdk images. + (clean-add-netx): Revert add-netx. + (add-netx-debug): Equivalent of add-netx for the debug build. + (clean-add-netx-debug): Revert add-netx-debug. + (icedtea-ecj): Remove plugin and NetX dependencies. + 2010-08-09 Omair Majid * NEWS: Update with support for 1.6 spec. diff -r 82f743a92f73 -r 7816c6d7a641 Makefile.am --- a/Makefile.am Mon Aug 09 11:37:09 2010 -0400 +++ b/Makefile.am Mon Aug 09 17:08:38 2010 -0400 @@ -270,10 +270,10 @@ ICEDTEA_PATCHES = \ patches/icedtea-parisc.patch \ patches/icedtea-sh4-support.patch \ patches/icedtea-policy-evaluation.patch \ + patches/update-bootclasspath.patch \ patches/libpng.patch \ patches/shark.patch \ patches/extensions/netx.patch \ - patches/extensions/netx-dist.patch \ patches/extensions/netx-umask.patch \ patches/icedtea-jtreg-httpTest.patch \ patches/arm.patch \ @@ -298,8 +298,7 @@ endif if ENABLE_PLUGIN ICEDTEA_PATCHES += \ - patches/extensions/liveconnect.patch \ - patches/extensions/liveconnect-dist.patch + patches/extensions/liveconnect.patch endif if BUILD_CACAO @@ -444,8 +443,6 @@ ICEDTEA_ENV = \ DEBUG_BINARIES="true" \ ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ VERBOSE="$(VERBOSE)" \ - ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ - ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \ ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" if WITH_CACAO @@ -571,7 +568,8 @@ install: clean-icedtea-against-ecj clean-cacao clean-add-cacao clean-add-cacao-debug \ clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \ clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \ - clean-rewriter clean-rewrite-rhino + clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \ + clean-add-plugin clean-add-plugin-debug env: @echo 'unset JAVA_HOME' @@ -1218,9 +1216,7 @@ clean-bootstrap-directory-symlink: # If you change anything here in the icedtea target, please make sure # you change it in the icedtea-debug target as well. stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ - stamps/rewrite-rhino.stamp + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk \ @@ -1229,12 +1225,6 @@ stamps/icedtea.stamp: stamps/bootstrap-d mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext -if ENABLE_PLUGIN - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) -endif if ENABLE_PULSE_JAVA cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) @@ -1247,10 +1237,6 @@ if ENABLE_PULSE_JAVA (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) endif - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ - $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif @@ -1294,9 +1280,7 @@ clean-icedtea: rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ - stamps/rewrite-rhino.stamp + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk \ @@ -1305,12 +1289,6 @@ stamps/icedtea-debug.stamp: stamps/boots mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext -if ENABLE_PLUGIN - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) -endif if ENABLE_PULSE_JAVA cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) @@ -1323,10 +1301,6 @@ if ENABLE_PULSE_JAVA (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) endif - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib ; \ - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif @@ -1371,27 +1345,109 @@ clean-icedtea-debug: rm -f stamps/icedtea-debug.stamp stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ - stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp + stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp stamps/add-plugin.stamp \ + stamps/add-netx.stamp mkdir -p stamps touch stamps/icedtea-against-icedtea.stamp -clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao +clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx rm -f stamps/icedtea-against-icedtea.stamp stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ - stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp + stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \ + stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp mkdir -p stamps touch stamps/icedtea-debug-against-icedtea.stamp -clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug +clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug clean-add-plugin-debug \ + clean-add-netx-debug rm -f stamps/icedtea-debug-against-icedtea.stamp + +stamps/add-plugin.stamp: stamps/plugin.stamp +if ENABLE_PLUGIN + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar +endif + touch stamps/add-plugin.stamp + +clean-add-plugin: + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar + rm -f stamps/add-plugin.stamp + +stamps/add-plugin-debug.stamp: stamps/plugin.stamp +if ENABLE_PLUGIN + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar +endif + touch stamps/add-plugin-debug.stamp + +clean-add-plugin-debug: + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar + rm -f stamps/add-plugin-debug.stamp + +stamps/add-netx.stamp: stamps/netx-dist.stamp extra-lib/about.jar + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib + touch stamps/add-netx.stamp + +clean-add-netx: + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar + rm -f stamps/add-netx.stamp + +stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib + touch stamps/add-netx-debug.stamp + +clean-add-netx-debug: + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar + rm -f stamps/add-netx-debug.stamp # OpenJDK ecj Targets # =================== stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ - stamps/netx-dist.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \ - stamps/rewrite-rhino.stamp stamps/plugin.stamp + $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV_ECJ) \ -C openjdk-ecj/ \ diff -r 82f743a92f73 -r 7816c6d7a641 NEWS --- a/NEWS Mon Aug 09 11:37:09 2010 -0400 +++ b/NEWS Mon Aug 09 17:08:38 2010 -0400 @@ -762,6 +762,7 @@ New in release 1.8.1 (2010-07-28): - Fix Zero build on Hitachi SH. * SystemTap support: - PR476: Enable building SystemTap support on GCC 4.5. +* Plugin and NetX classes have been moved from rt.jar into 2 jars, netx.jar and plugin.jar New in release 1.7.4 (2010-07-28): diff -r 82f743a92f73 -r 7816c6d7a641 patches/extensions/liveconnect-dist.patch --- a/patches/extensions/liveconnect-dist.patch Mon Aug 09 11:37:09 2010 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,76 +0,0 @@ -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk ---- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-11-11 02:53:36.000000000 +0000 -@@ -0,0 +1,28 @@ -+# -+# Copyright 2009 Red Hat, 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. Red Hat 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. -+# -+ -+# The specific packages that come from or go to rt.jar and tools.jar -+IMPORT_RT_PACKAGES += \ -+ netscape/javascript \ -+ sun/applet -+ -+IMPORT_TOOLS_PACKAGES += -+ -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:52:44.000000000 +0000 -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:57:32.000000000 +0000 -@@ -49,6 +49,9 @@ - ifndef NETX_DIST - include $(BUILDDIR)/common/internal/Defs-netx.gmk - endif -+ifndef LIVECONNECT_DIST -+ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk -+endif - - # Clean up these lists so empty lists are empty - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) -@@ -123,6 +126,7 @@ - $(call import-one-sources,JAXP_DIST,$1) - $(call import-one-sources,JAXWS_DIST,$1) - $(call import-one-sources,NETX_DIST,$1) -+$(call import-one-sources,LIVECONNECT_DIST,$1) - endef - - # Import all component docs into directory $1 (optional) -@@ -162,6 +166,7 @@ - $(call import-one-classes,JAXP_DIST,$1) - $(call import-one-classes,JAXWS_DIST,$1) - $(call import-one-classes,NETX_DIST,$1) -+$(call import-one-classes,LIVECONNECT_DIST,$1) - endef - - # Clean up import files -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-11-11 02:52:44.000000000 +0000 -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-11-11 02:13:22.000000000 +0000 -@@ -365,6 +365,11 @@ - else - NETX_DIST = - endif -+ifdef ALT_LIVECONNECT_DIST -+ LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST)) -+else -+ LIVECONNECT_DIST = -+endif - - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH diff -r 82f743a92f73 -r 7816c6d7a641 patches/extensions/netx-dist.patch --- a/patches/extensions/netx-dist.patch Mon Aug 09 11:37:09 2010 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,86 +0,0 @@ -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-netx.gmk openjdk/jdk/make/common/internal/Defs-netx.gmk ---- openjdk.orig/jdk/make/common/internal/Defs-netx.gmk 1970-01-01 01:00:00.000000000 +0100 -+++ openjdk/jdk/make/common/internal/Defs-netx.gmk 2009-05-28 09:18:45.000000000 +0100 -@@ -0,0 +1,38 @@ -+# -+# Copyright 2009 Red Hat, 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. Red Hat 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. -+# -+ -+# The specific packages that come from or go to rt.jar and tools.jar -+IMPORT_RT_PACKAGES += \ -+ net/sourceforge/jnlp \ -+ net/sourceforge/jnlp/tools \ -+ net/sourceforge/jnlp/runtime \ -+ net/sourceforge/jnlp/util \ -+ net/sourceforge/jnlp/services \ -+ net/sourceforge/jnlp/security \ -+ net/sourceforge/jnlp/security/viewer \ -+ net/sourceforge/jnlp/cache \ -+ net/sourceforge/jnlp/event \ -+ net/sourceforge/jnlp/resources \ -+ net/sourceforge/nanoxml \ -+ javax/jnlp -+ -+IMPORT_TOOLS_PACKAGES += -+ -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100 -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:10:56.000000000 +0100 -@@ -46,6 +46,9 @@ - ifndef JAXWS_DIST - include $(BUILDDIR)/common/internal/Defs-jaxws.gmk - endif -+ifndef NETX_DIST -+ include $(BUILDDIR)/common/internal/Defs-netx.gmk -+endif - - # Clean up these lists so empty lists are empty - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) -@@ -119,6 +122,7 @@ - $(call import-one-sources,CORBA_DIST,$1) - $(call import-one-sources,JAXP_DIST,$1) - $(call import-one-sources,JAXWS_DIST,$1) -+$(call import-one-sources,NETX_DIST,$1) - endef - - # Import all component docs into directory $1 (optional) -@@ -157,6 +161,7 @@ - $(call import-one-classes,CORBA_DIST,$1) - $(call import-one-classes,JAXP_DIST,$1) - $(call import-one-classes,JAXWS_DIST,$1) -+$(call import-one-classes,NETX_DIST,$1) - endef - - # Clean up import files -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100 -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-29 02:11:18.000000000 +0100 -@@ -344,6 +344,11 @@ - else - JAXWS_DIST = - endif -+ifdef ALT_NETX_DIST -+ NETX_DIST := $(call FullPath,$(ALT_NETX_DIST)) -+else -+ NETX_DIST = -+endif - - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH diff -r 82f743a92f73 -r 7816c6d7a641 patches/icedtea-rhino.patch --- a/patches/icedtea-rhino.patch Mon Aug 09 11:37:09 2010 -0400 +++ b/patches/icedtea-rhino.patch Mon Aug 09 17:08:38 2010 -0400 @@ -1,13 +1,3 @@ ---- openjdk/hotspot/src/share/vm/runtime/os.cpp.orig 2008-11-22 00:11:18.000000000 +0000 -+++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2008-12-03 21:16:14.000000000 +0000 -@@ -886,6 +886,7 @@ - "%/lib/jsse.jar:" - "%/lib/jce.jar:" - "%/lib/charsets.jar:" -+ "%/lib/rhino.jar:" - "%/classes"; - char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); - if (sysclasspath == NULL) return false; --- openjdk/jdk/make/com/sun/script/Makefile.orig 2008-11-25 09:01:10.000000000 +0000 +++ openjdk/jdk/make/com/sun/script/Makefile 2008-12-03 21:13:14.000000000 +0000 @@ -31,6 +31,8 @@ diff -r 82f743a92f73 -r 7816c6d7a641 patches/update-bootclasspath.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/update-bootclasspath.patch Mon Aug 09 17:08:38 2010 -0400 @@ -0,0 +1,13 @@ +diff -ur openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/share/vm/runtime/os.cpp +--- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp 2010-06-21 17:12:21.000000000 -0400 ++++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2010-08-06 15:48:48.338599142 -0400 +@@ -884,6 +884,9 @@ + "%/lib/jsse.jar:" + "%/lib/jce.jar:" + "%/lib/charsets.jar:" ++ "%/lib/netx.jar:" ++ "%/lib/plugin.jar:" ++ "%/lib/rhino.jar:" + "%/classes"; + char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); + if (sysclasspath == NULL) return false; From dbhole at redhat.com Mon Aug 9 14:28:48 2010 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 9 Aug 2010 17:28:48 -0400 Subject: [PATCH FOR TESTING] Separation of plugin and NetX into separate JARs In-Reply-To: <20100806231445.GR6867@rivendell.middle-earth.co.uk> References: <20100805175048.GI6867@rivendell.middle-earth.co.uk> <20100805193038.GB2505@redhat.com> <20100805222803.GJ6867@rivendell.middle-earth.co.uk> <20100806192231.GB16822@redhat.com> <20100806193917.GQ6867@rivendell.middle-earth.co.uk> <20100806195702.GD16822@redhat.com> <20100806213435.GF16822@redhat.com> <20100806231445.GR6867@rivendell.middle-earth.co.uk> Message-ID: <20100809212847.GD24275@redhat.com> * Dr Andrew John Hughes [2010-08-06 19:14]: > On 17:34 Fri 06 Aug , Deepak Bhole wrote: > > * Deepak Bhole [2010-08-06 15:57]: > > > * Dr Andrew John Hughes [2010-08-06 15:39]: > > > > On 15:22 Fri 06 Aug , Deepak Bhole wrote: > > > > > * Dr Andrew John Hughes [2010-08-05 18:28]: > > > > > > On 15:30 Thu 05 Aug , Deepak Bhole wrote: > > > > > > > * Dr Andrew John Hughes [2010-08-05 13:50]: > > > > > > > > The attached patch changes the IcedTea build to produce two > > > > > > > > jar files (netx.jar and plugin.jar) in the JDK images for NetX > > > > > > > > and the plugin respectively, rather than adding their classes to > > > > > > > > rt.jar. > > > > > > > > > > > > > > > > Deepak et. al., can you please test this, make any needed changes to > > > > > > > > the plugin/NetX and commit? > > > > > > > > > > > > > > > > > > > > > > While the patch produces a plugin.jar and a netx.jar, they are not in > > > > > > > the bootclasspath. As a result, an error happens when something like > > > > > > > javaws is invoked: > > > > > > > > > > > > > > $ $JAVA_HOME/bin/javaws http://www.sweethome3d.com/SweetHome3D.jnlp > > > > > > > Exception in thread "main" java.lang.NoClassDefFoundError: > > > > > > > net/sourceforge/jnlp/runtime/Boot > > > > > > > > > > > > > > > > > > > Yes, I expected something like this. That's what I need you to fix. > > > > > > > > > > > > > > > > Ah, in that case ... :) > > > > > > > > > > New patch attached. It addresses the issue. > > > > > > > > > > > > > Thanks. Does java actually fail if the bootclasspath contains JAR files > > > > that don't exist? If not, could we not just have one patch that adds all > > > > three JAR files? > > > > > > > > > > Good point! I Just tried it. It works fine even if the jars are not > > > there. I have made the changes and am testing them now. Will post the > > > patch as soon as it is tested. > > > > > > > New file attached. > > > > Looks good. Couple of niggles: > > * Drop the 'icedtea' prefix on the patch name. It's fine as update-bootclasspath.patch. > I'm planning to do a mass rename of the old ones for 1.10 as the prefix is redundant. > * You haven't credited yourself in the ChangeLog :-) The new changes should be under > your name. > > Ok to commit to HEAD and 1.9 branch with those changes. > Thanks, done: http://icedtea.classpath.org/hg/icedtea6/rev/0974e80c4a6e http://icedtea.classpath.org/hg/release/icedtea6-1.9/rev/7816c6d7a641 Cheers, Deepak > Thanks for testing. > > > Cheers, > > Deepak > > > > > Thanks, > > > Deepak > > > > > > > > Cheers, > > > > > Deepak > > > > > > > > > > > > Cheers, > > > > > > > Deepak > > > > > > > > > > > > > > > 2010-08-05 Andrew John Hughes > > > > > > > > > > > > > > > > Produce separate JAR files for NetX and the > > > > > > > > plugin (netx.jar and plugin.jar) rather than > > > > > > > > integrating their code into rt.jar. > > > > > > > > * patches/extensions/liveconnect-dist.patch, > > > > > > > > * patches/extensions/netx-dist.patch: > > > > > > > > Remove unneeded patches to OpenJDK build to > > > > > > > > integrate NetX and the plugin's Java code. > > > > > > > > * Makefile.am: > > > > > > > > (ICEDTEA_ENV): Drop ALT_NETX_DIST and > > > > > > > > ALT_LIVECONNECT_DIST. > > > > > > > > (.PHONY): Add new clean targets. > > > > > > > > (icedtea): Remove unneeded NetX and plugin > > > > > > > > dependencies and copying. > > > > > > > > (icedtea-debug): Likewise. > > > > > > > > (icedtea-against-icedtea): Depend on add-plugin > > > > > > > > and add-netx. > > > > > > > > (clean-icedtea-against-icedtea): Depend on clean-add-netx > > > > > > > > and clean-add-plugin. > > > > > > > > (icedtea-debug-against-icedtea): Depend on add-plugin-debug > > > > > > > > and add-netx-debug. > > > > > > > > (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug > > > > > > > > and clean-add-plugin-debug. > > > > > > > > (add-plugin): Copy the plugin library and jar file into the jdk images. > > > > > > > > (clean-add-plugin): Revert add-plugin. > > > > > > > > (add-plugin-debug): Equivalent of add-plugin for the debug build. > > > > > > > > (clean-add-plugin-debug): Revert add-plugin-debug. > > > > > > > > (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the > > > > > > > > jdk images. > > > > > > > > (clean-add-netx): Revert add-netx. > > > > > > > > (add-netx-debug): Equivalent of add-netx for the debug build. > > > > > > > > (clean-add-netx-debug): Revert add-netx-debug. > > > > > > > > (icedtea-ecj): Remove plugin and NetX dependencies. > > > > > > > > > > > > > > > > Thanks, > > > > > > > > -- > > > > > > > > Andrew :) > > > > > > > > > > > > > > > > Free Java Software Engineer > > > > > > > > Red Hat, Inc. (http://www.redhat.com) > > > > > > > > > > > > > > > > Support Free Java! > > > > > > > > Contribute to GNU Classpath and the OpenJDK > > > > > > > > http://www.gnu.org/software/classpath > > > > > > > > http://openjdk.java.net > > > > > > > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > > > > > > > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > > > > > > > > > > > > > > > diff -r 6530d2aa9076 ChangeLog > > > > > > > > --- a/ChangeLog Thu Aug 05 16:58:30 2010 +0100 > > > > > > > > +++ b/ChangeLog Thu Aug 05 18:48:29 2010 +0100 > > > > > > > > @@ -1,3 +1,38 @@ > > > > > > > > +2010-08-05 Andrew John Hughes > > > > > > > > + > > > > > > > > + Produce separate JAR files for NetX and the > > > > > > > > + plugin (netx.jar and plugin.jar) rather than > > > > > > > > + integrating their code into rt.jar. > > > > > > > > + * patches/extensions/liveconnect-dist.patch, > > > > > > > > + * patches/extensions/netx-dist.patch: > > > > > > > > + Remove unneeded patches to OpenJDK build to > > > > > > > > + integrate NetX and the plugin's Java code. > > > > > > > > + * Makefile.am: > > > > > > > > + (ICEDTEA_ENV): Drop ALT_NETX_DIST and > > > > > > > > + ALT_LIVECONNECT_DIST. > > > > > > > > + (.PHONY): Add new clean targets. > > > > > > > > + (icedtea): Remove unneeded NetX and plugin > > > > > > > > + dependencies and copying. > > > > > > > > + (icedtea-debug): Likewise. > > > > > > > > + (icedtea-against-icedtea): Depend on add-plugin > > > > > > > > + and add-netx. > > > > > > > > + (clean-icedtea-against-icedtea): Depend on clean-add-netx > > > > > > > > + and clean-add-plugin. > > > > > > > > + (icedtea-debug-against-icedtea): Depend on add-plugin-debug > > > > > > > > + and add-netx-debug. > > > > > > > > + (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug > > > > > > > > + and clean-add-plugin-debug. > > > > > > > > + (add-plugin): Copy the plugin library and jar file into the jdk images. > > > > > > > > + (clean-add-plugin): Revert add-plugin. > > > > > > > > + (add-plugin-debug): Equivalent of add-plugin for the debug build. > > > > > > > > + (clean-add-plugin-debug): Revert add-plugin-debug. > > > > > > > > + (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the > > > > > > > > + jdk images. > > > > > > > > + (clean-add-netx): Revert add-netx. > > > > > > > > + (add-netx-debug): Equivalent of add-netx for the debug build. > > > > > > > > + (clean-add-netx-debug): Revert add-netx-debug. > > > > > > > > + (icedtea-ecj): Remove plugin and NetX dependencies. > > > > > > > > + > > > > > > > > 2010-08-05 Andrew John Hughes > > > > > > > > > > > > > > > > http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560056 > > > > > > > > diff -r 6530d2aa9076 Makefile.am > > > > > > > > --- a/Makefile.am Thu Aug 05 16:58:30 2010 +0100 > > > > > > > > +++ b/Makefile.am Thu Aug 05 18:48:29 2010 +0100 > > > > > > > > @@ -273,7 +273,6 @@ > > > > > > > > patches/libpng.patch \ > > > > > > > > patches/shark.patch \ > > > > > > > > patches/extensions/netx.patch \ > > > > > > > > - patches/extensions/netx-dist.patch \ > > > > > > > > patches/extensions/netx-umask.patch \ > > > > > > > > patches/icedtea-jtreg-httpTest.patch \ > > > > > > > > patches/arm.patch \ > > > > > > > > @@ -297,8 +296,7 @@ > > > > > > > > > > > > > > > > if ENABLE_PLUGIN > > > > > > > > ICEDTEA_PATCHES += \ > > > > > > > > - patches/extensions/liveconnect.patch \ > > > > > > > > - patches/extensions/liveconnect-dist.patch > > > > > > > > + patches/extensions/liveconnect.patch > > > > > > > > endif > > > > > > > > > > > > > > > > if BUILD_CACAO > > > > > > > > @@ -433,8 +431,6 @@ > > > > > > > > DEBUG_BINARIES="true" \ > > > > > > > > ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ > > > > > > > > VERBOSE="$(VERBOSE)" \ > > > > > > > > - ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ > > > > > > > > - ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \ > > > > > > > > ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" > > > > > > > > > > > > > > > > if WITH_CACAO > > > > > > > > @@ -560,7 +556,8 @@ > > > > > > > > clean-icedtea-against-ecj clean-cacao clean-add-cacao clean-add-cacao-debug \ > > > > > > > > clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \ > > > > > > > > clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \ > > > > > > > > - clean-rewriter clean-rewrite-rhino > > > > > > > > + clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \ > > > > > > > > + clean-add-plugin clean-add-plugin-debug > > > > > > > > > > > > > > > > env: > > > > > > > > @echo 'unset JAVA_HOME' > > > > > > > > @@ -1207,9 +1204,7 @@ > > > > > > > > # If you change anything here in the icedtea target, please make sure > > > > > > > > # you change it in the icedtea-debug target as well. > > > > > > > > stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > > > > > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > > > > > > > > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > > > > > > > > - stamps/rewrite-rhino.stamp > > > > > > > > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > > > > > > > > $(ARCH_PREFIX) $(MAKE) \ > > > > > > > > $(ICEDTEA_ENV) \ > > > > > > > > -C openjdk \ > > > > > > > > @@ -1218,12 +1213,6 @@ > > > > > > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > > > > > > > > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext > > > > > > > > -if ENABLE_PLUGIN > > > > > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > > > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > > > - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > > > -endif > > > > > > > > if ENABLE_PULSE_JAVA > > > > > > > > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > > > > > > > > $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > > > @@ -1236,10 +1225,6 @@ > > > > > > > > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > > > > > > > > $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > > > > > > > > endif > > > > > > > > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > > > - $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > > > > > > > > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > > > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > > > > > if ZERO_BUILD > > > > > > > > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg > > > > > > > > endif > > > > > > > > @@ -1283,9 +1268,7 @@ > > > > > > > > rm -f stamps/icedtea.stamp > > > > > > > > > > > > > > > > stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > > > > > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > > > > > > > > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > > > > > > > > - stamps/rewrite-rhino.stamp > > > > > > > > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > > > > > > > > $(ARCH_PREFIX) $(MAKE) \ > > > > > > > > $(ICEDTEA_ENV) \ > > > > > > > > -C openjdk \ > > > > > > > > @@ -1294,12 +1277,6 @@ > > > > > > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > > > > > > > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext > > > > > > > > -if ENABLE_PLUGIN > > > > > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > > > -endif > > > > > > > > if ENABLE_PULSE_JAVA > > > > > > > > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > > > > > > > > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > > > @@ -1312,10 +1289,6 @@ > > > > > > > > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > > > > > > > > $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > > > > > > > > endif > > > > > > > > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > > > > > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > > > > > > > > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > > > > > > > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > > > > > if ZERO_BUILD > > > > > > > > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg > > > > > > > > endif > > > > > > > > @@ -1360,27 +1333,109 @@ > > > > > > > > rm -f stamps/icedtea-debug.stamp > > > > > > > > > > > > > > > > stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > > > > > - stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp > > > > > > > > + stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp stamps/add-plugin.stamp \ > > > > > > > > + stamps/add-netx.stamp > > > > > > > > mkdir -p stamps > > > > > > > > touch stamps/icedtea-against-icedtea.stamp > > > > > > > > > > > > > > > > -clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao > > > > > > > > +clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx > > > > > > > > rm -f stamps/icedtea-against-icedtea.stamp > > > > > > > > > > > > > > > > stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > > > > > > > - stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp > > > > > > > > + stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \ > > > > > > > > + stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp > > > > > > > > mkdir -p stamps > > > > > > > > touch stamps/icedtea-debug-against-icedtea.stamp > > > > > > > > > > > > > > > > -clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug > > > > > > > > +clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug clean-add-plugin-debug \ > > > > > > > > + clean-add-netx-debug > > > > > > > > rm -f stamps/icedtea-debug-against-icedtea.stamp > > > > > > > > > > > > > > > > +stamps/add-plugin.stamp: stamps/plugin.stamp > > > > > > > > +if ENABLE_PLUGIN > > > > > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > > > > > +endif > > > > > > > > + touch stamps/add-plugin.stamp > > > > > > > > + > > > > > > > > +clean-add-plugin: > > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > > > > > + rm -f stamps/add-plugin.stamp > > > > > > > > + > > > > > > > > +stamps/add-plugin-debug.stamp: stamps/plugin.stamp > > > > > > > > +if ENABLE_PLUGIN > > > > > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > > > > > > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > > > > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > > > > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > > > > > +endif > > > > > > > > + touch stamps/add-plugin-debug.stamp > > > > > > > > + > > > > > > > > +clean-add-plugin-debug: > > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > > > > > > > + rm -f stamps/add-plugin-debug.stamp > > > > > > > > + > > > > > > > > +stamps/add-netx.stamp: stamps/netx-dist.stamp extra-lib/about.jar > > > > > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib > > > > > > > > + touch stamps/add-netx.stamp > > > > > > > > + > > > > > > > > +clean-add-netx: > > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > > > > > > > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > > > > > > > > + rm -f stamps/add-netx.stamp > > > > > > > > + > > > > > > > > +stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar > > > > > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > > > > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > > > > > > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > > > > > > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib > > > > > > > > + touch stamps/add-netx-debug.stamp > > > > > > > > + > > > > > > > > +clean-add-netx-debug: > > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > > > > > > > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > > > > > > > > + rm -f stamps/add-netx-debug.stamp > > > > > > > > + > > > > > > > > # OpenJDK ecj Targets > > > > > > > > # =================== > > > > > > > > > > > > > > > > stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ > > > > > > > > - stamps/netx-dist.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \ > > > > > > > > - stamps/rewrite-rhino.stamp stamps/plugin.stamp > > > > > > > > + $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp > > > > > > > > $(ARCH_PREFIX) $(MAKE) \ > > > > > > > > $(ICEDTEA_ENV_ECJ) \ > > > > > > > > -C openjdk-ecj/ \ > > > > > > > > diff -r 6530d2aa9076 patches/extensions/liveconnect-dist.patch > > > > > > > > --- a/patches/extensions/liveconnect-dist.patch Thu Aug 05 16:58:30 2010 +0100 > > > > > > > > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > > > > > > > > @@ -1,76 +0,0 @@ > > > > > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk > > > > > > > > ---- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 > > > > > > > > -+++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-11-11 02:53:36.000000000 +0000 > > > > > > > > -@@ -0,0 +1,28 @@ > > > > > > > > -+# > > > > > > > > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > > > > > > > > -+# > > > > > > > > -+ > > > > > > > > -+# The specific packages that come from or go to rt.jar and tools.jar > > > > > > > > -+IMPORT_RT_PACKAGES += \ > > > > > > > > -+ netscape/javascript \ > > > > > > > > -+ sun/applet > > > > > > > > -+ > > > > > > > > -+IMPORT_TOOLS_PACKAGES += > > > > > > > > -+ > > > > > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > > > > > > > > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:52:44.000000000 +0000 > > > > > > > > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:57:32.000000000 +0000 > > > > > > > > -@@ -49,6 +49,9 @@ > > > > > > > > - ifndef NETX_DIST > > > > > > > > - include $(BUILDDIR)/common/internal/Defs-netx.gmk > > > > > > > > - endif > > > > > > > > -+ifndef LIVECONNECT_DIST > > > > > > > > -+ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk > > > > > > > > -+endif > > > > > > > > - > > > > > > > > - # Clean up these lists so empty lists are empty > > > > > > > > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > > > > > > > > -@@ -123,6 +126,7 @@ > > > > > > > > - $(call import-one-sources,JAXP_DIST,$1) > > > > > > > > - $(call import-one-sources,JAXWS_DIST,$1) > > > > > > > > - $(call import-one-sources,NETX_DIST,$1) > > > > > > > > -+$(call import-one-sources,LIVECONNECT_DIST,$1) > > > > > > > > - endef > > > > > > > > - > > > > > > > > - # Import all component docs into directory $1 (optional) > > > > > > > > -@@ -162,6 +166,7 @@ > > > > > > > > - $(call import-one-classes,JAXP_DIST,$1) > > > > > > > > - $(call import-one-classes,JAXWS_DIST,$1) > > > > > > > > - $(call import-one-classes,NETX_DIST,$1) > > > > > > > > -+$(call import-one-classes,LIVECONNECT_DIST,$1) > > > > > > > > - endef > > > > > > > > - > > > > > > > > - # Clean up import files > > > > > > > > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > > > > > > > > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-11-11 02:52:44.000000000 +0000 > > > > > > > > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-11-11 02:13:22.000000000 +0000 > > > > > > > > -@@ -365,6 +365,11 @@ > > > > > > > > - else > > > > > > > > - NETX_DIST = > > > > > > > > - endif > > > > > > > > -+ifdef ALT_LIVECONNECT_DIST > > > > > > > > -+ LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST)) > > > > > > > > -+else > > > > > > > > -+ LIVECONNECT_DIST = > > > > > > > > -+endif > > > > > > > > - > > > > > > > > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > > > > > > > > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > > > > > > > > diff -r 6530d2aa9076 patches/extensions/netx-dist.patch > > > > > > > > --- a/patches/extensions/netx-dist.patch Thu Aug 05 16:58:30 2010 +0100 > > > > > > > > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > > > > > > > > @@ -1,86 +0,0 @@ > > > > > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-netx.gmk openjdk/jdk/make/common/internal/Defs-netx.gmk > > > > > > > > ---- openjdk.orig/jdk/make/common/internal/Defs-netx.gmk 1970-01-01 01:00:00.000000000 +0100 > > > > > > > > -+++ openjdk/jdk/make/common/internal/Defs-netx.gmk 2009-05-28 09:18:45.000000000 +0100 > > > > > > > > -@@ -0,0 +1,38 @@ > > > > > > > > -+# > > > > > > > > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > > > > > > > > -+# > > > > > > > > -+ > > > > > > > > -+# The specific packages that come from or go to rt.jar and tools.jar > > > > > > > > -+IMPORT_RT_PACKAGES += \ > > > > > > > > -+ net/sourceforge/jnlp \ > > > > > > > > -+ net/sourceforge/jnlp/tools \ > > > > > > > > -+ net/sourceforge/jnlp/runtime \ > > > > > > > > -+ net/sourceforge/jnlp/util \ > > > > > > > > -+ net/sourceforge/jnlp/services \ > > > > > > > > -+ net/sourceforge/jnlp/security \ > > > > > > > > -+ net/sourceforge/jnlp/security/viewer \ > > > > > > > > -+ net/sourceforge/jnlp/cache \ > > > > > > > > -+ net/sourceforge/jnlp/event \ > > > > > > > > -+ net/sourceforge/jnlp/resources \ > > > > > > > > -+ net/sourceforge/nanoxml \ > > > > > > > > -+ javax/jnlp > > > > > > > > -+ > > > > > > > > -+IMPORT_TOOLS_PACKAGES += > > > > > > > > -+ > > > > > > > > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > > > > > > > > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100 > > > > > > > > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:10:56.000000000 +0100 > > > > > > > > -@@ -46,6 +46,9 @@ > > > > > > > > - ifndef JAXWS_DIST > > > > > > > > - include $(BUILDDIR)/common/internal/Defs-jaxws.gmk > > > > > > > > - endif > > > > > > > > -+ifndef NETX_DIST > > > > > > > > -+ include $(BUILDDIR)/common/internal/Defs-netx.gmk > > > > > > > > -+endif > > > > > > > > - > > > > > > > > - # Clean up these lists so empty lists are empty > > > > > > > > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > > > > > > > > -@@ -119,6 +122,7 @@ > > > > > > > > - $(call import-one-sources,CORBA_DIST,$1) > > > > > > > > - $(call import-one-sources,JAXP_DIST,$1) > > > > > > > > - $(call import-one-sources,JAXWS_DIST,$1) > > > > > > > > -+$(call import-one-sources,NETX_DIST,$1) > > > > > > > > - endef > > > > > > > > - > > > > > > > > - # Import all component docs into directory $1 (optional) > > > > > > > > -@@ -157,6 +161,7 @@ > > > > > > > > - $(call import-one-classes,CORBA_DIST,$1) > > > > > > > > - $(call import-one-classes,JAXP_DIST,$1) > > > > > > > > - $(call import-one-classes,JAXWS_DIST,$1) > > > > > > > > -+$(call import-one-classes,NETX_DIST,$1) > > > > > > > > - endef > > > > > > > > - > > > > > > > > - # Clean up import files > > > > > > > > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > > > > > > > > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100 > > > > > > > > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-29 02:11:18.000000000 +0100 > > > > > > > > -@@ -344,6 +344,11 @@ > > > > > > > > - else > > > > > > > > - JAXWS_DIST = > > > > > > > > - endif > > > > > > > > -+ifdef ALT_NETX_DIST > > > > > > > > -+ NETX_DIST := $(call FullPath,$(ALT_NETX_DIST)) > > > > > > > > -+else > > > > > > > > -+ NETX_DIST = > > > > > > > > -+endif > > > > > > > > - > > > > > > > > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > > > > > > > > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > > > > > > > > > > > > > > > > > > > -- > > > > > > Andrew :) > > > > > > > > > > > > Free Java Software Engineer > > > > > > Red Hat, Inc. (http://www.redhat.com) > > > > > > > > > > > > Support Free Java! > > > > > > Contribute to GNU Classpath and the OpenJDK > > > > > > http://www.gnu.org/software/classpath > > > > > > http://openjdk.java.net > > > > > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > > > > > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > > > > > > > > > > > > -- > > > > Andrew :) > > > > > > > > Free Java Software Engineer > > > > Red Hat, Inc. (http://www.redhat.com) > > > > > > > > Support Free Java! > > > > Contribute to GNU Classpath and the OpenJDK > > > > http://www.gnu.org/software/classpath > > > > http://openjdk.java.net > > > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > > > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > > > diff -r da8128c0b021 ChangeLog > > --- a/ChangeLog Fri Aug 06 11:53:49 2010 +0100 > > +++ b/ChangeLog Fri Aug 06 17:31:39 2010 -0400 > > @@ -1,3 +1,40 @@ > > +2010-08-05 Andrew John Hughes > > + > > + Produce separate JAR files for NetX and the > > + plugin (netx.jar and plugin.jar) rather than > > + integrating their code into rt.jar. > > + * patches/extensions/liveconnect-dist.patch, > > + * patches/extensions/netx-dist.patch: > > + Remove unneeded patches to OpenJDK build to > > + integrate NetX and the plugin's Java code. > > + * patches/icedtea-update-bootclasspath.patch: New patch. Adds netx, > > + rhino and plugin jars to the bootclasspath. > > + * Makefile.am: > > + (ICEDTEA_ENV): Drop ALT_NETX_DIST and > > + ALT_LIVECONNECT_DIST. > > + (.PHONY): Add new clean targets. > > + (icedtea): Remove unneeded NetX and plugin > > + dependencies and copying. Add icedtea-update-bootclasspath.patch. > > + (icedtea-debug): Likewise. > > + (icedtea-against-icedtea): Depend on add-plugin > > + and add-netx. > > + (clean-icedtea-against-icedtea): Depend on clean-add-netx > > + and clean-add-plugin. > > + (icedtea-debug-against-icedtea): Depend on add-plugin-debug > > + and add-netx-debug. > > + (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug > > + and clean-add-plugin-debug. > > + (add-plugin): Copy the plugin library and jar file into the jdk images. > > + (clean-add-plugin): Revert add-plugin. > > + (add-plugin-debug): Equivalent of add-plugin for the debug build. > > + (clean-add-plugin-debug): Revert add-plugin-debug. > > + (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the > > + jdk images. > > + (clean-add-netx): Revert add-netx. > > + (add-netx-debug): Equivalent of add-netx for the debug build. > > + (clean-add-netx-debug): Revert add-netx-debug. > > + (icedtea-ecj): Remove plugin and NetX dependencies. > > + > > 2010-08-06 Andrew John Hughes > > > > Fix build on PAX-enabled kernels. > > diff -r da8128c0b021 Makefile.am > > --- a/Makefile.am Fri Aug 06 11:53:49 2010 +0100 > > +++ b/Makefile.am Fri Aug 06 17:31:39 2010 -0400 > > @@ -270,10 +270,10 @@ > > patches/icedtea-parisc.patch \ > > patches/icedtea-sh4-support.patch \ > > patches/icedtea-policy-evaluation.patch \ > > + patches/icedtea-update-bootclasspath.patch \ > > patches/libpng.patch \ > > patches/shark.patch \ > > patches/extensions/netx.patch \ > > - patches/extensions/netx-dist.patch \ > > patches/extensions/netx-umask.patch \ > > patches/icedtea-jtreg-httpTest.patch \ > > patches/arm.patch \ > > @@ -298,8 +298,7 @@ > > > > if ENABLE_PLUGIN > > ICEDTEA_PATCHES += \ > > - patches/extensions/liveconnect.patch \ > > - patches/extensions/liveconnect-dist.patch > > + patches/extensions/liveconnect.patch > > endif > > > > if BUILD_CACAO > > @@ -444,8 +443,6 @@ > > DEBUG_BINARIES="true" \ > > ALT_DROPS_DIR="$(abs_top_builddir)/drops" \ > > VERBOSE="$(VERBOSE)" \ > > - ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \ > > - ALT_LIVECONNECT_DIST="$(abs_top_builddir)/liveconnect" \ > > ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" > > > > if WITH_CACAO > > @@ -571,7 +568,8 @@ > > clean-icedtea-against-ecj clean-cacao clean-add-cacao clean-add-cacao-debug \ > > clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \ > > clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \ > > - clean-rewriter clean-rewrite-rhino > > + clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \ > > + clean-add-plugin clean-add-plugin-debug > > > > env: > > @echo 'unset JAVA_HOME' > > @@ -1218,9 +1216,7 @@ > > # If you change anything here in the icedtea target, please make sure > > # you change it in the icedtea-debug target as well. > > stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > > - stamps/rewrite-rhino.stamp > > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > > $(ARCH_PREFIX) $(MAKE) \ > > $(ICEDTEA_ENV) \ > > -C openjdk \ > > @@ -1229,12 +1225,6 @@ > > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > > mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext > > -if ENABLE_PLUGIN > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > -endif > > if ENABLE_PULSE_JAVA > > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > > $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > @@ -1247,10 +1237,6 @@ > > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > > $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > > endif > > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > - $(BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > > - cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > if ZERO_BUILD > > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg > > endif > > @@ -1294,9 +1280,7 @@ > > rm -f stamps/icedtea.stamp > > > > stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ > > - stamps/netx-dist.stamp $(OPENJDK_TREE) stamps/plugin.stamp \ > > - extra-lib/about.jar stamps/cacao.stamp $(PULSE_JAVA_TARGET) \ > > - stamps/rewrite-rhino.stamp > > + $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp > > $(ARCH_PREFIX) $(MAKE) \ > > $(ICEDTEA_ENV) \ > > -C openjdk \ > > @@ -1305,12 +1289,6 @@ > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext > > mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext > > -if ENABLE_PLUGIN > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > - cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > -endif > > if ENABLE_PULSE_JAVA > > cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ > > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > @@ -1323,10 +1301,6 @@ > > (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ > > $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) > > endif > > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib ; \ > > - cp $(NETX_RESOURCE_DIR)/default.jnlp extra-lib/about.jar \ > > - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > if ZERO_BUILD > > printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg > > endif > > @@ -1371,27 +1345,109 @@ > > rm -f stamps/icedtea-debug.stamp > > > > stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > - stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp > > + stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp stamps/add-plugin.stamp \ > > + stamps/add-netx.stamp > > mkdir -p stamps > > touch stamps/icedtea-against-icedtea.stamp > > > > -clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao > > +clean-icedtea-against-icedtea: clean-add-zero clean-add-cacao clean-add-plugin clean-add-netx > > rm -f stamps/icedtea-against-icedtea.stamp > > > > stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ > > - stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp > > + stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \ > > + stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp > > mkdir -p stamps > > touch stamps/icedtea-debug-against-icedtea.stamp > > > > -clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug > > +clean-icedtea-debug-against-icedtea: clean-add-zero-debug clean-add-cacao-debug clean-add-plugin-debug \ > > + clean-add-netx-debug > > rm -f stamps/icedtea-debug-against-icedtea.stamp > > > > +stamps/add-plugin.stamp: stamps/plugin.stamp > > +if ENABLE_PLUGIN > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > +endif > > + touch stamps/add-plugin.stamp > > + > > +clean-add-plugin: > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > + rm -f stamps/add-plugin.stamp > > + > > +stamps/add-plugin-debug.stamp: stamps/plugin.stamp > > +if ENABLE_PLUGIN > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > > + cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \ > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > + cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \ > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > +endif > > + touch stamps/add-plugin-debug.stamp > > + > > +clean-add-plugin-debug: > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/IcedTeaPlugin.so > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/plugin.jar > > + rm -f stamps/add-plugin-debug.stamp > > + > > +stamps/add-netx.stamp: stamps/netx-dist.stamp extra-lib/about.jar > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > + $(BUILD_OUTPUT_DIR)/j2re-image/lib > > + touch stamps/add-netx.stamp > > + > > +clean-add-netx: > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > > + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > > + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > > + rm -f stamps/add-netx.stamp > > + > > +stamps/add-netx-debug.stamp: stamps/netx-dist.stamp extra-lib/about.jar > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > + cp -pPRf $(abs_top_builddir)/netx.build/lib/classes.jar \ > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib > > + cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \ > > + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib > > + touch stamps/add-netx-debug.stamp > > + > > +clean-add-netx-debug: > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/netx.jar > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/netx.jar > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jnlp > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/about.jar > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jnlp > > + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/about.jar > > + rm -f stamps/add-netx-debug.stamp > > + > > # OpenJDK ecj Targets > > # =================== > > > > stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \ > > - stamps/netx-dist.stamp $(OPENJDK_ECJ_TREE) stamps/cacao.stamp \ > > - stamps/rewrite-rhino.stamp stamps/plugin.stamp > > + $(OPENJDK_ECJ_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp > > $(ARCH_PREFIX) $(MAKE) \ > > $(ICEDTEA_ENV_ECJ) \ > > -C openjdk-ecj/ \ > > diff -r da8128c0b021 patches/extensions/liveconnect-dist.patch > > --- a/patches/extensions/liveconnect-dist.patch Fri Aug 06 11:53:49 2010 +0100 > > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > > @@ -1,76 +0,0 @@ > > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk openjdk/jdk/make/common/internal/Defs-liveconnect.gmk > > ---- openjdk.orig/jdk/make/common/internal/Defs-liveconnect.gmk 1970-01-01 01:00:00.000000000 +0100 > > -+++ openjdk/jdk/make/common/internal/Defs-liveconnect.gmk 2009-11-11 02:53:36.000000000 +0000 > > -@@ -0,0 +1,28 @@ > > -+# > > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > > -+# > > -+ > > -+# The specific packages that come from or go to rt.jar and tools.jar > > -+IMPORT_RT_PACKAGES += \ > > -+ netscape/javascript \ > > -+ sun/applet > > -+ > > -+IMPORT_TOOLS_PACKAGES += > > -+ > > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:52:44.000000000 +0000 > > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-11-11 02:57:32.000000000 +0000 > > -@@ -49,6 +49,9 @@ > > - ifndef NETX_DIST > > - include $(BUILDDIR)/common/internal/Defs-netx.gmk > > - endif > > -+ifndef LIVECONNECT_DIST > > -+ include $(BUILDDIR)/common/internal/Defs-liveconnect.gmk > > -+endif > > - > > - # Clean up these lists so empty lists are empty > > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > > -@@ -123,6 +126,7 @@ > > - $(call import-one-sources,JAXP_DIST,$1) > > - $(call import-one-sources,JAXWS_DIST,$1) > > - $(call import-one-sources,NETX_DIST,$1) > > -+$(call import-one-sources,LIVECONNECT_DIST,$1) > > - endef > > - > > - # Import all component docs into directory $1 (optional) > > -@@ -162,6 +166,7 @@ > > - $(call import-one-classes,JAXP_DIST,$1) > > - $(call import-one-classes,JAXWS_DIST,$1) > > - $(call import-one-classes,NETX_DIST,$1) > > -+$(call import-one-classes,LIVECONNECT_DIST,$1) > > - endef > > - > > - # Clean up import files > > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-11-11 02:52:44.000000000 +0000 > > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-11-11 02:13:22.000000000 +0000 > > -@@ -365,6 +365,11 @@ > > - else > > - NETX_DIST = > > - endif > > -+ifdef ALT_LIVECONNECT_DIST > > -+ LIVECONNECT_DIST := $(call FullPath,$(ALT_LIVECONNECT_DIST)) > > -+else > > -+ LIVECONNECT_DIST = > > -+endif > > - > > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > > diff -r da8128c0b021 patches/extensions/netx-dist.patch > > --- a/patches/extensions/netx-dist.patch Fri Aug 06 11:53:49 2010 +0100 > > +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 > > @@ -1,86 +0,0 @@ > > -diff -Nru openjdk.orig/jdk/make/common/internal/Defs-netx.gmk openjdk/jdk/make/common/internal/Defs-netx.gmk > > ---- openjdk.orig/jdk/make/common/internal/Defs-netx.gmk 1970-01-01 01:00:00.000000000 +0100 > > -+++ openjdk/jdk/make/common/internal/Defs-netx.gmk 2009-05-28 09:18:45.000000000 +0100 > > -@@ -0,0 +1,38 @@ > > -+# > > -+# Copyright 2009 Red Hat, 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. Red Hat 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. > > -+# > > -+ > > -+# The specific packages that come from or go to rt.jar and tools.jar > > -+IMPORT_RT_PACKAGES += \ > > -+ net/sourceforge/jnlp \ > > -+ net/sourceforge/jnlp/tools \ > > -+ net/sourceforge/jnlp/runtime \ > > -+ net/sourceforge/jnlp/util \ > > -+ net/sourceforge/jnlp/services \ > > -+ net/sourceforge/jnlp/security \ > > -+ net/sourceforge/jnlp/security/viewer \ > > -+ net/sourceforge/jnlp/cache \ > > -+ net/sourceforge/jnlp/event \ > > -+ net/sourceforge/jnlp/resources \ > > -+ net/sourceforge/nanoxml \ > > -+ javax/jnlp > > -+ > > -+IMPORT_TOOLS_PACKAGES += > > -+ > > -diff -Nru openjdk.orig/jdk/make/common/internal/ImportComponents.gmk openjdk/jdk/make/common/internal/ImportComponents.gmk > > ---- openjdk.orig/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:09:27.000000000 +0100 > > -+++ openjdk/jdk/make/common/internal/ImportComponents.gmk 2009-05-29 02:10:56.000000000 +0100 > > -@@ -46,6 +46,9 @@ > > - ifndef JAXWS_DIST > > - include $(BUILDDIR)/common/internal/Defs-jaxws.gmk > > - endif > > -+ifndef NETX_DIST > > -+ include $(BUILDDIR)/common/internal/Defs-netx.gmk > > -+endif > > - > > - # Clean up these lists so empty lists are empty > > - IMPORT_TOOLS_PACKAGES := $(strip $(IMPORT_TOOLS_PACKAGES)) > > -@@ -119,6 +122,7 @@ > > - $(call import-one-sources,CORBA_DIST,$1) > > - $(call import-one-sources,JAXP_DIST,$1) > > - $(call import-one-sources,JAXWS_DIST,$1) > > -+$(call import-one-sources,NETX_DIST,$1) > > - endef > > - > > - # Import all component docs into directory $1 (optional) > > -@@ -157,6 +161,7 @@ > > - $(call import-one-classes,CORBA_DIST,$1) > > - $(call import-one-classes,JAXP_DIST,$1) > > - $(call import-one-classes,JAXWS_DIST,$1) > > -+$(call import-one-classes,NETX_DIST,$1) > > - endef > > - > > - # Clean up import files > > -diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk > > ---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2009-05-29 02:09:27.000000000 +0100 > > -+++ openjdk/jdk/make/common/shared/Defs.gmk 2009-05-29 02:11:18.000000000 +0100 > > -@@ -344,6 +344,11 @@ > > - else > > - JAXWS_DIST = > > - endif > > -+ifdef ALT_NETX_DIST > > -+ NETX_DIST := $(call FullPath,$(ALT_NETX_DIST)) > > -+else > > -+ NETX_DIST = > > -+endif > > - > > - # HOTSPOT_DOCS_IMPORT_PATH: Path to hotspot docs files to import into the docs generation > > - ifdef ALT_HOTSPOT_DOCS_IMPORT_PATH > > diff -r da8128c0b021 patches/icedtea-rhino.patch > > --- a/patches/icedtea-rhino.patch Fri Aug 06 11:53:49 2010 +0100 > > +++ b/patches/icedtea-rhino.patch Fri Aug 06 17:31:39 2010 -0400 > > @@ -1,13 +1,3 @@ > > ---- openjdk/hotspot/src/share/vm/runtime/os.cpp.orig 2008-11-22 00:11:18.000000000 +0000 > > -+++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2008-12-03 21:16:14.000000000 +0000 > > -@@ -886,6 +886,7 @@ > > - "%/lib/jsse.jar:" > > - "%/lib/jce.jar:" > > - "%/lib/charsets.jar:" > > -+ "%/lib/rhino.jar:" > > - "%/classes"; > > - char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); > > - if (sysclasspath == NULL) return false; > > --- openjdk/jdk/make/com/sun/script/Makefile.orig 2008-11-25 09:01:10.000000000 +0000 > > +++ openjdk/jdk/make/com/sun/script/Makefile 2008-12-03 21:13:14.000000000 +0000 > > @@ -31,6 +31,8 @@ > > diff -r da8128c0b021 patches/icedtea-update-bootclasspath.patch > > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > > +++ b/patches/icedtea-update-bootclasspath.patch Fri Aug 06 17:31:39 2010 -0400 > > @@ -0,0 +1,13 @@ > > +diff -ur openjdk.orig/hotspot/src/share/vm/runtime/os.cpp openjdk/hotspot/src/share/vm/runtime/os.cpp > > +--- openjdk.orig/hotspot/src/share/vm/runtime/os.cpp 2010-06-21 17:12:21.000000000 -0400 > > ++++ openjdk/hotspot/src/share/vm/runtime/os.cpp 2010-08-06 15:48:48.338599142 -0400 > > +@@ -884,6 +884,9 @@ > > + "%/lib/jsse.jar:" > > + "%/lib/jce.jar:" > > + "%/lib/charsets.jar:" > > ++ "%/lib/netx.jar:" > > ++ "%/lib/plugin.jar:" > > ++ "%/lib/rhino.jar:" > > + "%/classes"; > > + char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); > > + if (sysclasspath == NULL) return false; > > > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Mon Aug 9 14:49:33 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 9 Aug 2010 22:49:33 +0100 Subject: Shark hg repositories are now in harmony. In-Reply-To: <4C5D67E5.1040302@zafena.se> References: <4C5AB11B.3070802@zafena.se> <4C5D67E5.1040302@zafena.se> Message-ID: <20100809214933.GA25871@rivendell.middle-earth.co.uk> On 16:04 Sat 07 Aug , Xerxes Ranby wrote: > On 2010-08-05 17:43, Dr Andrew John Hughes wrote: > > On 5 August 2010 13:39, Xerxes R?nby wrote: > > > >> Hi all! > >> > >> I have harmonized all the three different Shark hg repositories in use > >> by back-porting changes in between them. > >> > > Thanks for doing this. > > > > > >> The three different shark repositories are: > >> > >> http://icedtea.classpath.org/hg/shark/hotspot > >> This are the current "main" Shark hg repository where Gary does his work > >> and makes sure that shark are ready to be included upstream into OpenJDK. > >> This repository are targets the latest Hotspot hs19. > >> > >> http://icedtea.classpath.org/hg/icedtea > >> This are the icedtea 7 hg repository containing the version of Shark > >> fixed to work with Hotspot hs18 and OpenJDK 7. > >> Today i have back-ported and pushed a fix to icedtea6 from the "main" > >> shark repository to make Shark build with LLVM 2.7 on non-product builds. > >> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009915.html > >> I have also pushed some changes to make it in sync with the icedtea6 hg. > >> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009911.html > >> - Match Shark in icedtea6, makes OSR work by removing vestigal check. > >> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009916.html > >> - Match Shark in icedtea6, Correct suffix for the llvm.atomic.cmp.swap > >> intrinsic. > >> > >> > > Does this actually build now? It's never worked for me before. > > > Yes it does build! > I have done sucessfull full bootstrap builds of icedtea 7 + shark on > ia32 and amd64 using Ubuntu 10.04. > For these two builds I have built Shark in combination with the Ubuntu > supplied LLVM 2.7 package. > > This are how i configured my build on amd64: > > $ hg clone http://icedtea.classpath.org/hg/icedtea > $ mkdir icedtea-shark > $ cd icedtea > icedtea$ ./autogen.sh > icedtea$ cd ../icedtea-shark > icedtea-shark$ ../icedtea/configure --enable-shark --with-parallel-jobs=4 > icedtea-shark$ time make > > ... and 96min later after processing docs etc... > You know there's a --disable-docs option, right? :-) > IcedTea is served: /media/_/icedtea-shark/openjdk.build > ... > > icedtea-shark$ ./openjdk.build/j2sdk-image/bin/java -version > java version "1.7.0_89-icedtea" > OpenJDK Runtime Environment (IcedTea7 1.14-pre+r90b892525f1b) (Ubuntu > build 1.7.0_89-icedtea-b89) > OpenJDK 64-Bit Shark VM (build 18.0-b02, mixed mode) > > > Please be aware that IcedTea7 will be bumping up to the latest > > OpenJDK7 now 1.13 is out. > > > > > > Thanks,Ii will keep this in mind and backport any fixes needed from the > "main" Shark hg if the get a new Hotspot. > Will we get a new Hotspot hs19 after the bump? > I just updated the IcedTea forest (http://hg.openjdk.java.net/icedtea/jdk7) to b104 (last update was b89 to b101). $ cat hotspot/make/hotspot_version ... HS_MAJOR_VER=19 HS_MINOR_VER=0 HS_BUILD_NUMBER=05 For now, IcedTea7 still builds against the earlier b89 changesets. > >> http://icedtea.classpath.org/hg/icedtea6 > >> This are the icedtea6 hg repository containing the version of Shark that > >> currently gets packaged and used by various linux distributions. > >> > > Does Shark get packaged? I wasn't aware of this. > > > > For what i know, the following distributions package Shark: > > Debian, Ubuntu > http://packages.debian.org/search?keywords=openjdk-6-jre-zero > for amd64 armel i386 and powerpc > > ?ngstrom. > http://www.angstrom-distribution.org/repo/?pkgname=openjdk-6-shark-vm-shark > > I have also started to see some Shark success reports where users starts > to recommend the use of Shark on small embedded servers. > http://plugcomputer.org/plugforum/index.php?topic=1633.0 > Do we know if anyone has used the packages? My experiences of Shark suggest that production use is still very premature. > > > > >> This repository are fixed to work with Hotspot hs17. > >> Today i have backported and pushed a fix to icedtea6 from the "main" > >> shark repository to make Shark build with LLVM 2.7 on non-product builds. > >> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009914.html > >> > >> With these fixes in place all Shark hg repository HEAD's are now in > >> harmony, they can bootstrap them self nicely and runs rock stable. > >> > >> Cheers and have a great day! > >> > > You too! Great work. > > > > > >> Xerxes > >> > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Mon Aug 9 14:55:44 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 9 Aug 2010 22:55:44 +0100 Subject: [RFC] backport opentype font support from openjdk6 to icedtea6 1.9 In-Reply-To: <4C600C13.2080404@redhat.com> References: <4C600C13.2080404@redhat.com> Message-ID: <20100809215544.GB25871@rivendell.middle-earth.co.uk> On 10:09 Mon 09 Aug , Omair Majid wrote: > Hi, > > I would like to backport OpenType font support from OpenJDK6 to > Icedtea6-1.9. Patches corresponding to the following two changesets will > need to be added to icedtea6: > > http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/b577c70564b8 > http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/acb763ebef95 > > Any thoughts? > > Cheers, > Omair Sounds sensible. Please note that patches for 1.9 require approval on the list before commit. I presume you are also going to commit this to HEAD as well. Backports should be stored in patches/openjdk/-.patch for ease of removal when they appear upstream. Does this fix any bugs in the IcedTea or Red Hat bugzilla as well? Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Mon Aug 9 14:58:25 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 9 Aug 2010 22:58:25 +0100 Subject: [RFC] netx: add 1.6 to supported jnlp versions In-Reply-To: <20100809152110.GB23631@redhat.com> References: <4C6019E4.6020800@redhat.com> <20100809152110.GB23631@redhat.com> Message-ID: <20100809215825.GC25871@rivendell.middle-earth.co.uk> On 11:21 Mon 09 Aug , Deepak Bhole wrote: > * Omair Majid [2010-08-09 11:08]: > > Hi, > > > > Some webstart applications like JForex [1] claim to use version 1.6 > > of the jnlp specification, even though it is not listed in the > > developers guide [2]: "The spec attribute can be 1.0, 1.5.0, or 6.0 > > or can use the wildcards such as 1.0+." > > > > The attached patch make netx work with a version of 1.6 as well. > > > > Ok to commit? > > > > Cheers, > > Omair > > > > > > [1] https://www.dukascopy.com/client/demo/jclient/jforex.jnlp > > [2]http://download.oracle.com/javase/6/docs/technotes/guides/javaws/developersguide/syntax.html > > > diff -r a570f4fed326 netx/net/sourceforge/jnlp/Parser.java > > --- a/netx/net/sourceforge/jnlp/Parser.java Fri Aug 06 20:08:18 2010 +0100 > > +++ b/netx/net/sourceforge/jnlp/Parser.java Mon Aug 09 10:57:48 2010 -0400 > > @@ -72,7 +72,7 @@ > > > > > > /** the supported JNLP file versions */ > > - private static Version supportedVersions = new Version("1.0 1.5 6.0"); > > + private static Version supportedVersions = new Version("1.0 1.5 1.6 6.0"); > > > > // fix: some descriptors need to use the jnlp file at a later > > // date and having file ref lets us pass it to their > > > > Okay to commit to 1.7, 1.8 and HEAD. > > Cheers, > Deepak And 1.9. Though Omair did this anyway. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From gbenson at redhat.com Tue Aug 10 01:55:50 2010 From: gbenson at redhat.com (Gary Benson) Date: Tue, 10 Aug 2010 09:55:50 +0100 Subject: Shark hg repositories are now in harmony. In-Reply-To: <20100809214933.GA25871@rivendell.middle-earth.co.uk> References: <4C5AB11B.3070802@zafena.se> <4C5D67E5.1040302@zafena.se> <20100809214933.GA25871@rivendell.middle-earth.co.uk> Message-ID: <20100810085550.GA3736@redhat.com> Dr Andrew John Hughes wrote: > On 16:04 Sat 07 Aug , Xerxes Ranby wrote: > > On 2010-08-05 17:43, Dr Andrew John Hughes wrote: > > > On 5 August 2010 13:39, Xerxes R?nby wrote: > > > > http://icedtea.classpath.org/hg/icedtea6 > > > > This are the icedtea6 hg repository containing the version of > > > > Shark that currently gets packaged and used by various linux > > > > distributions. > > > > > > Does Shark get packaged? I wasn't aware of this. > > > > For what i know, the following distributions package Shark: > > > > Debian, Ubuntu > > http://packages.debian.org/search?keywords=openjdk-6-jre-zero > > for amd64 armel i386 and powerpc > > > > ?ngstrom. > > http://www.angstrom-distribution.org/repo/?pkgname=openjdk-6-shark-vm-shark > > > > I have also started to see some Shark success reports where users > > starts to recommend the use of Shark on small embedded servers. > > http://plugcomputer.org/plugforum/index.php?topic=1633.0 > > Do we know if anyone has used the packages? > > My experiences of Shark suggest that production use is still very > premature. Really? What problems are you seeing? Cheers, Gary -- http://gbenson.net/ From ahughes at redhat.com Tue Aug 10 02:36:25 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 10 Aug 2010 10:36:25 +0100 Subject: Shark hg repositories are now in harmony. In-Reply-To: <20100810085550.GA3736@redhat.com> References: <4C5AB11B.3070802@zafena.se> <4C5D67E5.1040302@zafena.se> <20100809214933.GA25871@rivendell.middle-earth.co.uk> <20100810085550.GA3736@redhat.com> Message-ID: <20100810093625.GA27843@rivendell.middle-earth.co.uk> On 09:55 Tue 10 Aug , Gary Benson wrote: > Dr Andrew John Hughes wrote: > > On 16:04 Sat 07 Aug , Xerxes Ranby wrote: > > > On 2010-08-05 17:43, Dr Andrew John Hughes wrote: > > > > On 5 August 2010 13:39, Xerxes R?nby wrote: > > > > > http://icedtea.classpath.org/hg/icedtea6 > > > > > This are the icedtea6 hg repository containing the version of > > > > > Shark that currently gets packaged and used by various linux > > > > > distributions. > > > > > > > > Does Shark get packaged? I wasn't aware of this. > > > > > > For what i know, the following distributions package Shark: > > > > > > Debian, Ubuntu > > > http://packages.debian.org/search?keywords=openjdk-6-jre-zero > > > for amd64 armel i386 and powerpc > > > > > > ?ngstrom. > > > http://www.angstrom-distribution.org/repo/?pkgname=openjdk-6-shark-vm-shark > > > > > > I have also started to see some Shark success reports where users > > > starts to recommend the use of Shark on small embedded servers. > > > http://plugcomputer.org/plugforum/index.php?topic=1633.0 > > > > Do we know if anyone has used the packages? > > > > My experiences of Shark suggest that production use is still very > > premature. > > Really? What problems are you seeing? > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=348 http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=371 These are from the last time I tried it; it wouldn't even build which, given it was regarded as alpha quality, doesn't seem all that surprising. I've not had chance to try it more recently, and I've no doubt it has improved since, but I still wouldn't think it's had enough testing to be recommended for production use. What's the current status of it on ppc? > Cheers, > Gary > > -- > http://gbenson.net/ -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Aug 10 02:43:40 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 10 Aug 2010 10:43:40 +0100 Subject: [RFC] backport opentype font support from openjdk6 to icedtea6 1.9 In-Reply-To: <20100809215544.GB25871@rivendell.middle-earth.co.uk> References: <4C600C13.2080404@redhat.com> <20100809215544.GB25871@rivendell.middle-earth.co.uk> Message-ID: <20100810094340.GB27843@rivendell.middle-earth.co.uk> On 22:55 Mon 09 Aug , Dr Andrew John Hughes wrote: > On 10:09 Mon 09 Aug , Omair Majid wrote: > > Hi, > > > > I would like to backport OpenType font support from OpenJDK6 to > > Icedtea6-1.9. Patches corresponding to the following two changesets will > > need to be added to icedtea6: > > > > http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/b577c70564b8 > > http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/acb763ebef95 > > > > Any thoughts? > > > > Cheers, > > Omair > > Sounds sensible. Please note that patches for 1.9 require approval on > the list before commit. I presume you are also going to commit this to > HEAD as well. > > Backports should be stored in patches/openjdk/-.patch > for ease of removal when they appear upstream. > > Does this fix any bugs in the IcedTea or Red Hat bugzilla as well? > > Thanks, > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 Having now reviewed the changesets, I don't think this is suitable for 1.9 as it seems to add a new feature rather than fixing a bug, making significant changes to TTorT1Filter to do so. Is there a specific reason for wanting it in 1.9? The native changes only apply to Windows platforms. Does this actually change things on GNU/Linux systems? Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From gbenson at redhat.com Tue Aug 10 03:12:02 2010 From: gbenson at redhat.com (Gary Benson) Date: Tue, 10 Aug 2010 11:12:02 +0100 Subject: Shark hg repositories are now in harmony. In-Reply-To: <20100810093625.GA27843@rivendell.middle-earth.co.uk> References: <4C5AB11B.3070802@zafena.se> <4C5D67E5.1040302@zafena.se> <20100809214933.GA25871@rivendell.middle-earth.co.uk> <20100810085550.GA3736@redhat.com> <20100810093625.GA27843@rivendell.middle-earth.co.uk> Message-ID: <20100810101202.GB3736@redhat.com> Dr Andrew John Hughes wrote: > On 09:55 Tue 10 Aug , Gary Benson wrote: > > Dr Andrew John Hughes wrote: > > > My experiences of Shark suggest that production use is still > > > very premature. > > > > Really? What problems are you seeing? > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=348 > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=371 > > These are from the last time I tried it; it wouldn't even build > which, given it was regarded as alpha quality, doesn't seem all > that surprising. Ah, that was over a year ago, before all the TCK stabilization work. 348 is a HotSpot version mismatch, I've seen it since in icedtea6. And 371, well, the TCK work was on x86_64, so that platform at least should not segfault. > I've not had chance to try it more recently, and I've no doubt > it has improved since, but I still wouldn't think it's had > enough testing to be recommended for production use. Xerxes has been testing it extensively on ARM, and he knows of people who are using it (I think). > What's the current status of it on ppc? I'm currently resurrecting my test machine (which got reinstalled) to check an LLVM fix, so I should know Real Soon Now. Though does anybody use ppc (in the open source world) any more? Cheers, Gary -- http://gbenson.net/ From ahughes at redhat.com Tue Aug 10 03:13:58 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 10 Aug 2010 11:13:58 +0100 Subject: Cacerts generation in IcedTea6 - please review changes in build scripts In-Reply-To: <4BE98109.6070607@redhat.com> References: <4BE98109.6070607@redhat.com> Message-ID: On 11 May 2010 17:08, Pavel Tisnovsky wrote: > Hi, > > I changed IcedTea6 build scripts namely configure.ac and Makefile.am to > generate proper (i.e. not empty) cacerts file for J2SDK and also JRE images. > Cacerts generation could be enabled by configuration flag > --enable-openssh-cacerts. Cacerts generator (i.e. the script named > "generate-cacerts.sh") is written in Bash and uses keytool from compiled > J2SDK so this also does basic check whether J2SDK is built correctly. > > Can you please check whether it is possible to push the changes to the > IcedTea repository? > > TODO: > - allow specification of directory containing OpenSSH certificates (new > configuration flag) > - allow certificates downloading during build (from Mozilla project - is it > possible?) > > Cheers > Pavel > > --- configure.ac ? ? ? ?2010-05-11 17:51:45.000000000 +0200 > +++ /jck/2/configure.ac 2010-05-11 15:57:48.000000000 +0200 > @@ -159,6 +159,14 @@ > ? AC_MSG_RESULT([disabled by default (edit java.security to enable)]) > ?fi > > +AC_MSG_CHECKING([whether to generate cacerts file using OpenSSH > certificates]) > +AC_ARG_ENABLE([openssh-cacerts], > + ? ? ? ? ? ? ?[AS_HELP_STRING([--enable-openssh-cacerts], > + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?[Enable cacerts generation using OpenSSH > certificates])], > + ? ? ? ? ? ? ?[enable_openssh_cacerts="${enableval}"], > [enable-openssh-cacerts="no"]) > +AM_CONDITIONAL(GENERATE_CACERTS, test "x${enable_openssh_cacerts}" = > "xyes") > +AC_MSG_RESULT(${enable_openssh_cacerts}) > + > ?IT_GET_PKGVERSION > ?IT_GET_LSB_DATA > > > --- Makefile.am 2010-05-11 17:51:45.000000000 +0200 > +++ /jck/2/Makefile.am ?2010-05-11 17:39:31.000000000 +0200 > @@ -1314,6 +1314,14 @@ > ? ? ? ?cp $(abs_top_builddir)/tz.properties \ > ? ? ? ? ?$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; > ?endif > +if GENERATE_CACERTS > + ? ? ? rm -rf pems > + ? ? ? rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts > + ? ? ? rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts > + ? ? ? mkdir -p pems > + ? ? ? sh scripts/generate-cacerts.sh > $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool /etc/pki/tls/certs/ca-bundle.crt > pems $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts > + ? ? ? cp $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts > $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/cacerts > +endif > ? ? ? ?@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR) > ? ? ? ?mkdir -p stamps > ? ? ? ?touch stamps/icedtea.stamp > @@ -1404,6 +1412,14 @@ > ? ? ? ?cp $(abs_top_builddir)/tz.properties \ > ? ? ? ? ?$(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib; > ?endif > +if GENERATE_CACERTS > + ? ? ? rm -rf pems > + ? ? ? rm -f $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/security/cacerts > + ? ? ? rm -f $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/security/cacerts > + ? ? ? mkdir -p pems > + ? ? ? sh scripts/generate-cacerts.sh > $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/bin/keytool > /etc/pki/tls/certs/ca-bundle.crt pems > $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/security/cacerts > + ? ? ? cp $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/security/cacerts > $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/security/cacerts > +endif > ? ? ? ?@echo "IcedTea (debug build) is served:" \ > ? ? ? ? ?$(BUILD_OUTPUT_DIR)-debug > ? ? ? ?mkdir -p stamps > > Has there been any further progress on this? -- Andrew :-) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint: F8EF F1EA 401E 2E60 15FA? 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Aug 10 03:59:13 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 10 Aug 2010 11:59:13 +0100 Subject: Shark hg repositories are now in harmony. In-Reply-To: <20100810101202.GB3736@redhat.com> References: <4C5AB11B.3070802@zafena.se> <4C5D67E5.1040302@zafena.se> <20100809214933.GA25871@rivendell.middle-earth.co.uk> <20100810085550.GA3736@redhat.com> <20100810093625.GA27843@rivendell.middle-earth.co.uk> <20100810101202.GB3736@redhat.com> Message-ID: <20100810105912.GC27843@rivendell.middle-earth.co.uk> On 11:12 Tue 10 Aug , Gary Benson wrote: > Dr Andrew John Hughes wrote: > > On 09:55 Tue 10 Aug , Gary Benson wrote: > > > Dr Andrew John Hughes wrote: > > > > My experiences of Shark suggest that production use is still > > > > very premature. > > > > > > Really? What problems are you seeing? > > > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=348 > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=371 > > > > These are from the last time I tried it; it wouldn't even build > > which, given it was regarded as alpha quality, doesn't seem all > > that surprising. > > Ah, that was over a year ago, before all the TCK stabilization > work. 348 is a HotSpot version mismatch, I've seen it since in > icedtea6. And 371, well, the TCK work was on x86_64, so that > platform at least should not segfault. > Feel free to close them if they've been fixed. I didn't think the TCK work was done on IcedTea6 or 7, but on some random snapshot from your own repository. > > I've not had chance to try it more recently, and I've no doubt > > it has improved since, but I still wouldn't think it's had > > enough testing to be recommended for production use. > > Xerxes has been testing it extensively on ARM, and he knows of > people who are using it (I think). > > > What's the current status of it on ppc? > > I'm currently resurrecting my test machine (which got reinstalled) > to check an LLVM fix, so I should know Real Soon Now. Though > does anybody use ppc (in the open source world) any more? > Debian and Gentoo still have active ports. Ubuntu also seems to have one as far as I can see, and probably other distributions too. Fedora is the only one I've heard of dropping it, but then they never really supported many architectures to begin with. It's a shame because the F11 DVD was useful recently to get my ppc box booting again. The reason I ask is because ppc is the architecture where I could see Shark being useful personally (currently using CACAO). I don't really see the point in using it on x86_64 other than for development. > Cheers, > Gary > > -- > http://gbenson.net/ -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From andrew at icedtea.classpath.org Tue Aug 10 04:11:43 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 10 Aug 2010 11:11:43 +0000 Subject: /hg/icedtea6: Remove --with-gcj-jdk and --with-openjdk, replacin... Message-ID: changeset 0ba4ad0c362b in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0ba4ad0c362b author: Andrew John Hughes date: Tue Aug 10 12:11:36 2010 +0100 Remove --with-gcj-jdk and --with-openjdk, replacing with --with --jdk-home and --disable-bootstrap. 2009-07-17 Andrew John Hughes * Makefile.am: Remove use of WITH_OPENJDK and SYSTEM_GCJ_DIR replacing with BOOTSTRAPPING and SYSTEM_JDK_DIR as appropriate. * acinclude.m4: (FIND_JAVAC): Search for generic 'javac' first. (IT_FIND_ECJ): Only use ecj as javac if JAVA is unset. (IT_CHECK_ECJ): Add configure output. (IT_FIND_JAVAC): Likewise. (IT_CHECK_JAVAC): Likewise. (FIND_JAVA): Try java in SYSTEM_JDK_DIR before searching. (FIND_JAVAH): Likewise for javah. (FIND_JAR): Likewise for jar. (FIND_RMIC): Likewise for rmic. (IT_CHECK_IF_BOOTSTRAPPING): Allow bootstrapping to be disabled. Makes explicit the side-effect of --with-openjdk. (IT_CHECK_FOR_JDK): Find JDK to use. Replaces --with-gcj-jdk, and --with-openjdk. At present, only checks for gcj jdks if not bootstrapping. (AC_CHECK_FOR_OPENJDK): Removed. (AC_CHECK_FOR_GCJ_JDK): Removed. * configure.ac: Remove --with-openjdk. Always check for a JDK and then allow individual binaries to be overridden by --with-x. diffstat: 4 files changed, 160 insertions(+), 186 deletions(-) ChangeLog | 27 ++++++ Makefile.am | 55 ++++++------- acinclude.m4 | 232 ++++++++++++++++++++++++---------------------------------- configure.ac | 32 ++------ diffs (truncated from 590 to 500 lines): diff -r 0974e80c4a6e -r 0ba4ad0c362b ChangeLog --- a/ChangeLog Mon Aug 09 17:08:38 2010 -0400 +++ b/ChangeLog Tue Aug 10 12:11:36 2010 +0100 @@ -1,3 +1,30 @@ 2010-08-09 Deepak Bhole + + * Makefile.am: + Remove use of WITH_OPENJDK and SYSTEM_GCJ_DIR + replacing with BOOTSTRAPPING and SYSTEM_JDK_DIR + as appropriate. + * acinclude.m4: + (FIND_JAVAC): Search for generic 'javac' first. + (IT_FIND_ECJ): Only use ecj as javac if JAVA is unset. + (IT_CHECK_ECJ): Add configure output. + (IT_FIND_JAVAC): Likewise. + (IT_CHECK_JAVAC): Likewise. + (FIND_JAVA): Try java in SYSTEM_JDK_DIR before searching. + (FIND_JAVAH): Likewise for javah. + (FIND_JAR): Likewise for jar. + (FIND_RMIC): Likewise for rmic. + (IT_CHECK_IF_BOOTSTRAPPING): Allow bootstrapping to be disabled. + Makes explicit the side-effect of --with-openjdk. + (IT_CHECK_FOR_JDK): Find JDK to use. Replaces --with-gcj-jdk, + and --with-openjdk. At present, only checks for gcj jdks if + not bootstrapping. + (AC_CHECK_FOR_OPENJDK): Removed. + (AC_CHECK_FOR_GCJ_JDK): Removed. + * configure.ac: + Remove --with-openjdk. Always check for a JDK and then allow + individual binaries to be overridden by --with-x. + 2010-08-09 Deepak Bhole * Makefile.am: diff -r 0974e80c4a6e -r 0ba4ad0c362b Makefile.am --- a/Makefile.am Mon Aug 09 17:08:38 2010 -0400 +++ b/Makefile.am Tue Aug 10 12:11:36 2010 +0100 @@ -138,10 +138,10 @@ endif # FIXME: This should not depend on bootstrapping # but on whether MEMORY_LIMIT is accepted # as an argument to javac -if WITH_OPENJDK +if BOOTSTRAPPING + MEMORY_LIMIT = +else MEMORY_LIMIT = -J-Xmx1024m -else - MEMORY_LIMIT = endif if WITH_CACAO @@ -151,17 +151,14 @@ else ICEDTEA_DEBUG_BUILD_TARGET = debug_build endif -# FIXME (bootstrap): Assumption is WITH_OPENJDK == no bootstrap -if WITH_OPENJDK +if BOOTSTRAPPING + BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp + ICEDTEA_HOME = $(ICEDTEA_BOOT_DIR) + INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp +else BOOTSTRAP_DIRECTORY_STAMP = - SYSTEM_JDK_DIR = $(SYSTEM_OPENJDK_DIR) ICEDTEA_HOME = $(SYSTEM_JDK_DIR) INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink.stamp -else - BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp - SYSTEM_JDK_DIR = $(SYSTEM_GCJ_DIR) - ICEDTEA_HOME = $(ICEDTEA_BOOT_DIR) - INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp endif if CP_SUPPORTS_REFLINK @@ -491,6 +488,8 @@ ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \ BOOTCLASSPATH_CLS_RT="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ):$(RUNTIME)" \ BOOTCLASSPATH_CLS="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \ BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(RUNTIME)" \ + CLASSPATH="" \ + LD_LIBRARY_PATH="" \ GENSRCDIR="$(abs_top_builddir)/generated" \ JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \ JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \ @@ -1464,20 +1463,29 @@ clean-icedtea-ecj: # Rebuild targets rebuild: -if WITH_OPENJDK +if BOOTSTRAPPING + rm -f stamps/icedtea-ecj.stamp + rm -f stamps/icedtea-against-ecj.stamp + $(ARCH_PREFIX) $(MAKE) icedtea-against-ecj + @echo "ecj-poured IcedTea is served (again):" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image +else rm -f stamps/icedtea.stamp rm -f stamps/icedtea-against-icedtea.stamp $(ARCH_PREFIX) $(MAKE) icedtea-against-icedtea @echo "IcedTea is served (again):" $(BUILD_OUTPUT_DIR)/j2sdk-image -else - rm -f stamps/icedtea-ecj.stamp - rm -f stamps/icedtea-against-ecj.stamp - $(ARCH_PREFIX) $(MAKE) icedtea-against-ecj - @echo "ecj-poured IcedTea is served (again):" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image endif hotspot: -if WITH_OPENJDK +if BOOTSTRAPPING + rm -f stamps/icedtea-ecj.stamp + rm -f stamps/icedtea-against-ecj.stamp + $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-against-ecj + mkdir -p \ + $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server + cp $(ECJ_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \ + $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server + @echo "Hotspot is served:" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image +else rm -f stamps/icedtea.stamp rm -f stamps/icedtea-against-icedtea.stamp $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-against-icedtea @@ -1486,15 +1494,6 @@ if WITH_OPENJDK cp $(BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server @echo "Hotspot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image -else - rm -f stamps/icedtea-ecj.stamp - rm -f stamps/icedtea-against-ecj.stamp - $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-against-ecj - mkdir -p \ - $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server - cp $(ECJ_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \ - $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server - @echo "Hotspot is served:" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image endif stamps/icedtea-against-ecj.stamp: \ @@ -1840,7 +1839,7 @@ clean-add-cacao-debug: # configure script arguments, quoted in single quotes CONFIGURE_ARGS = @CONFIGURE_ARGS@ ADD_ZERO_CONFIGURE_ARGS = \ - --with-openjdk=$(BUILD_OUTPUT_DIR)/j2sdk-image \ + --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \ --enable-zero if ADD_SHARK_BUILD ADD_ZERO_CONFIGURE_ARGS += \ diff -r 0974e80c4a6e -r 0ba4ad0c362b acinclude.m4 --- a/acinclude.m4 Mon Aug 09 17:08:38 2010 -0400 +++ b/acinclude.m4 Tue Aug 10 12:11:36 2010 +0100 @@ -131,42 +131,46 @@ AC_DEFUN([SET_OS_DIRS], AC_DEFUN([FIND_JAVAC], [ - user_specified_javac= + JAVAC=${SYSTEM_JDK_DIR}/bin/javac + IT_FIND_JAVAC + IT_FIND_ECJ - CLASSPATH_WITH_ECJ - CLASSPATH_WITH_JAVAC - - if test "x${ECJ}" = x && test "x${JAVAC}" = x && test "x${user_specified_javac}" != xecj; then - AC_MSG_ERROR([cannot find javac, try --with-ecj]) + if test "x${JAVAC}" = x; then + AC_MSG_ERROR([cannot find a Java compiler, try --with-javac or --with-ecj]) fi + AC_SUBST(JAVAC) ]) -AC_DEFUN([CLASSPATH_WITH_ECJ], +AC_DEFUN([IT_FIND_ECJ], [ AC_ARG_WITH([ecj], [AS_HELP_STRING(--with-ecj,bytecode compilation with ecj)], [ if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then - CLASSPATH_CHECK_ECJ(${withval}) + IT_CHECK_ECJ(${withval}) else if test "x${withval}" != xno; then - CLASSPATH_CHECK_ECJ + IT_CHECK_ECJ fi fi - user_specified_javac=ecj ], [ - CLASSPATH_CHECK_ECJ + IT_CHECK_ECJ ]) - JAVAC="${ECJ} -nowarn" - AC_SUBST(JAVAC) + if test "x${JAVAC}" = "x"; then + if test "x{ECJ}" != "x"; then + JAVAC="${ECJ} -nowarn" + fi + fi ]) -AC_DEFUN([CLASSPATH_CHECK_ECJ], +AC_DEFUN([IT_CHECK_ECJ], [ if test "x$1" != x; then if test -f "$1"; then + AC_MSG_CHECKING(for ecj) ECJ="$1" + AC_MSG_RESULT(${ECJ}) else AC_PATH_PROG(ECJ, "$1") fi @@ -184,31 +188,31 @@ AC_DEFUN([CLASSPATH_CHECK_ECJ], fi ]) -AC_DEFUN([CLASSPATH_WITH_JAVAC], +AC_DEFUN([IT_FIND_JAVAC], [ AC_ARG_WITH([javac], [AS_HELP_STRING(--with-javac,bytecode compilation with javac)], [ if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then - CLASSPATH_CHECK_JAVAC(${withval}) + IT_CHECK_JAVAC(${withval}) else if test "x${withval}" != xno; then - CLASSPATH_CHECK_JAVAC + IT_CHECK_JAVAC fi fi - user_specified_javac=javac ], [ - CLASSPATH_CHECK_JAVAC + IT_CHECK_JAVAC ]) - AC_SUBST(JAVAC) ]) -AC_DEFUN([CLASSPATH_CHECK_JAVAC], +AC_DEFUN([IT_CHECK_JAVAC], [ if test "x$1" != x; then if test -f "$1"; then + AC_MSG_CHECKING(for javac) JAVAC="$1" + AC_MSG_RESULT(${JAVAC}) else AC_PATH_PROG(JAVAC, "$1") fi @@ -219,20 +223,18 @@ AC_DEFUN([CLASSPATH_CHECK_JAVAC], AC_DEFUN([FIND_JAVA], [ + AC_MSG_CHECKING(for java) AC_ARG_WITH([java], [AS_HELP_STRING(--with-java,specify location of the 1.5 java vm)], [ - if test -f "${withval}"; then - AC_MSG_CHECKING(java) - JAVA="${withval}" - AC_MSG_RESULT(${withval}) - else - AC_PATH_PROG(JAVA, "${withval}") - fi + JAVA="${withval}" ], [ - JAVA= + JAVA=${SYSTEM_JDK_DIR}/bin/java ]) + if ! test -f "${JAVA}"; then + AC_PATH_PROG(JAVA, "${JAVA}") + fi if test -z "${JAVA}"; then AC_PATH_PROG(JAVA, "gij") fi @@ -242,6 +244,7 @@ AC_DEFUN([FIND_JAVA], if test -z "${JAVA}"; then AC_MSG_ERROR("A 1.5-compatible Java VM is required.") fi + AC_MSG_RESULT(${JAVA}) AC_SUBST(JAVA) ]) @@ -358,26 +361,17 @@ AC_DEFUN([AC_CHECK_GCC_VERSION], AC_DEFUN([FIND_JAVAH], [ - AC_MSG_CHECKING([if a javah executable is specified]) + AC_MSG_CHECKING([for javah]) AC_ARG_WITH([javah], - [AS_HELP_STRING(--with-javah,specify location of javah)], + [AS_HELP_STRING(--with-javah,specify location of the Java header generator)], [ - if test "x${withval}" = "xyes"; then - JAVAH=no - else - JAVAH="${withval}" - fi + JAVAH="${withval}" ], [ - JAVAH=no + JAVAH=${SYSTEM_JDK_DIR}/bin/javah ]) - AC_MSG_RESULT(${JAVAH}) if ! test -f "${JAVAH}"; then - if test "x${JAVAH}" = "xno"; then - JAVAH= - else - AC_PATH_PROG(JAVAH, "${JAVAH}") - fi + AC_PATH_PROG(JAVAH, "${JAVAH}") fi if test -z "${JAVAH}"; then AC_PATH_PROG(JAVAH, "gjavah") @@ -388,31 +382,23 @@ AC_DEFUN([FIND_JAVAH], if test -z "${JAVAH}"; then AC_MSG_ERROR("A Java header generator was not found.") fi + AC_MSG_RESULT(${JAVAH}) AC_SUBST(JAVAH) ]) AC_DEFUN([FIND_JAR], [ - AC_MSG_CHECKING([if a jar executable is specified]) + AC_MSG_CHECKING([for jar]) AC_ARG_WITH([jar], - [AS_HELP_STRING(--with-jar,specify location of jar)], + [AS_HELP_STRING(--with-jar,specify location of Java archive tool (jar))], [ - if test "x${withval}" = "xyes"; then - JAR=no - else - JAR="${withval}" - fi + JAR="${withval}" ], [ - JAR=no + JAR=${SYSTEM_JDK_DIR}/bin/jar ]) - AC_MSG_RESULT(${JAR}) if ! test -f "${JAR}"; then - if test "x${JAR}" = "xno"; then - JAR= - else - AC_PATH_PROG(JAR, "${JAR}") - fi + AC_PATH_PROG(JAR, "${JAR}") fi if test -z "${JAR}"; then AC_PATH_PROG(JAR, "gjar") @@ -421,8 +407,9 @@ AC_DEFUN([FIND_JAR], AC_PATH_PROG(JAR, "jar") fi if test -z "${JAR}"; then - AC_MSG_ERROR("A jar tool was not found.") + AC_MSG_ERROR("No Java archive tool was found.") fi + AC_MSG_RESULT(${JAR}) AC_MSG_CHECKING([whether jar supports @ argument]) touch _config.txt cat >_config.list < This option has now been removed from IcedTea6 HEAD in line with the changes made to IcedTea7 a year ago: http://icedtea.classpath.org/hg/icedtea6/rev/0ba4ad0c362b To do a quick non-bootstrap build, the option is now --disable-bootstrap. To specify an explicit jdk, use --with-jdk-home=. Both options were previously merged together under --with-openjdk and are now available separately. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ptisnovs at icedtea.classpath.org Tue Aug 10 04:58:58 2010 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 10 Aug 2010 11:58:58 +0000 Subject: /hg/gfx-test: Class Configuration and related classes is now abs... Message-ID: changeset 6a72cc4964cc in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=6a72cc4964cc author: Pavel Tisnovsky date: Tue Aug 10 13:59:14 2010 +0200 Class Configuration and related classes is now abstract as its will be used also by report generator. diffstat: 34 files changed, 445 insertions(+), 368 deletions(-) Makefile | 13 src/org/gfxtest/common/Configuration.java | 122 +++++ src/org/gfxtest/common/ConfigurationException.java | 58 ++ src/org/gfxtest/common/InvalidParameterValueException.java | 60 ++ src/org/gfxtest/framework/Configuration.java | 204 ---------- src/org/gfxtest/framework/ConfigurationException.java | 58 -- src/org/gfxtest/framework/GfxTest.java | 38 - src/org/gfxtest/framework/GfxTestConfiguration.java | 147 +++++++ src/org/gfxtest/framework/InvalidParameterValueException.java | 59 -- src/org/gfxtest/framework/ParameterNotFoundException.java | 2 src/org/gfxtest/framework/TestImage.java | 6 src/org/gfxtest/testsuites/DashedCircles.java | 2 src/org/gfxtest/testsuites/DashedEllipses.java | 2 src/org/gfxtest/testsuites/DashedLines.java | 2 src/org/gfxtest/testsuites/DashedPolylines.java | 2 src/org/gfxtest/testsuites/DashedRectangles.java | 2 src/org/gfxtest/testsuites/FilledArcs.java | 2 src/org/gfxtest/testsuites/FilledCircles.java | 2 src/org/gfxtest/testsuites/FilledEllipses.java | 2 src/org/gfxtest/testsuites/FilledPolygons.java | 2 src/org/gfxtest/testsuites/FilledRectangles.java | 2 src/org/gfxtest/testsuites/FilledRoundRectangles.java | 2 src/org/gfxtest/testsuites/Normal3DRectangles.java | 2 src/org/gfxtest/testsuites/NormalArcs.java | 2 src/org/gfxtest/testsuites/NormalCircles.java | 2 src/org/gfxtest/testsuites/NormalEllipses.java | 2 src/org/gfxtest/testsuites/NormalLines.java | 2 src/org/gfxtest/testsuites/NormalPolygons.java | 2 src/org/gfxtest/testsuites/NormalPolylines.java | 2 src/org/gfxtest/testsuites/NormalRectangles.java | 2 src/org/gfxtest/testsuites/NormalRoundRectangles.java | 2 src/org/gfxtest/testsuites/ScaledLines.java | 2 src/org/gfxtest/testsuites/ScaledPolylines.java | 2 src/org/gfxtest/testsuites/ScaledRectangles.java | 2 diffs (truncated from 1267 to 500 lines): diff -r ec9ff0e79e84 -r 6a72cc4964cc Makefile --- a/Makefile Mon Aug 09 17:11:20 2010 +0200 +++ b/Makefile Tue Aug 10 13:59:14 2010 +0200 @@ -41,6 +41,7 @@ OUTPUT=output OUTPUT=output SAMPLES=samples RESULTS=results +COMMON_DIR=org/gfxtest/common FRAMEWORK_DIR=org/gfxtest/framework TESTSUITE_DIR=org/gfxtest/testsuites TEST_PACKAGE=org.gfxtest.testsuites @@ -50,6 +51,9 @@ JAVAC=javac JAVAC=javac FRAMEWORK_CLASSES = \ + $(CLASSES)/$(COMMON_DIR)/InvalidParameterValueException.class \ + $(CLASSES)/$(COMMON_DIR)/ConfigurationException.class \ + $(CLASSES)/$(COMMON_DIR)/Configuration.class \ $(CLASSES)/$(FRAMEWORK_DIR)/annotations/GraphicsPrimitives.class \ $(CLASSES)/$(FRAMEWORK_DIR)/annotations/GraphicsPrimitive.class \ $(CLASSES)/$(FRAMEWORK_DIR)/annotations/RenderStyles.class \ @@ -58,11 +62,10 @@ FRAMEWORK_CLASSES = \ $(CLASSES)/$(FRAMEWORK_DIR)/annotations/TestType.class \ $(CLASSES)/$(FRAMEWORK_DIR)/annotations/Transformations.class \ $(CLASSES)/$(FRAMEWORK_DIR)/annotations/Transformation.class \ + $(CLASSES)/$(FRAMEWORK_DIR)/EntityRenderingStyle.class \ $(CLASSES)/$(FRAMEWORK_DIR)/TestResult.class \ - $(CLASSES)/$(FRAMEWORK_DIR)/ConfigurationException.class \ - $(CLASSES)/$(FRAMEWORK_DIR)/InvalidParameterValueException.class \ $(CLASSES)/$(FRAMEWORK_DIR)/ParameterNotFoundException.class \ - $(CLASSES)/$(FRAMEWORK_DIR)/Configuration.class \ + $(CLASSES)/$(FRAMEWORK_DIR)/GfxTestConfiguration.class \ $(CLASSES)/$(FRAMEWORK_DIR)/TestImage.class \ $(CLASSES)/$(FRAMEWORK_DIR)/GfxTest.class \ $(CLASSES)/$(FRAMEWORK_DIR)/Log.class @@ -144,6 +147,9 @@ test_suites: $(TESTSUITE_CLASSES) mkdir -p $(SAMPLES) touch $(SAMPLES)/stamp +$(CLASSES)/$(COMMON_DIR)/%.class: $(SOURCEPATH)/$(COMMON_DIR)/%.java + $(JAVAC) -d $(CLASSES) -sourcepath src/ $< + $(CLASSES)/$(FRAMEWORK_DIR)/%.class: $(SOURCEPATH)/$(FRAMEWORK_DIR)/%.java $(JAVAC) -d $(CLASSES) -sourcepath src/ $< @@ -177,6 +183,7 @@ compare-results: compareresults compare-results: compareresults compareresults: $(COMPARE_RESULTS) + cp results.html $(RESULTS) mkdir -p masks cleanall: clean clean-output clean-results clean-samples diff -r ec9ff0e79e84 -r 6a72cc4964cc src/org/gfxtest/common/Configuration.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/common/Configuration.java Tue Aug 10 13:59:14 2010 +0200 @@ -0,0 +1,122 @@ +/* + Java gfx-test framework + + Copyright (C) 2010 Red Hat + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea 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 for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. +*/ + +package org.gfxtest.common; + +import java.util.HashMap; +import java.util.Map; + +import org.gfxtest.framework.Log; +import org.gfxtest.framework.ParameterNotFoundException; + +/** + * This class is used to store actual configuration of graphics test framework. + * Configuration can be changed via command line switches. + * + * @author Pavel Tisnovsky + */ +public abstract class Configuration +{ + /** + * Instance of logger class. + */ + protected Log log; + + public Configuration(String[] args, Log log) throws ConfigurationException + { + this.log = log; + log.logBegin("read configuration"); //$NON-NLS-1$ + readCommandLineParameters(args); + log.logEnd("read configuration"); //$NON-NLS-1$ + printParameters(); + } + + protected abstract void readCommandLineParameters(String[] args) throws ConfigurationException; + protected abstract void printParameters(); + + protected int getIntegerParameter(Map options, String parameterName) throws ConfigurationException + { + if (!options.containsKey(parameterName)) + { + throw new ParameterNotFoundException(parameterName); + } + String parameterValue = options.get(parameterName); + try + { + return Integer.parseInt(parameterValue); + } + catch (NumberFormatException e) + { + throw new InvalidParameterValueException(parameterName, parameterValue); + } + } + + protected String getStringParameter(Map options, String parameterName) throws ConfigurationException + { + if (!options.containsKey(parameterName)) + { + throw new ParameterNotFoundException(parameterName); + } + return options.get(parameterName); + } + + @SuppressWarnings("nls") + protected Map resolveAllOptions(String[] args) + { + Map options = new HashMap(); + for (String arg : args) + { + String[] splittedArg = arg.split("="); + if (splittedArg.length >= 1 && splittedArg[0].length() >= 2) + { + this.log.log("found option " + arg); + String optionName = splittedArg[0].substring(1); + String optionValue = splittedArg.length == 2 ? splittedArg[1] : "true"; + options.put(optionName, optionValue); + } + else + { + this.log.logError("unknown option " + arg); + } + } + return options; + } + +} diff -r ec9ff0e79e84 -r 6a72cc4964cc src/org/gfxtest/common/ConfigurationException.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/common/ConfigurationException.java Tue Aug 10 13:59:14 2010 +0200 @@ -0,0 +1,58 @@ +/* + Java gfx-test framework + + Copyright (C) 2010 Red Hat + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea 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 for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. +*/ + +package org.gfxtest.common; + +/** + * + * @author Pavel Tisnovsky + */ +public abstract class ConfigurationException extends Exception +{ + /** + * Generated serial version ID + */ + private static final long serialVersionUID = -2168810923554713703L; + + public ConfigurationException(String message) + { + super(message); + } +} diff -r ec9ff0e79e84 -r 6a72cc4964cc src/org/gfxtest/common/InvalidParameterValueException.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/gfxtest/common/InvalidParameterValueException.java Tue Aug 10 13:59:14 2010 +0200 @@ -0,0 +1,60 @@ +/* + Java gfx-test framework + + Copyright (C) 2010 Red Hat + +This file is part of IcedTea. + +IcedTea is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +IcedTea 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 for more details. + +You should have received a copy of the GNU General Public License +along with IcedTea; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. +*/ + +package org.gfxtest.common; + + +/** + * + * @author Pavel Tisnovsky + */ +public class InvalidParameterValueException extends ConfigurationException +{ + /** + * Genereated serial version ID. + */ + private static final long serialVersionUID = 3027080845460577282L; + + public InvalidParameterValueException(String parameterName, String value) + { + super("invalid value of parameter " + parameterName + ": " + value); //$NON-NLS-1$ //$NON-NLS-2$ + } + +} diff -r ec9ff0e79e84 -r 6a72cc4964cc src/org/gfxtest/framework/Configuration.java --- a/src/org/gfxtest/framework/Configuration.java Mon Aug 09 17:11:20 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,204 +0,0 @@ -/* - Java gfx-test framework - - Copyright (C) 2010 Red Hat - -This file is part of IcedTea. - -IcedTea is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -IcedTea 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 for more details. - -You should have received a copy of the GNU General Public License -along with IcedTea; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. -*/ - -package org.gfxtest.framework; - -import java.awt.image.BufferedImage; -import java.io.File; -import java.util.HashMap; -import java.util.Map; - -/** - * This class is used to store actual configuration of graphics test framework. - * Configuration can be changed via command line switches. - * - * @author Pavel Tisnovsky - */ -public class Configuration -{ - /** - * Instance of logger class. - */ - private Log log; - - /** - * Path to generated output files. - */ - private File outputPath; - - /** - * Width (measured in pixels) of the generated images. - */ - private int imageWidth; - - /** - * Height (measured in pixels) of the generated images. - */ - private int imageHeight; - - /** - * Image type. Currently are supported these image types: - * BufferedImage.TYPE_INT_RGB, BufferedImage.TYPE_BYTE_GRAY and - * BufferedImage.TYPE_BYTE_INDEXED. - */ - private int imageType; - - public Configuration(String[] args, Log log) throws ConfigurationException - { - this.log = log; - log.logBegin("read configuration"); //$NON-NLS-1$ - readCommandLineParameters(args); - log.logEnd("read configuration"); //$NON-NLS-1$ - printParameters(); - } - - @SuppressWarnings("nls") - private void readCommandLineParameters(String[] args) throws ConfigurationException - { - Map options = resolveAllOptions(args); - this.imageWidth = getIntegerParameter(options, "w"); - this.imageHeight = getIntegerParameter(options, "h"); - this.imageType = getImageType(options); - this.outputPath = new File(getStringParameter(options, "o")); - } - - @SuppressWarnings("nls") - private int getImageType(Map options) throws ConfigurationException - { - if (!options.containsKey("t")) - { - throw new ParameterNotFoundException("t"); - } - String imgType = options.get("t"); - if ("rgb".equals(imgType)) - { - return BufferedImage.TYPE_INT_RGB; - } - else if ("gray".equals(imgType)) - { - return BufferedImage.TYPE_BYTE_GRAY; - } - else if ("bw".equals(imgType) || ("bit".equals(imgType))) - { - return BufferedImage.TYPE_BYTE_INDEXED; - } - else - { - throw new InvalidParameterValueException("t", imgType); - } - } - - private int getIntegerParameter(Map options, String parameterName) throws ConfigurationException - { - if (!options.containsKey(parameterName)) - { - throw new ParameterNotFoundException(parameterName); - } - String parameterValue = options.get(parameterName); - try - { - return Integer.parseInt(parameterValue); - } - catch (NumberFormatException e) - { - throw new InvalidParameterValueException(parameterName, parameterValue); - } - } - - private String getStringParameter(Map options, String parameterName) throws ConfigurationException - { - if (!options.containsKey(parameterName)) - { - throw new ParameterNotFoundException(parameterName); - } - return options.get(parameterName); - } - - @SuppressWarnings("nls") - private Map resolveAllOptions(String[] args) - { - Map options = new HashMap(); - for (String arg : args) - { - String[] splittedArg = arg.split("="); - if (splittedArg.length >= 1 && splittedArg[0].length() >= 2) - { - this.log.log("found option " + arg); - String optionName = splittedArg[0].substring(1); - String optionValue = splittedArg.length == 2 ? splittedArg[1] : "true"; - options.put(optionName, optionValue); - } - else - { - this.log.logError("unknown option " + arg); - } - } - return options; - } - - @SuppressWarnings("nls") - private void printParameters() - { - this.log.logSet("output path", this.outputPath); - this.log.logSet("image width", Integer.valueOf(this.imageWidth)); - this.log.logSet("image height", Integer.valueOf(this.imageHeight)); - this.log.logSet("image type", Integer.valueOf(this.imageType)); - } - - public File getOutputPath() - { - return this.outputPath; - } - - public int getImageWidth() - { From ptisnovs at redhat.com Tue Aug 10 05:34:18 2010 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Tue, 10 Aug 2010 14:34:18 +0200 Subject: For users of --with-openjdk In-Reply-To: <20100810111600.GF27843@rivendell.middle-earth.co.uk> References: <20100810111600.GF27843@rivendell.middle-earth.co.uk> Message-ID: <4C61474A.4070308@redhat.com> Dr Andrew John Hughes wrote: > This option has now been removed from IcedTea6 HEAD in line with the > changes made to IcedTea7 a year ago: > > http://icedtea.classpath.org/hg/icedtea6/rev/0ba4ad0c362b > > To do a quick non-bootstrap build, the option is now --disable-bootstrap. > To specify an explicit jdk, use --with-jdk-home=. I think that this flag is still used (actually filtered out :-) in assignment to variable ADD_ZERO_CONFIGURE_ARGS Btw, is it on purpose or mistake that configuration switches starting with the "--with-*" are not checked during ./configure? For example, when I run ./configure --xyzzy or ./configure --with I got error (which is correct of course) but when I run ./configure --with-xyzzy or ./configure --with- it passes. > > Both options were previously merged together under --with-openjdk and are now > available separately. > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From omajid at redhat.com Tue Aug 10 06:38:13 2010 From: omajid at redhat.com (Omair Majid) Date: Tue, 10 Aug 2010 09:38:13 -0400 Subject: [RFC] backport opentype font support from openjdk6 to icedtea6 1.9 In-Reply-To: <20100810094340.GB27843@rivendell.middle-earth.co.uk> References: <4C600C13.2080404@redhat.com> <20100809215544.GB25871@rivendell.middle-earth.co.uk> <20100810094340.GB27843@rivendell.middle-earth.co.uk> Message-ID: <4C615645.9030005@redhat.com> On 08/10/2010 05:43 AM, Dr Andrew John Hughes wrote: > On 22:55 Mon 09 Aug , Dr Andrew John Hughes wrote: >> On 10:09 Mon 09 Aug , Omair Majid wrote: >>> Hi, >>> >>> I would like to backport OpenType font support from OpenJDK6 to >>> Icedtea6-1.9. Patches corresponding to the following two changesets will >>> need to be added to icedtea6: >>> >>> http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/b577c70564b8 >>> http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/acb763ebef95 >>> >>> Any thoughts? >>> >>> Cheers, >>> Omair >> >> Sounds sensible. Please note that patches for 1.9 require approval on >> the list before commit. I presume you are also going to commit this to >> HEAD as well. >> Or we could wait until the next OpenJDK6 build and automatically acquire the patch that way. I am not in any hurry about committing it to head - as long as HEAD gets the patch before the next release (1.10?) >> Backports should be stored in patches/openjdk/-.patch >> for ease of removal when they appear upstream. >> >> Does this fix any bugs in the IcedTea or Red Hat bugzilla as well? >> Yes, it fixes https://bugzilla.redhat.com/show_bug.cgi?id=525870. Not completely - x11 native fonts are still not supported - but it does make Java report many more fonts on the system >> Thanks, >> -- >> Andrew :) >> >> Free Java Software Engineer >> Red Hat, Inc. (http://www.redhat.com) >> >> Support Free Java! >> Contribute to GNU Classpath and the OpenJDK >> http://www.gnu.org/software/classpath >> http://openjdk.java.net >> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >> Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > > Having now reviewed the changesets, I don't think this is suitable for 1.9 > as it seems to add a new feature rather than fixing a bug, making significant > changes to TTorT1Filter to do so. Is there a specific reason for wanting it > in 1.9? > Yes. Please see the bugzilla link I posted above. > The native changes only apply to Windows platforms. Does this actually > change things on GNU/Linux systems? > Surprisingly, it does. OpenJDK uses freetype which already supports OpenType fonts [1]. Before this patch was put in, the JDK would say that OpenType fonts are not supported and not even try to let freetype handle OpenType fonts. Cheers, Omair [1] http://freetype.sourceforge.net/freetype2/index.html#features From omajid at redhat.com Tue Aug 10 06:59:12 2010 From: omajid at redhat.com (Omair Majid) Date: Tue, 10 Aug 2010 09:59:12 -0400 Subject: [RFC] netx: add 1.6 to supported jnlp versions In-Reply-To: <20100809215825.GC25871@rivendell.middle-earth.co.uk> References: <4C6019E4.6020800@redhat.com> <20100809152110.GB23631@redhat.com> <20100809215825.GC25871@rivendell.middle-earth.co.uk> Message-ID: <4C615B30.2040702@redhat.com> On 08/09/2010 05:58 PM, Dr Andrew John Hughes wrote: > On 11:21 Mon 09 Aug , Deepak Bhole wrote: >> * Omair Majid [2010-08-09 11:08]: >>> Hi, >>> >>> Some webstart applications like JForex [1] claim to use version 1.6 >>> of the jnlp specification, even though it is not listed in the >>> developers guide [2]: "The spec attribute can be 1.0, 1.5.0, or 6.0 >>> or can use the wildcards such as 1.0+." >>> >>> The attached patch make netx work with a version of 1.6 as well. >>> >>> Ok to commit? >>> >>> Cheers, >>> Omair >>> >>> >>> [1] https://www.dukascopy.com/client/demo/jclient/jforex.jnlp >>> [2]http://download.oracle.com/javase/6/docs/technotes/guides/javaws/developersguide/syntax.html >> >>> diff -r a570f4fed326 netx/net/sourceforge/jnlp/Parser.java >>> --- a/netx/net/sourceforge/jnlp/Parser.java Fri Aug 06 20:08:18 2010 +0100 >>> +++ b/netx/net/sourceforge/jnlp/Parser.java Mon Aug 09 10:57:48 2010 -0400 >>> @@ -72,7 +72,7 @@ >>> >>> >>> /** the supported JNLP file versions */ >>> - private static Version supportedVersions = new Version("1.0 1.5 6.0"); >>> + private static Version supportedVersions = new Version("1.0 1.5 1.6 6.0"); >>> >>> // fix: some descriptors need to use the jnlp file at a later >>> // date and having file ref lets us pass it to their >> >> >> >> Okay to commit to 1.7, 1.8 and HEAD. >> >> Cheers, >> Deepak > > And 1.9. Though Omair did this anyway. Well, I assumed that if a fix is good enough for 1.7, 1.8 and HEAD, it is good enough for 1.9 :) Cheers, Omair From ahughes at redhat.com Tue Aug 10 07:20:02 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 10 Aug 2010 15:20:02 +0100 Subject: [RFC] backport opentype font support from openjdk6 to icedtea6 1.9 In-Reply-To: <4C615645.9030005@redhat.com> References: <4C600C13.2080404@redhat.com> <20100809215544.GB25871@rivendell.middle-earth.co.uk> <20100810094340.GB27843@rivendell.middle-earth.co.uk> <4C615645.9030005@redhat.com> Message-ID: <20100810142002.GG27843@rivendell.middle-earth.co.uk> On 09:38 Tue 10 Aug , Omair Majid wrote: > On 08/10/2010 05:43 AM, Dr Andrew John Hughes wrote: > > On 22:55 Mon 09 Aug , Dr Andrew John Hughes wrote: > >> On 10:09 Mon 09 Aug , Omair Majid wrote: > >>> Hi, > >>> > >>> I would like to backport OpenType font support from OpenJDK6 to > >>> Icedtea6-1.9. Patches corresponding to the following two changesets will > >>> need to be added to icedtea6: > >>> > >>> http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/b577c70564b8 > >>> http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/acb763ebef95 > >>> > >>> Any thoughts? > >>> > >>> Cheers, > >>> Omair > >> > >> Sounds sensible. Please note that patches for 1.9 require approval on > >> the list before commit. I presume you are also going to commit this to > >> HEAD as well. > >> > > Or we could wait until the next OpenJDK6 build and automatically acquire > the patch that way. I am not in any hurry about committing it to head - > as long as HEAD gets the patch before the next release (1.10?) > I'd prefer it went in ASAP so it could receive testing. My trepidation with respect to 1.9 is that it hasn't really received much testing so far. It sounds like a sensible fix to basically just remove some code that is preventing FreeType being fully used. However, I'd rather we tried it in HEAD for a bit first, and then thought about adding it to the release branches if no issues arise. We also don't know what the timeline is for b21. This is already supported by the icedtea6-hg branch so the patch can simply be dropped again from there. > >> Backports should be stored in patches/openjdk/-.patch > >> for ease of removal when they appear upstream. > >> > >> Does this fix any bugs in the IcedTea or Red Hat bugzilla as well? > >> > > Yes, it fixes https://bugzilla.redhat.com/show_bug.cgi?id=525870. Not > completely - x11 native fonts are still not supported - but it does make > Java report many more fonts on the system > Good. Please make sure that both this bug and the Oracle bug ID are mentioned in NEWS. > >> Thanks, > >> -- > >> Andrew :) > >> > >> Free Java Software Engineer > >> Red Hat, Inc. (http://www.redhat.com) > >> > >> Support Free Java! > >> Contribute to GNU Classpath and the OpenJDK > >> http://www.gnu.org/software/classpath > >> http://openjdk.java.net > >> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > >> Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > > > > Having now reviewed the changesets, I don't think this is suitable for 1.9 > > as it seems to add a new feature rather than fixing a bug, making significant > > changes to TTorT1Filter to do so. Is there a specific reason for wanting it > > in 1.9? > > > > Yes. Please see the bugzilla link I posted above. > > > The native changes only apply to Windows platforms. Does this actually > > change things on GNU/Linux systems? > > > > Surprisingly, it does. OpenJDK uses freetype which already supports > OpenType fonts [1]. Before this patch was put in, the JDK would say that > OpenType fonts are not supported and not even try to let freetype handle > OpenType fonts. > There may be another part to the patch we can't see; adding support to their proprietary backend. Another reason for testing this is that only OpenJDK uses FreeType and so testing of FreeType with OpenType fonts is likely to be limited. > Cheers, > Omair > > [1] http://freetype.sourceforge.net/freetype2/index.html#features Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Aug 10 07:21:49 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 10 Aug 2010 15:21:49 +0100 Subject: [RFC] netx: add 1.6 to supported jnlp versions In-Reply-To: <4C615B30.2040702@redhat.com> References: <4C6019E4.6020800@redhat.com> <20100809152110.GB23631@redhat.com> <20100809215825.GC25871@rivendell.middle-earth.co.uk> <4C615B30.2040702@redhat.com> Message-ID: <20100810142148.GH27843@rivendell.middle-earth.co.uk> On 09:59 Tue 10 Aug , Omair Majid wrote: > On 08/09/2010 05:58 PM, Dr Andrew John Hughes wrote: > > On 11:21 Mon 09 Aug , Deepak Bhole wrote: > >> * Omair Majid [2010-08-09 11:08]: > >>> Hi, > >>> > >>> Some webstart applications like JForex [1] claim to use version 1.6 > >>> of the jnlp specification, even though it is not listed in the > >>> developers guide [2]: "The spec attribute can be 1.0, 1.5.0, or 6.0 > >>> or can use the wildcards such as 1.0+." > >>> > >>> The attached patch make netx work with a version of 1.6 as well. > >>> > >>> Ok to commit? > >>> > >>> Cheers, > >>> Omair > >>> > >>> > >>> [1] https://www.dukascopy.com/client/demo/jclient/jforex.jnlp > >>> [2]http://download.oracle.com/javase/6/docs/technotes/guides/javaws/developersguide/syntax.html > >> > >>> diff -r a570f4fed326 netx/net/sourceforge/jnlp/Parser.java > >>> --- a/netx/net/sourceforge/jnlp/Parser.java Fri Aug 06 20:08:18 2010 +0100 > >>> +++ b/netx/net/sourceforge/jnlp/Parser.java Mon Aug 09 10:57:48 2010 -0400 > >>> @@ -72,7 +72,7 @@ > >>> > >>> > >>> /** the supported JNLP file versions */ > >>> - private static Version supportedVersions = new Version("1.0 1.5 6.0"); > >>> + private static Version supportedVersions = new Version("1.0 1.5 1.6 6.0"); > >>> > >>> // fix: some descriptors need to use the jnlp file at a later > >>> // date and having file ref lets us pass it to their > >> > >> > >> > >> Okay to commit to 1.7, 1.8 and HEAD. > >> > >> Cheers, > >> Deepak > > > > And 1.9. Though Omair did this anyway. > > Well, I assumed that if a fix is good enough for 1.7, 1.8 and HEAD, it > is good enough for 1.9 :) > Yeah, exactly :-) The note was more to remind Deepak that there's an additional branch to consider now... > Cheers, > Omair -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Aug 10 07:35:23 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 10 Aug 2010 15:35:23 +0100 Subject: For users of --with-openjdk In-Reply-To: <4C61474A.4070308@redhat.com> References: <20100810111600.GF27843@rivendell.middle-earth.co.uk> <4C61474A.4070308@redhat.com> Message-ID: <20100810143523.GJ27843@rivendell.middle-earth.co.uk> On 14:34 Tue 10 Aug , Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: > > This option has now been removed from IcedTea6 HEAD in line with the > > changes made to IcedTea7 a year ago: > > > > http://icedtea.classpath.org/hg/icedtea6/rev/0ba4ad0c362b > > > > To do a quick non-bootstrap build, the option is now --disable-bootstrap. > > To specify an explicit jdk, use --with-jdk-home=. > > I think that this flag is still used (actually filtered out :-) in > assignment to variable ADD_ZERO_CONFIGURE_ARGS > I didn't check the add-vm support and I guess it was added after the original patch (July 2009 IIRC). Probably just needs correcting to the new flag. > Btw, is it on purpose or mistake that configuration switches starting > with the "--with-*" are not checked during ./configure? > > For example, when I run > ./configure --xyzzy > or > ./configure --with > I got error (which is correct of course) > > but when I run > ./configure --with-xyzzy > or > ./configure --with- > it passes. > You should get a warning: configure: WARNING: unrecognized options: --disable-jdk-tests, --disable-langtools-tests, --with-openjdk I believe you can make it error out instead, but that then means you have to filter your flags more carefully depending on the IcedTea version being built. At present, setting --with-openjdk and --disable-bootstrap should mean you can handle all versions of IcedTea with no problems. If you have an argument to --with-openjdk, you'll also need --with-jdk-home=. The end goal is for both bootstrap modes to work with either jdk. But we're not there yet. > > > > Both options were previously merged together under --with-openjdk and are now > > available separately. > > -- > > Andrew :) > > > > Free Java Software Engineer > > Red Hat, Inc. (http://www.redhat.com) > > > > Support Free Java! > > Contribute to GNU Classpath and the OpenJDK > > http://www.gnu.org/software/classpath > > http://openjdk.java.net > > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From omajid at redhat.com Tue Aug 10 07:40:57 2010 From: omajid at redhat.com (Omair Majid) Date: Tue, 10 Aug 2010 10:40:57 -0400 Subject: [RFC] backport opentype font support from openjdk6 to icedtea6 1.9 In-Reply-To: <20100810142002.GG27843@rivendell.middle-earth.co.uk> References: <4C600C13.2080404@redhat.com> <20100809215544.GB25871@rivendell.middle-earth.co.uk> <20100810094340.GB27843@rivendell.middle-earth.co.uk> <4C615645.9030005@redhat.com> <20100810142002.GG27843@rivendell.middle-earth.co.uk> Message-ID: <4C6164F9.7010508@redhat.com> On 08/10/2010 10:20 AM, Dr Andrew John Hughes wrote: > On 09:38 Tue 10 Aug , Omair Majid wrote: >> On 08/10/2010 05:43 AM, Dr Andrew John Hughes wrote: >>> On 22:55 Mon 09 Aug , Dr Andrew John Hughes wrote: >>>> On 10:09 Mon 09 Aug , Omair Majid wrote: >>>>> Hi, >>>>> >>>>> I would like to backport OpenType font support from OpenJDK6 to >>>>> Icedtea6-1.9. Patches corresponding to the following two changesets will >>>>> need to be added to icedtea6: >>>>> >>>>> http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/b577c70564b8 >>>>> http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/acb763ebef95 >>>>> >>>>> Any thoughts? >>>>> >>>>> Cheers, >>>>> Omair >>>> >>>> Sounds sensible. Please note that patches for 1.9 require approval on >>>> the list before commit. I presume you are also going to commit this to >>>> HEAD as well. >>>> >> >> Or we could wait until the next OpenJDK6 build and automatically acquire >> the patch that way. I am not in any hurry about committing it to head - >> as long as HEAD gets the patch before the next release (1.10?) >> > > I'd prefer it went in ASAP so it could receive testing. My > trepidation with respect to 1.9 is that it hasn't really received much > testing so far. It sounds like a sensible fix to basically just > remove some code that is preventing FreeType being fully used. > However, I'd rather we tried it in HEAD for a bit first, and then > thought about adding it to the release branches if no issues arise. > > We also don't know what the timeline is for b21. This is already > supported by the icedtea6-hg branch so the patch can simply be dropped > again from there. > >>>> Backports should be stored in patches/openjdk/-.patch >>>> for ease of removal when they appear upstream. >>>> >>>> Does this fix any bugs in the IcedTea or Red Hat bugzilla as well? >>>> >> >> Yes, it fixes https://bugzilla.redhat.com/show_bug.cgi?id=525870. Not >> completely - x11 native fonts are still not supported - but it does make >> Java report many more fonts on the system >> > > Good. Please make sure that both this bug and the Oracle bug ID are mentioned > in NEWS. > >>>> Thanks, >>>> -- >>>> Andrew :) >>>> >>>> Free Java Software Engineer >>>> Red Hat, Inc. (http://www.redhat.com) >>>> >>>> Support Free Java! >>>> Contribute to GNU Classpath and the OpenJDK >>>> http://www.gnu.org/software/classpath >>>> http://openjdk.java.net >>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) >>>> Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 >>> >>> Having now reviewed the changesets, I don't think this is suitable for 1.9 >>> as it seems to add a new feature rather than fixing a bug, making significant >>> changes to TTorT1Filter to do so. Is there a specific reason for wanting it >>> in 1.9? >>> >> >> Yes. Please see the bugzilla link I posted above. >> >>> The native changes only apply to Windows platforms. Does this actually >>> change things on GNU/Linux systems? >>> >> >> Surprisingly, it does. OpenJDK uses freetype which already supports >> OpenType fonts [1]. Before this patch was put in, the JDK would say that >> OpenType fonts are not supported and not even try to let freetype handle >> OpenType fonts. >> > > There may be another part to the patch we can't see; adding support to > their proprietary backend. Another reason for testing this is that > only OpenJDK uses FreeType and so testing of FreeType with OpenType > fonts is likely to be limited. > Ok. Combined with the above, I am taking it to mean that I should commit this to HEAD but not to 1.9 until we have tested it out for a while. >> Cheers, >> Omair >> >> [1] http://freetype.sourceforge.net/freetype2/index.html#features > > Thanks, From gbenson at redhat.com Tue Aug 10 08:43:21 2010 From: gbenson at redhat.com (Gary Benson) Date: Tue, 10 Aug 2010 16:43:21 +0100 Subject: Shark hg repositories are now in harmony. In-Reply-To: <20100810105912.GC27843@rivendell.middle-earth.co.uk> References: <4C5AB11B.3070802@zafena.se> <4C5D67E5.1040302@zafena.se> <20100809214933.GA25871@rivendell.middle-earth.co.uk> <20100810085550.GA3736@redhat.com> <20100810093625.GA27843@rivendell.middle-earth.co.uk> <20100810101202.GB3736@redhat.com> <20100810105912.GC27843@rivendell.middle-earth.co.uk> Message-ID: <20100810154320.GC3736@redhat.com> Dr Andrew John Hughes wrote: > On 11:12 Tue 10 Aug , Gary Benson wrote: > > Dr Andrew John Hughes wrote: > > > On 09:55 Tue 10 Aug , Gary Benson wrote: > > > > Dr Andrew John Hughes wrote: > > > > > My experiences of Shark suggest that production use is still > > > > > very premature. > > > > > > > > Really? What problems are you seeing? > > > > > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=348 > > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=371 > > > > > > These are from the last time I tried it; it wouldn't even build > > > which, given it was regarded as alpha quality, doesn't seem all > > > that surprising. > > > > Ah, that was over a year ago, before all the TCK stabilization > > work. 348 is a HotSpot version mismatch, I've seen it since in > > icedtea6. And 371, well, the TCK work was on x86_64, so that > > platform at least should not segfault. > > Feel free to close them if they've been fixed. I didn't think the > TCK work was done on IcedTea6 or 7, but on some random snapshot > from your own repository. It was on a random snapshot of icedtea6, so that at least should be ok. Is there some way of seeing all Zero/Shark bugs in bugzilla? > > Though does anybody use ppc (in the open source world) any more? > > Debian and Gentoo still have active ports. Ubuntu also seems to > have one as far as I can see, and probably other distributions too. > Fedora is the only one I've heard of dropping it, but then they > never really supported many architectures to begin with. It's a > shame because the F11 DVD was useful recently to get my ppc box > booting again. > > The reason I ask is because ppc is the architecture where I could > see Shark being useful personally (currently using CACAO). I don't > really see the point in using it on x86_64 other than for > development. Quite. Cheers, Gary -- http://gbenson.net/ From ahughes at redhat.com Tue Aug 10 09:09:43 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 10 Aug 2010 17:09:43 +0100 Subject: Shark hg repositories are now in harmony. In-Reply-To: <20100810154320.GC3736@redhat.com> References: <4C5AB11B.3070802@zafena.se> <4C5D67E5.1040302@zafena.se> <20100809214933.GA25871@rivendell.middle-earth.co.uk> <20100810085550.GA3736@redhat.com> <20100810093625.GA27843@rivendell.middle-earth.co.uk> <20100810101202.GB3736@redhat.com> <20100810105912.GC27843@rivendell.middle-earth.co.uk> <20100810154320.GC3736@redhat.com> Message-ID: <20100810160943.GA10867@rivendell.middle-earth.co.uk> On 16:43 Tue 10 Aug , Gary Benson wrote: > Dr Andrew John Hughes wrote: > > On 11:12 Tue 10 Aug , Gary Benson wrote: > > > Dr Andrew John Hughes wrote: > > > > On 09:55 Tue 10 Aug , Gary Benson wrote: > > > > > Dr Andrew John Hughes wrote: > > > > > > My experiences of Shark suggest that production use is still > > > > > > very premature. > > > > > > > > > > Really? What problems are you seeing? > > > > > > > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=348 > > > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=371 > > > > > > > > These are from the last time I tried it; it wouldn't even build > > > > which, given it was regarded as alpha quality, doesn't seem all > > > > that surprising. > > > > > > Ah, that was over a year ago, before all the TCK stabilization > > > work. 348 is a HotSpot version mismatch, I've seen it since in > > > icedtea6. And 371, well, the TCK work was on x86_64, so that > > > platform at least should not segfault. > > > > Feel free to close them if they've been fixed. I didn't think the > > TCK work was done on IcedTea6 or 7, but on some random snapshot > > from your own repository. > > It was on a random snapshot of icedtea6, so that at least should be > ok. > Oh right. I thought you'd tested your shark tree. > Is there some way of seeing all Zero/Shark bugs in bugzilla? > http://icedtea.classpath.org/bugzilla/buglist.cgi?query_format=advanced&component=Shark&component=Zero assuming they are correctly categorised (I triaged through them a few months back but new ones may be missing). > > > Though does anybody use ppc (in the open source world) any more? > > > > Debian and Gentoo still have active ports. Ubuntu also seems to > > have one as far as I can see, and probably other distributions too. > > Fedora is the only one I've heard of dropping it, but then they > > never really supported many architectures to begin with. It's a > > shame because the F11 DVD was useful recently to get my ppc box > > booting again. > > > > The reason I ask is because ppc is the architecture where I could > > see Shark being useful personally (currently using CACAO). I don't > > really see the point in using it on x86_64 other than for > > development. > > Quite. > > Cheers, > Gary > > -- > http://gbenson.net/ -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Aug 10 09:53:00 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 10 Aug 2010 17:53:00 +0100 Subject: [RFC] backport opentype font support from openjdk6 to icedtea6 1.9 In-Reply-To: <4C6164F9.7010508@redhat.com> References: <4C600C13.2080404@redhat.com> <20100809215544.GB25871@rivendell.middle-earth.co.uk> <20100810094340.GB27843@rivendell.middle-earth.co.uk> <4C615645.9030005@redhat.com> <20100810142002.GG27843@rivendell.middle-earth.co.uk> <4C6164F9.7010508@redhat.com> Message-ID: <20100810165300.GB10867@rivendell.middle-earth.co.uk> On 10:40 Tue 10 Aug , Omair Majid wrote: > On 08/10/2010 10:20 AM, Dr Andrew John Hughes wrote: > > On 09:38 Tue 10 Aug , Omair Majid wrote: > >> On 08/10/2010 05:43 AM, Dr Andrew John Hughes wrote: > >>> On 22:55 Mon 09 Aug , Dr Andrew John Hughes wrote: > >>>> On 10:09 Mon 09 Aug , Omair Majid wrote: > >>>>> Hi, > >>>>> > >>>>> I would like to backport OpenType font support from OpenJDK6 to > >>>>> Icedtea6-1.9. Patches corresponding to the following two changesets will > >>>>> need to be added to icedtea6: > >>>>> > >>>>> http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/b577c70564b8 > >>>>> http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/acb763ebef95 > >>>>> > >>>>> Any thoughts? > >>>>> > >>>>> Cheers, > >>>>> Omair > >>>> > >>>> Sounds sensible. Please note that patches for 1.9 require approval on > >>>> the list before commit. I presume you are also going to commit this to > >>>> HEAD as well. > >>>> > >> > >> Or we could wait until the next OpenJDK6 build and automatically acquire > >> the patch that way. I am not in any hurry about committing it to head - > >> as long as HEAD gets the patch before the next release (1.10?) > >> > > > > I'd prefer it went in ASAP so it could receive testing. My > > trepidation with respect to 1.9 is that it hasn't really received much > > testing so far. It sounds like a sensible fix to basically just > > remove some code that is preventing FreeType being fully used. > > However, I'd rather we tried it in HEAD for a bit first, and then > > thought about adding it to the release branches if no issues arise. > > > > We also don't know what the timeline is for b21. This is already > > supported by the icedtea6-hg branch so the patch can simply be dropped > > again from there. > > > >>>> Backports should be stored in patches/openjdk/-.patch > >>>> for ease of removal when they appear upstream. > >>>> > >>>> Does this fix any bugs in the IcedTea or Red Hat bugzilla as well? > >>>> > >> > >> Yes, it fixes https://bugzilla.redhat.com/show_bug.cgi?id=525870. Not > >> completely - x11 native fonts are still not supported - but it does make > >> Java report many more fonts on the system > >> > > > > Good. Please make sure that both this bug and the Oracle bug ID are mentioned > > in NEWS. > > > >>>> Thanks, > >>>> -- > >>>> Andrew :) > >>>> > >>>> Free Java Software Engineer > >>>> Red Hat, Inc. (http://www.redhat.com) > >>>> > >>>> Support Free Java! > >>>> Contribute to GNU Classpath and the OpenJDK > >>>> http://www.gnu.org/software/classpath > >>>> http://openjdk.java.net > >>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > >>>> Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 > >>> > >>> Having now reviewed the changesets, I don't think this is suitable for 1.9 > >>> as it seems to add a new feature rather than fixing a bug, making significant > >>> changes to TTorT1Filter to do so. Is there a specific reason for wanting it > >>> in 1.9? > >>> > >> > >> Yes. Please see the bugzilla link I posted above. > >> > >>> The native changes only apply to Windows platforms. Does this actually > >>> change things on GNU/Linux systems? > >>> > >> > >> Surprisingly, it does. OpenJDK uses freetype which already supports > >> OpenType fonts [1]. Before this patch was put in, the JDK would say that > >> OpenType fonts are not supported and not even try to let freetype handle > >> OpenType fonts. > >> > > > > There may be another part to the patch we can't see; adding support to > > their proprietary backend. Another reason for testing this is that > > only OpenJDK uses FreeType and so testing of FreeType with OpenType > > fonts is likely to be limited. > > > > Ok. Combined with the above, I am taking it to mean that I should commit > this to HEAD but not to 1.9 until we have tested it out for a while. > Yes. Let's review the situation for 1.9.1. > >> Cheers, > >> Omair > >> > >> [1] http://freetype.sourceforge.net/freetype2/index.html#features > > > > Thanks, > Cheers, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From omajid at icedtea.classpath.org Tue Aug 10 11:53:13 2010 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Tue, 10 Aug 2010 18:53:13 +0000 Subject: /hg/icedtea6: Backport 4356282, 6954424 - OpenType font support Message-ID: changeset c73c4672031a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c73c4672031a author: Omair Majid date: Tue Aug 10 14:52:56 2010 -0400 Backport 4356282, 6954424 - OpenType font support 2010-08-09 Omair Majid * NEWS: Update with OpenType support. * Makefile.am: Apply the two new patches. * patches/openjdk/4356282-opentype.patch: Adds OpenType font support. * patches/openjdk/6954424-opentype_javadoc.patch: Fixes javadocs to mention OpenType font support. diffstat: 5 files changed, 264 insertions(+), 1 deletion(-) ChangeLog | 8 Makefile.am | 4 NEWS | 3 patches/openjdk/4356282-opentype.patch | 227 ++++++++++++++++++++++++ patches/openjdk/6954424-opentype_javadoc.patch | 23 ++ diffs (300 lines): diff -r 0ba4ad0c362b -r c73c4672031a ChangeLog --- a/ChangeLog Tue Aug 10 12:11:36 2010 +0100 +++ b/ChangeLog Tue Aug 10 14:52:56 2010 -0400 @@ -1,3 +1,11 @@ 2009-07-17 Andrew John Hughes + + * NEWS: Update with OpenType support. + * Makefile.am: Apply the two new patches. + * patches/openjdk/4356282-opentype.patch: Adds OpenType font support. + * patches/openjdk/6954424-opentype_javadoc.patch: Fixes javadocs to + mention OpenType font support. + 2009-07-17 Andrew John Hughes * Makefile.am: diff -r 0ba4ad0c362b -r c73c4672031a Makefile.am --- a/Makefile.am Tue Aug 10 12:11:36 2010 +0100 +++ b/Makefile.am Tue Aug 10 14:52:56 2010 -0400 @@ -286,7 +286,9 @@ ICEDTEA_PATCHES = \ patches/fonts-rhel.patch \ patches/fonts-gentoo.patch \ patches/ipv4-mapped-ipv6-addresses.patch \ - patches/openjdk/6795060-icu_crash.patch + patches/openjdk/6795060-icu_crash.patch \ + patches/openjdk/4356282-opentype.patch \ + patches/openjdk/6954424-opentype_javadoc.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r 0ba4ad0c362b -r c73c4672031a NEWS --- a/NEWS Tue Aug 10 12:11:36 2010 +0100 +++ b/NEWS Tue Aug 10 14:52:56 2010 -0400 @@ -9,6 +9,9 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY New in release 1.10 (2010-XX-XX): +* Backports from OpenJDK6 + - S4356282, RH525870: RFE: T2K should be used to rasterize CID/CFF fonts + - S6954424: Support OpenType/CFF fonts in JDK 7 New in release 1.9 (2010-XX-XX): diff -r 0ba4ad0c362b -r c73c4672031a patches/openjdk/4356282-opentype.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/4356282-opentype.patch Tue Aug 10 14:52:56 2010 -0400 @@ -0,0 +1,227 @@ + +# HG changeset patch +# User igor +# Date 1217861443 -14400 +# Node ID b577c70564b8053092bf35f012fa29efe22f56c9 +# Parent 2b1a7d4b9ac69c2366f38b5b0e9ebcf61f1e3277 +4356282: RFE: T2K should be used to rasterize CID/CFF fonts +Reviewed-by: bae, prr + +--- openjdk.orig/jdk/src/share/classes/sun/font/FontManager.java Fri Jun 25 11:53:15 2010 -0700 ++++ openjdk/jdk/src/share/classes/sun/font/FontManager.java Mon Aug 04 18:50:43 2008 +0400 +@@ -3269,7 +3269,7 @@ public final class FontManager { + int fontFormat = FONTFORMAT_NONE; + int fontRank = Font2D.UNKNOWN_RANK; + +- if (ext.equals(".ttf") || isTTC) { ++ if (ext.equals(".ttf") || ext.equals(".otf") || isTTC) { + fontFormat = FONTFORMAT_TRUETYPE; + fontRank = Font2D.TTF_RANK; + } else if (ext.equals(".pfa") || ext.equals(".pfb")) { +--- openjdk.orig/jdk/src/share/classes/sun/font/TrueTypeFont.java Fri Jun 25 11:53:15 2010 -0700 ++++ openjdk/jdk/src/share/classes/sun/font/TrueTypeFont.java Mon Aug 04 18:50:43 2008 +0400 +@@ -90,6 +90,7 @@ public class TrueTypeFont extends FileFo + public static final int ttcfTag = 0x74746366; // 'ttcf' - TTC file + public static final int v1ttTag = 0x00010000; // 'v1tt' - Version 1 TT font + public static final int trueTag = 0x74727565; // 'true' - Version 2 TT font ++ public static final int ottoTag = 0x4f54544f; // 'otto' - OpenType font + + /* -- ID's used in the 'name' table */ + public static final int MS_PLATFORM_ID = 3; +@@ -499,6 +500,7 @@ public class TrueTypeFont extends FileFo + + case v1ttTag: + case trueTag: ++ case ottoTag: + break; + + default: +--- openjdk.orig/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java Fri Jun 25 11:53:15 2010 -0700 ++++ openjdk/jdk/src/share/classes/sun/java2d/SunGraphicsEnvironment.java Mon Aug 04 18:50:43 2008 +0400 +@@ -792,7 +792,9 @@ public abstract class SunGraphicsEnviron + return(name.startsWith(".ttf", offset) || + name.startsWith(".TTF", offset) || + name.startsWith(".ttc", offset) || +- name.startsWith(".TTC", offset)); ++ name.startsWith(".TTC", offset) || ++ name.startsWith(".otf", offset) || ++ name.startsWith(".OTF", offset)); + } + } + } +@@ -815,31 +817,11 @@ public abstract class SunGraphicsEnviron + } + } + +- public static class TTorT1Filter implements FilenameFilter { +- public boolean accept(File dir, String name) { +- +- /* all conveniently have the same suffix length */ +- int offset = name.length()-4; +- if (offset <= 0) { /* must be at least A.ttf or A.pfa */ +- return false; +- } else { +- boolean isTT = +- name.startsWith(".ttf", offset) || +- name.startsWith(".TTF", offset) || +- name.startsWith(".ttc", offset) || +- name.startsWith(".TTC", offset); +- if (isTT) { +- return true; +- } else if (noType1Font) { +- return false; +- } else { +- return(name.startsWith(".pfa", offset) || +- name.startsWith(".pfb", offset) || +- name.startsWith(".PFA", offset) || +- name.startsWith(".PFB", offset)); +- } +- } +- } ++ public static class TTorT1Filter implements FilenameFilter { ++ public boolean accept(File dir, String name) { ++ return SunGraphicsEnvironment.ttFilter.accept(dir, name) || ++ SunGraphicsEnvironment.t1Filter.accept(dir, name); ++ } + } + + /* No need to keep consing up new instances - reuse a singleton. +--- openjdk.orig/jdk/src/windows/native/sun/font/fontpath.c Fri Jun 25 11:53:15 2010 -0700 ++++ openjdk/jdk/src/windows/native/sun/font/fontpath.c Mon Aug 04 18:50:43 2008 +0400 +@@ -153,7 +153,8 @@ static int CALLBACK EnumFontFacesInFamil + JNIEnv *env = fmi->env; + jstring fullname, fullnameLC; + +- if (FontType != TRUETYPE_FONTTYPE) { ++ /* Both Vista and XP return DEVICE_FONTTYPE for OTF fonts */ ++ if (FontType != TRUETYPE_FONTTYPE && FontType != DEVICE_FONTTYPE) { + return 1; + } + +@@ -227,7 +228,8 @@ static int CALLBACK EnumFontFacesInFamil + JNIEnv *env = fmi->env; + jstring fullname, fullnameLC; + +- if (FontType != TRUETYPE_FONTTYPE) { ++ /* Both Vista and XP return DEVICE_FONTTYPE for OTF fonts */ ++ if (FontType != TRUETYPE_FONTTYPE && FontType != DEVICE_FONTTYPE) { + return 1; + } + +@@ -274,7 +276,8 @@ static int CALLBACK EnumFamilyNamesA( + jstring familyLC; + LOGFONTA lfa; + +- if (FontType != TRUETYPE_FONTTYPE) { ++ /* Both Vista and XP return DEVICE_FONTTYPE for OTF fonts */ ++ if (FontType != TRUETYPE_FONTTYPE && FontType != DEVICE_FONTTYPE) { + return 1; + } + +@@ -323,7 +326,8 @@ static int CALLBACK EnumFamilyNamesW( + int slen; + LOGFONTW lfw; + +- if (FontType != TRUETYPE_FONTTYPE) { ++ /* Both Vista and XP return DEVICE_FONTTYPE for OTF fonts */ ++ if (FontType != TRUETYPE_FONTTYPE && FontType != DEVICE_FONTTYPE) { + return 1; + } + /* wprintf(L"FAMILY=%s charset=%d FULL=%s\n", */ +@@ -383,15 +387,16 @@ static int CALLBACK EnumFamilyNamesW( + * Also if a Font has a name for this locale that name also + * exists in the registry using the appropriate platform encoding. + * What do we do then? +- */ +- +-/* static const wchar_t W_TTSUFFIX[] = L" (TrueType)"; */ +-/* static const char C_TTSUFFIX[] = " (TrueType)"; */ +-/* static int TTSLEN = 11; hard-coded - be careful */ +-static BOOL RegistryToBaseTTNameA(LPCSTR name) { ++ * ++ * Note: OpenType fonts seems to have " (TrueType)" suffix on Vista ++ * but " (OpenType)" on XP. ++ */ ++ ++static BOOL RegistryToBaseTTNameA(LPSTR name) { + static const char TTSUFFIX[] = " (TrueType)"; ++ static const char OTSUFFIX[] = " (OpenType)"; + int TTSLEN = strlen(TTSUFFIX); +- char *match; ++ char *suffix; + + int len = strlen(name); + if (len == 0) { +@@ -403,19 +408,21 @@ static BOOL RegistryToBaseTTNameA(LPCSTR + if (len <= TTSLEN) { + return FALSE; + } +- match = strstr(name, TTSUFFIX); +- if ((match != NULL) && (match == name+(len-TTSLEN))) { +- match[0] = '\0'; /* truncate name */ ++ ++ /* suffix length is the same for truetype and opentype fonts */ ++ suffix = name + len - TTSLEN; ++ if (strcmp(suffix, TTSUFFIX) == 0 || strcmp(suffix, OTSUFFIX) == 0) { ++ suffix[0] = '\0'; /* truncate name */ + return TRUE; +- } else { +- return FALSE; +- } ++ } ++ return FALSE; + } + + static BOOL RegistryToBaseTTNameW(LPWSTR name) { + static const wchar_t TTSUFFIX[] = L" (TrueType)"; ++ static const wchar_t OTSUFFIX[] = L" (OpenType)"; + int TTSLEN = wcslen(TTSUFFIX); +- wchar_t *match; ++ wchar_t *suffix; + + int len = wcslen(name); + if (len == 0) { +@@ -427,13 +434,13 @@ static BOOL RegistryToBaseTTNameW(LPWSTR + if (len <= TTSLEN) { + return FALSE; + } +- match = wcsstr(name, TTSUFFIX); +- if ((match != NULL) && (match == name+(len-TTSLEN))) { +- match[0] = L'\0'; /* truncate name */ ++ /* suffix length is the same for truetype and opentype fonts */ ++ suffix = name + (len - TTSLEN); ++ if (wcscmp(suffix, TTSUFFIX) == 0 || wcscmp(suffix, OTSUFFIX) == 0) { ++ suffix[0] = L'\0'; /* truncate name */ + return TRUE; +- } else { +- return FALSE; +- } ++ } ++ return FALSE; + } + + static void registerFontA(GdiFontMapInfo *fmi, jobject fontToFileMap, +@@ -675,18 +682,19 @@ Java_sun_font_FontManager_populateFontFi + } + if (IS_NT) { + if (!RegistryToBaseTTNameW((LPWSTR)wname) ) { +- /* If the filename ends with ".ttf" also accept it. ++ /* If the filename ends with ".ttf" or ".otf" also accept it. + * Not expecting to need to do this for .ttc files. + * Also note this code is not mirrored in the "A" (win9x) path. + */ + LPWSTR dot = wcsrchr((LPWSTR)data, L'.'); +- if (dot == NULL || (wcsicmp(dot, L".ttf") != 0)) { ++ if (dot == NULL || ((wcsicmp(dot, L".ttf") != 0) ++ && (wcsicmp(dot, L".otf") != 0))) { + continue; /* not a TT font... */ + } + } + registerFontW(&fmi, fontToFileMap, (LPWSTR)wname, (LPWSTR)data); + } else { +- if (!RegistryToBaseTTNameA(cname) ) { ++ if (!RegistryToBaseTTNameA((LPSTR)cname)) { + continue; /* not a TT font... */ + } + registerFontA(&fmi, fontToFileMap, cname, (LPCSTR)data); + diff -r 0ba4ad0c362b -r c73c4672031a patches/openjdk/6954424-opentype_javadoc.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6954424-opentype_javadoc.patch Tue Aug 10 14:52:56 2010 -0400 @@ -0,0 +1,23 @@ + +# HG changeset patch +# User prr +# Date 1274975625 25200 +# Node ID acb763ebef9585000dda40e379d4e615be25c6b1 +# Parent 80a618f36d003b3e64fe8dd86f723d980db0d0bc +6954424: Support OpenType/CFF fonts in JDK 7 +Reviewed-by: bae, igor + +--- openjdk.orig/jdk/src/share/classes/java/awt/Font.java Wed Aug 04 00:07:49 2010 +0100 ++++ openjdk/jdk/src/share/classes/java/awt/Font.java Thu May 27 08:53:45 2010 -0700 +@@ -325,6 +325,10 @@ public class Font implements java.io.Ser + * Identify a font resource of type TRUETYPE. + * Used to specify a TrueType font resource to the + * {@link #createFont} method. ++ * The TrueType format was extended to become the OpenType ++ * format, which adds support for fonts with Postscript outlines, ++ * this tag therefore references these fonts, as well as those ++ * with TrueType outlines. + * @since 1.3 + */ + + From dj at linuxfromscratch.org Tue Aug 10 22:28:12 2010 From: dj at linuxfromscratch.org (DJ Lucas) Date: Wed, 11 Aug 2010 00:28:12 -0500 Subject: For users of --with-openjdk In-Reply-To: <20100810111600.GF27843@rivendell.middle-earth.co.uk> References: <20100810111600.GF27843@rivendell.middle-earth.co.uk> Message-ID: <4C6234EC.7020809@linuxfromscratch.org> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 08/10/2010 06:16 AM, Dr Andrew John Hughes wrote: > This option has now been removed from IcedTea6 HEAD in line with the > changes made to IcedTea7 a year ago: > > http://icedtea.classpath.org/hg/icedtea6/rev/0ba4ad0c362b > > To do a quick non-bootstrap build, the option is now --disable-bootstrap. > To specify an explicit jdk, use --with-jdk-home=. > > Both options were previously merged together under --with-openjdk and are now > available separately. > -- > Andrew :) > Andrew, sorry that I haven't gotten back to you on this from the previous messages, but I've got a pretty good excuse! Initial test against the 1.9 branch point (I had it handy) is the same as what I had locally last week when using icedtea6-1.8.1 as the bootstrap jdk for 1.9 (or likely 1.10). I worked around this in the patch I sent offline for 1.8.1 ( http://www.linuxfromscratch.org/~dj/icedtea6/icedtea6-1.8.1-with_jdk_home-2.patch ) by copying tools.jar from the host's JDK. Unfortunately, that hack will only work with same versions (something to the effect of conflicting types IIRC). I've been away for the past 6 days, so I haven't had time to investigate just yet as to how sun.tools.java gets pulled in with gcj and why it does not with a real jdk handy. Here is the relevant part of the build log for reference: >>>Recursively making rmic build @ Wed Aug 11 00:03:19 CDT 2010 ... make[6]: Entering directory `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj/corba/make/sun/rmi/rmic' # Java sources to be compiled: (listed in file /home/dj/icedtea6-cb463b94b82d/openjdk.build-ecj/corba/tmp/sun/sun.rmi.rmic/.classes.list) ../../../../src/share/classes/sun/rmi/rmic/iiop/AbstractType.java ../../../../src/share/classes/sun/rmi/rmic/iiop/ArrayType.java ../../../../src/share/classes/sun/rmi/rmic/iiop/BatchEnvironment.java ../../../../src/share/classes/sun/rmi/rmic/iiop/ClassType.java ../../../../src/share/classes/sun/rmi/rmic/iiop/CompoundType.java ../../../../src/share/classes/sun/rmi/rmic/iiop/Constants.java ../../../../src/share/classes/sun/rmi/rmic/iiop/ClassPathLoader.java ../../../../src/share/classes/sun/rmi/rmic/iiop/Generator.java ../../../../src/share/classes/sun/rmi/rmic/iiop/Util.java ../../../../src/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java ../../../../src/share/classes/sun/rmi/rmic/iiop/IDLNames.java ../../../../src/share/classes/sun/rmi/rmic/iiop/ImplementationType.java ../../../../src/share/classes/sun/rmi/rmic/iiop/InterfaceType.java ../../../../src/share/classes/sun/rmi/rmic/iiop/NCClassType.java ../../../../src/share/classes/sun/rmi/rmic/iiop/NCInterfaceType.java ../../../../src/share/classes/sun/rmi/rmic/iiop/PrimitiveType.java ../../../../src/share/classes/sun/rmi/rmic/iiop/PrintGenerator.java ../../../../src/share/classes/sun/rmi/rmic/iiop/RemoteType.java ../../../../src/share/classes/sun/rmi/rmic/iiop/SpecialClassType.java ../../../../src/share/classes/sun/rmi/rmic/iiop/SpecialInterfaceType.java ../../../../src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java ../../../../src/share/classes/sun/rmi/rmic/iiop/Type.java ../../../../src/share/classes/sun/rmi/rmic/iiop/ValueType.java ../../../../src/share/classes/sun/rmi/rmic/iiop/ContextStack.java # Running javac: /home/dj/icedtea6-cb463b94b82d/bootstrap/jdk1.6.0/bin/javac - -J-XX:ThreadStackSize=768 -J-client -J-Xmx896m -J-Xms128m - -J-XX:PermSize=32m -J-XX:MaxPermSize=160m -g -XDignore.symbol.file=true - -source 1.5 -target 5 -encoding ascii -classpath /home/dj/icedtea6-cb463b94b82d/bootstrap/jdk1.6.0/lib/tools.jar - -bootclasspath /home/dj/icedtea6-cb463b94b82d/bootstrap/jdk1.6.0/jre/lib/rt.jar:/home/dj/icedtea6-cb463b94b82d/openjdk.build-ecj/corba/classes - -sourcepath /home/dj/icedtea6-cb463b94b82d/generated:../../../../src/share/classes - -d /home/dj/icedtea6-cb463b94b82d/openjdk.build-ecj/corba/classes @/home/dj/icedtea6-cb463b94b82d/openjdk.build-ecj/corba/tmp/sun/sun.rmi.rmic/.classes.list - ---------- 1. ERROR in ../../../../src/share/classes/sun/rmi/rmic/iiop/AbstractType.java (at line 36) import sun.tools.java.CompilerError; ^^^^^^^^^^^^^^ The import sun.tools.java cannot be resolved - ---------- 730 problems (730 errors)make[6]: *** [.compile.classlist] Error 255 make[6]: Leaving directory `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj/corba/make/sun/rmi/rmic' make[5]: *** [build] Error 1 make[5]: Leaving directory `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj/corba/make/sun/rmi' make[4]: *** [build] Error 1 make[4]: Leaving directory `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj/corba/make/sun' make[3]: *** [build] Error 1 make[3]: Leaving directory `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj/corba/make' make[2]: *** [corba-build] Error 2 make[2]: Leaving directory `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj' make[1]: *** [build_product_image] Error 2 make[1]: Leaving directory `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj' make: *** [stamps/icedtea-ecj.stamp] Error 2 For reference (these should be the only relevant parts as my env output is not pretty). dj [ ~/icedtea6-cb463b94b82d ]$ echo $PATH /usr/bin:/bin:/opt/gnome/bin:/opt/X11/bin:/opt/icedtea6-1.8.1-bin/bin dj [ ~/icedtea6-cb463b94b82d ]$ echo $ANT_HOME /opt/ant dj [ ~/icedtea6-cb463b94b82d ]$ echo $JAVA_HOME dj [ ~/icedtea6-cb463b94b82d ]$ echo $CLASSPATH dj [ ~/icedtea6-cb463b94b82d ]$ ./configure - --with-jdk-home=/opt/icedtea6-1.8.1-bin checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking how to create a pax tar archive... gnutar checking build system type... i686-pc-linux-gnu checking host system type... i686-pc-linux-gnu checking for gcc... gcc checking whether the C compiler works... yes checking for C compiler default output file name... a.out checking for suffix of executables... checking whether we are cross compiling... no checking for suffix of object files... o checking whether we are using the GNU C compiler... yes checking whether gcc accepts -g... yes checking for gcc option to accept ISO C89... none needed checking for style of include used by make... GNU checking dependency style of gcc... none checking for g++... g++ checking whether we are using the GNU C++ compiler... yes checking whether g++ accepts -g... yes checking dependency style of g++... none checking for make... /usr/bin/make checking for gzip... /bin/gzip checking for ant... /usr/bin/ant checking for find... /usr/bin/find checking for patch... /usr/bin/patch checking for tar... /bin/tar checking for chmod... /bin/chmod checking for md5sum... /usr/bin/md5sum checking for sha256sum... /usr/bin/sha256sum checking for wget... /usr/bin/wget checking for zip... /usr/bin/zip checking for unzip... /usr/bin/unzip checking for cpio... /bin/cpio checking for file... /usr/bin/file checking for fastjar... no checking for jar... jar checking for ldd... ldd checking for gawk... /usr/bin/gawk checking for hg... no checking for an OpenJDK source directory... /home/dj/icedtea6-cb463b94b82d/openjdk checking for lsb_release... no checking whether to compile ecj natively... no checking which HotSpot build to use... original checking for linux32... /usr/bin/linux32 checking version of GCC... 4.4.3 (major version 4, minor version 4) checking for getconf... /usr/bin/getconf checking the number of online processors... 2 checking how many parallel build jobs to execute... 2 checking if cp supports --reflink... yes checking if we can hard link rather than copy from /home/dj/icedtea6-cb463b94b82d... yes checking if a PaX-enabled kernel is running... no checking for an Ant home directory... /usr/share/ant checking whether to include PulseAudio support... no checking whether to build documentation... yes checking whether to enable experimental OpenJDK cross-compilation support... no checking whether to include the XRender pipeline... yes checking whether to include NIO2 support... no checking whether to include SystemTap tracing support... no checking for system library directory... checking for pkg-config... /usr/bin/pkg-config checking pkg-config is at least version 0.9.0... yes checking for NSS... yes checking whether to include the NSS-based security provider... disabled by default (edit java.security to enable) checking for distribution package version... none checking build identification... Custom build (Wed Aug 11 00:19:35 CDT 2010) checking whether to build a bootstrap version first... yes checking for a JDK home directory... /opt/icedtea6-1.8.1-bin checking for java... /opt/icedtea6-1.8.1-bin/bin/java checking for javac... /opt/icedtea6-1.8.1-bin/bin/javac checking for ecj... no checking for ecj-3.1... no checking for ecj-3.2... no checking for ecj-3.3... no checking for javah... /opt/icedtea6-1.8.1-bin/bin/javah checking for jar... /opt/icedtea6-1.8.1-bin/bin/jar checking whether jar supports @ argument... yes checking whether jar supports stdin file arguments... no checking whether jar supports -J options at the end... yes checking for rmic... /opt/icedtea6-1.8.1-bin/bin/rmic checking for an ecj JAR file... /usr/share/java/ecj.jar checking for a xalan2 jar... /usr/share/java/xalan2.jar checking for a xalan2 serializer jar... /usr/share/java/serializer.jar checking for a xerces2 jar... /usr/share/java/xercesImpl.jar checking whether to include Javascript support via Rhino... /usr/share/java/js.jar checking for an OpenJDK source zip... not specified checking for a HotSpot source zip... not specified checking for an alternate jar command... not specified checking for a JAXP drop zip... not specified checking for a JAF drop zip... not specified checking for a JAXWS drop zip... not specified checking whether to use CACAO as VM... no checking for a CACAO home directory... $(abs_top_builddir)/cacao/install checking for a CACAO source zip... not specified checking for a CACAO source directory... not specified checking whether to disable optimizations and build with -O0 -g... no checking whether to use the Shark JIT... no checking how to run the C preprocessor... gcc -E checking for grep that handles long lines and -e... /bin/grep checking for egrep... /bin/grep -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking whether to use the zero-assembler port... no checking whether byte ordering is bigendian... no checking for additional virtual machines to build... none checking whether to retrieve the source code from Mercurial... no checking which Mercurial revision to use... tip checking which Java timezone data directory to use... /usr/share/javazi checking if sun.awt.SunToolkit is missing... no checking if javax.xml.stream.events.Attribute.getDTDType() wrongly returns a QName... no checking whether to build the browser plugin... yes checking for GTK... yes checking for GLIB... yes checking for MOZILLA... yes checking for xulrunner version... 1090206 checking cups/cups.h usability... yes checking cups/cups.h presence... yes checking for cups/cups.h... yes checking cups/ppd.h usability... yes checking cups/ppd.h presence... yes checking for cups/ppd.h... yes checking X11/X.h usability... yes checking X11/X.h presence... yes checking for X11/X.h... yes checking for main in -ljpeg... yes checking for main in -lgif... yes checking for main in -lz... yes checking for XPROTO... yes checking for XT... yes checking for XP... yes checking for X11... yes checking for XINERAMA... yes checking for XRENDER... yes checking for LIBPNG... yes checking for XTST... yes checking for FREETYPE2... yes checking for ALSA... yes configure: creating ./config.status config.status: creating Makefile config.status: creating nss.cfg config.status: creating javac config.status: creating javap config.status: creating jvm.cfg config.status: creating ergo.c config.status: creating tz.properties config.status: executing depfiles commands dj [ ~/icedtea6-cb463b94b82d ]$ Entire build log is available here if it is needed for anything: http://www.linuxfromscratch.org/~dj/icedtea6/builderror.log.bz2 As I've just returned home from the hospital (for my son, all is well now BTW), and I'm only vaguely familiar with the icedtea build/directory layout so far, so I am going to crash for a bit. I will look into it sometime over the next couple of days (if somebody doesn't beat me to it). Thank you for getting on this so quickly. - -- DJ Lucas -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) iQIcBAEBAgAGBQJMYjTrAAoJEIUM+xKzBYsIddEP/2fgXzMddWkKd0Idrhjs9PT2 K8alO9T3+I0d2o4me5booAaD6GYw94nXs4Ni4NieXvkWcnzP1xBPeCQXsaWLY0JY DyXbtv5gOrKsWY9wUel07dLSd4CzLJUKuota8iD4Y7zbHtM16xDCSGwB7cb7y3t5 qFhqr+g8bDHtDVxQRMNJ2OhE4AHypAquJ/fRBBAa8e6uLq9KvTQ6n5U/gGof/4uh Du4gBdukxNDYRka3PMYCWkyxHtQmeEz4zIknSIOSVsMRkmX87aU9kOq2mWwQbq0D m2n2wrZ9eNjRFEjkx9Q6+GJp0U9hkjNLoc8CtcFDGvaowC0VbIc9QBqUxVbTgnj9 /jqP/vXOAb0sJlPirxFu4+zH7AG2NI3EM2qeMFUPX/5k7xCPVdUCi+8f7bx0Ho8a MSipamh0ZfYpqUXGBBhCsXsEOKkMqUSImV6Jp65fRZJmKfCoOfGqmaG+WhC04Q87 UOy9OxRUhvxwwL+T5+YmwPv+jWiupCBR63oHYvpuJD1jhMewGXTzJgS+ZcwQSTU0 91boFHsQWPLkDVv1yUHVR/aW+od8TNCropRKLm7uwsxa2HPTIVIqdY4srXI/rxyj oApNYHTrtqbTPApCU/0sfZrUbGaqOBeg/qs0bhP1fzNAXaudlu8Q0FX+dMJxQ+Td nbBoF47RkGqLIrxkS7wU =pZHp -----END PGP SIGNATURE----- -- This message has been scanned for viruses and dangerous content, and is believed to be clean. From ahughes at redhat.com Wed Aug 11 11:11:12 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 11 Aug 2010 19:11:12 +0100 Subject: For users of --with-openjdk In-Reply-To: <4C6234EC.7020809@linuxfromscratch.org> References: <20100810111600.GF27843@rivendell.middle-earth.co.uk> <4C6234EC.7020809@linuxfromscratch.org> Message-ID: <20100811181112.GL10867@rivendell.middle-earth.co.uk> On 00:28 Wed 11 Aug , DJ Lucas wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > On 08/10/2010 06:16 AM, Dr Andrew John Hughes wrote: > > This option has now been removed from IcedTea6 HEAD in line with the > > changes made to IcedTea7 a year ago: > > > > http://icedtea.classpath.org/hg/icedtea6/rev/0ba4ad0c362b > > > > To do a quick non-bootstrap build, the option is now --disable-bootstrap. > > To specify an explicit jdk, use --with-jdk-home=. > > > > Both options were previously merged together under --with-openjdk and are now > > available separately. > > -- > > Andrew :) > > > > Andrew, sorry that I haven't gotten back to you on this from the > previous messages, but I've got a pretty good excuse! No worries, hope everything is okay for you now. > Initial test > against the 1.9 branch point (I had it handy) is the same as what I had > locally last week when using icedtea6-1.8.1 as the bootstrap jdk for 1.9 > (or likely 1.10). I worked around this in the patch I sent offline for > 1.8.1 ( > http://www.linuxfromscratch.org/~dj/icedtea6/icedtea6-1.8.1-with_jdk_home-2.patch > ) by copying tools.jar from the host's JDK. Unfortunately, that hack > will only work with same versions (something to the effect of > conflicting types IIRC). I've been away for the past 6 days, so I > haven't had time to investigate just yet as to how sun.tools.java gets > pulled in with gcj and why it does not with a real jdk handy. > Could you elaborate on what you mean by 'conflicting types'? I didn't try the bootstrap-with-icedtea option myself so far, just the existing options (bootstrap-with-gcj, no-bootstrap-with-icedtea) to make sure we didn't regress. I left out the tools.jar chunk of the patch because I wasn't sure about it. There's a bit of history to the whole tools.jar situation. The ecj build originally created a tools.jar as well (in a similar way to the current rt.stamp target and friends) but it resulted in a lot of additional confusion and duplication of compilation with little benefit. So the bootstrap was changed to pack all the bootstrap classes in an updated rt.jar from the system jdk. tools.jar only actually needs to exist for an existence check by HotSpot. IcedTea6 currently satifies that by a symlink to rt.jar, as you've seen, but I think I'll switch it to patching HotSpot during bootstrap as I've done in IcedTea7. This works fine for the existing configurations but breaks with bootstrapping with IcedTea. Why? Well... 1. The necessary sun.* classes are built in the rt.stamp stage. However, this only happens if sun.awt.Toolkit is not found (which is used to signify that the bootstrap JDK has Sun classes). See > checking if sun.awt.SunToolkit is missing... no in your output. 2. Of course those classes are available in your JDK but in tools.jar not rt.jar. The javac invocation looks at tools.jar but because we don't symlink the whole system JDK to bootstrap/jdk1.6.0 (as in the second stage), it's not accessible from the build. Thus, your fix seems appropriate and I'll add the symlink to tools.jar if it exists. I'd be very interested to know what issues you had with doing this. If you're wondering why the bootstrap build doesn't just link the system JDK, it's so we can override its javac with the Perl script used by IcedTea which contains a number of workarounds to make ecj look like javac. > Here is the relevant part of the build log for reference: > > >>>Recursively making rmic build @ Wed Aug 11 00:03:19 CDT 2010 ... > make[6]: Entering directory > `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj/corba/make/sun/rmi/rmic' > # Java sources to be compiled: (listed in file > /home/dj/icedtea6-cb463b94b82d/openjdk.build-ecj/corba/tmp/sun/sun.rmi.rmic/.classes.list) > ../../../../src/share/classes/sun/rmi/rmic/iiop/AbstractType.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/ArrayType.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/BatchEnvironment.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/ClassType.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/CompoundType.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/Constants.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/ClassPathLoader.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/Generator.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/Util.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/IDLGenerator.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/IDLNames.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/ImplementationType.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/InterfaceType.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/NCClassType.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/NCInterfaceType.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/PrimitiveType.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/PrintGenerator.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/RemoteType.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/SpecialClassType.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/SpecialInterfaceType.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/Type.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/ValueType.java > ../../../../src/share/classes/sun/rmi/rmic/iiop/ContextStack.java > # Running javac: > /home/dj/icedtea6-cb463b94b82d/bootstrap/jdk1.6.0/bin/javac > - -J-XX:ThreadStackSize=768 -J-client -J-Xmx896m -J-Xms128m > - -J-XX:PermSize=32m -J-XX:MaxPermSize=160m -g -XDignore.symbol.file=true > - -source 1.5 -target 5 -encoding ascii -classpath > /home/dj/icedtea6-cb463b94b82d/bootstrap/jdk1.6.0/lib/tools.jar > - -bootclasspath > /home/dj/icedtea6-cb463b94b82d/bootstrap/jdk1.6.0/jre/lib/rt.jar:/home/dj/icedtea6-cb463b94b82d/openjdk.build-ecj/corba/classes > - -sourcepath > /home/dj/icedtea6-cb463b94b82d/generated:../../../../src/share/classes > - -d /home/dj/icedtea6-cb463b94b82d/openjdk.build-ecj/corba/classes > @/home/dj/icedtea6-cb463b94b82d/openjdk.build-ecj/corba/tmp/sun/sun.rmi.rmic/.classes.list > - ---------- > 1. ERROR in > ../../../../src/share/classes/sun/rmi/rmic/iiop/AbstractType.java (at > line 36) > import sun.tools.java.CompilerError; > ^^^^^^^^^^^^^^ > The import sun.tools.java cannot be resolved > - ---------- > > 730 problems (730 errors)make[6]: *** [.compile.classlist] Error 255 > make[6]: Leaving directory > `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj/corba/make/sun/rmi/rmic' > make[5]: *** [build] Error 1 > make[5]: Leaving directory > `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj/corba/make/sun/rmi' > make[4]: *** [build] Error 1 > make[4]: Leaving directory > `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj/corba/make/sun' > make[3]: *** [build] Error 1 > make[3]: Leaving directory > `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj/corba/make' > make[2]: *** [corba-build] Error 2 > make[2]: Leaving directory `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj' > make[1]: *** [build_product_image] Error 2 > make[1]: Leaving directory `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj' > make: *** [stamps/icedtea-ecj.stamp] Error 2 > > > For reference (these should be the only relevant parts as my env output > is not pretty). > > dj [ ~/icedtea6-cb463b94b82d ]$ echo $PATH > /usr/bin:/bin:/opt/gnome/bin:/opt/X11/bin:/opt/icedtea6-1.8.1-bin/bin > dj [ ~/icedtea6-cb463b94b82d ]$ echo $ANT_HOME > /opt/ant > dj [ ~/icedtea6-cb463b94b82d ]$ echo $JAVA_HOME > > dj [ ~/icedtea6-cb463b94b82d ]$ echo $CLASSPATH > > dj [ ~/icedtea6-cb463b94b82d ]$ ./configure > - --with-jdk-home=/opt/icedtea6-1.8.1-bin > checking for a BSD-compatible install... /usr/bin/install -c > checking whether build environment is sane... yes > checking for a thread-safe mkdir -p... /bin/mkdir -p > checking for gawk... gawk > checking whether make sets $(MAKE)... yes > checking how to create a pax tar archive... gnutar > checking build system type... i686-pc-linux-gnu > checking host system type... i686-pc-linux-gnu > checking for gcc... gcc > checking whether the C compiler works... yes > checking for C compiler default output file name... a.out > checking for suffix of executables... > checking whether we are cross compiling... no > checking for suffix of object files... o > checking whether we are using the GNU C compiler... yes > checking whether gcc accepts -g... yes > checking for gcc option to accept ISO C89... none needed > checking for style of include used by make... GNU > checking dependency style of gcc... none > checking for g++... g++ > checking whether we are using the GNU C++ compiler... yes > checking whether g++ accepts -g... yes > checking dependency style of g++... none > checking for make... /usr/bin/make > checking for gzip... /bin/gzip > checking for ant... /usr/bin/ant > checking for find... /usr/bin/find > checking for patch... /usr/bin/patch > checking for tar... /bin/tar > checking for chmod... /bin/chmod > checking for md5sum... /usr/bin/md5sum > checking for sha256sum... /usr/bin/sha256sum > checking for wget... /usr/bin/wget > checking for zip... /usr/bin/zip > checking for unzip... /usr/bin/unzip > checking for cpio... /bin/cpio > checking for file... /usr/bin/file > checking for fastjar... no > checking for jar... jar > checking for ldd... ldd > checking for gawk... /usr/bin/gawk > checking for hg... no > checking for an OpenJDK source directory... > /home/dj/icedtea6-cb463b94b82d/openjdk > checking for lsb_release... no > checking whether to compile ecj natively... no > checking which HotSpot build to use... original > checking for linux32... /usr/bin/linux32 > checking version of GCC... 4.4.3 (major version 4, minor version 4) > checking for getconf... /usr/bin/getconf > checking the number of online processors... 2 > checking how many parallel build jobs to execute... 2 > checking if cp supports --reflink... yes > checking if we can hard link rather than copy from > /home/dj/icedtea6-cb463b94b82d... yes > checking if a PaX-enabled kernel is running... no > checking for an Ant home directory... /usr/share/ant > checking whether to include PulseAudio support... no > checking whether to build documentation... yes > checking whether to enable experimental OpenJDK cross-compilation > support... no > checking whether to include the XRender pipeline... yes > checking whether to include NIO2 support... no > checking whether to include SystemTap tracing support... no > checking for system library directory... > checking for pkg-config... /usr/bin/pkg-config > checking pkg-config is at least version 0.9.0... yes > checking for NSS... yes > checking whether to include the NSS-based security provider... disabled > by default (edit java.security to enable) > checking for distribution package version... none > checking build identification... Custom build (Wed Aug 11 00:19:35 CDT 2010) > checking whether to build a bootstrap version first... yes > checking for a JDK home directory... /opt/icedtea6-1.8.1-bin > checking for java... /opt/icedtea6-1.8.1-bin/bin/java > checking for javac... /opt/icedtea6-1.8.1-bin/bin/javac > checking for ecj... no > checking for ecj-3.1... no > checking for ecj-3.2... no > checking for ecj-3.3... no > checking for javah... /opt/icedtea6-1.8.1-bin/bin/javah > checking for jar... /opt/icedtea6-1.8.1-bin/bin/jar > checking whether jar supports @ argument... yes > checking whether jar supports stdin file arguments... no > checking whether jar supports -J options at the end... yes > checking for rmic... /opt/icedtea6-1.8.1-bin/bin/rmic > checking for an ecj JAR file... /usr/share/java/ecj.jar > checking for a xalan2 jar... /usr/share/java/xalan2.jar > checking for a xalan2 serializer jar... /usr/share/java/serializer.jar > checking for a xerces2 jar... /usr/share/java/xercesImpl.jar > checking whether to include Javascript support via Rhino... > /usr/share/java/js.jar > checking for an OpenJDK source zip... not specified > checking for a HotSpot source zip... not specified > checking for an alternate jar command... not specified > checking for a JAXP drop zip... not specified > checking for a JAF drop zip... not specified > checking for a JAXWS drop zip... not specified > checking whether to use CACAO as VM... no > checking for a CACAO home directory... $(abs_top_builddir)/cacao/install > checking for a CACAO source zip... not specified > checking for a CACAO source directory... not specified > checking whether to disable optimizations and build with -O0 -g... no > checking whether to use the Shark JIT... no > checking how to run the C preprocessor... gcc -E > checking for grep that handles long lines and -e... /bin/grep > checking for egrep... /bin/grep -E > checking for ANSI C header files... yes > checking for sys/types.h... yes > checking for sys/stat.h... yes > checking for stdlib.h... yes > checking for string.h... yes > checking for memory.h... yes > checking for strings.h... yes > checking for inttypes.h... yes > checking for stdint.h... yes > checking for unistd.h... yes > checking whether to use the zero-assembler port... no > checking whether byte ordering is bigendian... no > checking for additional virtual machines to build... none > checking whether to retrieve the source code from Mercurial... no > checking which Mercurial revision to use... tip > checking which Java timezone data directory to use... /usr/share/javazi > checking if sun.awt.SunToolkit is missing... no > checking if javax.xml.stream.events.Attribute.getDTDType() wrongly > returns a QName... no > checking whether to build the browser plugin... yes > checking for GTK... yes > checking for GLIB... yes > checking for MOZILLA... yes > checking for xulrunner version... 1090206 > checking cups/cups.h usability... yes > checking cups/cups.h presence... yes > checking for cups/cups.h... yes > checking cups/ppd.h usability... yes > checking cups/ppd.h presence... yes > checking for cups/ppd.h... yes > checking X11/X.h usability... yes > checking X11/X.h presence... yes > checking for X11/X.h... yes > checking for main in -ljpeg... yes > checking for main in -lgif... yes > checking for main in -lz... yes > checking for XPROTO... yes > checking for XT... yes > checking for XP... yes > checking for X11... yes > checking for XINERAMA... yes > checking for XRENDER... yes > checking for LIBPNG... yes > checking for XTST... yes > checking for FREETYPE2... yes > checking for ALSA... yes > configure: creating ./config.status > config.status: creating Makefile > config.status: creating nss.cfg > config.status: creating javac > config.status: creating javap > config.status: creating jvm.cfg > config.status: creating ergo.c > config.status: creating tz.properties > config.status: executing depfiles commands > dj [ ~/icedtea6-cb463b94b82d ]$ > > > Entire build log is available here if it is needed for anything: > http://www.linuxfromscratch.org/~dj/icedtea6/builderror.log.bz2 > > As I've just returned home from the hospital (for my son, all is well > now BTW), and I'm only vaguely familiar with the icedtea build/directory > layout so far, so I am going to crash for a bit. I will look into it > sometime over the next couple of days (if somebody doesn't beat me to it). > > Thank you for getting on this so quickly. > > - -- DJ Lucas > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2.0.15 (GNU/Linux) > > iQIcBAEBAgAGBQJMYjTrAAoJEIUM+xKzBYsIddEP/2fgXzMddWkKd0Idrhjs9PT2 > K8alO9T3+I0d2o4me5booAaD6GYw94nXs4Ni4NieXvkWcnzP1xBPeCQXsaWLY0JY > DyXbtv5gOrKsWY9wUel07dLSd4CzLJUKuota8iD4Y7zbHtM16xDCSGwB7cb7y3t5 > qFhqr+g8bDHtDVxQRMNJ2OhE4AHypAquJ/fRBBAa8e6uLq9KvTQ6n5U/gGof/4uh > Du4gBdukxNDYRka3PMYCWkyxHtQmeEz4zIknSIOSVsMRkmX87aU9kOq2mWwQbq0D > m2n2wrZ9eNjRFEjkx9Q6+GJp0U9hkjNLoc8CtcFDGvaowC0VbIc9QBqUxVbTgnj9 > /jqP/vXOAb0sJlPirxFu4+zH7AG2NI3EM2qeMFUPX/5k7xCPVdUCi+8f7bx0Ho8a > MSipamh0ZfYpqUXGBBhCsXsEOKkMqUSImV6Jp65fRZJmKfCoOfGqmaG+WhC04Q87 > UOy9OxRUhvxwwL+T5+YmwPv+jWiupCBR63oHYvpuJD1jhMewGXTzJgS+ZcwQSTU0 > 91boFHsQWPLkDVv1yUHVR/aW+od8TNCropRKLm7uwsxa2HPTIVIqdY4srXI/rxyj > oApNYHTrtqbTPApCU/0sfZrUbGaqOBeg/qs0bhP1fzNAXaudlu8Q0FX+dMJxQ+Td > nbBoF47RkGqLIrxkS7wU > =pZHp > -----END PGP SIGNATURE----- > > -- > This message has been scanned for viruses and > dangerous content, and is believed to be clean. > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From dj at linuxfromscratch.org Wed Aug 11 17:08:31 2010 From: dj at linuxfromscratch.org (DJ Lucas) Date: Wed, 11 Aug 2010 19:08:31 -0500 Subject: For users of --with-openjdk In-Reply-To: <20100811181112.GL10867@rivendell.middle-earth.co.uk> References: <20100810111600.GF27843@rivendell.middle-earth.co.uk> <4C6234EC.7020809@linuxfromscratch.org> <20100811181112.GL10867@rivendell.middle-earth.co.uk> Message-ID: <4C633B7F.3080101@linuxfromscratch.org> On 08/11/2010 01:11 PM, Dr Andrew John Hughes wrote: >> Could you elaborate on what you mean by 'conflicting types'? Bad memory? (human, not system) :-) > I didn't try the bootstrap-with-icedtea option myself so far, just the > existing options (bootstrap-with-gcj, no-bootstrap-with-icedtea) to > make sure we didn't regress. I left out the tools.jar chunk of the > patch because I wasn't sure about it. > > There's a bit of history to the whole tools.jar situation. The ecj > build originally created a tools.jar as well (in a similar way to the > current rt.stamp target and friends) but it resulted in a lot of > additional confusion and duplication of compilation with little > benefit. So the bootstrap was changed to pack all the bootstrap > classes in an updated rt.jar from the system jdk. tools.jar only > actually needs to exist for an existence check by HotSpot. IcedTea6 > currently satifies that by a symlink to rt.jar, as you've seen, but I > think I'll switch it to patching HotSpot during bootstrap as I've done > in IcedTea7. > > This works fine for the existing configurations but breaks with > bootstrapping with IcedTea. Why? Well... > > 1. The necessary sun.* classes are built in the rt.stamp stage. However, > this only happens if sun.awt.Toolkit is not found (which is used to signify > that the bootstrap JDK has Sun classes). See >> checking if sun.awt.SunToolkit is missing... no > in your output. > > 2. Of course those classes are available in your JDK but in tools.jar not > rt.jar. The javac invocation looks at tools.jar but because we don't symlink > the whole system JDK to bootstrap/jdk1.6.0 (as in the second stage), it's > not accessible from the build. > > Thus, your fix seems appropriate and I'll add the symlink to tools.jar > if it exists. I'd be very interested to know what issues you had with > doing this. > Actually, it breaks while building awt: # Running javac: /home/dj/icedtea6-cb463b94b82d/bootstrap/jdk1.6.0/bin/javac -J-XX:ThreadStackSize=768 -J-client -J-Xmx896m -J-Xms128m -J-XX:PermSize=32m -J-XX:MaxPermSize=160m -g -source 1.5 -target 5 -encoding ascii -Xbootclasspath:/home/dj/icedtea6-cb463b94b82d/openjdk.build-ecj/classes -sourcepath /home/dj/icedtea6-cb463b94b82d/generated:../../../src/solaris/classes:../../../src/share/classes -bootclasspath /home/dj/icedtea6-cb463b94b82d/bootstrap/jdk1.6.0/jre/lib/rt.jar::/home/dj/icedtea6-cb463b94b82d/openjdk.build-ecj/classes -d /home/dj/icedtea6-cb463b94b82d/openjdk.build-ecj/classes @/home/dj/icedtea6-cb463b94b82d/openjdk.build-ecj/tmp/sun/java.awt/.classes.list ---------- 1. ERROR in ../../../src/share/classes/java/awt/Robot.java (at line 359) SunWritableRaster.makeTrackable(buffer); ^^^^^^^^^^^^^ The method makeTrackable(DataBufferInt) is undefined for the type SunWritableRaster ---------- ---------- 2. ERROR in ../../../src/share/classes/java/awt/Component.java (at line 3509) if (!caps.isPageFlipping() && sge.isFlipStrategyPreferred(peer)) { ^^^^^^^^^^^^^^^^^^^^^^^ The method isFlipStrategyPreferred(ComponentPeer) is undefined for the type SunGraphicsEnvironment ---------- 3. ERROR in ../../../src/share/classes/java/awt/Component.java (at line 4147) private class FlipSubRegionBufferStrategy extends FlipBufferStrategy ^^^^^^^^^^^^^^^^^^^^^^^^^^^ The type Component.FlipSubRegionBufferStrategy must implement the inherited abstract method SubRegionShowable.validateAndShow(int, int, int, int) ---------- 4. ERROR in ../../../src/share/classes/java/awt/Component.java (at line 4178) private class BltSubRegionBufferStrategy extends BltBufferStrategy ^^^^^^^^^^^^^^^^^^^^^^^^^^ The type Component.BltSubRegionBufferStrategy must implement the inherited abstract method SubRegionShowable.validateAndShow(int, int, int, int) ---------- 4 problems (4 errors)make[5]: *** [.compile.classlist] Error 255 make[5]: Leaving directory `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj/jdk/make/java/awt' make[4]: *** [all] Error 1 make[4]: Leaving directory `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj/jdk/make/java' make[3]: *** [all] Error 1 make[3]: Leaving directory `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj/jdk/make' make[2]: *** [jdk-build] Error 2 make[2]: Leaving directory `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj' make[1]: *** [build_product_image] Error 2 make[1]: Leaving directory `/home/dj/icedtea6-cb463b94b82d/openjdk-ecj' make: *** [stamps/icedtea-ecj.stamp] Error 2 dj [ ~/icedtea6-cb463b94b82d ]$ I'm not sure if this was the same error I had seen earlier, but I've since scrapped that diff in favor of the one you checked in the other day. This error messages below were achieved by simply copying /opt/icedtea6-1.8.1-bin/lib/tools.jar into the previously failed build's bootstrap/jdk-1.6.0/lib directory. Options, from my admittedly limited POV are to either increase the complexity of that test, or scrap it and always build tools into the temp rt.jar (as you hinted at above). I like the second option as on a fairly modern system, this would probably only amount to a few minutes extra time, and further isolate the host JDK. Compared to the 8-10 hours on old hardware back in the 1.6.0 SCSL days, my (est.) one hour bootstrap is nothing. My fear for the first option is that the test would have to be adjusted with every change that is not completely backwards compatible from here on out (and the above errors only cover 6-1.8.1, no idea about other Oracle/Sun JDKs, open or otherwise). Of course, there is always the possibility that my System JDK is broken and this is an isolated incident. I'm also getting an error in swing/plaf, with the changes and the sun.awt.SunTookit check gone, but I should probably update to the latest snapshot before going any further (this is in 1.9 branch at the branch point). 1. ERROR in ../../../../src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java (at line 245) ((NimbusLookAndFeel) laf).shouldUpdateStyleOnEvent(event)) { ^^^^^^^^^^^^^^^^^^^^^^^^ The method shouldUpdateStyleOnEvent(PropertyChangeEvent) is undefined for the type NimbusLookAndFeel -- DJ Lucas -- This message has been scanned for viruses and dangerous content, and is believed to be clean. From aph at redhat.com Thu Aug 12 02:01:40 2010 From: aph at redhat.com (Andrew Haley) Date: Thu, 12 Aug 2010 10:01:40 +0100 Subject: Review Request: Shark In-Reply-To: <20100812085610.GA3263@redhat.com> References: <1277195726.27950.40.camel@macbook> <20100622132939.GC3420@redhat.com> <1277216100.27950.46.camel@macbook> <20100622144841.GD3420@redhat.com> <1278582298.19588.22.camel@macbook> <4C365A67.6070402@oracle.com> <1281515082.17347.16.camel@macbook> <1281516371.17347.18.camel@macbook> <20100811091010.GA3420@redhat.com> <1281519621.17347.20.camel@macbook> <20100812085610.GA3263@redhat.com> Message-ID: <4C63B874.4000307@redhat.com> On 08/12/2010 09:56 AM, Gary Benson wrote: > Christian Thalinger wrote: >> On Wed, 2010-08-11 at 10:10 +0100, Gary Benson wrote: >>> Christian Thalinger wrote: >>>> On Wed, 2010-08-11 at 10:24 +0200, Christian Thalinger wrote: >>>>> On Thu, 2010-07-08 at 16:08 -0700, Vladimir Kozlov wrote: >>>>>> Changes in our files looks fine. >>>>> >>>>> Sorry for the delay, I'll push it today. >>>> >>>> ...and it goes in as: >>>> >>>> 6976186: integrate Shark HotSpot changes >>> >>> Awesome, thanks! >> >> I needed to fix some copyright years, one copyright header >> (make/linux/makefiles/shark.make) and a couple of trailing spaces. >> It's in the JPRT queue. > > Thank you. And sorry for all the copyrights and whitespace! Handy hint for users of superior editing technology: you can solve whitespace problems forever by using: (set-variable 'show-trailing-whitespace t) :-) Andrew. From gbenson at redhat.com Thu Aug 12 02:09:43 2010 From: gbenson at redhat.com (Gary Benson) Date: Thu, 12 Aug 2010 10:09:43 +0100 Subject: Review Request: Shark In-Reply-To: <4C63B874.4000307@redhat.com> References: <1277216100.27950.46.camel@macbook> <20100622144841.GD3420@redhat.com> <1278582298.19588.22.camel@macbook> <4C365A67.6070402@oracle.com> <1281515082.17347.16.camel@macbook> <1281516371.17347.18.camel@macbook> <20100811091010.GA3420@redhat.com> <1281519621.17347.20.camel@macbook> <20100812085610.GA3263@redhat.com> <4C63B874.4000307@redhat.com> Message-ID: <20100812090942.GB3263@redhat.com> Andrew Haley wrote: > On 08/12/2010 09:56 AM, Gary Benson wrote: > > Christian Thalinger wrote: > >> On Wed, 2010-08-11 at 10:10 +0100, Gary Benson wrote: > >>> Christian Thalinger wrote: > >>>> On Wed, 2010-08-11 at 10:24 +0200, Christian Thalinger wrote: > >>>>> On Thu, 2010-07-08 at 16:08 -0700, Vladimir Kozlov wrote: > >>>>>> Changes in our files looks fine. > >>>>> > >>>>> Sorry for the delay, I'll push it today. > >>>> > >>>> ...and it goes in as: > >>>> > >>>> 6976186: integrate Shark HotSpot changes > >>> > >>> Awesome, thanks! > >> > >> I needed to fix some copyright years, one copyright header > >> (make/linux/makefiles/shark.make) and a couple of trailing spaces. > >> It's in the JPRT queue. > > > > Thank you. And sorry for all the copyrights and whitespace! > > Handy hint for users of superior editing technology: you can > solve whitespace problems forever by using: > > (set-variable 'show-trailing-whitespace t) Awesome :) Cheers, Gary -- http://gbenson.net/ From ptisnovs at redhat.com Thu Aug 12 09:27:20 2010 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 12 Aug 2010 18:27:20 +0200 Subject: Possible regression between IcedTea6-1.8 and IcedTea6-1.9 Message-ID: <4C6420E8.3090901@redhat.com> Hi all, I tried to find out why some new regression tests does not pass on the IcedTea6 HEAD and - by the way - I may have found the regression between IcedTea6 IcedTea6-1.8 and-1.9. When the following very simple test is run with option -Dsun.java2d.opengl set to True and I run it inside VNC session (ie without acceleration): import javax.swing.JPanel; public class Test extends JPanel { public Test() { } public static void main(String[] args) { Test t = new Test(); System.out.println("Test Passed."); } } It simply wrote warning message in IcedTea6-1.8: /temp/icedtea6-1.8/openjdk/build/linux-amd64/j2sdk-image/bin/java -Dsun.java2d.opengl=True Test Could not enable OpenGL pipeline for default config on screen 0 Test Passed. but it failed in IcedTea6-1.9 (and HEAD too): /temp/icedtea6-1.9/openjdk.build/j2sdk-image/bin/java -Dsun.java2d.opengl=True Test Exception in thread "main" java.lang.UnsatisfiedLinkError: sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String; at sun.java2d.opengl.OGLContext.getOGLIdString(Native Method) at sun.java2d.opengl.GLXGraphicsConfig$1.run(GLXGraphicsConfig.java:126) at sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run(OGLRenderQueue.java:220) ~ Tested on RHEL5 x86_64 in VNC session, DISPLAY is set to :2.0 (it's correct, of course). Do anyone remember that we did any changes in XRender or java2d.opengl packages between 1.8 and 1.9? PS: at least these regression tests fail due to issue mentioned above: FAILED: sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java FAILED: sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java FAILED: sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java FAILED: sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java FAILED: sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java FAILED: sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java FAILED: sun/java2d/OpenGL/DrawBufImgOp.java FAILED: sun/java2d/OpenGL/GradientPaints.java FAILED: sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java FAILED: sun/java2d/pipe/MutableColorTest/MutableColorTest.java Cheers Pavel From ahughes at redhat.com Thu Aug 12 09:45:13 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 Aug 2010 17:45:13 +0100 Subject: Possible regression between IcedTea6-1.8 and IcedTea6-1.9 In-Reply-To: <4C6420E8.3090901@redhat.com> References: <4C6420E8.3090901@redhat.com> Message-ID: <20100812164513.GN10867@rivendell.middle-earth.co.uk> On 18:27 Thu 12 Aug , Pavel Tisnovsky wrote: > Hi all, > > I tried to find out why some new regression tests does not pass on the > IcedTea6 HEAD and - by the way - I may have found the regression between > IcedTea6 IcedTea6-1.8 and-1.9. > > When the following very simple test is run with option > -Dsun.java2d.opengl set to True and I run it inside VNC session (ie > without acceleration): > > import javax.swing.JPanel; > > public class Test extends JPanel { > public Test() { > } > > public static void main(String[] args) > { > Test t = new Test(); > System.out.println("Test Passed."); > } > } > > It simply wrote warning message in IcedTea6-1.8: > > /temp/icedtea6-1.8/openjdk/build/linux-amd64/j2sdk-image/bin/java > -Dsun.java2d.opengl=True Test > Could not enable OpenGL pipeline for default config on screen 0 > Test Passed. > > but it failed in IcedTea6-1.9 (and HEAD too): > > /temp/icedtea6-1.9/openjdk.build/j2sdk-image/bin/java > -Dsun.java2d.opengl=True Test > Exception in thread "main" java.lang.UnsatisfiedLinkError: > sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String; > at sun.java2d.opengl.OGLContext.getOGLIdString(Native Method) > at > sun.java2d.opengl.GLXGraphicsConfig$1.run(GLXGraphicsConfig.java:126) > at > sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run(OGLRenderQueue.java:220) > ~ > > > Tested on RHEL5 x86_64 in VNC session, DISPLAY is set to :2.0 (it's > correct, of course). > > Do anyone remember that we did any changes in XRender or java2d.opengl > packages between 1.8 and 1.9? > > PS: at least these regression tests fail due to issue mentioned above: > FAILED: sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java > FAILED: sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java > FAILED: > sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java > FAILED: sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java > FAILED: > sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java > FAILED: sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java > FAILED: sun/java2d/OpenGL/DrawBufImgOp.java > FAILED: sun/java2d/OpenGL/GradientPaints.java > FAILED: sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java > FAILED: sun/java2d/pipe/MutableColorTest/MutableColorTest.java > > Cheers > Pavel As discussed on the mailing list, XRender was updated to the new version: http://icedtea.classpath.org/hg/release/icedtea6-1.9/rev/9da4f50c13c0 Part of this involved updating the pipeline code which XRender relies on (see the patch). Both are 7 backports. Have you checked whether the same tests fail in 7? Note: There is no 1.9 release yet. The branch was created specifically so we'd find stuff like this before release :-) -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ptisnovs at redhat.com Thu Aug 12 09:49:07 2010 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 12 Aug 2010 18:49:07 +0200 Subject: Possible regression between IcedTea6-1.8 and IcedTea6-1.9 In-Reply-To: <20100812164513.GN10867@rivendell.middle-earth.co.uk> References: <4C6420E8.3090901@redhat.com> <20100812164513.GN10867@rivendell.middle-earth.co.uk> Message-ID: <4C642603.50701@redhat.com> Dr Andrew John Hughes wrote: > On 18:27 Thu 12 Aug , Pavel Tisnovsky wrote: >> Hi all, >> >> I tried to find out why some new regression tests does not pass on the >> IcedTea6 HEAD and - by the way - I may have found the regression between >> IcedTea6 IcedTea6-1.8 and-1.9. >> >> When the following very simple test is run with option >> -Dsun.java2d.opengl set to True and I run it inside VNC session (ie >> without acceleration): >> >> import javax.swing.JPanel; >> >> public class Test extends JPanel { >> public Test() { >> } >> >> public static void main(String[] args) >> { >> Test t = new Test(); >> System.out.println("Test Passed."); >> } >> } >> >> It simply wrote warning message in IcedTea6-1.8: >> >> /temp/icedtea6-1.8/openjdk/build/linux-amd64/j2sdk-image/bin/java >> -Dsun.java2d.opengl=True Test >> Could not enable OpenGL pipeline for default config on screen 0 >> Test Passed. >> >> but it failed in IcedTea6-1.9 (and HEAD too): >> >> /temp/icedtea6-1.9/openjdk.build/j2sdk-image/bin/java >> -Dsun.java2d.opengl=True Test >> Exception in thread "main" java.lang.UnsatisfiedLinkError: >> sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String; >> at sun.java2d.opengl.OGLContext.getOGLIdString(Native Method) >> at >> sun.java2d.opengl.GLXGraphicsConfig$1.run(GLXGraphicsConfig.java:126) >> at >> sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run(OGLRenderQueue.java:220) >> ~ >> >> >> Tested on RHEL5 x86_64 in VNC session, DISPLAY is set to :2.0 (it's >> correct, of course). >> >> Do anyone remember that we did any changes in XRender or java2d.opengl >> packages between 1.8 and 1.9? >> >> PS: at least these regression tests fail due to issue mentioned above: >> FAILED: sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java >> FAILED: sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java >> FAILED: >> sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java >> FAILED: sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java >> FAILED: >> sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java >> FAILED: sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java >> FAILED: sun/java2d/OpenGL/DrawBufImgOp.java >> FAILED: sun/java2d/OpenGL/GradientPaints.java >> FAILED: sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java >> FAILED: sun/java2d/pipe/MutableColorTest/MutableColorTest.java >> >> Cheers >> Pavel Hi Andrew, thanks for comments > As discussed on the mailing list, XRender was updated to the new version: > > http://icedtea.classpath.org/hg/release/icedtea6-1.9/rev/9da4f50c13c0 > > Part of this involved updating the pipeline code which XRender relies on > (see the patch). Both are 7 backports. Have you checked whether the > same tests fail in 7? no I didn't test it in 7 yet, I'm going to try it. > > Note: There is no 1.9 release yet. The branch was created specifically > so we'd find stuff like this before release :-) yes I know I just wanted to specify which sources I've used. From ahughes at redhat.com Thu Aug 12 11:34:11 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Thu, 12 Aug 2010 19:34:11 +0100 Subject: Possible regression between IcedTea6-1.8 and IcedTea6-1.9 In-Reply-To: <4C642603.50701@redhat.com> References: <4C6420E8.3090901@redhat.com> <20100812164513.GN10867@rivendell.middle-earth.co.uk> <4C642603.50701@redhat.com> Message-ID: <20100812183411.GO10867@rivendell.middle-earth.co.uk> On 18:49 Thu 12 Aug , Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: > > On 18:27 Thu 12 Aug , Pavel Tisnovsky wrote: > >> Hi all, > >> > >> I tried to find out why some new regression tests does not pass on the > >> IcedTea6 HEAD and - by the way - I may have found the regression between > >> IcedTea6 IcedTea6-1.8 and-1.9. > >> > >> When the following very simple test is run with option > >> -Dsun.java2d.opengl set to True and I run it inside VNC session (ie > >> without acceleration): > >> > >> import javax.swing.JPanel; > >> > >> public class Test extends JPanel { > >> public Test() { > >> } > >> > >> public static void main(String[] args) > >> { > >> Test t = new Test(); > >> System.out.println("Test Passed."); > >> } > >> } > >> > >> It simply wrote warning message in IcedTea6-1.8: > >> > >> /temp/icedtea6-1.8/openjdk/build/linux-amd64/j2sdk-image/bin/java > >> -Dsun.java2d.opengl=True Test > >> Could not enable OpenGL pipeline for default config on screen 0 > >> Test Passed. > >> > >> but it failed in IcedTea6-1.9 (and HEAD too): > >> > >> /temp/icedtea6-1.9/openjdk.build/j2sdk-image/bin/java > >> -Dsun.java2d.opengl=True Test > >> Exception in thread "main" java.lang.UnsatisfiedLinkError: > >> sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String; > >> at sun.java2d.opengl.OGLContext.getOGLIdString(Native Method) > >> at > >> sun.java2d.opengl.GLXGraphicsConfig$1.run(GLXGraphicsConfig.java:126) > >> at > >> sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run(OGLRenderQueue.java:220) > >> ~ > >> > >> > >> Tested on RHEL5 x86_64 in VNC session, DISPLAY is set to :2.0 (it's > >> correct, of course). > >> > >> Do anyone remember that we did any changes in XRender or java2d.opengl > >> packages between 1.8 and 1.9? > >> > >> PS: at least these regression tests fail due to issue mentioned above: > >> FAILED: sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java > >> FAILED: sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java > >> FAILED: > >> sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java > >> FAILED: sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java > >> FAILED: > >> sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java > >> FAILED: sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java > >> FAILED: sun/java2d/OpenGL/DrawBufImgOp.java > >> FAILED: sun/java2d/OpenGL/GradientPaints.java > >> FAILED: sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java > >> FAILED: sun/java2d/pipe/MutableColorTest/MutableColorTest.java > >> > >> Cheers > >> Pavel > > Hi Andrew, > > thanks for comments > > As discussed on the mailing list, XRender was updated to the new version: > > > > http://icedtea.classpath.org/hg/release/icedtea6-1.9/rev/9da4f50c13c0 > > > > Part of this involved updating the pipeline code which XRender relies on > > (see the patch). Both are 7 backports. Have you checked whether the > > same tests fail in 7? > > no I didn't test it in 7 yet, I'm going to try it. > > > > > Note: There is no 1.9 release yet. The branch was created specifically > > so we'd find stuff like this before release :-) > yes I know I just wanted to specify which sources I've used. It's good to know you're testing it and finding bugs! -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From andrew at icedtea.classpath.org Thu Aug 12 13:13:34 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Thu, 12 Aug 2010 20:13:34 +0000 Subject: /hg/icedtea6-hg: 46 new changesets Message-ID: changeset bd5248cb292f in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=bd5248cb292f author: doko at ubuntu.com date: Wed Jul 28 14:41:56 2010 +0200 Add 1.8.1 NEWS entry. 2010-07-28 Matthias Klose * NEWS: Add 1.8.1 entry. changeset 842a42d31b3e in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=842a42d31b3e author: Deepak Bhole date: Wed Jul 28 15:20:07 2010 -0400 Fix issue that allowed unsigned applications to modify system properties. changeset 9d642dc5d6fb in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9d642dc5d6fb author: Deepak Bhole date: Wed Jul 28 15:23:50 2010 -0400 Fix issue that allowed unsigned code to use extension services without prompt. Collapse extention loaders into baseloader rather than vice-versa -- this makes it so that a loader is reported signed only if the main app is. changeset fb0ddfb8daa5 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fb0ddfb8daa5 author: Deepak Bhole date: Wed Jul 28 15:36:19 2010 -0400 Add new security dialog that prompts the user if there is mixed signed and unsigned code present. changeset acaf27f20127 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=acaf27f20127 author: Deepak Bhole date: Wed Jul 28 15:38:26 2010 -0400 Warn user if extended services are being used from unsigned code (even if the main application code is signed). changeset 39a4a1ccee06 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=39a4a1ccee06 author: Deepak Bhole date: Wed Jul 28 15:40:48 2010 -0400 Mark jar as unverified only if it is unsigned (since signed jars -- even ones with problems, and still 'verified' for contents). changeset bc4e4ad6e4b8 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=bc4e4ad6e4b8 author: Deepak Bhole date: Wed Jul 28 15:42:06 2010 -0400 Make sandbox permissions a subset of permissions returned for any code source. changeset 31d6a8239c29 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=31d6a8239c29 author: Deepak Bhole date: Wed Jul 28 15:42:55 2010 -0400 Add security descriptor mapping for nested jars. changeset f62dd7854414 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f62dd7854414 author: Deepak Bhole date: Wed Jul 28 15:52:36 2010 -0400 Track security descriptors per jar, and made permission decisions based on it. changeset cc5ebdf8e65d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=cc5ebdf8e65d author: Deepak Bhole date: Wed Jul 28 16:06:09 2010 -0400 Fix build error introduced when porting plugin changes changeset f57a0960f919 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f57a0960f919 author: doko at ubuntu.com date: Thu Jul 29 00:00:07 2010 +0200 Boring ChangeLog formatting change to limit lines to 80 columns changeset 3fdbfd1baf5e in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3fdbfd1baf5e author: Xerxes R?nby date: Thu Jul 29 13:33:33 2010 +0200 PR525: Shark made not entrant deopt sigsegv regression after bump to b20 and hs17 2010-07-29 Gary Benson PR icedtea/525: * NEWS: Updated. * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp (SharkDecacher::end_frame): Add missing fields. changeset 9e8951cefda4 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9e8951cefda4 author: Andrew John Hughes date: Tue Nov 17 17:00:32 2009 +0000 Patch the JAXWS source if getDTDType() has the wrong return type (gcj 4.3 and earlier) 2009-11-17 Andrew John Hughes * Makefile.am: Make use of JAXWS dependent on absence of javax.annotation.Resource and/or getDTDType() bug. Add new JAXWS patch. (extract-jaxws.stamp): Apply getDTDType() patch if bug found. * acinclude.m4: (IT_GETDTDTYPE_CHECK): Check for old versions of gcj/Classpath which have javax.xml.stream.events.Attribute.getDTDType() with a return type of QName not String. * configure.ac: Invoke new IT_GETDTDTYPE_CHECK macro. * patches/icedtea-jaxws-getdtdtype.patch: New patch to work around the getDTDType() bug. changeset 61d8de6ae872 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=61d8de6ae872 author: Andrew John Hughes date: Tue Nov 17 17:47:58 2009 +0000 Fix path on new JAXWS patch. 2009-11-17 Andrew John Hughes * patches/icedtea-jaxws-getdtdtype.patch: Fix path. changeset deb3e47003fb in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=deb3e47003fb author: Andrew John Hughes date: Tue Nov 17 19:49:20 2009 +0000 Add additional JAXWS gcj 4.3 fix for AttributeBase.java 2009-11-17 Andrew John Hughes * patches/icedtea-jaxws-getdtdtype.patch: Add additional fix for AttributeBase.java changeset c80c2eef6dc5 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c80c2eef6dc5 author: Andrew John Hughes date: Tue Nov 17 21:35:00 2009 +0000 Make the AttributeBase fix actually compile... 2009-11-17 Andrew John Hughes * patches/icedtea-jaxws-getdtdtype.patch: Replace getDTDType method, don't add another. * HACKING: Document the patch. changeset b0a47dfa2eb5 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b0a47dfa2eb5 author: Mark Wielaard date: Thu Jul 29 13:53:51 2010 +0200 Add workaround for calculating systemtap object_alloc probe size argument. Generating a dwarf location expression for variable * "constant" as used in the hotspot.object_alloc probe argument triggers unforseen complications. See https://bugzilla.redhat.com/show_bug.cgi?id=613824 Workaround for now by passing the size without HeapWordSize adjustment. 2010-07-29 Mark Wielaard * patches/systemtap-alloc-size-workaround.patch: New patch. * Makefile.am (ICEDTEA_PATCHES): Add new patch for ENABLE_SYSTEMTAP. * tapset/hotspot.stp.in (object_alloc): Calculate size from $arg4 and $HeapWordSize. changeset 41911a183c51 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=41911a183c51 author: Mark Wielaard date: Thu Jul 29 14:06:38 2010 +0200 Merge changeset d241c1eea54b in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d241c1eea54b author: Andrew John Hughes date: Wed Jul 28 21:15:53 2010 +0100 Add 1.7.2, 1.7.3, 1.7.4 and 1.6.3 to NEWS. 2010-07-28 Andrew John Hughes * NEWS: Add 1.7.2, 1.7.3, 1.7.4 and 1.6.3 releases. changeset d29f287d0cba in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d29f287d0cba author: Andrew John Hughes date: Thu Jul 29 17:57:12 2010 +0100 Update NEWS with current contents of b19. 2010-07-29 Andrew John Hughes * NEWS: Update with contents of b19 & b20, and fixes to NetX, Zero and Shark not on the 1.8 branch. changeset c2a106281dd6 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c2a106281dd6 author: Andrew John Hughes date: Thu Jul 29 18:03:16 2010 +0100 Mention 6961732 backport in NEWS. 2010-07-29 Andrew John Hughes * NEWS: Add 6961732 backport. changeset 1d9802df001a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1d9802df001a author: Andrew John Hughes date: Thu Jul 29 18:06:08 2010 +0100 Merge changeset ab52bc9e9ed3 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ab52bc9e9ed3 author: Jon VanAlten date: Thu Jul 29 16:07:11 2010 -0400 Backpatch S6967533 fix for pre-Epoch System class initialization * patches/openjdk/6967533-pre_epoch.patch: New file. Backpatched from jdk7 for upstream bug#6967533. Fixes IcedTea Bug#394: java.lang.ExceptionInInitializerError on systems with time set before January 1, 1970 * Makefile.am: include above patch. * NEWS: Add 6967533 backport. changeset 577c13110734 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=577c13110734 author: Omair Majid date: Thu Jul 29 16:50:32 2010 -0400 netx: minor fixes to JNLPRandomAccessFile 2010-07-29 Omair Majid * NEWS: Add this fix. * netx/javax/jnlp/JNLPRandomAccessFile.java: Extend java.io.DataInput and java.io.DataOutput. * netx/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java (XJNLPRandomAccessFile): Throw IOException on failure. changeset 58d1f80fc642 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=58d1f80fc642 author: Omair Majid date: Thu Jul 29 16:59:15 2010 -0400 netx: fix browser command in BasicService.showDocument(URL) 2010-07-29 Omair Majid * NEWS: Add this fix. * netx/net/sourceforge/jnlp/services/XBasicService.java (showDocument): Fix missing space in browser command. changeset 775503860dc5 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=775503860dc5 author: Mark Wielaard date: Fri Jul 30 12:18:43 2010 +0200 Revert duplicate icedtea-jaxws-getdtdtype.patch from bad merge 41911a183c51. patches/ecj/icedtea-jaxws-getdtdtype.patch replaced patches/icedtea- jaxws-getdtdtype.patch. The merge accidentically reintroduced the old patch and duplicated the check. changeset 4bd31caf5e07 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=4bd31caf5e07 author: Man Lung Wong date: Fri Jul 30 15:42:22 2010 -0400 Force Event Dispatch to always get created before so its contextclassloader will be set properly. Also made a minor update to reflect related bug number to a previous commit made. changeset e8dfb4f0000d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e8dfb4f0000d author: Andrew John Hughes date: Mon Aug 02 17:52:22 2010 +0100 Add a font configuration for RHEL6. 2010-07-30 Andrew John Hughes * Makefile.am: Add patch below. * patches/fonts-rhel.patch: Add a font configuration for RHEL6 (currently a copy of Fedora's). changeset fc45c67366b9 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fc45c67366b9 author: Andrew John Hughes date: Mon Aug 02 22:28:51 2010 +0100 Support a font configuration for Gentoo systems. 2010-08-02 Andrew John Hughes * Makefile.am: Add patch below. * patches/fonts-gentoo.patch: Add a font configuration for Gentoo (currently a copy of Fedora's). changeset fe41bee26224 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=fe41bee26224 author: Andrew John Hughes date: Mon Aug 02 22:34:02 2010 +0100 Update NEWS with font fixes. 2010-08-02 Andrew John Hughes * NEWS: Updated with font fixes. changeset 9da4f50c13c0 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9da4f50c13c0 author: Andrew John Hughes date: Wed Aug 04 00:46:09 2010 +0100 Backport latest XRender pipeline. 2010-08-03 Andrew John Hughes Backport latest XRender pipeline. * patches/xrender/icedtea-000.patch, * patches/xrender/icedtea-001.patch, * patches/xrender/icedtea-002.patch, * patches/xrender/icedtea-003.patch, * patches/xrender/icedtea-004.patch, * patches/xrender/icedtea-005.patch, * patches/xrender/icedtea-006.patch, * patches/xrender/icedtea-007.patch, * patches/xrender/icedtea-008.patch, * patches/xrender/icedtea-009.patch: Removed. * Makefile.am: Add new patches. * patches/ecj/javah.patch: Backported from IcedTea7 to handle issues with gjavah's generation of headers for the OpenGL pipeline. * patches/ecj/needs-6.patch: Sets source & target to 6 for awt and xawt during the bootstrap build as these now have classes containing @Override. See OpenJDK6 b20 fix for javax.swing & Nimbus. * patches/openjdk/6307603-xrender-01.patch, * patches/openjdk/6725214-direct3d-01.patch, * patches/openjdk/6961633-xrender-02.patch: Backports from OpenJDK7. The XRender fixes build heavily on changes made by 6725214 for the Direct3D pipeline. changeset 5be68dd68632 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5be68dd68632 author: Gary Benson date: Wed May 12 11:16:47 2010 +0100 LLVM 2.7 non-product fixes changeset 87f0c2edefcf in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=87f0c2edefcf author: Xerxes R?nby date: Thu Aug 05 13:45:36 2010 +0200 Updated NEWS and ChangeLog with LLVM 2.7 non-product fixes. 2010-08-05 Gary Benson * NEWS: Updated with LLVM 2.7 non-product fixes. * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Prevent LLVM headers to define DEBUG. * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp (SharkBuilder::CreateDump): Make non-product debug code LLVM 2.7 API compatible. changeset 6530d2aa9076 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6530d2aa9076 author: Andrew John Hughes date: Thu Aug 05 16:58:30 2010 +0100 D560056: Avoid failure when net.ipv6.bindv6only is set to 1. 2010-08-05 Andrew John Hughes http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560056 * Makefile.am: Add new patch. * NEWS: Add bug fix and key for bug URLs. * patches/ipv4-mapped-ipv6-addresses.patch: New patch and test case from Torsten Werner . * THANKYOU: Updated. changeset e9de4114620e in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=e9de4114620e author: Omair Majid date: Thu Aug 05 17:40:41 2010 -0400 netx: use getMethod instead of getDeclaredMethod to find main method 2010-08-05 Omair Majid * NEWS: Update with netx bugfix. * netx/net/sourceforge/jnlp/Launcher.java (launchApplication): Replace use of getDeclaredMethod with getMethod. Fixes applications that have a main-class that inherits main(String[]). changeset ad637c9154cf in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=ad637c9154cf author: Andrew John Hughes date: Fri Aug 06 00:09:35 2010 +0100 S6795060: VM crash on Linux in ICU layout library when processing \u0DDD (Sinhalese) 2010-08-05 Andrew John Hughes * Makefile.am: Add new patch. * NEWS: Updated. * patches/openjdk/6795060-icu_crash.patch: Fixes VM crash on Linux in ICU layout library when processing \u0DDD (Sinhalese) changeset cb463b94b82d in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=cb463b94b82d author: Andrew John Hughes date: Fri Aug 06 11:52:12 2010 +0100 G244901: Skip test_gamma on hardened (PaX-enabled) kernels 2010-08-06 Andrew John Hughes Fix build on PAX-enabled kernels. https://bugs.gentoo.org/244901 * Makefile.am: (ICEDTEA_PATCHES): Add test_gamma patch if PAX is enabled. (ICEDTEA_ECJ_PATCHES): Add test_gamma patch if PAX not enabled (and thus not already patched). * NEWS: Mention new bug fix. * acinclude.m4: (IT_CHECK_FOR_PAX): Check for a PaX-enabled kernel. * configure.ac: Call above macro. * patches/ecj/icedtea-hotspot.patch: Remove test_gamma segment into separate patch. * patches/ecj/no-test_gamma.patch: test_gamma patch for non- PaX-enabled kernels (i.e. bootstrap build only). * patches/no-test_gamma.patch: test_gamma patch for PaX- enabled kernels. changeset da8128c0b021 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=da8128c0b021 author: Andrew John Hughes date: Fri Aug 06 11:53:49 2010 +0100 Added tag icedtea6-1.9-branchpoint for changeset cb463b94b82d changeset a570f4fed326 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a570f4fed326 author: Andrew John Hughes date: Fri Aug 06 20:08:18 2010 +0100 Bump to 1.10. 2010-08-06 Andrew John Hughes * configure.ac: Bump to 1.10. * NEWS: Add 1.10 section. changeset b8fc04b080aa in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b8fc04b080aa author: Omair Majid date: Mon Aug 09 11:40:33 2010 -0400 netx: support JNLP spec version 1.6 2010-08-09 Omair Majid * NEWS: Update with support for 1.6 spec. * netx/net/sourceforge/jnlp/Parser.java: Add 1.6 to supportedVersions. changeset 0974e80c4a6e in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0974e80c4a6e author: Deepak Bhole date: Mon Aug 09 17:08:38 2010 -0400 Apply patch (modified from original by Andrew Hughes) to move plugin and netx classes from rt.jar into plugin.jar and netx.jar. changeset 0ba4ad0c362b in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0ba4ad0c362b author: Andrew John Hughes date: Tue Aug 10 12:11:36 2010 +0100 Remove --with-gcj-jdk and --with-openjdk, replacing with --with --jdk-home and --disable-bootstrap. 2009-07-17 Andrew John Hughes * Makefile.am: Remove use of WITH_OPENJDK and SYSTEM_GCJ_DIR replacing with BOOTSTRAPPING and SYSTEM_JDK_DIR as appropriate. * acinclude.m4: (FIND_JAVAC): Search for generic 'javac' first. (IT_FIND_ECJ): Only use ecj as javac if JAVA is unset. (IT_CHECK_ECJ): Add configure output. (IT_FIND_JAVAC): Likewise. (IT_CHECK_JAVAC): Likewise. (FIND_JAVA): Try java in SYSTEM_JDK_DIR before searching. (FIND_JAVAH): Likewise for javah. (FIND_JAR): Likewise for jar. (FIND_RMIC): Likewise for rmic. (IT_CHECK_IF_BOOTSTRAPPING): Allow bootstrapping to be disabled. Makes explicit the side-effect of --with-openjdk. (IT_CHECK_FOR_JDK): Find JDK to use. Replaces --with-gcj-jdk, and --with-openjdk. At present, only checks for gcj jdks if not bootstrapping. (AC_CHECK_FOR_OPENJDK): Removed. (AC_CHECK_FOR_GCJ_JDK): Removed. * configure.ac: Remove --with-openjdk. Always check for a JDK and then allow individual binaries to be overridden by --with-x. changeset c73c4672031a in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c73c4672031a author: Omair Majid date: Tue Aug 10 14:52:56 2010 -0400 Backport 4356282, 6954424 - OpenType font support 2010-08-09 Omair Majid * NEWS: Update with OpenType support. * Makefile.am: Apply the two new patches. * patches/openjdk/4356282-opentype.patch: Adds OpenType font support. * patches/openjdk/6954424-opentype_javadoc.patch: Fixes javadocs to mention OpenType font support. changeset 274608924880 in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=274608924880 author: Andrew John Hughes date: Thu Aug 12 19:04:54 2010 +0100 Drop patch for 6678385; applied upstream. 2010-08-12 Andrew John Hughes * patches/openjdk/6678385-window_movement_crasher.patch: Dropped, applied upstream. * Makefile.am: Remove above patch. changeset cbec424f470f in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=cbec424f470f author: Andrew John Hughes date: Thu Aug 12 19:07:43 2010 +0100 Merge changeset 2113816251fb in /hg/icedtea6-hg details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2113816251fb author: Andrew John Hughes date: Thu Aug 12 21:13:14 2010 +0100 2010-08-12 Andrew John Hughes * patches/openjdk/4356282-opentype.patch, * patches/openjdk/6795060-icu_crash.patch, * patches/openjdk/6954424-opentype_javadoc.patch: Dropped, applied upstream. * Makefile.am: Remove above patches. diffstat: 57 files changed, 61651 insertions(+), 14863 deletions(-) .hgtags | 1 ChangeLog | 538 HACKING | 1 Makefile.am | 221 NEWS | 926 THANKYOU | 1 acinclude.m4 | 244 configure.ac | 36 netx/javax/jnlp/JNLPRandomAccessFile.java | 2 netx/net/sourceforge/jnlp/Launcher.java | 9 netx/net/sourceforge/jnlp/Parser.java | 2 netx/net/sourceforge/jnlp/SecurityDesc.java | 63 netx/net/sourceforge/jnlp/resources/Messages.properties | 2 netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 35 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 133 netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | 98 netx/net/sourceforge/jnlp/security/NotAllSignedWarningPane.java | 120 netx/net/sourceforge/jnlp/security/SecurityDialogPanel.java | 7 netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java | 31 netx/net/sourceforge/jnlp/services/ServiceUtil.java | 58 netx/net/sourceforge/jnlp/services/XBasicService.java | 2 netx/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java | 11 netx/net/sourceforge/jnlp/tools/JarSigner.java | 32 patches/ecj/icedtea-hotspot.patch | 46 patches/ecj/javah.patch | 92 patches/ecj/needs-6.patch | 24 patches/ecj/no-test_gamma.patch | 46 patches/extensions/liveconnect-dist.patch | 76 patches/extensions/netx-dist.patch | 86 patches/fonts-gentoo.patch | 406 patches/fonts-rhel.patch | 393 patches/icedtea-jtreg-jrunscript.patch | 12 patches/icedtea-rhino.patch | 10 patches/ipv4-mapped-ipv6-addresses.patch | 171 patches/no-test_gamma.patch | 46 patches/openjdk/6307603-xrender-01.patch | 9013 + patches/openjdk/6678385-window_movement_crasher.patch | 1241 patches/openjdk/6725214-direct3d-01.patch |49210 ++++++++++ patches/openjdk/6961633-xrender-02.patch | 44 patches/openjdk/6961732-negative_leading.patch | 45 patches/openjdk/6967533-pre_epoch.patch | 57 patches/systemtap-alloc-size-workaround.patch | 17 patches/update-bootclasspath.patch | 13 patches/xrender/icedtea-000.patch | 426 patches/xrender/icedtea-001.patch | 5320 - patches/xrender/icedtea-002.patch | 5199 - patches/xrender/icedtea-003.patch | 78 patches/xrender/icedtea-004.patch | 86 patches/xrender/icedtea-005.patch | 18 patches/xrender/icedtea-006.patch | 295 patches/xrender/icedtea-007.patch | 1143 patches/xrender/icedtea-008.patch | 131 patches/xrender/icedtea-009.patch | 170 ports/hotspot/src/share/vm/shark/llvmHeaders.hpp | 15 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 8 ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 2 tapset/hotspot.stp.in | 2 diffs (truncated from 77735 to 500 lines): diff -r dd4d9f50ac7c -r 2113816251fb .hgtags --- a/.hgtags Mon Jul 26 09:38:47 2010 +0100 +++ b/.hgtags Thu Aug 12 21:13:14 2010 +0100 @@ -18,3 +18,4 @@ 9420faca6468e1c75e9bfa73b31246ba0b73a77d 9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea-1.6-branchpoint 8826d5735e2ca97ecdb35e7c977785d3e5b99556 icedtea-1.7-branchpoint 9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea6-1.8-branchpoint +cb463b94b82da269ea089c481ed5e39700525a8a icedtea6-1.9-branchpoint diff -r dd4d9f50ac7c -r 2113816251fb ChangeLog --- a/ChangeLog Mon Jul 26 09:38:47 2010 +0100 +++ b/ChangeLog Thu Aug 12 21:13:14 2010 +0100 @@ -1,3 +1,378 @@ 2010-07-26 Andrew John Hughes + + * patches/openjdk/4356282-opentype.patch, + * patches/openjdk/6795060-icu_crash.patch, + * patches/openjdk/6954424-opentype_javadoc.patch: + Dropped, applied upstream. + * Makefile.am: + Remove above patches. + +2010-08-12 Andrew John Hughes + + * patches/openjdk/6678385-window_movement_crasher.patch: + Dropped, applied upstream. + * Makefile.am: + Remove above patch. + +2010-08-09 Omair Majid + + * NEWS: Update with OpenType support. + * Makefile.am: Apply the two new patches. + * patches/openjdk/4356282-opentype.patch: Adds OpenType font support. + * patches/openjdk/6954424-opentype_javadoc.patch: Fixes javadocs to + mention OpenType font support. + +2009-07-17 Andrew John Hughes + + * Makefile.am: + Remove use of WITH_OPENJDK and SYSTEM_GCJ_DIR + replacing with BOOTSTRAPPING and SYSTEM_JDK_DIR + as appropriate. + * acinclude.m4: + (FIND_JAVAC): Search for generic 'javac' first. + (IT_FIND_ECJ): Only use ecj as javac if JAVA is unset. + (IT_CHECK_ECJ): Add configure output. + (IT_FIND_JAVAC): Likewise. + (IT_CHECK_JAVAC): Likewise. + (FIND_JAVA): Try java in SYSTEM_JDK_DIR before searching. + (FIND_JAVAH): Likewise for javah. + (FIND_JAR): Likewise for jar. + (FIND_RMIC): Likewise for rmic. + (IT_CHECK_IF_BOOTSTRAPPING): Allow bootstrapping to be disabled. + Makes explicit the side-effect of --with-openjdk. + (IT_CHECK_FOR_JDK): Find JDK to use. Replaces --with-gcj-jdk, + and --with-openjdk. At present, only checks for gcj jdks if + not bootstrapping. + (AC_CHECK_FOR_OPENJDK): Removed. + (AC_CHECK_FOR_GCJ_JDK): Removed. + * configure.ac: + Remove --with-openjdk. Always check for a JDK and then allow + individual binaries to be overridden by --with-x. + +2010-08-09 Deepak Bhole + + * Makefile.am: + (icedtea):Add update-bootclasspath.patch. + dependencies and copying. Add icedtea-update-bootclasspath.patch. + * patches/update-bootclasspath.patch: New patch. Adds netx, + rhino and plugin jars to the bootclasspath. + +2010-08-09 Andrew John Hughes + + Produce separate JAR files for NetX and the + plugin (netx.jar and plugin.jar) rather than + integrating their code into rt.jar. + * patches/extensions/liveconnect-dist.patch, + * patches/extensions/netx-dist.patch: + Remove unneeded patches to OpenJDK build to + integrate NetX and the plugin's Java code. + * Makefile.am: + (ICEDTEA_ENV): Drop ALT_NETX_DIST and + ALT_LIVECONNECT_DIST. + (.PHONY): Add new clean targets. + (icedtea): Remove unneeded NetX and plugin + dependencies and copying. + (icedtea-debug): Likewise. + (icedtea-against-icedtea): Depend on add-plugin + and add-netx. + (clean-icedtea-against-icedtea): Depend on clean-add-netx + and clean-add-plugin. + (icedtea-debug-against-icedtea): Depend on add-plugin-debug + and add-netx-debug. + (clean-icedtea-debug-against-icedtea): Depend on clean-add-netx-debug + and clean-add-plugin-debug. + (add-plugin): Copy the plugin library and jar file into the jdk images. + (clean-add-plugin): Revert add-plugin. + (add-plugin-debug): Equivalent of add-plugin for the debug build. + (clean-add-plugin-debug): Revert add-plugin-debug. + (add-netx): Copy the NetX jar file, about.jnlp and about.jar into the + jdk images. + (clean-add-netx): Revert add-netx. + (add-netx-debug): Equivalent of add-netx for the debug build. + (clean-add-netx-debug): Revert add-netx-debug. + (icedtea-ecj): Remove plugin and NetX dependencies. + +2010-08-09 Omair Majid + + * NEWS: Update with support for JNLP spec 1.6 + * net/sourceforge/jnlp/Parser.java: Add 1.6 to supportedVersions. + +2010-08-06 Andrew John Hughes + + * configure.ac: Bump to 1.10. + * NEWS: Add 1.10 section. + +2010-08-06 Andrew John Hughes + + Fix build on PAX-enabled kernels. + https://bugs.gentoo.org/244901 + * Makefile.am: + (ICEDTEA_PATCHES): Add test_gamma patch + if PAX is enabled. + (ICEDTEA_ECJ_PATCHES): Add test_gamma patch + if PAX not enabled (and thus not already patched). + * NEWS: Mention new bug fix. + * acinclude.m4: + (IT_CHECK_FOR_PAX): Check for a PaX-enabled kernel. + * configure.ac: Call above macro. + * patches/ecj/icedtea-hotspot.patch: Remove + test_gamma segment into separate patch. + * patches/ecj/no-test_gamma.patch: test_gamma + patch for non-PaX-enabled kernels (i.e. bootstrap + build only). + * patches/no-test_gamma.patch: test_gamma patch + for PaX-enabled kernels. + +2010-08-05 Andrew John Hughes + + * Makefile.am: Add new patch. + * NEWS: Updated. + * patches/openjdk/6795060-icu_crash.patch: + Fixes VM crash on Linux in ICU layout library + when processing \u0DDD (Sinhalese) + +2010-08-05 Omair Majid + + * NEWS: Update with netx bugfix. + * netx/net/sourceforge/jnlp/Launcher.java + (launchApplication): Replace use of getDeclaredMethod with + getMethod. Fixes applications that have a main-class that + inherits main(String[]). + +2010-08-05 Andrew John Hughes + + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560056 + * Makefile.am: Add new patch. + * NEWS: Add bug fix and key for bug URLs. + * patches/ipv4-mapped-ipv6-addresses.patch: + New patch and test case from Torsten Werner + . + * THANKYOU: Updated. + +2010-08-05 Gary Benson + + * NEWS: Updated with LLVM 2.7 non-product fixes. + * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: + Prevent LLVM headers to define DEBUG. + * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp + (SharkBuilder::CreateDump): Make non-product debug code + LLVM 2.7 API compatible. + +2010-08-03 Andrew John Hughes + + Backport latest XRender pipeline. + * patches/xrender/icedtea-000.patch, + * patches/xrender/icedtea-001.patch, + * patches/xrender/icedtea-002.patch, + * patches/xrender/icedtea-003.patch, + * patches/xrender/icedtea-004.patch, + * patches/xrender/icedtea-005.patch, + * patches/xrender/icedtea-006.patch, + * patches/xrender/icedtea-007.patch, + * patches/xrender/icedtea-008.patch, + * patches/xrender/icedtea-009.patch: + Removed. + * Makefile.am: Add new patches. + * patches/ecj/javah.patch: + Backported from IcedTea7 to handle issues + with gjavah's generation of headers for the + OpenGL pipeline. + * patches/ecj/needs-6.patch: + Sets source & target to 6 for awt and xawt + during the bootstrap build as these now + have classes containing @Override. See + OpenJDK6 b20 fix for javax.swing & Nimbus. + * patches/openjdk/6307603-xrender-01.patch, + * patches/openjdk/6725214-direct3d-01.patch, + * patches/openjdk/6961633-xrender-02.patch: + Backports from OpenJDK7. The XRender fixes + build heavily on changes made by 6725214 for + the Direct3D pipeline. + +2010-08-02 Andrew John Hughes + + * NEWS: Updated with font fixes. + +2010-08-02 Andrew John Hughes + + http://bugs.gentoo.org/show_bug.cgi?id=266295: + * Makefile.am: Add patch below. + * patches/fonts-gentoo.patch: + Add a font configuration for Gentoo + (currently a copy of Fedora's). + +2010-07-30 Andrew John Hughes + + * Makefile.am: Add patch below. + * patches/fonts-rhel.patch: + Add a font configuration for RHEL6 + (currently a copy of Fedora's). + +2010-07-30 Man Lung Wong + + * netx/net/sourceforge/jnlp/Launcher.java + (launchApplication): Make sure an Event Dispatch Thread + is created before contextclassloader gets set. + * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java + (ContextUpdater): Removed it as it is no longer useful after + the above change. + (checkTopLevelWindow): Removed the line that adds + ContextUpdater as it no longer exists. + * NEWS: This fixes one of the problems launching the link + mentioned in icedtea bug 486. + +2010-07-29 Omair Majid + + * NEWS: Add this fix. + * netx/net/sourceforge/jnlp/services/XBasicService.java + (showDocument): Fix missing space in browser command. + +2010-07-29 Omair Majid + + * NEWS: Add this fix. + * netx/javax/jnlp/JNLPRandomAccessFile.java: Extend java.io.DataInput and + java.io.DataOutput. + * netx/net/sourceforge/jnlp/services/XJNLPRandomAccessFile.java + (XJNLPRandomAccessFile): Throw IOException on failure. + +2010-07-29 Jon VanAlten + + * patches/openjdk/6967533-pre_epoch.patch: New file. Backpatched from + jdk7 for upstream bug#6967533. Fixes IcedTea Bug#394: + java.lang.ExceptionInInitializerError on systems with + time set before January 1, 1970 + * Makefile.am: include above patch. + * NEWS: Add 6967533 backport. + +2010-07-29 Andrew John Hughes + + * NEWS: Add 6961732 backport. + +2010-07-29 Andrew John Hughes + + * NEWS: Update with contents of b19 & b20, + and fixes to NetX, Zero and Shark not on + the 1.8 branch. + +2010-07-29 Mark Wielaard + + * patches/systemtap-alloc-size-workaround.patch: New patch. + * Makefile.am (ICEDTEA_PATCHES): Add new patch for ENABLE_SYSTEMTAP. + * tapset/hotspot.stp.in (object_alloc): Calculate size from + $arg4 and $HeapWordSize. + +2010-07-29 Gary Benson + + PR icedtea/525: + * NEWS: Updated. + * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp + (SharkDecacher::end_frame): Add missing fields. + +2010-07-28 Andrew John Hughes + + * NEWS: Add 1.7.2, 1.7.3, 1.7.4 and 1.6.3 + releases. + +2010-07-28 Deepak Bhole + + * netx/net/sourceforge/jnlp/security/NotAllSignedWarningPane.java + (addComponents): Fix erroneous line that got added when backporting. + +2010-07-28 Deepak Bhole + + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Added a new + HashMap to map source locations to security descriptors for that + location. + (getInstance): Use the new merge() method to merge loader data. + (initializeResources): Add map entries to the new + jarLocationSecurityMap. + (getPermissions): Decide permissions based on security descriptor + associated with the calling code, rather than with the jnlp file. + (getCodeSourceSecurity): New method. Returns the security descriptor + associated with the given code source URL. + (merge): New method. Merges loader classpaths, native dir paths, and + security descriptor mappings. + +2010-07-28 Deepak Bhole + + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (activateJars): + Add security descriptor mapping for nested jars. + +2010-07-28 Deepak Bhole + + * netx/net/sourceforge/jnlp/SecurityDesc.java (getPermissions): Clean + up method, and make sure sandbox permissions are always a subset of + what is returned. + +2010-07-28 Deepak Bhole + + * netx/net/sourceforge/jnlp/tools/JarSigner.java: Add new verifyResult + enum to track verification status. + (verifyJars): Mark jar unverified only if it has no signature. + (verifyJar): Use new verifyResult enum to return status based on if jar + is unsigned, signed but with errors, or signed and ok. + +2010-07-28 Deepak Bhole + + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (getInstance): + Collapse new loader paths into base loader. + * netx/net/sourceforge/jnlp/services/ServiceUtil.java (checkAccess): + Check if calling code is trusted all the way to the end. If it isn't, + prompt user. + +2010-07-28 Deepak Bhole + + * netx/net/sourceforge/jnlp/resources/Messages.properties: Add new + strings. + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (getInstance): + Prompt user if the main app code is signed, but the extentions aren't. + (initializeResources): Prompt user if there are any unsigned jars mixed + with signed jars. + * netx/net/sourceforge/jnlp/security/NotAllSignedWarningPane.java: New + file. Dialog shown to user if the main app code is signed but the + extentions aren't. + * netx/net/sourceforge/jnlp/security/SecurityDialogUI.java + (SecurityDialogUI): Add a constructor that doesn't take a CertVerifier + object. + * netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java: Added + dialog and accesstype enum elements for a 'Not all jars signed' case. + (showNotAllSignedWarningDialog): New function. Prompts the user if the + main app code is signed but the extentions aren't. + (createDialog): Wire in the 'Not all jars signed' case. + (updateUI): Same. + * netx/net/sourceforge/jnlp/tools/JarSigner.java (allJarsSigned): New + function. Returns if there are any unsigned jars. + +2010-07-28 Deepak Bhole + + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (getInstance): + Collapse extention loaders into baseloader rather than vice-verse. + +2010-07-28 Deepak Bhole + + * netx/net/sourceforge/jnlp/SecurityDesc.java: Converge all property + permission settings info a single class. + (getPermissions): Do not give read/write permissions to anything other + than what is allowed by spec. + (getSandBoxPermissions): Same. + * netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java: Remove + blanket imports. + (installEnvironment): Write properties in a restricted + AccessControlContext based on app specific permissions only. + * netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java + (checkPermission): Remove all property permission decision making code + and collapse it all into SecurityDesc.java. + +2010-07-28 Matthias Klose + + * NEWS: Add 1.8.1 entry. + +2010-07-26 Andrew John Hughes + + * patches/icedtea-jtreg-jrunscript.patch: + Regenerate after 50002bfcff96 from dcubed being + added to OpenJDK6. + 2010-07-26 Andrew John Hughes * README: Updated for HEAD using IcedTea7 version. @@ -179,8 +554,8 @@ 2010-07-23 Andrew John Hughes - * netx/net/sourceforge/jnlp/Parser.java: Undo changes from 98c88b32cdb4 to - Parser.java, since they could cause potential regressions. + * netx/net/sourceforge/jnlp/Parser.java: Undo changes from 98c88b32cdb4 + to Parser.java, since they could cause potential regressions. 2010-07-20 Man Lung Wong @@ -210,8 +585,8 @@ 2010-07-20 Omair Majid @@ -224,23 +599,23 @@ 2010-07-19 Omair Majid References: <20100810111600.GF27843@rivendell.middle-earth.co.uk> <4C6234EC.7020809@linuxfromscratch.org> <20100811181112.GL10867@rivendell.middle-earth.co.uk> <4C633B7F.3080101@linuxfromscratch.org> Message-ID: <4C6484B8.6090007@linuxfromscratch.org> On 08/11/2010 07:08 PM, DJ Lucas wrote: > > 1. ERROR in > ../../../../src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java > (at line 245) > ((NimbusLookAndFeel) laf).shouldUpdateStyleOnEvent(event)) { > ^^^^^^^^^^^^^^^^^^^^^^^^ > The method shouldUpdateStyleOnEvent(PropertyChangeEvent) is undefined > for the type NimbusLookAndFeel > The correct fix is to include $(SHARE)/javax/swing/plaf in ICEDTEA_BOOTSTRAP_DIRS (as I am still using the 1.8.1 nimbus classes in this particular case). Again, given the larger target of possible system JDKs, I wonder if it would be best to build rt.jar from scratch rather than copying from the system version and updating selectively (for similar reason to rebuilding tools.jar unconditionally as mentioned earlier in this thread). Anyway, that minimal change (along with rebuilding tools.jar) is enough to get to through the classes with 1.8.1 (both are covered in the attached patch) but I've no idea if more updates are required for 1.7.x or 1.8.0, or even how far back should be 'supported'. Keep in mind that this is on the 1.9 branch, but should apply to 1.10 as there haven't been that many changes yet. The other option is to update tools.jar as is done with rt now, but I see that getting to be a nightmare to manage unless you require a minimum version of OpenJDK (and Oracle/Sun JDK if intended to be supported). My next error is from gcc, and is a known issue: /usr/bin/gcc -O2 -fno-strict-aliasing -fPIC -W -Wall -Wno-unused -Wno-parentheses -fno-omit-frame-pointer -D_LITTLE_ENDIAN -g -DARCH='"i586"' -Di586 -DLINUX -DRELEASE='"1.6.0_20"' -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -I. -I/home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/CClassHeaders -I../../../src/solaris/javavm/export -I../../../src/share/javavm/export -I../../../src/share/javavm/include -I../../../src/solaris/javavm/include -I../../../src/share/native/common -I../../../src/solaris/native/common -I../../../src/share/native/sun/awt/X11 -I../../../src/solaris/native/sun/awt/X11 -I/usr/include -DXAWT -DXAWT_HACK -I/home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/../../sun.awt/awt/CClassHeaders -I../../../src/solaris/native/sun/awt -I../../../src/solaris/native/sun/xawt -I../../../src/solaris/native/sun/jdga -I../../../src/share/native/sun/awt/debug -I../../../src/share/native/sun/awt/image/cvutils -I../../../src/share/native/sun/java2d -I../../../src/share/native/sun/java2d/loops -I../../../src/share/native/sun/awt/image/cvutils -I../../../src/share/native/sun/awt/image -I../../../src/share/native/sun/font -I../../../src/solaris/native/sun/java2d -I../../../src/share/native/sun/java2d/pipe -I../../../src/share/native/sun/java2d/opengl -I../../../src/solaris/native/sun/java2d/opengl -I../../../src/solaris/native/sun/java2d/x11 -I../../../src/share/native/sun/dc/path -I../../../src/share/native/sun/dc/doe -I../../../src/share/native/sun/awt/alphacomposite -I../../../src/share/native/sun/awt/medialib -I../../../src/solaris/native/sun/awt/medialib -I../../../src/solaris/native/sun/font -I../../../src/share/native/sun/awt -I../../../src/solaris/native/sun/awt -I/usr/X11R6/include/X11/extensions -I/usr/include/X11/extensions -I/usr/include -I/usr/X11R6/include -c -o /home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/obj/OGLContext.o ../../../src/share/native/sun/java2d/opengl/OGLContext.c ../../../src/share/native/sun/java2d/opengl/OGLContext.c: In function ?OGLContext_GetExtensionInfo?: ../../../src/share/native/sun/java2d/opengl/OGLContext.c:872: error: ?sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_TEXRECT? undeclared (first use in this function) ../../../src/share/native/sun/java2d/opengl/OGLContext.c:872: error: (Each undeclared identifier is reported only once ../../../src/share/native/sun/java2d/opengl/OGLContext.c:872: error: for each function it appears in.) ../../../src/share/native/sun/java2d/opengl/OGLContext.c:875: error: ?sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_FBOBJECT? undeclared (first use in this function) ../../../src/share/native/sun/java2d/opengl/OGLContext.c:878: error: ?sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_LCD_SHADER? undeclared (first use in this function) ../../../src/share/native/sun/java2d/opengl/OGLContext.c:881: error: ?sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_BIOP_SHADER? undeclared (first use in this function) ../../../src/share/native/sun/java2d/opengl/OGLContext.c:884: error: ?sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_GRAD_SHADER? undeclared (first use in this function) /usr/bin/gcc -O2 -fno-strict-aliasing -fPIC -W -Wall -Wno-unused -Wno-parentheses -fno-omit-frame-pointer -D_LITTLE_ENDIAN -g -DARCH='"i586"' -Di586 -DLINUX -DRELEASE='"1.6.0_20"' -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -I. -I/home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/CClassHeaders -I../../../src/solaris/javavm/export -I../../../src/share/javavm/export -I../../../src/share/javavm/include -I../../../src/solaris/javavm/include -I../../../src/share/native/common -I../../../src/solaris/native/common -I../../../src/share/native/sun/awt/X11 -I../../../src/solaris/native/sun/awt/X11 -I/usr/include -DXAWT -DXAWT_HACK -I/home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/../../sun.awt/awt/CClassHeaders -I../../../src/solaris/native/sun/awt -I../../../src/solaris/native/sun/xawt -I../../../src/solaris/native/sun/jdga -I../../../src/share/native/sun/awt/debug -I../../../src/share/native/sun/awt/image/cvutils -I../../../src/share/native/sun/java2d -I../../../src/share/native/sun/java2d/loops -I../../../src/share/native/sun/awt/image/cvutils -I../../../src/share/native/sun/awt/image -I../../../src/share/native/sun/font -I../../../src/solaris/native/sun/java2d -I../../../src/share/native/sun/java2d/pipe -I../../../src/share/native/sun/java2d/opengl -I../../../src/solaris/native/sun/java2d/opengl -I../../../src/solaris/native/sun/java2d/x11 -I../../../src/share/native/sun/dc/path -I../../../src/share/native/sun/dc/doe -I../../../src/share/native/sun/awt/alphacomposite -I../../../src/share/native/sun/awt/medialib -I../../../src/solaris/native/sun/awt/medialib -I../../../src/solaris/native/sun/font -I../../../src/share/native/sun/awt -I../../../src/solaris/native/sun/awt -I/usr/X11R6/include/X11/extensions -I/usr/include/X11/extensions -I/usr/include -I/usr/X11R6/include -c -o /home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/obj/OGLFuncs.o ../../../src/share/native/sun/java2d/opengl/OGLFuncs.c ../../../src/share/native/sun/java2d/opengl/OGLContext.c: In function ?Java_sun_java2d_opengl_OGLContext_getOGLIdString?: ../../../src/share/native/sun/java2d/opengl/OGLContext.c:1051: warning: implicit declaration of function ?jio_snprintf? make[6]: *** [/home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/obj/OGLContext.o] Error 1 make[6]: *** Waiting for unfinished jobs.... make[6]: Leaving directory `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj/jdk/make/sun/xawt' make[5]: *** [library_parallel_compile] Error 2 make[5]: Leaving directory `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj/jdk/make/sun/xawt' make[4]: *** [all] Error 1 make[4]: Leaving directory `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj/jdk/make/sun' make[3]: *** [all] Error 1 make[3]: Leaving directory `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj/jdk/make' make[2]: *** [jdk-build] Error 2 make[2]: Leaving directory `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj' make[1]: *** [build_product_image] Error 2 make[1]: Leaving directory `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj' make: *** [stamps/icedtea-ecj.stamp] Error 2 See http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-October/007339.html I'll have to wrap the additional hunk in an ifndef (or probably better, apply the responsible patch conditionally), but I'll get back to that over the weekend (again, if somebody doesn't beat me to it first). I hope some of my observations are useful. -- DJ Lucas -- This message has been scanned for viruses and dangerous content, and is believed to be clean. -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: icedtea6-1.9-build_with_1.8.1-2.patch Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100812/19838725/icedtea6-1.9-build_with_1.8.1-2.patch From ahughes at redhat.com Thu Aug 12 17:41:37 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 13 Aug 2010 01:41:37 +0100 Subject: For users of --with-openjdk In-Reply-To: <4C6484B8.6090007@linuxfromscratch.org> References: <20100810111600.GF27843@rivendell.middle-earth.co.uk> <4C6234EC.7020809@linuxfromscratch.org> <20100811181112.GL10867@rivendell.middle-earth.co.uk> <4C633B7F.3080101@linuxfromscratch.org> <4C6484B8.6090007@linuxfromscratch.org> Message-ID: <20100813004137.GP10867@rivendell.middle-earth.co.uk> On 18:33 Thu 12 Aug , DJ Lucas wrote: > On 08/11/2010 07:08 PM, DJ Lucas wrote: > > > With regard to your previous e-mail, I think you're right that the sun.awt.Toolkit fix is insufficent. It was the result of only considering the two existing configurations; gcj+bootstrap, icedtea+no-bootstrap, with the intent of speeding up the no-bootstrap case. In the no-bootstrap case, the built rt files aren't used so it was a waste of time building them. So instead of removing the conditional altogether, I'd go for changing it to a BOOTSTRAPPING conditional. Bootstrapping is the default so if you choose to turn it off you should know what you're doing in making the tradeoff of safety for speed. If your system JDK is so old it needs some bootstrap classes, then you should be using bootstrap mode. As I say, it won't use the built classes anyway as it uses the system JDK directly. I gather you understand the safety issues with disabling it and that's why you want to do a full build with IcedTea. > > 1. ERROR in > > ../../../../src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java > > (at line 245) > > ((NimbusLookAndFeel) laf).shouldUpdateStyleOnEvent(event)) { > > ^^^^^^^^^^^^^^^^^^^^^^^^ > > The method shouldUpdateStyleOnEvent(PropertyChangeEvent) is undefined > > for the type NimbusLookAndFeel > > > > The correct fix is to include $(SHARE)/javax/swing/plaf in > ICEDTEA_BOOTSTRAP_DIRS (as I am still using the 1.8.1 nimbus classes in > this particular case). Again, given the larger target of possible > system JDKs, I wonder if it would be best to build rt.jar from scratch > rather than copying from the system version and updating selectively > (for similar reason to rebuilding tools.jar unconditionally as mentioned > earlier in this thread). I've been thinking about this a bit. It's quite a weird one. The failure is due to a hack needed for backporting Nimbus to JDK6. The SynthLookAndFeel class has to know about a possible subclass, NimbusLookAndFeel, because we can't add the needed method to the appropriate interface/superclass, as was done in 7. So the synth look and feel now depends on the nimbus one being built before. In 1.8.1, you have an older version of NimbusLookAndFeel which is what causes the complaint. In icedtea-no-bootstrap mode (and straight OpenJDK builds), we fixed this by building Nimbus first. However, gcj can't generate Nimbus; so in bootstrap mode, you'll see that we pass DISABLE_NIMBUS=true in the Makefile and the files are instead compiled from pre-generated versions in the rt.stamp stage. I'm guessing this doesn't work for the icedtea-bootstrap mode because it doesn't pull in as many classes to rebuild as gcj does (presumably because Sun classes which are built when using gcj are found in rt.jar when using IcedTea). Your fix seems correct, though for IcedTea, removing the DISABLE_NIMBUS line would also work. I don't think we should rebuild everything for a new rt.jar. Not only would it take longer, but something would probably fail if core classes like String are being rebuilt. Anyway, that minimal change (along with > rebuilding tools.jar) is enough to get to through the classes with 1.8.1 > (both are covered in the attached patch) but I've no idea if more > updates are required for 1.7.x or 1.8.0, or even how far back should be > 'supported'. Keep in mind that this is on the 1.9 branch, but should > apply to 1.10 as there haven't been that many changes yet. The other > option is to update tools.jar as is done with rt now, but I see that > getting to be a nightmare to manage unless you require a minimum version > of OpenJDK (and Oracle/Sun JDK if intended to be supported). > The aim is to support icedtea-bootstrap mode with 1.10. I won't be backporting such major build changes to older versions (that's why I waited for 1.9 to fork). You are of course welcome to patch it locally, and it sounds like you have 1.8 nearly there. It should be a slightly easier task as you only have to work about icedtea-bootstrap mode working and not breaking the other two :-) When 1.10 is out, you can then drop the patches. The issue below is due to the Xrender update that went into 1.9 last week before the branch. gjavah produces different output to Oracle's javah so we have to patch the code to work with it in patches/ecj/javah.patch. This is currently applied unconditionally and I need to look at this issue in more detail before we can have a test in configure to determine whether to patch or not. For now, you can build 1.9 by dropping ecj/javah.patch from the Makefile.am. The issue shouldn't occur with 1.8 as it doesn't have the OpenGL changes or the javah patch. > My next error is from gcc, and is a known issue: > > /usr/bin/gcc -O2 -fno-strict-aliasing -fPIC -W -Wall -Wno-unused > -Wno-parentheses -fno-omit-frame-pointer -D_LITTLE_ENDIAN -g > -DARCH='"i586"' -Di586 -DLINUX -DRELEASE='"1.6.0_20"' > -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -I. > -I/home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/CClassHeaders > -I../../../src/solaris/javavm/export -I../../../src/share/javavm/export > -I../../../src/share/javavm/include > -I../../../src/solaris/javavm/include -I../../../src/share/native/common > -I../../../src/solaris/native/common > -I../../../src/share/native/sun/awt/X11 > -I../../../src/solaris/native/sun/awt/X11 -I/usr/include -DXAWT > -DXAWT_HACK > -I/home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/../../sun.awt/awt/CClassHeaders > -I../../../src/solaris/native/sun/awt > -I../../../src/solaris/native/sun/xawt > -I../../../src/solaris/native/sun/jdga > -I../../../src/share/native/sun/awt/debug > -I../../../src/share/native/sun/awt/image/cvutils > -I../../../src/share/native/sun/java2d > -I../../../src/share/native/sun/java2d/loops > -I../../../src/share/native/sun/awt/image/cvutils > -I../../../src/share/native/sun/awt/image > -I../../../src/share/native/sun/font > -I../../../src/solaris/native/sun/java2d > -I../../../src/share/native/sun/java2d/pipe > -I../../../src/share/native/sun/java2d/opengl > -I../../../src/solaris/native/sun/java2d/opengl > -I../../../src/solaris/native/sun/java2d/x11 > -I../../../src/share/native/sun/dc/path > -I../../../src/share/native/sun/dc/doe > -I../../../src/share/native/sun/awt/alphacomposite > -I../../../src/share/native/sun/awt/medialib > -I../../../src/solaris/native/sun/awt/medialib > -I../../../src/solaris/native/sun/font > -I../../../src/share/native/sun/awt > -I../../../src/solaris/native/sun/awt > -I/usr/X11R6/include/X11/extensions -I/usr/include/X11/extensions > -I/usr/include -I/usr/X11R6/include -c -o > /home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/obj/OGLContext.o > ../../../src/share/native/sun/java2d/opengl/OGLContext.c > ../../../src/share/native/sun/java2d/opengl/OGLContext.c: In function > ?OGLContext_GetExtensionInfo?: > ../../../src/share/native/sun/java2d/opengl/OGLContext.c:872: error: > ?sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_TEXRECT? > undeclared (first use in this function) > ../../../src/share/native/sun/java2d/opengl/OGLContext.c:872: error: > (Each undeclared identifier is reported only once > ../../../src/share/native/sun/java2d/opengl/OGLContext.c:872: error: for > each function it appears in.) > ../../../src/share/native/sun/java2d/opengl/OGLContext.c:875: error: > ?sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_FBOBJECT? > undeclared (first use in this function) > ../../../src/share/native/sun/java2d/opengl/OGLContext.c:878: error: > ?sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_LCD_SHADER? > undeclared (first use in this function) > ../../../src/share/native/sun/java2d/opengl/OGLContext.c:881: error: > ?sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_BIOP_SHADER? > undeclared (first use in this function) > ../../../src/share/native/sun/java2d/opengl/OGLContext.c:884: error: > ?sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_GRAD_SHADER? > undeclared (first use in this function) > /usr/bin/gcc -O2 -fno-strict-aliasing -fPIC -W -Wall -Wno-unused > -Wno-parentheses -fno-omit-frame-pointer -D_LITTLE_ENDIAN -g > -DARCH='"i586"' -Di586 -DLINUX -DRELEASE='"1.6.0_20"' > -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT -I. > -I/home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/CClassHeaders > -I../../../src/solaris/javavm/export -I../../../src/share/javavm/export > -I../../../src/share/javavm/include > -I../../../src/solaris/javavm/include -I../../../src/share/native/common > -I../../../src/solaris/native/common > -I../../../src/share/native/sun/awt/X11 > -I../../../src/solaris/native/sun/awt/X11 -I/usr/include -DXAWT > -DXAWT_HACK > -I/home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/../../sun.awt/awt/CClassHeaders > -I../../../src/solaris/native/sun/awt > -I../../../src/solaris/native/sun/xawt > -I../../../src/solaris/native/sun/jdga > -I../../../src/share/native/sun/awt/debug > -I../../../src/share/native/sun/awt/image/cvutils > -I../../../src/share/native/sun/java2d > -I../../../src/share/native/sun/java2d/loops > -I../../../src/share/native/sun/awt/image/cvutils > -I../../../src/share/native/sun/awt/image > -I../../../src/share/native/sun/font > -I../../../src/solaris/native/sun/java2d > -I../../../src/share/native/sun/java2d/pipe > -I../../../src/share/native/sun/java2d/opengl > -I../../../src/solaris/native/sun/java2d/opengl > -I../../../src/solaris/native/sun/java2d/x11 > -I../../../src/share/native/sun/dc/path > -I../../../src/share/native/sun/dc/doe > -I../../../src/share/native/sun/awt/alphacomposite > -I../../../src/share/native/sun/awt/medialib > -I../../../src/solaris/native/sun/awt/medialib > -I../../../src/solaris/native/sun/font > -I../../../src/share/native/sun/awt > -I../../../src/solaris/native/sun/awt > -I/usr/X11R6/include/X11/extensions -I/usr/include/X11/extensions > -I/usr/include -I/usr/X11R6/include -c -o > /home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/obj/OGLFuncs.o > ../../../src/share/native/sun/java2d/opengl/OGLFuncs.c > ../../../src/share/native/sun/java2d/opengl/OGLContext.c: In function > ?Java_sun_java2d_opengl_OGLContext_getOGLIdString?: > ../../../src/share/native/sun/java2d/opengl/OGLContext.c:1051: warning: > implicit declaration of function ?jio_snprintf? > make[6]: *** > [/home/dj/icedtea6-1-9-7816c6d7a641/openjdk.build-ecj/tmp/sun/sun.awt.X11/xawt/obj/OGLContext.o] > Error 1 > make[6]: *** Waiting for unfinished jobs.... > make[6]: Leaving directory > `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj/jdk/make/sun/xawt' > make[5]: *** [library_parallel_compile] Error 2 > make[5]: Leaving directory > `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj/jdk/make/sun/xawt' > make[4]: *** [all] Error 1 > make[4]: Leaving directory > `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj/jdk/make/sun' > make[3]: *** [all] Error 1 > make[3]: Leaving directory > `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj/jdk/make' > make[2]: *** [jdk-build] Error 2 > make[2]: Leaving directory `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj' > make[1]: *** [build_product_image] Error 2 > make[1]: Leaving directory `/home/dj/icedtea6-1-9-7816c6d7a641/openjdk-ecj' > make: *** [stamps/icedtea-ecj.stamp] Error 2 > > See > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2009-October/007339.html > > I'll have to wrap the additional hunk in an ifndef (or probably better, > apply the responsible patch conditionally), but I'll get back to that > over the weekend (again, if somebody doesn't beat me to it first). > > I hope some of my observations are useful. > They are. I've been meaning to look at getting this work for a while, and having someone else looking too is good motivation ;-) > -- DJ Lucas > > -- > This message has been scanned for viruses and > dangerous content, and is believed to be clean. > > diff -Naurp icedtea6-1-9-7816c6d7a641-orig/configure.ac icedtea6-1-9-7816c6d7a641/configure.ac > --- icedtea6-1-9-7816c6d7a641-orig/configure.ac 2010-08-11 23:01:25.000000000 -0500 > +++ icedtea6-1-9-7816c6d7a641/configure.ac 2010-08-11 23:14:21.000000000 -0500 > @@ -178,7 +178,6 @@ IT_CHECK_ADDITIONAL_VMS > ENABLE_HG > AC_CHECK_WITH_HG_REVISION > AC_CHECK_WITH_TZDATA_DIR > -IT_CHECK_FOR_CLASS([SUN_AWT_TOOLKIT], [sun.awt.SunToolkit]) > IT_GETDTDTYPE_CHECK > IT_CHECK_XULRUNNER_VERSION > > diff -Naurp icedtea6-1-9-7816c6d7a641-orig/Makefile.am icedtea6-1-9-7816c6d7a641/Makefile.am > --- icedtea6-1-9-7816c6d7a641-orig/Makefile.am 2010-08-11 23:01:25.000000000 -0500 > +++ icedtea6-1-9-7816c6d7a641/Makefile.am 2010-08-11 23:15:03.000000000 -0500 > @@ -75,6 +76,7 @@ ICEDTEA_BOOTSTRAP_DIRS = \ > $(SHARE)/javax/script \ > $(SHARE)/javax/security/auth/kerberos \ > $(SHARE)/javax/security/sasl \ > + $(SHARE)/javax/swing/plaf/synth \ > $(LANGTOOLS)/com/sun/mirror \ > $(LANGTOOLS)/com/sun/tools/apt > > @@ -2066,13 +2068,11 @@ rt-source-files.txt: $(OPENJDK_ECJ_TREE) > done > > stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt > -if LACKS_SUN_AWT_TOOLKIT > mkdir -p lib/rt > $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d lib/rt \ > -sourcepath $(SOURCEPATH_DIRS) -bootclasspath \'\' \ > -classpath $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \ > @rt-source-files.txt ; > -endif > mkdir -p stamps > touch stamps/rt-class-files.stamp > > @@ -2081,15 +2081,12 @@ clean-rt: > rm -f stamps/rt-class-files.stamp > rm -f stamps/rt.stamp > rm -f rt-source-files.txt > -if LACKS_SUN_AWT_TOOLKIT > if [ -e $(ECJ_BOOT_DIR) ] ; then \ > cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/jre/lib/rt.jar ; \ > fi > -endif > > stamps/rt.stamp: stamps/rt-class-files.stamp > mkdir -p stamps > -if LACKS_SUN_AWT_TOOLKIT > $(BOOT_DIR)/bin/jar uf $(RUNTIME) -C lib/rt com -C lib/rt java \ > -C lib/rt javax -C lib/rt sun > if ENABLE_NIO2 > @@ -2097,7 +2094,6 @@ if ENABLE_NIO2 > $(BOOT_DIR)/bin/jar uf $(RUNTIME) -C lib/rt org/classpath ; \ > fi > endif > -endif > touch stamps/rt.stamp > > # Target Aliases -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From dj at linuxfromscratch.org Thu Aug 12 18:00:28 2010 From: dj at linuxfromscratch.org (DJ Lucas) Date: Thu, 12 Aug 2010 20:00:28 -0500 Subject: For users of --with-openjdk In-Reply-To: <20100813004137.GP10867@rivendell.middle-earth.co.uk> References: <20100810111600.GF27843@rivendell.middle-earth.co.uk> <4C6234EC.7020809@linuxfromscratch.org> <20100811181112.GL10867@rivendell.middle-earth.co.uk> <4C633B7F.3080101@linuxfromscratch.org> <4C6484B8.6090007@linuxfromscratch.org> <20100813004137.GP10867@rivendell.middle-earth.co.uk> Message-ID: <4C64992C.5000107@linuxfromscratch.org> On 08/12/2010 07:41 PM, Dr Andrew John Hughes wrote: > They are. I've been meaning to look at getting this work for a while, and having > someone else looking too is good motivation ;-) > So I wasn't able to put it down as I should have. I noticed the FIXME around MEMORY_LIMIT. I wonder if something like the attached patch would be sufficient for both (the choice of terminology is ugly I think, but it was a quick patch). I don't know a thing about Zero or Cacao, and I haven't even tested this yet beyond making sure that configure is sane and that it completes with the expected results in the Makefile. As to the versions, I am wanting this for 1.9 for my book, but 1.10 is so close to 1.9, I doubt that anything I come up with wouldn't apply there for the next couple of weeks. Now, I am really out of here, no more from me till really late this evening, or the weekend. :-) -- DJ Lucas -- This message has been scanned for viruses and dangerous content, and is believed to be clean. -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: icedtea6-1.9-determine_jdk_type-3.patch Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100812/57a27fb2/icedtea6-1.9-determine_jdk_type-3.patch From bugzilla-daemon at icedtea.classpath.org Fri Aug 13 01:43:54 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 13 Aug 2010 08:43:54 +0000 Subject: [Bug 530] New: Shark running DaCapo 9.12 eclipse triggers Unimplemented in sharkTopLevelBlock.cpp:1180 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=530 Summary: Shark running DaCapo 9.12 eclipse triggers Unimplemented in sharkTopLevelBlock.cpp:1180 Product: IcedTea Version: 6-hg Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Shark AssignedTo: unassigned at icedtea.classpath.org ReportedBy: xerxes at zafena.se CC: gbenson at redhat.com Testcase: wget http://sourceforge.net/projects/dacapobench/files/9.12-bach/dacapo-9.12-bach.jar/download java -jar dacapo-9.12-bach.jar eclipse Output: Unzip workspace ===== DaCapo 9.12 eclipse starting ===== Initialize workspace ................... Index workspace ..# # A fatal error has been detected by the Java Runtime Environment: # # Internal Error (sharkTopLevelBlock.cpp:1180), pid=26687, tid=3078409072 # Error: Unimplemented() # # JRE version: 6.0_20-b20 # Java VM: OpenJDK Shark VM (17.0-b16 mixed mode linux-i386 ) # Derivative: IcedTea6 1.9pre+r87f0c2edefcf # Distribution: Built on Ubuntu 10.04.1 LTS (Thu Aug 5 15:14:33 CEST 2010) # An error report file with more information is saved as: # /home/xerxes/test/hs_err_pid26687.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # Reproducablility: Allways. Im hitting the same bug when running Shark from Icedtea6 and Icedtea7 head. ******************* Testresults when using a debug build: When running a debug build with assertions enabled then i hit this: # after -XX: or in .hotspotrc: SuppressErrorAt=/klassVtable.cpp:1137 # # A fatal error has been detected by the Java Runtime Environment: # # Internal Error (/home/xerxes/icedtea6-shark-b20/openjdk/hotspot/src/share/vm/oops/klassVtable.cpp:1137), pid=26994, tid=2428443504 # Error: assert(instanceKlass::cast(intf)->is_interface(),"sanity check") # # JRE version: 6.0_20-b20 # Java VM: OpenJDK Shark VM (17.0-b16-product mixed mode linux-i386 ) # Derivative: IcedTea6 1.9pre+rdd4d9f50ac7c # Distribution: Built on Ubuntu 10.04.1 LTS (Thu Jul 29 13:14:36 CEST 2010) # An error report file with more information is saved as: # /home/xerxes/test/hs_err_pid26994.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From ahughes at redhat.com Fri Aug 13 05:35:14 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 13 Aug 2010 13:35:14 +0100 Subject: [1.7 & 1.8 BRANCH APPROVAL] Font and PaX patches Message-ID: <20100813123514.GT10867@rivendell.middle-earth.co.uk> I'd like to backport the following fixes to 1.7 & 1.8: changeset: 2076:3fd44a9bb9a3 user: Andrew John Hughes date: Wed Aug 11 21:04:10 2010 +0100 summary: G244901: Skip test_gamma on hardened (PaX-enabled) kernels http://icedtea.classpath.org/hg/icedtea6/rev/cb463b94b82d changeset: 2077:be9c0d303dfc user: Andrew John Hughes date: Wed Aug 11 21:05:04 2010 +0100 summary: G266295: Provide font configuration for Gentoo. http://icedtea.classpath.org/hg/icedtea6/rev/fc45c67366b9 changeset: 2078:8dbe3de24290 tag: tip user: Andrew John Hughes date: Fri Aug 13 00:35:50 2010 +0100 summary: Add a font configuration for RHEL6. http://icedtea.classpath.org/hg/icedtea6/rev/e8dfb4f0000d The backports include the NEWS updates in http://icedtea.classpath.org/hg/icedtea6/rev/fe41bee26224. Ok to push? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ptisnovs at redhat.com Fri Aug 13 08:12:08 2010 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 13 Aug 2010 17:12:08 +0200 Subject: Possible regression between IcedTea6-1.8 and IcedTea6-1.9 In-Reply-To: <20100812164513.GN10867@rivendell.middle-earth.co.uk> References: <4C6420E8.3090901@redhat.com> <20100812164513.GN10867@rivendell.middle-earth.co.uk> Message-ID: <4C6560C8.2050505@redhat.com> Dr Andrew John Hughes wrote: > On 18:27 Thu 12 Aug , Pavel Tisnovsky wrote: >> Hi all, >> >> I tried to find out why some new regression tests does not pass on the >> IcedTea6 HEAD and - by the way - I may have found the regression between >> IcedTea6 IcedTea6-1.8 and-1.9. >> >> When the following very simple test is run with option >> -Dsun.java2d.opengl set to True and I run it inside VNC session (ie >> without acceleration): >> >> import javax.swing.JPanel; >> >> public class Test extends JPanel { >> public Test() { >> } >> >> public static void main(String[] args) >> { >> Test t = new Test(); >> System.out.println("Test Passed."); >> } >> } >> >> It simply wrote warning message in IcedTea6-1.8: >> >> /temp/icedtea6-1.8/openjdk/build/linux-amd64/j2sdk-image/bin/java >> -Dsun.java2d.opengl=True Test >> Could not enable OpenGL pipeline for default config on screen 0 >> Test Passed. >> >> but it failed in IcedTea6-1.9 (and HEAD too): >> >> /temp/icedtea6-1.9/openjdk.build/j2sdk-image/bin/java >> -Dsun.java2d.opengl=True Test >> Exception in thread "main" java.lang.UnsatisfiedLinkError: >> sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String; >> at sun.java2d.opengl.OGLContext.getOGLIdString(Native Method) >> at >> sun.java2d.opengl.GLXGraphicsConfig$1.run(GLXGraphicsConfig.java:126) >> at >> sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run(OGLRenderQueue.java:220) >> ~ >> >> >> Tested on RHEL5 x86_64 in VNC session, DISPLAY is set to :2.0 (it's >> correct, of course). >> >> Do anyone remember that we did any changes in XRender or java2d.opengl >> packages between 1.8 and 1.9? >> >> PS: at least these regression tests fail due to issue mentioned above: >> FAILED: sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java >> FAILED: sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java >> FAILED: >> sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java >> FAILED: sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java >> FAILED: >> sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java >> FAILED: sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java >> FAILED: sun/java2d/OpenGL/DrawBufImgOp.java >> FAILED: sun/java2d/OpenGL/GradientPaints.java >> FAILED: sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java >> FAILED: sun/java2d/pipe/MutableColorTest/MutableColorTest.java >> >> Cheers >> Pavel > > As discussed on the mailing list, XRender was updated to the new version: > > http://icedtea.classpath.org/hg/release/icedtea6-1.9/rev/9da4f50c13c0 > > Part of this involved updating the pipeline code which XRender relies on > (see the patch). Both are 7 backports. Have you checked whether the > same tests fail in 7? I successfully run the test against IcedTea7 1.4 built from /hg/icedtea/ repository. Is this the correct version of JDK7? I'll try to compare the mentioned patch with the O7 sources. > > Note: There is no 1.9 release yet. The branch was created specifically > so we'd find stuff like this before release :-) From ptisnovs at redhat.com Fri Aug 13 08:46:06 2010 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Fri, 13 Aug 2010 17:46:06 +0200 Subject: Possible regression between IcedTea6-1.8 and IcedTea6-1.9 In-Reply-To: <20100812164513.GN10867@rivendell.middle-earth.co.uk> References: <4C6420E8.3090901@redhat.com> <20100812164513.GN10867@rivendell.middle-earth.co.uk> Message-ID: <4C6568BE.9040202@redhat.com> Dr Andrew John Hughes wrote: > On 18:27 Thu 12 Aug , Pavel Tisnovsky wrote: >> Hi all, >> >> I tried to find out why some new regression tests does not pass on the >> IcedTea6 HEAD and - by the way - I may have found the regression between >> IcedTea6 IcedTea6-1.8 and-1.9. >> >> When the following very simple test is run with option >> -Dsun.java2d.opengl set to True and I run it inside VNC session (ie >> without acceleration): >> >> import javax.swing.JPanel; >> >> public class Test extends JPanel { >> public Test() { >> } >> >> public static void main(String[] args) >> { >> Test t = new Test(); >> System.out.println("Test Passed."); >> } >> } >> >> It simply wrote warning message in IcedTea6-1.8: >> >> /temp/icedtea6-1.8/openjdk/build/linux-amd64/j2sdk-image/bin/java >> -Dsun.java2d.opengl=True Test >> Could not enable OpenGL pipeline for default config on screen 0 >> Test Passed. >> >> but it failed in IcedTea6-1.9 (and HEAD too): >> >> /temp/icedtea6-1.9/openjdk.build/j2sdk-image/bin/java >> -Dsun.java2d.opengl=True Test >> Exception in thread "main" java.lang.UnsatisfiedLinkError: >> sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String; >> at sun.java2d.opengl.OGLContext.getOGLIdString(Native Method) >> at >> sun.java2d.opengl.GLXGraphicsConfig$1.run(GLXGraphicsConfig.java:126) >> at >> sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run(OGLRenderQueue.java:220) >> ~ >> >> >> Tested on RHEL5 x86_64 in VNC session, DISPLAY is set to :2.0 (it's >> correct, of course). >> >> Do anyone remember that we did any changes in XRender or java2d.opengl >> packages between 1.8 and 1.9? >> >> PS: at least these regression tests fail due to issue mentioned above: >> FAILED: sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java >> FAILED: sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java >> FAILED: >> sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java >> FAILED: sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java >> FAILED: >> sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java >> FAILED: sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java >> FAILED: sun/java2d/OpenGL/DrawBufImgOp.java >> FAILED: sun/java2d/OpenGL/GradientPaints.java >> FAILED: sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java >> FAILED: sun/java2d/pipe/MutableColorTest/MutableColorTest.java >> >> Cheers >> Pavel > > As discussed on the mailing list, XRender was updated to the new version: > > http://icedtea.classpath.org/hg/release/icedtea6-1.9/rev/9da4f50c13c0 > > Part of this involved updating the pipeline code which XRender relies on > (see the patch). Both are 7 backports. Have you checked whether the > same tests fail in 7? One more comment: these tests are listed in test/jtreg/excludelist.jdk.jtx in IcedTea(7) repo. > > Note: There is no 1.9 release yet. The branch was created specifically > so we'd find stuff like this before release :-) From ahughes at redhat.com Fri Aug 13 11:11:26 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 13 Aug 2010 19:11:26 +0100 Subject: Possible regression between IcedTea6-1.8 and IcedTea6-1.9 In-Reply-To: <4C6560C8.2050505@redhat.com> References: <4C6420E8.3090901@redhat.com> <20100812164513.GN10867@rivendell.middle-earth.co.uk> <4C6560C8.2050505@redhat.com> Message-ID: <20100813181126.GV10867@rivendell.middle-earth.co.uk> On 17:12 Fri 13 Aug , Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: > > On 18:27 Thu 12 Aug , Pavel Tisnovsky wrote: > >> Hi all, > >> > >> I tried to find out why some new regression tests does not pass on the > >> IcedTea6 HEAD and - by the way - I may have found the regression between > >> IcedTea6 IcedTea6-1.8 and-1.9. > >> > >> When the following very simple test is run with option > >> -Dsun.java2d.opengl set to True and I run it inside VNC session (ie > >> without acceleration): > >> > >> import javax.swing.JPanel; > >> > >> public class Test extends JPanel { > >> public Test() { > >> } > >> > >> public static void main(String[] args) > >> { > >> Test t = new Test(); > >> System.out.println("Test Passed."); > >> } > >> } > >> > >> It simply wrote warning message in IcedTea6-1.8: > >> > >> /temp/icedtea6-1.8/openjdk/build/linux-amd64/j2sdk-image/bin/java > >> -Dsun.java2d.opengl=True Test > >> Could not enable OpenGL pipeline for default config on screen 0 > >> Test Passed. > >> > >> but it failed in IcedTea6-1.9 (and HEAD too): > >> > >> /temp/icedtea6-1.9/openjdk.build/j2sdk-image/bin/java > >> -Dsun.java2d.opengl=True Test > >> Exception in thread "main" java.lang.UnsatisfiedLinkError: > >> sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String; > >> at sun.java2d.opengl.OGLContext.getOGLIdString(Native Method) > >> at > >> sun.java2d.opengl.GLXGraphicsConfig$1.run(GLXGraphicsConfig.java:126) > >> at > >> sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run(OGLRenderQueue.java:220) > >> ~ > >> > >> > >> Tested on RHEL5 x86_64 in VNC session, DISPLAY is set to :2.0 (it's > >> correct, of course). > >> > >> Do anyone remember that we did any changes in XRender or java2d.opengl > >> packages between 1.8 and 1.9? > >> > >> PS: at least these regression tests fail due to issue mentioned above: > >> FAILED: sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java > >> FAILED: sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java > >> FAILED: > >> sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java > >> FAILED: sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java > >> FAILED: > >> sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java > >> FAILED: sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java > >> FAILED: sun/java2d/OpenGL/DrawBufImgOp.java > >> FAILED: sun/java2d/OpenGL/GradientPaints.java > >> FAILED: sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java > >> FAILED: sun/java2d/pipe/MutableColorTest/MutableColorTest.java > >> > >> Cheers > >> Pavel > > > > As discussed on the mailing list, XRender was updated to the new version: > > > > http://icedtea.classpath.org/hg/release/icedtea6-1.9/rev/9da4f50c13c0 > > > > Part of this involved updating the pipeline code which XRender relies on > > (see the patch). Both are 7 backports. Have you checked whether the > > same tests fail in 7? > > I successfully run the test against IcedTea7 1.4 built from /hg/icedtea/ > repository. Is this the correct version of JDK7? I'll try to compare the > mentioned patch with the O7 sources. > 1.4 doesn't sound right, that's from October 2007. Are you sure you have the right version number there? I assumed you'd just use OpenJDK7 directly (from http://hg.openjdk.java.net/jdk7/jdk7) not via IcedTea. Sorry, should have been explicit on that. > > > > Note: There is no 1.9 release yet. The branch was created specifically > > so we'd find stuff like this before release :-) > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From andrew at icedtea.classpath.org Fri Aug 13 12:01:00 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 13 Aug 2010 19:01:00 +0000 Subject: /hg/icedtea6: Make rt.jar update dependent on bootstrapping, not... Message-ID: changeset 00d9b2c78bc4 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=00d9b2c78bc4 author: Andrew John Hughes date: Fri Aug 13 20:00:48 2010 +0100 Make rt.jar update dependent on bootstrapping, not the existence of sun.awt.Toolkit. 2010-08-13 Andrew John Hughes * Makefile.am: Replace conditionals on LACKS_SUN_AWT_TOOLKIT with ones on BOOTSTRAPPING. If we are bootstrapping, we don't trust the system JDK and update rt.jar with newly built classes, regardless of whether it's an Oracle-based JDK or not. * configure.ac: Remove check for sun.awt.Toolkit. diffstat: 3 files changed, 14 insertions(+), 4 deletions(-) ChangeLog | 11 +++++++++++ Makefile.am | 6 +++--- configure.ac | 1 - diffs (59 lines): diff -r c73c4672031a -r 00d9b2c78bc4 ChangeLog --- a/ChangeLog Tue Aug 10 14:52:56 2010 -0400 +++ b/ChangeLog Fri Aug 13 20:00:48 2010 +0100 @@ -1,3 +1,14 @@ 2010-08-09 Omair Majid + + * Makefile.am: + Replace conditionals on LACKS_SUN_AWT_TOOLKIT + with ones on BOOTSTRAPPING. If we are bootstrapping, + we don't trust the system JDK and update rt.jar + with newly built classes, regardless of whether it's + an Oracle-based JDK or not. + * configure.ac: + Remove check for sun.awt.Toolkit. + 2010-08-09 Omair Majid * NEWS: Update with OpenType support. diff -r c73c4672031a -r 00d9b2c78bc4 Makefile.am --- a/Makefile.am Tue Aug 10 14:52:56 2010 -0400 +++ b/Makefile.am Fri Aug 13 20:00:48 2010 +0100 @@ -2068,7 +2068,7 @@ rt-source-files.txt: $(OPENJDK_ECJ_TREE) done stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt -if LACKS_SUN_AWT_TOOLKIT +if BOOTSTRAPPING mkdir -p lib/rt $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) -d lib/rt \ -sourcepath $(SOURCEPATH_DIRS) -bootclasspath \'\' \ @@ -2083,7 +2083,7 @@ clean-rt: rm -f stamps/rt-class-files.stamp rm -f stamps/rt.stamp rm -f rt-source-files.txt -if LACKS_SUN_AWT_TOOLKIT +if BOOTSTRAPPING if [ -e $(ECJ_BOOT_DIR) ] ; then \ cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(ECJ_BOOT_DIR)/jre/lib/rt.jar ; \ fi @@ -2091,7 +2091,7 @@ endif stamps/rt.stamp: stamps/rt-class-files.stamp mkdir -p stamps -if LACKS_SUN_AWT_TOOLKIT +if BOOTSTRAPPING $(BOOT_DIR)/bin/jar uf $(RUNTIME) -C lib/rt com -C lib/rt java \ -C lib/rt javax -C lib/rt sun if ENABLE_NIO2 diff -r c73c4672031a -r 00d9b2c78bc4 configure.ac --- a/configure.ac Tue Aug 10 14:52:56 2010 -0400 +++ b/configure.ac Fri Aug 13 20:00:48 2010 +0100 @@ -178,7 +178,6 @@ ENABLE_HG ENABLE_HG AC_CHECK_WITH_HG_REVISION AC_CHECK_WITH_TZDATA_DIR -IT_CHECK_FOR_CLASS([SUN_AWT_TOOLKIT], [sun.awt.SunToolkit]) IT_GETDTDTYPE_CHECK IT_CHECK_XULRUNNER_VERSION From andrew at icedtea.classpath.org Fri Aug 13 15:28:54 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 13 Aug 2010 22:28:54 +0000 Subject: /hg/icedtea6: Only patch the OpenGL headers when javah exhibits ... Message-ID: changeset 552e98f1c215 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=552e98f1c215 author: Andrew John Hughes date: Fri Aug 13 23:28:38 2010 +0100 Only patch the OpenGL headers when javah exhibits Classpath bug #40188. 2010-08-13 Andrew John Hughes * patches/ecj/javah.patch: Moved to... * Makefile.am: Apply patch to OpenGL headers only if javah exhibits Classpath bug 40188. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40188 * patches/ecj/cp40188-opengl.patch: here. diffstat: 6 files changed, 187 insertions(+), 95 deletions(-) ChangeLog | 31 ++++++++++++ Makefile.am | 7 +- acinclude.m4 | 59 ++++++++++++++++++++++++ configure.ac | 1 patches/ecj/cp40188-opengl.patch | 92 ++++++++++++++++++++++++++++++++++++++ patches/ecj/javah.patch | 92 -------------------------------------- diffs (324 lines): diff -r 00d9b2c78bc4 -r 552e98f1c215 ChangeLog --- a/ChangeLog Fri Aug 13 20:00:48 2010 +0100 +++ b/ChangeLog Fri Aug 13 23:28:38 2010 +0100 @@ -1,3 +1,34 @@ 2010-08-13 Andrew John Hughes + + * patches/ecj/javah.patch: Moved to... + * Makefile.am: Apply patch to OpenGL headers + only if javah exhibits Classpath bug 40188. + http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40188 + * patches/ecj/cp40188-opengl.patch: here. + +2009-05-19 Andrew John Hughes + + * acinclude.m4: + (IT_JAVAH): Renamed from IT_CP39408_JAVAH. + Add test for PR40188. + * configure.ac: + Make full bootstrap the default again. Rename + IT_CP39408_JAVAH to IT_JAVAH. + +2009-03-18 Andrew John Hughes + + * acinclude.m4: + (IT_CP39408_JAVAH): Add classpath specification + to JAVAC invocation to handle buggy ecjs. + +2009-03-17 Andrew John Hughes + + * acinclude.m4: + (IT_CP39408_JAVAH): New test for Classpath + bug 39408. + * configure.ac: Enable new test. Result + as yet unused. + 2010-08-13 Andrew John Hughes * Makefile.am: diff -r 00d9b2c78bc4 -r 552e98f1c215 Makefile.am --- a/Makefile.am Fri Aug 13 20:00:48 2010 +0100 +++ b/Makefile.am Fri Aug 13 23:28:38 2010 +0100 @@ -365,9 +365,10 @@ endif endif if ENABLE_XRENDER -ICEDTEA_ECJ_PATCHES += \ - patches/ecj/needs-6.patch \ - patches/ecj/javah.patch +ICEDTEA_ECJ_PATCHES += patches/ecj/needs-6.patch +if CP40188_JAVAH +ICEDTEA_ECJ_PATCHES += patches/ecj/cp40188-opengl.patch +endif endif if !HAS_PAX diff -r 00d9b2c78bc4 -r 552e98f1c215 acinclude.m4 --- a/acinclude.m4 Fri Aug 13 20:00:48 2010 +0100 +++ b/acinclude.m4 Fri Aug 13 23:28:38 2010 +0100 @@ -1515,3 +1515,62 @@ AM_CONDITIONAL([HAS_PAX], test x"${it_cv AM_CONDITIONAL([HAS_PAX], test x"${it_cv_pax}" = "xyes") AC_PROVIDE([$0])dnl ]) + +AC_DEFUN([IT_JAVAH],[ +AC_CACHE_CHECK([if $JAVAH exhibits Classpath bug 39408], it_cv_cp39408_javah, [ +SUPERCLASS=Test.java +SUBCLASS=TestImpl.java +SUB=$(echo $SUBCLASS|sed 's#\.java##') +SUBHEADER=$(echo $SUBCLASS|sed 's#\.java#.h#') +mkdir tmp.$$ +cd tmp.$$ +cat << \EOF > $SUPERCLASS +/* [#]line __oline__ "configure" */ +public class Test +{ + public static final int POTATO = 0; + public static final int CABBAGE = 1; +} +EOF +cat << \EOF > $SUBCLASS +/* [#]line __oline__ "configure" */ +public class TestImpl + extends Test +{ + public native void doStuff(); +} +EOF +if $JAVAC -cp . $JAVACFLAGS $SUBCLASS >&AS_MESSAGE_LOG_FD 2>&1; then + if $JAVAH -classpath . $SUB >&AS_MESSAGE_LOG_FD 2>&1; then + if cat $SUBHEADER | grep POTATO >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_cp39408_javah=no; + else + it_cv_cp39408_javah=yes; + fi + else + AC_MSG_ERROR([The Java header generator $JAVAH failed]) + echo "configure: failed program was:" >&AC_FD_CC + cat $SUBCLASS >&AC_FD_CC + fi +else + AC_MSG_ERROR([The Java compiler $JAVAC failed]) + echo "configure: failed program was:" >&AC_FD_CC + cat $SUBCLASS >&AC_FD_CC +fi +]) +AC_CACHE_CHECK([if $JAVAH exhibits Classpath bug 40188], it_cv_cp40188_javah, [ + if test -e $SUBHEADER ; then + if cat $SUBHEADER | grep TestImpl_POTATO >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_cp40188_javah=no; + else + it_cv_cp40188_javah=yes; + fi + fi +]) +rm -f $SUBCLASS $SUPERCLASS $SUBHEADER *.class +cd .. +rmdir tmp.$$ +AM_CONDITIONAL([CP39408_JAVAH], test x"${it_cv_cp39408_javah}" = "xyes") +AM_CONDITIONAL([CP40188_JAVAH], test x"${it_cv_cp40188_javah}" = "xyes") +AC_PROVIDE([$0])dnl +]) diff -r 00d9b2c78bc4 -r 552e98f1c215 configure.ac --- a/configure.ac Fri Aug 13 20:00:48 2010 +0100 +++ b/configure.ac Fri Aug 13 23:28:38 2010 +0100 @@ -180,6 +180,7 @@ AC_CHECK_WITH_TZDATA_DIR AC_CHECK_WITH_TZDATA_DIR IT_GETDTDTYPE_CHECK IT_CHECK_XULRUNNER_VERSION +IT_JAVAH dnl pkgconfig cannot be used to find these headers and libraries. AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[] diff -r 00d9b2c78bc4 -r 552e98f1c215 patches/ecj/cp40188-opengl.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/cp40188-opengl.patch Fri Aug 13 23:28:38 2010 +0100 @@ -0,0 +1,92 @@ +diff -Nru openjdk-boot.orig/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk +--- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2009-12-13 20:37:41.000000000 +0000 ++++ openjdk-ecj/jdk/make/common/Rules.gmk 2009-12-13 21:11:04.000000000 +0000 +@@ -303,7 +303,11 @@ + $(prep-target) + @$(ECHO) "# Running javah:" + $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \ +- $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner)) ++ $(CLASSES.export) ++ $(foreach innerclass,$(subst $$,\$$,$(EXPORTED_inner)), \ ++ $(JAVAH_CMD) \ ++ -o $(CLASSHDRDIR)/$(subst .,_,$(subst \$$,_,$(innerclass))).h \ ++ $(innerclass)) + @$(java-vm-cleanup) + @$(TOUCH) $@ + +diff -Nru openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk +--- openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-12-04 23:26:35.000000000 +0000 ++++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2009-12-13 21:11:04.000000000 +0000 +@@ -189,3 +189,5 @@ + java/awt/dnd/DnDConstants.java \ + sun/awt/CausedFocusEvent.java + ++EXPORTED_inner = \ ++ sun.java2d.opengl.OGLContext$$OGLContextCaps +diff -Nru openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h +--- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-12-04 23:33:16.000000000 +0000 ++++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-12-13 21:11:04.000000000 +0000 +@@ -27,6 +27,7 @@ + #define OGLContext_h_Included + + #include "sun_java2d_pipe_BufferedContext.h" ++#include "sun_java2d_pipe_hw_ContextCapabilities.h" + #include "sun_java2d_opengl_OGLContext.h" + #include "sun_java2d_opengl_OGLContext_OGLContextCaps.h" + +@@ -100,39 +101,39 @@ + * See OGLContext.java for more on these flags. + */ + #define CAPS_EMPTY \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EMPTY ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_EMPTY + #define CAPS_RT_PLAIN_ALPHA \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_PLAIN_ALPHA ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_PLAIN_ALPHA + #define CAPS_RT_TEXTURE_ALPHA \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_TEXTURE_ALPHA ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_TEXTURE_ALPHA + #define CAPS_RT_TEXTURE_OPAQUE \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_TEXTURE_OPAQUE ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_TEXTURE_OPAQUE + #define CAPS_MULTITEXTURE \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_MULTITEXTURE ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_MULTITEXTURE + #define CAPS_TEXNONPOW2 \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_TEXNONPOW2 ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_TEXNONPOW2 + #define CAPS_TEXNONSQUARE \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_TEXNONSQUARE ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_TEXNONSQUARE + #define CAPS_PS20 \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_PS20 ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_PS20 + #define CAPS_PS30 \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_PS30 ++ sun_java2d_pipe_hw_ContextCapabilities_CAPS_PS30 + #define LAST_SHARED_CAP \ + sun_java2d_opengl_OGLContext_OGLContextCaps_LAST_SHARED_CAP + #define CAPS_EXT_FBOBJECT \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_FBOBJECT ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_FBOBJECT + #define CAPS_STORED_ALPHA \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_STORED_ALPHA ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_STORED_ALPHA + #define CAPS_DOUBLEBUFFERED \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_DOUBLEBUFFERED ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_DOUBLEBUFFERED + #define CAPS_EXT_LCD_SHADER \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_LCD_SHADER ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_LCD_SHADER + #define CAPS_EXT_BIOP_SHADER \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_BIOP_SHADER ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_BIOP_SHADER + #define CAPS_EXT_GRAD_SHADER \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_GRAD_SHADER ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_GRAD_SHADER + #define CAPS_EXT_TEXRECT \ +- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_TEXRECT ++ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_TEXRECT + + /** + * Evaluates to true if the given capability bitmask is present for the diff -r 00d9b2c78bc4 -r 552e98f1c215 patches/ecj/javah.patch --- a/patches/ecj/javah.patch Fri Aug 13 20:00:48 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,92 +0,0 @@ -diff -Nru openjdk-boot.orig/jdk/make/common/Rules.gmk openjdk-boot/jdk/make/common/Rules.gmk ---- openjdk-ecj.orig/jdk/make/common/Rules.gmk 2009-12-13 20:37:41.000000000 +0000 -+++ openjdk-ecj/jdk/make/common/Rules.gmk 2009-12-13 21:11:04.000000000 +0000 -@@ -303,7 +303,11 @@ - $(prep-target) - @$(ECHO) "# Running javah:" - $(JAVAH_CMD) -d $(CLASSHDRDIR)/ \ -- $(CLASSES.export) $(subst $$,\$$,$(EXPORTED_inner)) -+ $(CLASSES.export) -+ $(foreach innerclass,$(subst $$,\$$,$(EXPORTED_inner)), \ -+ $(JAVAH_CMD) \ -+ -o $(CLASSHDRDIR)/$(subst .,_,$(subst \$$,_,$(innerclass))).h \ -+ $(innerclass)) - @$(java-vm-cleanup) - @$(TOUCH) $@ - -diff -Nru openjdk-boot.orig/jdk/make/sun/awt/FILES_export_unix.gmk openjdk-boot/jdk/make/sun/awt/FILES_export_unix.gmk ---- openjdk-ecj.orig/jdk/make/sun/awt/FILES_export_unix.gmk 2009-12-04 23:26:35.000000000 +0000 -+++ openjdk-ecj/jdk/make/sun/awt/FILES_export_unix.gmk 2009-12-13 21:11:04.000000000 +0000 -@@ -189,3 +189,5 @@ - java/awt/dnd/DnDConstants.java \ - sun/awt/CausedFocusEvent.java - -+EXPORTED_inner = \ -+ sun.java2d.opengl.OGLContext$$OGLContextCaps -diff -Nru openjdk-boot.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h openjdk-boot/jdk/src/share/native/sun/java2d/opengl/OGLContext.h ---- openjdk-ecj.orig/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-12-04 23:33:16.000000000 +0000 -+++ openjdk-ecj/jdk/src/share/native/sun/java2d/opengl/OGLContext.h 2009-12-13 21:11:04.000000000 +0000 -@@ -27,6 +27,7 @@ - #define OGLContext_h_Included - - #include "sun_java2d_pipe_BufferedContext.h" -+#include "sun_java2d_pipe_hw_ContextCapabilities.h" - #include "sun_java2d_opengl_OGLContext.h" - #include "sun_java2d_opengl_OGLContext_OGLContextCaps.h" - -@@ -100,39 +101,39 @@ - * See OGLContext.java for more on these flags. - */ - #define CAPS_EMPTY \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EMPTY -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_EMPTY - #define CAPS_RT_PLAIN_ALPHA \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_PLAIN_ALPHA -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_PLAIN_ALPHA - #define CAPS_RT_TEXTURE_ALPHA \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_TEXTURE_ALPHA -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_TEXTURE_ALPHA - #define CAPS_RT_TEXTURE_OPAQUE \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_RT_TEXTURE_OPAQUE -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_RT_TEXTURE_OPAQUE - #define CAPS_MULTITEXTURE \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_MULTITEXTURE -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_MULTITEXTURE - #define CAPS_TEXNONPOW2 \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_TEXNONPOW2 -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_TEXNONPOW2 - #define CAPS_TEXNONSQUARE \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_TEXNONSQUARE -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_TEXNONSQUARE - #define CAPS_PS20 \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_PS20 -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_PS20 - #define CAPS_PS30 \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_PS30 -+ sun_java2d_pipe_hw_ContextCapabilities_CAPS_PS30 - #define LAST_SHARED_CAP \ - sun_java2d_opengl_OGLContext_OGLContextCaps_LAST_SHARED_CAP - #define CAPS_EXT_FBOBJECT \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_FBOBJECT -+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_FBOBJECT - #define CAPS_STORED_ALPHA \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_STORED_ALPHA -+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_STORED_ALPHA - #define CAPS_DOUBLEBUFFERED \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_DOUBLEBUFFERED -+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_DOUBLEBUFFERED - #define CAPS_EXT_LCD_SHADER \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_LCD_SHADER -+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_LCD_SHADER - #define CAPS_EXT_BIOP_SHADER \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_BIOP_SHADER -+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_BIOP_SHADER - #define CAPS_EXT_GRAD_SHADER \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_GRAD_SHADER -+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_GRAD_SHADER - #define CAPS_EXT_TEXRECT \ -- sun_java2d_opengl_OGLContext_OGLContextCaps_CAPS_EXT_TEXRECT -+ sun_java2d_opengl_OGLContext_00024OGLContextCaps_CAPS_EXT_TEXRECT - - /** - * Evaluates to true if the given capability bitmask is present for the From dj at linuxfromscratch.org Sat Aug 14 11:08:57 2010 From: dj at linuxfromscratch.org (DJ Lucas) Date: Sat, 14 Aug 2010 13:08:57 -0500 Subject: For users of --with-openjdk In-Reply-To: <20100813195739.GX10867@rivendell.middle-earth.co.uk> References: <20100810111600.GF27843@rivendell.middle-earth.co.uk> <4C6234EC.7020809@linuxfromscratch.org> <20100811181112.GL10867@rivendell.middle-earth.co.uk> <4C633B7F.3080101@linuxfromscratch.org> <4C6484B8.6090007@linuxfromscratch.org> <20100813004137.GP10867@rivendell.middle-earth.co.uk> <4C64A128.2010300@linuxfromscratch.org> <20100813195739.GX10867@rivendell.middle-earth.co.uk> Message-ID: <4C66DBB9.4070707@linuxfromscratch.org> On 08/13/2010 02:57 PM, Dr Andrew John Hughes wrote: > On 20:34 Thu 12 Aug , DJ Lucas wrote: >> On 08/12/2010 07:41 PM, Dr Andrew John Hughes wrote: >>> On 18:33 Thu 12 Aug , DJ Lucas wrote: >>>> On 08/11/2010 07:08 PM, DJ Lucas wrote: >>>> >>>>> >>> >>> With regard to your previous e-mail, I think you're right that the sun.awt.Toolkit >>> fix is insufficent. It was the result of only considering the two existing configurations; >>> gcj+bootstrap, icedtea+no-bootstrap, with the intent of speeding up the no-bootstrap >>> case. In the no-bootstrap case, the built rt files aren't used so it was a waste of >>> time building them. So instead of removing the conditional altogether, I'd go for >>> changing it to a BOOTSTRAPPING conditional. >>> >> >> OK, will do. >> > > I've pushed this. Got it locally now. Thanks. >>>> >>>> The correct fix is to include $(SHARE)/javax/swing/plaf in >>>> ICEDTEA_BOOTSTRAP_DIRS (as I am still using the 1.8.1 nimbus classes in >>>> this particular case). Again, given the larger target of possible >>>> system JDKs, I wonder if it would be best to build rt.jar from scratch >>>> rather than copying from the system version and updating selectively >>>> (for similar reason to rebuilding tools.jar unconditionally as mentioned >>>> earlier in this thread). >>> >>> I've been thinking about this a bit. It's quite a weird one. The failure >>> is due to a hack needed for backporting Nimbus to JDK6. The SynthLookAndFeel >>> class has to know about a possible subclass, NimbusLookAndFeel, because we can't >>> add the needed method to the appropriate interface/superclass, as was done in >>> 7. So the synth look and feel now depends on the nimbus one being built before. >>> >>> In 1.8.1, you have an older version of NimbusLookAndFeel which is what causes the >>> complaint. In icedtea-no-bootstrap mode (and straight OpenJDK builds), we fixed >>> this by building Nimbus first. However, gcj can't generate Nimbus; so in bootstrap >>> mode, you'll see that we pass DISABLE_NIMBUS=true in the Makefile and the files >>> are instead compiled from pre-generated versions in the rt.stamp stage. >>> >>> I'm guessing this doesn't work for the icedtea-bootstrap mode because it doesn't >>> pull in as many classes to rebuild as gcj does (presumably because Sun classes which >>> are built when using gcj are found in rt.jar when using IcedTea). Your fix seems >>> correct, though for IcedTea, removing the DISABLE_NIMBUS line would also work. >> >> No, my proposed fix is not correct. Disabling Nimbus in the stage1 >> build is the only working fix for both targets. Will do locally. > > I don't understand. It already is disabled and bootstrapping with gcj works fine. No, it was me who did not understand. I misread your previous comments. Sorry for the confusion. I was referring to including $(SHARE)/javax/swing/plaf/synth in ICETEA_BOOTSTRAP_DIRS on a gcj build. IIUC, this will not work with a gcj bootstrap (though I haven't tried it yet). If that is true, then it has to be conditional. Also, I did not remove DISABLE_NIMBUS="true", but rather changed it to false conditionally, and that resulted in the same error, so I went back to the extra classes refresh in rt.jar. Attached patch works for me, but there is probably already a way to determine what the host JDK is, but it escapes me at the moment if it is there already. As of now, I am basically working from tip with the exception of OpenType font support, but I'll go back and build tip with the result of tonight's build to verify anyway. > > If someone wants to test a JDK as a bootstrap JDK, and they find > issues, we'll try to fix them where appropriate. There aren't really > any specific versions, it's more a case of what people are willing to > actively maintain. If someone is willing to step up and keep doing > regular builds with a certain system JDK, it'll be supported. I'll be happy to continue down my current path whenever I am able to. I'm always going to want to keep up with the current closed JDK. >> BTW, 1.8 worked well enough with the -2 patch I posted a link to earlier >> for my target (1.8.1->1.8.1) > > Yeah I guessed it would without the OpenGL change. It's probably worth > fixing that on the 1.9 branch too so we don't regress from 1.8. Attached patch will have to be moved appropriately for 1.9 branch (if accepted) and could be done in the same location for 1.10 in FIND_JAVAC. > > With regard to your patch for that, I don't think testing the VM is > correct; it may get fixed in later versions of gcj and other VMs than > gcj use that javah. I think (part of) the issue is > http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40188 again, which there > is already a configure test for in IcedTea7. So I'll backport that. > The other part of the issue is that gjavah doesn't seem to handle > inner classes implicitly. Excellent! That's one more done. Applied locally. So now, I have nothing in my 1.9 that is not in 1.10 except the attached patch which gets me a 1.9 build to completion (ignore the 1.9 in the name, is for 1.10). I will try tip in a few moments, but don't expect a confirmation until tomorrow. BTW, for reference, machine is x86_64 with only 32bit toolchain. Not so sure I like the unattended testsuite results, so I reran them without the screen saver active, and the results still are not looking so good to me. Are there some test suite changes that need to come back with the Xrender changes? --------------- jtreg console summary for hotspot --------------- Test results: passed: 86 --------------- jtreg console summary for langtools --------------- Error: tools/javac/processing/6499119/ClassProcessor.java FAILED: tools/javac/InterfaceAssert.java Test results: passed: 1,377; failed: 1; error: 1 --------------- jtreg console summary for jdk --------------- FAILED: com/sun/net/httpserver/bugs/B6361557.java FAILED: java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java FAILED: java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java FAILED: java/awt/font/TextLayout/TextLayoutBounds.java FAILED: java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java FAILED: java/awt/FullScreen/BufferStrategyExceptionTest/BufferStrategyExceptionTest.java FAILED: java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java FAILED: java/awt/Graphics2D/DrawString/RotTransText.java FAILED: java/awt/GraphicsDevice/CloneConfigsTest.java FAILED: java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html FAILED: java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html FAILED: java/awt/print/PrinterJob/ExceptionTest.java FAILED: java/awt/xembed/server/RunTestXEmbed.java FAILED: java/beans/XMLEncoder/javax_swing_tree_TreePath.java FAILED: java/net/MulticastSocket/NoLoopbackPackets.java FAILED: java/net/URL/TestHttps.java FAILED: java/nio/charset/Charset/NIOCharsetAvailabilityTest.java FAILED: java/rmi/transport/pinLastArguments/PinLastArguments.java MyDeflater had end() called MyInflater had end() called FAILED: javax/swing/plaf/synth/Test6933784.java FAILED: sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java FAILED: sun/java2d/cmm/ColorConvertOp/ColConvDCMTest.java FAILED: sun/java2d/cmm/ColorConvertOp/MTColConvTest.java FAILED: sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java FAILED: sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java FAILED: sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java FAILED: sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java FAILED: sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java FAILED: sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java FAILED: sun/java2d/OpenGL/DrawBufImgOp.java FAILED: sun/java2d/OpenGL/GradientPaints.java FAILED: sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java FAILED: sun/java2d/pipe/MutableColorTest/MutableColorTest.java FAILED: sun/java2d/SunGraphics2D/DrawImageBilinear.java FAILED: sun/java2d/SunGraphics2D/PolyVertTest.java FAILED: sun/java2d/SunGraphics2D/SimplePrimQuality.java FAILED: sun/nio/cs/Test4200310.sh FAILED: sun/nio/cs/TestSJIS0213.java Test results: passed: 3,287; failed: 37 : # kill testsuite processes still hanging nothing to cleanup make[1]: Leaving directory `/home/dj/icedtea6-1-9-7816c6d7a641' DirectX? I'm fairly sure those are expected to fail at least. :-) > > The JCK only applies to binaries. So it would only allow you to test > a binary that you built and provided to users. Anyone using the > script (just like anyone using a Gentoo source ebuild) would have to > license the JCK and test it themselves. > > If binaries aren't your primary target, I wouldn't put too much weight > on it. The Free JTreg test suite is already integrated with IcedTea > (try 'make check') and can be used to check the sanity of your > builds. Others > (http://openjdk.java.net/groups/conformance/JckAccess/jck-access.html) > already run the JCK on binaries built from the same sources. Getting OT for this part of the discussion, but I just want it to verify that the book instructions work as I expect them to. As far as providing a 'compatible' binary version, I could probably just piggy back off of the RedHat RPM with rpm2tgz or similar. That is the other reason for wanting to use icedtea to bootstrap icedtea--historically, building JDK from scratch has always been optional (and was dropped shortly after OpenJDK was announced as the JRL source releases were lagging behind quite a bit at that time), but there has always been an upstream jdk*{arch}*.bin to install from, whereas there currently is not (or not that I'm aware of) for IcedTea6. -- DJ Lucas -- This message has been scanned for viruses and dangerous content, and is believed to be clean. -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: icedtea6-1.9-bootstrap_nimbus-1.patch Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100814/9353f75e/icedtea6-1.9-bootstrap_nimbus-1.patch From ptisnovs at redhat.com Mon Aug 16 08:28:32 2010 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Mon, 16 Aug 2010 17:28:32 +0200 Subject: Bug in make scripts for IcedTea6 HEAD Message-ID: <4C695920.20105@redhat.com> Hi, after I successfully build IcedTea6 HEAD from http://icedtea.classpath.org/hg/icedtea6 I tried to run command "make clean dist", but it printed this error message: rm -f stamps/bootstrap-directory-symlink.stamp rm -f /jck/icedtea6/bootstrap/jdk1.6.0 rm -f stamps/bootstrap-directory-symlink-ecj.stamp { test ! -d icedtea6-1.10pre || { find icedtea6-1.10pre -type d ! -perm -200 -exec chmod u+w {} ';' && rm -fr icedtea6-1.10pre; }; } mkdir icedtea6-1.10pre mkdir -p -- icedtea6-1.10pre//jck/icedtea6 icedtea6-1.10pre//jck/icedtea6/patches icedtea6-1.10pre//jck/icedtea6/rewriter/com/redhat/rewriter icedtea6-1.10pre/. icedtea6-1.10pre/rewriter icedtea6-1.10pre/scripts icedtea6-1.10pre/tapset icedtea6-1.10pre/test cp: cannot stat `.//jck/icedtea6/netx': No such file or directory make: *** [distdir] Error 1 I ran this command from directory /jck/icedtea6 but the string "icedtea6-1.10pre/" is inserted before the path. Any suggestions? Pavel T. From omajid at redhat.com Mon Aug 16 10:26:57 2010 From: omajid at redhat.com (Omair Majid) Date: Mon, 16 Aug 2010 13:26:57 -0400 Subject: [RFC] netx: dont try to render null images Message-ID: <4C6974E1.2080905@redhat.com> Hi, The current splash screen code for Netx has a bug where it tries to display an image even if the image was not read successfully. The patch checks if the image is null and skips drawing the splash screen in that case. Any comments? Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-jnlp-splashscreen-nullref.patch Type: text/x-patch Size: 758 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100816/12ca92c9/icedtea6-jnlp-splashscreen-nullref.patch From Bin.Lan at windriver.com Mon Aug 16 19:03:41 2010 From: Bin.Lan at windriver.com (Bin Lan) Date: Tue, 17 Aug 2010 10:03:41 +0800 Subject: Shark sun.nio.cs.UTF_8$Encoder::encodeArrayLoop throw unhandled signal 4 error on ARM Message-ID: <1282010621.1931.25.camel@Jetlan-D1> Testcase: public class HelloLoop { public static void main(String[] args) { HelloLoop hello=new HelloLoop(); hello.printOut(); } private void printOut() { for(int i=0;i<20000;i++) { System.out.println("hello world "+i); } } } ENV: Hardware: Mindspeed C100 OS: embed Linux How to reproduce: root at comcerto100:/root> java -XX:+SharkTraceInstalls HelloLoop hello world 0 hello world 1 hello world 2 hello world 3 hello world 4 hello world 5 hello world 6 hello world 7 hello world 8 hello world 9 ... hello world 10305 hello world 10306 hello world 10307 hello world 10308 [0x43662010-0x43662f6c): sun.nio.cs.UTF_8$Encoder::encodeArrayLoop (3932 bytes code) hello world 10309# # A fatal error has been detected by the Java Runtime Environment: # # Internal Error (os_linux_zero.cpp:236), pid=1729, tid=1086248080 # Error: caught unhandled signal 4 # # JRE version: 6.0_18-b18 # Java VM: OpenJDK Shark VM (14.0-b16 mixed mode linux-arm ) # Derivative: IcedTea6 1.8 # Distribution: Ubuntu 9.10, package fedora-36.b18-arm # An error report file with more information is saved as: # /root/hs_err_pid1729.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # Aborted The attachment file is the log. ////////////////////////////////////////////////////////////////////// I found a same bug http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=319 , the bug was fixed. But I don't know why the bug occurred? Does anyone can help me solve the issue or some suggestion? I appreciate for your help. B.R -------------- next part -------------- A non-text attachment was scrubbed... Name: hs_err_pid1729.log Type: text/x-log Size: 25555 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100817/ad2d8f26/hs_err_pid1729.log From ptisnovs at redhat.com Tue Aug 17 02:36:42 2010 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Tue, 17 Aug 2010 11:36:42 +0200 Subject: Possible regression between IcedTea6-1.8 and IcedTea6-1.9 In-Reply-To: <20100812164513.GN10867@rivendell.middle-earth.co.uk> References: <4C6420E8.3090901@redhat.com> <20100812164513.GN10867@rivendell.middle-earth.co.uk> Message-ID: <4C6A582A.6040303@redhat.com> Dr Andrew John Hughes wrote: > On 18:27 Thu 12 Aug , Pavel Tisnovsky wrote: >> Hi all, >> >> I tried to find out why some new regression tests does not pass on the >> IcedTea6 HEAD and - by the way - I may have found the regression between >> IcedTea6 IcedTea6-1.8 and-1.9. >> >> When the following very simple test is run with option >> -Dsun.java2d.opengl set to True and I run it inside VNC session (ie >> without acceleration): >> >> import javax.swing.JPanel; >> >> public class Test extends JPanel { >> public Test() { >> } >> >> public static void main(String[] args) >> { >> Test t = new Test(); >> System.out.println("Test Passed."); >> } >> } >> >> It simply wrote warning message in IcedTea6-1.8: >> >> /temp/icedtea6-1.8/openjdk/build/linux-amd64/j2sdk-image/bin/java >> -Dsun.java2d.opengl=True Test >> Could not enable OpenGL pipeline for default config on screen 0 >> Test Passed. >> >> but it failed in IcedTea6-1.9 (and HEAD too): >> >> /temp/icedtea6-1.9/openjdk.build/j2sdk-image/bin/java >> -Dsun.java2d.opengl=True Test >> Exception in thread "main" java.lang.UnsatisfiedLinkError: >> sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String; >> at sun.java2d.opengl.OGLContext.getOGLIdString(Native Method) >> at >> sun.java2d.opengl.GLXGraphicsConfig$1.run(GLXGraphicsConfig.java:126) >> at >> sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run(OGLRenderQueue.java:220) >> ~ >> >> >> Tested on RHEL5 x86_64 in VNC session, DISPLAY is set to :2.0 (it's >> correct, of course). >> >> Do anyone remember that we did any changes in XRender or java2d.opengl >> packages between 1.8 and 1.9? >> >> PS: at least these regression tests fail due to issue mentioned above: >> FAILED: sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java >> FAILED: sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java >> FAILED: >> sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java >> FAILED: sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java >> FAILED: >> sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java >> FAILED: sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java >> FAILED: sun/java2d/OpenGL/DrawBufImgOp.java >> FAILED: sun/java2d/OpenGL/GradientPaints.java >> FAILED: sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java >> FAILED: sun/java2d/pipe/MutableColorTest/MutableColorTest.java >> >> Cheers >> Pavel > > As discussed on the mailing list, XRender was updated to the new version: > > http://icedtea.classpath.org/hg/release/icedtea6-1.9/rev/9da4f50c13c0 > > Part of this involved updating the pipeline code which XRender relies on > (see the patch). Both are 7 backports. Have you checked whether the > same tests fail in 7? I think that this issue could be solved by the patch stored in attachment [OGLContext.patch] because OGLContext.o is already included in xawt.so (which is correct) but it does not exist JNI link to native function OGLContext.getOGLIdString(). Is it possible to add this patch to IcedTea6 or (preferably) add its contents to existing patch 6961633-xrender-02.patch? But I found another issue: when I run the test against IcedTea6 with the patch applied JRE failed due to fatal error - see attachment [hs_err_pid32222.log]. It's quite strange for me because libGL.so contains function glGetString(). I have to further investigate why this call failed (I run the test in VNC session which can be one possible source of failure). > > Note: There is no 1.9 release yet. The branch was created specifically > so we'd find stuff like this before release :-) -------------- next part -------------- A non-text attachment was scrubbed... Name: OGLContext.patch Type: text/x-patch Size: 497 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100817/aae45649/OGLContext.patch -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: hs_err_pid32222.log Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100817/aae45649/hs_err_pid32222.log From xerxes at zafena.se Tue Aug 17 03:25:50 2010 From: xerxes at zafena.se (=?UTF-8?B?WGVyeGVzIFLDpW5ieQ==?=) Date: Tue, 17 Aug 2010 12:25:50 +0200 Subject: Shark sun.nio.cs.UTF_8$Encoder::encodeArrayLoop throw unhandled signal 4 error on ARM In-Reply-To: <1282010621.1931.25.camel@Jetlan-D1> References: <1282010621.1931.25.camel@Jetlan-D1> Message-ID: <4C6A63AE.3060304@zafena.se> On 2010-08-17 04:03, Bin Lan wrote: > Testcase: > > public class HelloLoop { > > public static void main(String[] args) { > > HelloLoop hello=new HelloLoop(); > hello.printOut(); > } > > private void printOut() > { > for(int i=0;i<20000;i++) > { > System.out.println("hello world "+i); > } > } > } > ENV: > Hardware: Mindspeed C100 > OS: embed Linux > > How to reproduce: > root at comcerto100:/root> java -XX:+SharkTraceInstalls HelloLoop > hello world 0 > hello world 1 > hello world 2 > hello world 3 > hello world 4 > hello world 5 > hello world 6 > hello world 7 > hello world 8 > hello world 9 > ... > hello world 10305 > hello world 10306 > hello world 10307 > hello world 10308 > [0x43662010-0x43662f6c): sun.nio.cs.UTF_8$Encoder::encodeArrayLoop > (3932 bytes code) > hello world 10309# > # A fatal error has been detected by the Java Runtime Environment: > # > # Internal Error (os_linux_zero.cpp:236), pid=1729, tid=1086248080 > # Error: caught unhandled signal 4 > > Signal 4 SIGILL illegal instruction usually indicate that the JITed code have taken a branch into garbage memory. It can also some times indicate that LLVM have actually JITed a broken instruction ... or a instruction not supported by your ARM core, since the LLVM JIT defaults to use armv4 instructions and all those are supported by you core means that you should not see any signal 4 SIGILL issues under normal circumstances. I have tested your testcase on my various ARM hardware and have been unable to reproduce the bug. All Shark versions tested below here have been run in combination with patched LLVM versions in order to work around LLVM JIT bugs. I think you need to patch your LLVM version as well. See the end of the mail for lists of patches. passed on ubuntu 9.04: running shark using llvm 2.8svn and icedtea6-pre1.9 on armv7 hardware compiled using gcc 4.3.3 xerxes at xerxes:~$ uname -a Linux xerxes 2.6.28-15-araneo #50fsl1araneo19-Ubuntu PREEMPT Mon Jan 25 15:54:27 UTC 2010 armv7l GNU/Linux xerxes at xerxes:~$ java -version java version "1.6.0_20" OpenJDK Runtime Environment (IcedTea6 1.9pre+rdd4d9f50ac7c) (Ubuntu build 1.6.0_20-b20) OpenJDK Shark VM (build 17.0-b16, mixed mode) passed on debian squeese: running shark using llvm 2.6 and icedtea6-1.8 on armv5 hardware compiled using gcc 4.4.4 xranby at stora:~$ uname -a Linux stora 2.6.22.18-Netgear #4 Thu Sep 3 13:29:25 EDT 2009 armv5tejl GNU/Linux xranby at stora:~$ java -shark -version java version "1.6.0_18" OpenJDK Runtime Environment (IcedTea6 1.8) (6b18-1.8-1) OpenJDK Shark VM (build 14.0-b16, mixed mode) passed on ubuntu 9.04 using llvm 2.7 and icedtea6-1.8 on armv7 omap hardware compiled using gcc 4.5 using openembedded targeting armv4 instructionset xerxes at overo:~$ /usr/src/openembedded/shark-test/26jul-shark-armv4/bin/java -shark -version java version "1.6.0_18" OpenJDK Runtime Environment (IcedTea6 1.8) (6b18-1.8) OpenJDK Shark VM (build 14.0-b16, mixed mode) xerxes at overo:~$ /usr/src/openembedded/shark-test/26jul-shark-armv4/bin/java -shark -XX:+SharkTraceInstalls -XX:CompileThreshold=2000 HelloLoop [0x67e89010-0x67e89320): java.lang.String::hashCode (784 bytes code) hello world 0 hello world 1 hello world 2 hello world 3 hello world 4 hello world 5 hello world 6 hello world 7 hello world 8 hello world 9 [0x67e89360-0x67e8a1c4): sun.nio.cs.UTF_8$Encoder::encodeArrayLoop (3684 bytes code) hello world 10 hello world 11 ... hello world 26 hello world 27 hello world 28 [0x67e8a200-0x67e8aab8): java.lang.String::indexOf (2232 bytes code) ... a lot of hellos and 70 jited methods later hello world 19992 hello world 19993 hello world 19994 hello world 19995 hello world 19996 hello world 19997 hello world 19998 hello world 19999 xerxes at overo:~$ success! > ////////////////////////////////////////////////////////////////////// > > I found a same bug > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=319 , the bug was > fixed. This fixed bug behaves a bit differently than the bug you are experiencing since pr319 triggered a regular segfault. > But I don't know why the bug occurred? > Honestly we are still a bit unsure why pr319 occurred since we never investigated it more closely by creating a gdb backtrace, Most likely the pr319 bug got fixed during October 2009 while inventing a workaround for a armv4 indirect branch JIT bug found in LLVM. http://labb.zafena.se/?p=257 Today i would categorize pr319 as a duplicate of http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=434 This branch bug have now fixed properly when using Shark in combination with LLVM 2.8svn from LLVM upstream. LLVM 2.8svn contain the first implementation of the ARM JIT that work on armv4 and later out of the box. sun.nio.cs.UTF_8$Encoder::encodeArrayLoop are usually one of the first larger methods to get jited by Shark and therefore are quite likely to trigger any LLVM JIT issue if there are any instability in the LLVM JIT. We still need a GDB backtrace in order to find out and categorize why your JITed sun.nio.cs.UTF_8$Encoder::encodeArrayLoop hits a Signal 4 SIGILL. > Does anyone can help me solve the issue or some suggestion? I appreciate > for your help. > What LLVM version do you use? At a minimal if you compile LLVM yourself then you must patch the LLVM JIT for ARM to mainly work around two LLVM JIT bugs: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=434 - the armv4 indirect branch JIT bug as mentioned above. - fixed in llvm 2.8 and later and http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=399 - this LLVM bug hits for long running applications when the JITed code spans over more than 32mb of RAM on ARM. There do exist other LLVM JIT bugs that triggers if you try to enable armv6 instructions and later or enable the use of a VFP FPU units NEON unit etc etc. Since LLVM dont make bugfix dot releases the various Linux distributions have to keep track of all bugfix patches needed to fixes issues reported by their users to be applied on the various LLVM releases. The current list of patches we used to stabilize LLVM 2.7 for Openembedded users are: http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/llvm/llvm2.7 Ubuntu currently use these sources for llvm2.7: https://launchpad.net/ubuntu/+source/llvm-2.7/ and Debian currently uses these set of patches for llvm2.6: http://patch-tracker.debian.org/package/llvm/2.6-9 > B.R > > Cheers and have a great day! Xerxes From ptisnovs at redhat.com Tue Aug 17 04:26:25 2010 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Tue, 17 Aug 2010 13:26:25 +0200 Subject: Repeated attempt to open non-existent libsunwjdga.so for Awt/Swing apps in IcedTea6 HEAD Message-ID: <4C6A71E1.4000801@redhat.com> Hi, I've found that IcedTea6 HEAD's JRE repeatedly tries to open non-existent library libsunwjdga.so when some Awt or Swing based application is started. Do anyone know if this is correct behaviour or do we have to add rules for this library to our build scripts? Grepped messages from Strace are stored in attachment. Pavel -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: libsunwjdga.strace Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100817/4815386e/libsunwjdga.strace From evgueni.gordienko at motorola.com Tue Aug 17 11:55:03 2010 From: evgueni.gordienko at motorola.com (Gordienko Evgueni-XPNG76) Date: Tue, 17 Aug 2010 14:55:03 -0400 Subject: Java flags for TCK test with Shark Message-ID: Hi All, Where can I find the set of flags used for java in TCK tests with Shark? Thanks, Eugene -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100817/7e0291ac/attachment.html From bugzilla-daemon at icedtea.classpath.org Tue Aug 17 12:18:00 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 17 Aug 2010 19:18:00 +0000 Subject: [Bug 531] New: install thinkingrock 3.1.2 start get erroe and crash Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=531 Summary: install thinkingrock 3.1.2 start get erroe and crash Product: IcedTea Version: unspecified Platform: arm OS/Version: Other Status: NEW Severity: major Priority: P2 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: mdaitzman at mac.com 66672000-66675000 r-xp 00000000 fe:01 20191 /lib/libnss_dns-2.5.so 66675000-6667c000 ---p 00003000 fe:01 20191 /lib/libnss_dns-2.5.so 6667c000-6667d000 r--p 00002000 fe:01 20191 /lib/libnss_dns-2.5.so 6667d000-6667e000 rw-p 00003000 fe:01 20191 /lib/libnss_dns-2.5.so 6667e000-6668c000 r-xp 00000000 fe:01 20052 /lib/libresolv-2.5.so 6668c000-66693000 ---p 0000e000 fe:01 20052 /lib/libresolv-2.5.so 66693000-66694000 r--p 0000d000 fe:01 20052 /lib/libresolv-2.5.so 66694000-66695000 rw-p 0000e000 fe:01 20052 /lib/libresolv-2.5.so 66695000-66697000 rw-p 66695000 00:00 0 66697000-6669a000 ---p 66697000 00:00 0 6669a000-66817000 rwxp 6669a000 00:00 0 66817000-6681a000 rwxp 66817000 00:00 0 6681a000-66997000 rwxp 6681a000 00:00 0 66a00000-66afb000 rw-p 66a00000 00:00 0 66afb000-66b00000 ---p 66afb000 00:00 0 66b00000-66b03000 rwxp 66b00000 00:00 0 66b03000-66c80000 rwxp 66b03000 00:00 0 66c80000-66c83000 ---p 66c80000 00:00 0 66c83000-66e00000 rwxp 66c83000 00:00 0 66e00000-66efd000 rw-p 66e00000 00:00 0 66efd000-66f00000 ---p 66efd000 00:00 0 66f00000-66f29000 rw-p 66f00000 00:00 0 66f29000-67000000 ---p 66f29000 00:00 0 bef0b000-bef20000 rwxp befeb000 00:00 0 [stack] VM Arguments: jvm_args: -Djdk.home=/opt/icedtea6 -Dnetbeans.dirs=./../tr:./../ide:./../modules: -Dnetbeans.home=/usr/local/tr/platform -Xms64m -Xmx256m -XX:PermSize=64m -XX:MaxPermSize=256m -Dsun.java2d.noddraw=true -Xverify:none -Dorg.netbeans.ProxyClassLoader.level=1000 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/home/user/.thinkingrock/tr-3.1.2/var/log/heapdump.hprof java_command: org.netbeans.Main --userdir /home/user/.thinkingrock/tr-3.1.2 --locale en:US --laf javax.swing.plaf.metal.MetalLookAndFeel --branding tr --fontsize 13 Launcher Type: SUN_STANDARD Environment Variables: PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin LD_LIBRARY_PATH=/opt/icedtea6/jre/lib/arm/server:/opt/icedtea6/jre/lib/arm:/opt/icedtea6/jre/../lib/arm SHELL=/bin/sh DISPLAY=:0.0 Signal Handlers: SIGSEGV: [libjvm.so+0x2f6948], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGBUS: [libjvm.so+0x2f6948], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGFPE: [libjvm.so+0x254bf4], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGPIPE: [libjvm.so+0x254bf4], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGXFSZ: [libjvm.so+0x254bf4], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGILL: [libjvm.so+0x254bf4], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000 SIGUSR2: [libjvm.so+0x257898], sa_mask[0]=0x00000000, sa_flags=0x10000004 SIGHUP: [libjvm.so+0x25692c], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGINT: SIG_IGN, sa_mask[0]=0x00000000, sa_flags=0x00000000 SIGTERM: [libjvm.so+0x25692c], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGQUIT: [libjvm.so+0x25692c], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 --------------- S Y S T E M --------------- OS:testing/unstable uname:Linux 2.6.28-omap1 #1 PREEMPT Thu Apr 15 09:47:09 EEST 2010 armv7l libc:glibc 2.5 NPTL 2.5 rlimit: STACK 2048k, CORE infinity, NPROC 2048, NOFILE 1024, AS infinity load average:2.98 3.04 2.71 CPU:total 1 Memory: 4k page, physical 245540k(3752k free), swap 786424k(486184k free) vm_info: OpenJDK Zero VM (14.0-b16) for linux-arm JRE (1.6.0_18-b18), built on May 3 2010 12:44:07 by "buildd" with gcc 4.4.3 time: Tue Aug 17 14:22:40 2010 elapsed time: 126 seconds -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From Bin.Lan at windriver.com Tue Aug 17 23:56:57 2010 From: Bin.Lan at windriver.com (Bin Lan) Date: Wed, 18 Aug 2010 14:56:57 +0800 Subject: Shark sun.nio.cs.UTF_8$Encoder::encodeArrayLoop throw unhandled signal 4 error on ARM In-Reply-To: <4C6A63AE.3060304@zafena.se> References: <1282010621.1931.25.camel@Jetlan-D1> <4C6A63AE.3060304@zafena.se> Message-ID: <1282114617.1945.4.camel@Jetlan-D1> Hi Xerxes, I use LLVM version is 2.7, after applied the two patches which you refer to in last email, the issue is fixed, and openjdk can work fine. Thank you very much for your help and suggestion. Bin Lan On Tue, 2010-08-17 at 12:25 +0200, Xerxes R?nby wrote: > On 2010-08-17 04:03, Bin Lan wrote: > > Testcase: > > > > public class HelloLoop { > > > > public static void main(String[] args) { > > > > HelloLoop hello=new HelloLoop(); > > hello.printOut(); > > } > > > > private void printOut() > > { > > for(int i=0;i<20000;i++) > > { > > System.out.println("hello world "+i); > > } > > } > > } > > ENV: > > Hardware: Mindspeed C100 > > OS: embed Linux > > > > How to reproduce: > > root at comcerto100:/root> java -XX:+SharkTraceInstalls HelloLoop > > hello world 0 > > hello world 1 > > hello world 2 > > hello world 3 > > hello world 4 > > hello world 5 > > hello world 6 > > hello world 7 > > hello world 8 > > hello world 9 > > ... > > hello world 10305 > > hello world 10306 > > hello world 10307 > > hello world 10308 > > [0x43662010-0x43662f6c): sun.nio.cs.UTF_8$Encoder::encodeArrayLoop > > (3932 bytes code) > > hello world 10309# > > # A fatal error has been detected by the Java Runtime Environment: > > # > > # Internal Error (os_linux_zero.cpp:236), pid=1729, tid=1086248080 > > # Error: caught unhandled signal 4 > > > > > Signal 4 SIGILL illegal instruction usually indicate that the JITed code > have taken a branch into garbage memory. > It can also some times indicate that LLVM have actually JITed a broken > instruction > ... or a instruction not supported by your ARM core, since the LLVM JIT > defaults to use armv4 instructions and all those are supported by you > core means that you should not see any signal 4 SIGILL issues under > normal circumstances. > > I have tested your testcase on my various ARM hardware and have been > unable to reproduce the bug. > > All Shark versions tested below here have been run in combination with > patched LLVM versions in order to work around LLVM JIT bugs. > I think you need to patch your LLVM version as well. See the end of the > mail for lists of patches. > > passed on ubuntu 9.04: running shark using llvm 2.8svn and > icedtea6-pre1.9 on armv7 hardware > compiled using gcc 4.3.3 > xerxes at xerxes:~$ uname -a > Linux xerxes 2.6.28-15-araneo #50fsl1araneo19-Ubuntu PREEMPT Mon Jan > 25 15:54:27 UTC 2010 armv7l GNU/Linux > xerxes at xerxes:~$ java -version > java version "1.6.0_20" > OpenJDK Runtime Environment (IcedTea6 1.9pre+rdd4d9f50ac7c) (Ubuntu > build 1.6.0_20-b20) > OpenJDK Shark VM (build 17.0-b16, mixed mode) > > passed on debian squeese: running shark using llvm 2.6 and icedtea6-1.8 > on armv5 hardware > compiled using gcc 4.4.4 > xranby at stora:~$ uname -a > Linux stora 2.6.22.18-Netgear #4 Thu Sep 3 13:29:25 EDT 2009 > armv5tejl GNU/Linux > xranby at stora:~$ java -shark > -version > java version "1.6.0_18" > OpenJDK Runtime Environment (IcedTea6 1.8) (6b18-1.8-1) > OpenJDK Shark VM (build 14.0-b16, mixed mode) > > passed on ubuntu 9.04 using llvm 2.7 and icedtea6-1.8 on armv7 omap hardware > compiled using gcc 4.5 using openembedded targeting armv4 instructionset > xerxes at overo:~$ > /usr/src/openembedded/shark-test/26jul-shark-armv4/bin/java -shark -version > java version "1.6.0_18" > OpenJDK Runtime Environment (IcedTea6 1.8) (6b18-1.8) > OpenJDK Shark VM (build 14.0-b16, mixed mode) > > xerxes at overo:~$ > /usr/src/openembedded/shark-test/26jul-shark-armv4/bin/java -shark > -XX:+SharkTraceInstalls -XX:CompileThreshold=2000 HelloLoop > [0x67e89010-0x67e89320): java.lang.String::hashCode (784 bytes code) > hello world 0 > hello world 1 > hello world 2 > hello world 3 > hello world 4 > hello world 5 > hello world 6 > hello world 7 > hello world 8 > hello world 9 [0x67e89360-0x67e8a1c4): > sun.nio.cs.UTF_8$Encoder::encodeArrayLoop (3684 bytes code) > > hello world 10 > hello world 11 > > ... > > hello world 26 > hello world 27 > hello world 28 [0x67e8a200-0x67e8aab8): java.lang.String::indexOf (2232 > bytes code) > > ... a lot of hellos and 70 jited methods later > > hello world 19992 > hello world 19993 > hello world 19994 > hello world 19995 > hello world 19996 > hello world 19997 > hello world 19998 > hello world 19999 > xerxes at overo:~$ > > success! > > > ////////////////////////////////////////////////////////////////////// > > > > I found a same bug > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=319 , the bug was > > fixed. > > This fixed bug behaves a bit differently than the bug you are > experiencing since pr319 triggered a regular segfault. > > > But I don't know why the bug occurred? > > > Honestly we are still a bit unsure why pr319 occurred since we never > investigated it more closely by creating a gdb backtrace, > > Most likely the pr319 bug got fixed during October 2009 while inventing > a workaround for a armv4 indirect branch JIT bug found in LLVM. > http://labb.zafena.se/?p=257 > Today i would categorize pr319 as a duplicate of > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=434 > This branch bug have now fixed properly when using Shark in combination > with LLVM 2.8svn from LLVM upstream. LLVM 2.8svn contain the first > implementation of the ARM JIT that work on armv4 and later out of the box. > > sun.nio.cs.UTF_8$Encoder::encodeArrayLoop are usually one of the first > larger methods to get jited by Shark and therefore are quite likely to > trigger any LLVM JIT issue if there are any instability in the LLVM JIT. > > We still need a GDB backtrace in order to find out and categorize why > your JITed sun.nio.cs.UTF_8$Encoder::encodeArrayLoop hits a Signal 4 > SIGILL. > > Does anyone can help me solve the issue or some suggestion? I appreciate > > for your help. > > > > What LLVM version do you use? > > At a minimal if you compile LLVM yourself then you must patch the LLVM > JIT for ARM to mainly work around two LLVM JIT bugs: > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=434 - the armv4 > indirect branch JIT bug as mentioned above. - fixed in llvm 2.8 and later > and > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=399 - this LLVM > bug hits for long running applications when the JITed code spans over > more than 32mb of RAM on ARM. > > > There do exist other LLVM JIT bugs that triggers if you try to enable > armv6 instructions and later or enable the use of a VFP FPU units NEON > unit etc etc. > > Since LLVM dont make bugfix dot releases the various Linux distributions > have to keep track of all bugfix patches needed to fixes issues reported > by their users to be applied on the various LLVM releases. > > The current list of patches we used to stabilize LLVM 2.7 for > Openembedded users are: > http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/llvm/llvm2.7 > > Ubuntu currently use these sources for llvm2.7: > https://launchpad.net/ubuntu/+source/llvm-2.7/ > > and Debian currently uses these set of patches for llvm2.6: > http://patch-tracker.debian.org/package/llvm/2.6-9 > > > B.R > > > > > > Cheers and have a great day! > Xerxes > From gbenson at redhat.com Wed Aug 18 01:56:48 2010 From: gbenson at redhat.com (Gary Benson) Date: Wed, 18 Aug 2010 09:56:48 +0100 Subject: Java flags for TCK test with Shark In-Reply-To: References: Message-ID: <20100818085648.GB3280@redhat.com> Hi Evgueni, Ask me :) What do you want to know? Cheers, Gary Gordienko Evgueni-XPNG76 wrote: > Hi All, > > Where can I find the set of flags used for java in TCK tests with > Shark? > > Thanks, > Eugene From gbenson at redhat.com Wed Aug 18 02:00:25 2010 From: gbenson at redhat.com (Gary Benson) Date: Wed, 18 Aug 2010 10:00:25 +0100 Subject: Shark sun.nio.cs.UTF_8$Encoder::encodeArrayLoop throw unhandled signal 4 error on ARM In-Reply-To: <1282114617.1945.4.camel@Jetlan-D1> References: <1282010621.1931.25.camel@Jetlan-D1> <4C6A63AE.3060304@zafena.se> <1282114617.1945.4.camel@Jetlan-D1> Message-ID: <20100818090025.GC3280@redhat.com> Awesome, nice work Xerxes! Bin Lan wrote: > Hi Xerxes, > > I use LLVM version is 2.7, after applied the two patches which you > refer to in last email, the issue is fixed, and openjdk can work > fine. > > Thank you very much for your help and suggestion. > > Bin Lan > > On Tue, 2010-08-17 at 12:25 +0200, Xerxes R?nby wrote: > > On 2010-08-17 04:03, Bin Lan wrote: > > > Testcase: > > > > > > public class HelloLoop { > > > > > > public static void main(String[] args) { > > > > > > HelloLoop hello=new HelloLoop(); > > > hello.printOut(); > > > } > > > > > > private void printOut() > > > { > > > for(int i=0;i<20000;i++) > > > { > > > System.out.println("hello world "+i); > > > } > > > } > > > } > > > ENV: > > > Hardware: Mindspeed C100 > > > OS: embed Linux > > > > > > How to reproduce: > > > root at comcerto100:/root> java -XX:+SharkTraceInstalls HelloLoop > > > hello world 0 > > > hello world 1 > > > hello world 2 > > > hello world 3 > > > hello world 4 > > > hello world 5 > > > hello world 6 > > > hello world 7 > > > hello world 8 > > > hello world 9 > > > ... > > > hello world 10305 > > > hello world 10306 > > > hello world 10307 > > > hello world 10308 > > > [0x43662010-0x43662f6c): sun.nio.cs.UTF_8$Encoder::encodeArrayLoop > > > (3932 bytes code) > > > hello world 10309# > > > # A fatal error has been detected by the Java Runtime Environment: > > > # > > > # Internal Error (os_linux_zero.cpp:236), pid=1729, tid=1086248080 > > > # Error: caught unhandled signal 4 > > > > > > > > Signal 4 SIGILL illegal instruction usually indicate that the JITed code > > have taken a branch into garbage memory. > > It can also some times indicate that LLVM have actually JITed a broken > > instruction > > ... or a instruction not supported by your ARM core, since the LLVM JIT > > defaults to use armv4 instructions and all those are supported by you > > core means that you should not see any signal 4 SIGILL issues under > > normal circumstances. > > > > I have tested your testcase on my various ARM hardware and have been > > unable to reproduce the bug. > > > > All Shark versions tested below here have been run in combination with > > patched LLVM versions in order to work around LLVM JIT bugs. > > I think you need to patch your LLVM version as well. See the end of the > > mail for lists of patches. > > > > passed on ubuntu 9.04: running shark using llvm 2.8svn and > > icedtea6-pre1.9 on armv7 hardware > > compiled using gcc 4.3.3 > > xerxes at xerxes:~$ uname -a > > Linux xerxes 2.6.28-15-araneo #50fsl1araneo19-Ubuntu PREEMPT Mon Jan > > 25 15:54:27 UTC 2010 armv7l GNU/Linux > > xerxes at xerxes:~$ java -version > > java version "1.6.0_20" > > OpenJDK Runtime Environment (IcedTea6 1.9pre+rdd4d9f50ac7c) (Ubuntu > > build 1.6.0_20-b20) > > OpenJDK Shark VM (build 17.0-b16, mixed mode) > > > > passed on debian squeese: running shark using llvm 2.6 and icedtea6-1.8 > > on armv5 hardware > > compiled using gcc 4.4.4 > > xranby at stora:~$ uname -a > > Linux stora 2.6.22.18-Netgear #4 Thu Sep 3 13:29:25 EDT 2009 > > armv5tejl GNU/Linux > > xranby at stora:~$ java -shark > > -version > > java version "1.6.0_18" > > OpenJDK Runtime Environment (IcedTea6 1.8) (6b18-1.8-1) > > OpenJDK Shark VM (build 14.0-b16, mixed mode) > > > > passed on ubuntu 9.04 using llvm 2.7 and icedtea6-1.8 on armv7 omap hardware > > compiled using gcc 4.5 using openembedded targeting armv4 instructionset > > xerxes at overo:~$ > > /usr/src/openembedded/shark-test/26jul-shark-armv4/bin/java -shark -version > > java version "1.6.0_18" > > OpenJDK Runtime Environment (IcedTea6 1.8) (6b18-1.8) > > OpenJDK Shark VM (build 14.0-b16, mixed mode) > > > > xerxes at overo:~$ > > /usr/src/openembedded/shark-test/26jul-shark-armv4/bin/java -shark > > -XX:+SharkTraceInstalls -XX:CompileThreshold=2000 HelloLoop > > [0x67e89010-0x67e89320): java.lang.String::hashCode (784 bytes code) > > hello world 0 > > hello world 1 > > hello world 2 > > hello world 3 > > hello world 4 > > hello world 5 > > hello world 6 > > hello world 7 > > hello world 8 > > hello world 9 [0x67e89360-0x67e8a1c4): > > sun.nio.cs.UTF_8$Encoder::encodeArrayLoop (3684 bytes code) > > > > hello world 10 > > hello world 11 > > > > ... > > > > hello world 26 > > hello world 27 > > hello world 28 [0x67e8a200-0x67e8aab8): java.lang.String::indexOf (2232 > > bytes code) > > > > ... a lot of hellos and 70 jited methods later > > > > hello world 19992 > > hello world 19993 > > hello world 19994 > > hello world 19995 > > hello world 19996 > > hello world 19997 > > hello world 19998 > > hello world 19999 > > xerxes at overo:~$ > > > > success! > > > > > ////////////////////////////////////////////////////////////////////// > > > > > > I found a same bug > > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=319 , the bug was > > > fixed. > > > > This fixed bug behaves a bit differently than the bug you are > > experiencing since pr319 triggered a regular segfault. > > > > > But I don't know why the bug occurred? > > > > > Honestly we are still a bit unsure why pr319 occurred since we never > > investigated it more closely by creating a gdb backtrace, > > > > Most likely the pr319 bug got fixed during October 2009 while inventing > > a workaround for a armv4 indirect branch JIT bug found in LLVM. > > http://labb.zafena.se/?p=257 > > Today i would categorize pr319 as a duplicate of > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=434 > > This branch bug have now fixed properly when using Shark in combination > > with LLVM 2.8svn from LLVM upstream. LLVM 2.8svn contain the first > > implementation of the ARM JIT that work on armv4 and later out of the box. > > > > sun.nio.cs.UTF_8$Encoder::encodeArrayLoop are usually one of the first > > larger methods to get jited by Shark and therefore are quite likely to > > trigger any LLVM JIT issue if there are any instability in the LLVM JIT. > > > > We still need a GDB backtrace in order to find out and categorize why > > your JITed sun.nio.cs.UTF_8$Encoder::encodeArrayLoop hits a Signal 4 > > SIGILL. > > > Does anyone can help me solve the issue or some suggestion? I appreciate > > > for your help. > > > > > > > What LLVM version do you use? > > > > At a minimal if you compile LLVM yourself then you must patch the LLVM > > JIT for ARM to mainly work around two LLVM JIT bugs: > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=434 - the armv4 > > indirect branch JIT bug as mentioned above. - fixed in llvm 2.8 and later > > and > > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=399 - this LLVM > > bug hits for long running applications when the JITed code spans over > > more than 32mb of RAM on ARM. > > > > > > There do exist other LLVM JIT bugs that triggers if you try to enable > > armv6 instructions and later or enable the use of a VFP FPU units NEON > > unit etc etc. > > > > Since LLVM dont make bugfix dot releases the various Linux distributions > > have to keep track of all bugfix patches needed to fixes issues reported > > by their users to be applied on the various LLVM releases. > > > > The current list of patches we used to stabilize LLVM 2.7 for > > Openembedded users are: > > http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/llvm/llvm2.7 > > > > Ubuntu currently use these sources for llvm2.7: > > https://launchpad.net/ubuntu/+source/llvm-2.7/ > > > > and Debian currently uses these set of patches for llvm2.6: > > http://patch-tracker.debian.org/package/llvm/2.6-9 > > > > > B.R > > > > > > > > > > Cheers and have a great day! > > Xerxes > > > > -- http://gbenson.net/ From bugzilla-daemon at icedtea.classpath.org Wed Aug 18 02:48:13 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 18 Aug 2010 09:48:13 +0000 Subject: [Bug 531] install thinkingrock 3.1.2 start get erroe and crash Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=531 ------- Comment #1 from xerxes at zafena.se 2010-08-18 09:48 ------- Hi I have started to look into this bug but have not been able to reproduce this crash bug with the latest "free" version of thinkingrock. Some questions: Is it possible for you to trigger this bug when using the "free" version 2.2.1 taken from sourceforge? http://sourceforge.net/projects/thinkingrock/files/ Have you been able to reproduce this bug by using any of the components that the non-free Thinkingrock 3.x are made up from? Are you able to reproduce this bug by running the latest Netbeans version 6.9 without running thinkingrock? I cant see the crash message in the attached logfile. We must figure out if the crash are a segfault, an illegal instruction, a unimplemented something, an exception or perhaps a jit miscompilation of some java method or what else. please attach the full hs_error_pid.log crash log. If you are able to generate a GDB debugger backtrace of the crash then that would also help a lot. Thanks Xerxes -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From ptisnovs at redhat.com Thu Aug 19 10:12:52 2010 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 19 Aug 2010 19:12:52 +0200 Subject: Possible regression between IcedTea6-1.8 and IcedTea6-1.9 In-Reply-To: <4C6A582A.6040303@redhat.com> References: <4C6420E8.3090901@redhat.com> <20100812164513.GN10867@rivendell.middle-earth.co.uk> <4C6A582A.6040303@redhat.com> Message-ID: <4C6D6614.2020107@redhat.com> Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: >> On 18:27 Thu 12 Aug , Pavel Tisnovsky wrote: >>> Hi all, >>> >>> I tried to find out why some new regression tests does not pass on the >>> IcedTea6 HEAD and - by the way - I may have found the regression between >>> IcedTea6 IcedTea6-1.8 and-1.9. >>> >>> When the following very simple test is run with option >>> -Dsun.java2d.opengl set to True and I run it inside VNC session (ie >>> without acceleration): >>> >>> import javax.swing.JPanel; >>> >>> public class Test extends JPanel { >>> public Test() { >>> } >>> >>> public static void main(String[] args) >>> { >>> Test t = new Test(); >>> System.out.println("Test Passed."); >>> } >>> } >>> >>> It simply wrote warning message in IcedTea6-1.8: >>> >>> /temp/icedtea6-1.8/openjdk/build/linux-amd64/j2sdk-image/bin/java >>> -Dsun.java2d.opengl=True Test >>> Could not enable OpenGL pipeline for default config on screen 0 >>> Test Passed. >>> >>> but it failed in IcedTea6-1.9 (and HEAD too): >>> >>> /temp/icedtea6-1.9/openjdk.build/j2sdk-image/bin/java >>> -Dsun.java2d.opengl=True Test >>> Exception in thread "main" java.lang.UnsatisfiedLinkError: >>> sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String; >>> at sun.java2d.opengl.OGLContext.getOGLIdString(Native Method) >>> at >>> sun.java2d.opengl.GLXGraphicsConfig$1.run(GLXGraphicsConfig.java:126) >>> at >>> sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run(OGLRenderQueue.java:220) >>> ~ >>> >>> >>> Tested on RHEL5 x86_64 in VNC session, DISPLAY is set to :2.0 (it's >>> correct, of course). >>> >>> Do anyone remember that we did any changes in XRender or java2d.opengl >>> packages between 1.8 and 1.9? >>> >>> PS: at least these regression tests fail due to issue mentioned above: >>> FAILED: sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java >>> FAILED: sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java >>> FAILED: >>> sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java >>> FAILED: sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java >>> FAILED: >>> sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java >>> FAILED: sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java >>> FAILED: sun/java2d/OpenGL/DrawBufImgOp.java >>> FAILED: sun/java2d/OpenGL/GradientPaints.java >>> FAILED: sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java >>> FAILED: sun/java2d/pipe/MutableColorTest/MutableColorTest.java >>> >>> Cheers >>> Pavel >> As discussed on the mailing list, XRender was updated to the new version: >> >> http://icedtea.classpath.org/hg/release/icedtea6-1.9/rev/9da4f50c13c0 >> >> Part of this involved updating the pipeline code which XRender relies on >> (see the patch). Both are 7 backports. Have you checked whether the >> same tests fail in 7? > > I think that this issue could be solved by the patch stored in > attachment [OGLContext.patch] because OGLContext.o is already included > in xawt.so (which is correct) but it does not exist JNI link to native > function OGLContext.getOGLIdString(). > > Is it possible to add this patch to IcedTea6 or (preferably) add its > contents to existing patch 6961633-xrender-02.patch? > > But I found another issue: when I run the test against IcedTea6 with the > patch applied JRE failed due to fatal error - see attachment > [hs_err_pid32222.log]. It's quite strange for me because libGL.so > contains function glGetString(). I have to further investigate why this > call failed (I run the test in VNC session which can be one possible > source of failure). So after many hours of testing: This failure happens on RHEL 5 box, but not (for example) on Fedora 10. I tried to run this very simple test in VNC sessions on both OSs: #include #include #include int main(void) { char *c; glGetString(GL_VENDOR); c=(char*)glGetString(GL_VERSION); printf("%x\n", (int)c); return 0; } In VNC session which was started in Fedora 10 this test prints only 0 (ie empty string) which is fine because OpenGL is not initialized and possibly can't be initialized. But the same test SEGFAULTed on RHEL 5 (also in VNC session). Maybe we could add some simple test if OpenGL can be initialized, for example something like this: Display *dpy; Window root; XVisualInfo *vi; dpy = XOpenDisplay(NULL); root = DefaultRootWindow(dpy); vi = glXChooseVisual(dpy, 0, att); if (!vi) {print_error_message_or_disable_opengl} From omajid at redhat.com Thu Aug 19 12:11:08 2010 From: omajid at redhat.com (Omair Majid) Date: Thu, 19 Aug 2010 15:11:08 -0400 Subject: [RFC] netx: add support for reading and parsing element Message-ID: <4C6D81CC.4080805@redhat.com> Hi, The attached patch adds support for netx to read and parse the contents of the element in JNLP files. This element is used to decide how updates to the application are handled. Any comments? Cheers, Omair -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-jnlp-add-updatedesc.patch Type: text/x-patch Size: 6174 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100819/0d512ea9/icedtea6-jnlp-add-updatedesc.patch From dbhole at redhat.com Thu Aug 19 12:24:01 2010 From: dbhole at redhat.com (Deepak Bhole) Date: Thu, 19 Aug 2010 14:24:01 -0500 Subject: [RFC] netx: add support for reading and parsing element In-Reply-To: <4C6D81CC.4080805@redhat.com> References: <4C6D81CC.4080805@redhat.com> Message-ID: <20100819192400.GE15742@redhat.com> Looks good. Please commit to 1.7, 1.8, 1.9 and HEAD. Note: The changes to honour these flags will be going in HEAD only, but since attached patch does not affect functionality, we might as well put it in all. The lesser differences to deal with, the better. Thanks, Deepak * Omair Majid [2010-08-19 14:11]: > Hi, > > The attached patch adds support for netx to read and parse the > contents of the element in JNLP files. This element is used > to decide how updates to the application are handled. > > Any comments? > > Cheers, > Omair > diff -r c73c4672031a netx/net/sourceforge/jnlp/JNLPFile.java > --- a/netx/net/sourceforge/jnlp/JNLPFile.java Tue Aug 10 14:52:56 2010 -0400 > +++ b/netx/net/sourceforge/jnlp/JNLPFile.java Thu Aug 19 14:10:06 2010 -0400 > @@ -83,6 +83,8 @@ > /** information */ > protected List info; > > + protected UpdateDesc update; > + > /** resources */ > protected List resources; > > @@ -345,6 +347,13 @@ > } > > /** > + * Returns the update section of the JNLP file. > + */ > + public UpdateDesc getUpdate() { > + return update; > + } > + > + /** > * Returns the security section of the JNLP file. > */ > public SecurityDesc getSecurity() { > @@ -561,6 +570,7 @@ > codeBase = parser.getCodeBase(); > sourceLocation = parser.getFileLocation() != null ? parser.getFileLocation() : location; > info = parser.getInfo(root); > + update = parser.getUpdate(root); > resources = parser.getResources(root, false); // false == not a j2se/java resources section > launchType = parser.getLauncher(root); > security = parser.getSecurity(root); > diff -r c73c4672031a netx/net/sourceforge/jnlp/Parser.java > --- a/netx/net/sourceforge/jnlp/Parser.java Tue Aug 10 14:52:56 2010 -0400 > +++ b/netx/net/sourceforge/jnlp/Parser.java Thu Aug 19 14:10:06 2010 -0400 > @@ -25,6 +25,8 @@ > //import org.w3c.dom.*; // class for using Tiny XML | NanoXML > //import org.xml.sax.*; > //import gd.xml.tiny.*; > +import net.sourceforge.jnlp.UpdateDesc.Check; > +import net.sourceforge.jnlp.UpdateDesc.Policy; > import net.sourceforge.jnlp.runtime.JNLPRuntime; > import net.sourceforge.nanoxml.*; > > @@ -178,6 +180,53 @@ > return spec; > } > > + public UpdateDesc getUpdate(Node parent) throws ParseException { > + UpdateDesc updateDesc = null; > + Node child = parent.getFirstChild(); > + while (child != null) { > + if (child.getNodeName().equals("update")) { > + if (strict && updateDesc != null) { > + throw new ParseException(R("PTwoUpdates")); > + } > + > + Node node = child; > + > + Check check; > + String checkValue = getAttribute(node, "check", "timeout"); > + if (checkValue.equals("always")) { > + check = Check.ALWAYS; > + } else if (checkValue.equals("timeout")) { > + check = Check.TIMEOUT; > + } else if (checkValue.equals("background")) { > + check = Check.BACKGROUND; > + } else { > + check = Check.TIMEOUT; > + } > + > + String policyString = getAttribute(node, "policy", "always"); > + Policy policy; > + if (policyString.equals("always")) { > + policy = Policy.ALWAYS; > + } else if (policyString.equals("prompt-update")) { > + policy = Policy.PROMPT_UPDATE; > + } else if (policyString.equals("prompt-run")) { > + policy = Policy.PROMPT_RUN; > + } else { > + policy = Policy.ALWAYS; > + } > + > + updateDesc = new UpdateDesc(check, policy); > + } > + > + child = child.getNextSibling(); > + } > + > + if (updateDesc == null) { > + updateDesc = new UpdateDesc(Check.TIMEOUT, Policy.ALWAYS); > + } > + return updateDesc; > + } > + > // > // This section loads the resources elements > // > @@ -1267,4 +1316,5 @@ > > return encoding; > } > + > } > diff -r c73c4672031a netx/net/sourceforge/jnlp/UpdateDesc.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/netx/net/sourceforge/jnlp/UpdateDesc.java Thu Aug 19 14:10:06 2010 -0400 > @@ -0,0 +1,70 @@ > +package net.sourceforge.jnlp; > + > +/** > + * Represents an 'update' element in a JNLP file. This element describes when to > + * check for updates and what actions to take if updates are available > + * > + * @see Check > + * @see Policy > + */ > +public class UpdateDesc { > + > + /** > + * Describes when/how long to check for updates. > + */ > + public enum Check { > + /** Always check for updates before launching the application */ > + ALWAYS, > + > + /** > + * Default. Check for updates until a certain timeout. If the update > + * check is not completed by timeout, launch the cached application and > + * continue updating in the background > + */ > + TIMEOUT, > + > + /** Check for application updates in the background */ > + BACKGROUND > + } > + > + /** > + * Describes what to do when the Runtime knows there is an applicatFion > + * update before the application is launched. > + */ > + public enum Policy { > + /** > + * Default. Always download updates without any user prompt and then launch the > + * application > + */ > + ALWAYS, > + > + /** > + * Prompt the user asking whether the user wants to download and run the > + * updated application or run the version in the cache > + */ > + PROMPT_UPDATE, > + > + /** > + * Prompts the user asking to download and run the latest version of the > + * application or abort running > + */ > + PROMPT_RUN, > + } > + > + private Check check; > + private Policy policy; > + > + public UpdateDesc(Check check, Policy policy) { > + this.check = check; > + this.policy = policy; > + } > + > + public Check getCheck() { > + return this.check; > + } > + > + public Policy getPolicy() { > + return this.policy; > + } > + > +} > diff -r c73c4672031a netx/net/sourceforge/jnlp/resources/Messages.properties > --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Aug 10 14:52:56 2010 -0400 > +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Thu Aug 19 14:10:06 2010 -0400 > @@ -88,6 +88,7 @@ > PTwoMenus=Only one menu element allowed > PTwoTitles=Only one title element allowed > PTwoIcons=Only one icon element allowed > +PTwoUpdates=Only one update element is allowed > PUnknownApplet=Unknown Applet > PBadWidth=Invalid applet width. > PBadHeight=Invalid applet height. From java at oflebbe.de Thu Aug 19 14:30:54 2010 From: java at oflebbe.de (Olaf Flebbe) Date: Thu, 19 Aug 2010 23:30:54 +0200 Subject: For users of --with-openjdk In-Reply-To: <20100810111600.GF27843@rivendell.middle-earth.co.uk> References: <20100810111600.GF27843@rivendell.middle-earth.co.uk> Message-ID: <4C6DA28E.2060409@oflebbe.de> Am 10.08.2010 13:16, schrieb Dr Andrew John Hughes: > This option has now been removed from IcedTea6 HEAD in line with the > changes made to IcedTea7 a year ago: > > http://icedtea.classpath.org/hg/icedtea6/rev/0ba4ad0c362b > > To do a quick non-bootstrap build, the option is now --disable-bootstrap. > To specify an explicit jdk, use --with-jdk-home=. > I stumbled over the --with-openjdk option in INSTALL. Appended a patch. Cheers Olaf -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: PATCH-INSTALL Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100819/ceef24ec/PATCH-INSTALL.ksh From omajid at icedtea.classpath.org Fri Aug 20 14:06:47 2010 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Fri, 20 Aug 2010 21:06:47 +0000 Subject: /hg/icedtea6: netx: check for possible null in splash screen code Message-ID: changeset fe7d70ac2b1a in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fe7d70ac2b1a author: omajid date: Fri Aug 20 17:06:32 2010 -0400 netx: check for possible null in splash screen code 2010-08-19 Omair Majid Fixes rhbz601281 * NEWS: Update with this fix. * netx/net/sourceforge/jnlp/JNLPSplashScreen.java (setSplashImageURL): Check for possible null. diffstat: 3 files changed, 15 insertions(+) ChangeLog | 7 +++++++ NEWS | 2 ++ netx/net/sourceforge/jnlp/JNLPSplashScreen.java | 6 ++++++ diffs (42 lines): diff -r 552e98f1c215 -r fe7d70ac2b1a ChangeLog --- a/ChangeLog Fri Aug 13 23:28:38 2010 +0100 +++ b/ChangeLog Fri Aug 20 17:06:32 2010 -0400 @@ -1,3 +1,10 @@ 2010-08-13 Andrew John Hughes + + Fixes rhbz601281 + * NEWS: Update with this fix. + * netx/net/sourceforge/jnlp/JNLPSplashScreen.java + (setSplashImageURL): Check for possible null. + 2010-08-13 Andrew John Hughes * patches/ecj/javah.patch: Moved to... diff -r 552e98f1c215 -r fe7d70ac2b1a NEWS --- a/NEWS Fri Aug 13 23:28:38 2010 +0100 +++ b/NEWS Fri Aug 20 17:06:32 2010 -0400 @@ -12,6 +12,8 @@ New in release 1.10 (2010-XX-XX): * Backports from OpenJDK6 - S4356282, RH525870: RFE: T2K should be used to rasterize CID/CFF fonts - S6954424: Support OpenType/CFF fonts in JDK 7 +* Netx + - RH601281: Possible NullPointerException in splash screen code New in release 1.9 (2010-XX-XX): diff -r 552e98f1c215 -r fe7d70ac2b1a netx/net/sourceforge/jnlp/JNLPSplashScreen.java --- a/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Fri Aug 13 23:28:38 2010 +0100 +++ b/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Fri Aug 20 17:06:32 2010 -0400 @@ -44,6 +44,12 @@ public class JNLPSplashScreen extends JF try { splashImage = ImageIO.read(resourceTracker .getCacheFile(splashImageUrl)); + if (splashImage == null) { + if (JNLPRuntime.isDebug()) { + System.err.println("Error loading splash image: " + url); + } + return; + } } catch (IOException e) { if (JNLPRuntime.isDebug()) { System.err.println("Error loading splash image: " + url); From omajid at icedtea.classpath.org Fri Aug 20 14:23:31 2010 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Fri, 20 Aug 2010 21:23:31 +0000 Subject: /hg/icedtea6: netx: parse update elements in jnlp files Message-ID: changeset fa8c9bfd3da5 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fa8c9bfd3da5 author: omajid date: Fri Aug 20 17:22:24 2010 -0400 netx: parse update elements in jnlp files 2010-08-20 Omair Majid * netx/net/sourceforge/jnlp/JNLPFile.java (getUpdate): New method. Returns the parsed UpdateDesc. (parse): Call parser.getUpdate. * netx/net/sourceforge/jnlp/Parser.java (getUpdate): New method. Parses a node to find elements. * netx/net/sourceforge/jnlp/UpdateDesc.java: New class. (UpdateDesc): New method. Creates a new UpdateDesc. (getPolicy): New method. Returns the policy attribute of this update. (getCheck): New method. Returns the check attribute for this update. * netx/net/sourceforge/jnlp/resources/Messages.properties: Add PTwoUpdates error. diffstat: 5 files changed, 145 insertions(+) ChangeLog | 14 +++ netx/net/sourceforge/jnlp/JNLPFile.java | 10 ++ netx/net/sourceforge/jnlp/Parser.java | 50 ++++++++++ netx/net/sourceforge/jnlp/UpdateDesc.java | 70 +++++++++++++++ netx/net/sourceforge/jnlp/resources/Messages.properties | 1 diffs (212 lines): diff -r fe7d70ac2b1a -r fa8c9bfd3da5 ChangeLog --- a/ChangeLog Fri Aug 20 17:06:32 2010 -0400 +++ b/ChangeLog Fri Aug 20 17:22:24 2010 -0400 @@ -1,3 +1,17 @@ 2010-08-19 Omair Majid + + * netx/net/sourceforge/jnlp/JNLPFile.java + (getUpdate): New method. Returns the parsed UpdateDesc. + (parse): Call parser.getUpdate. + * netx/net/sourceforge/jnlp/Parser.java + (getUpdate): New method. Parses a node to find elements. + * netx/net/sourceforge/jnlp/UpdateDesc.java: New class. + (UpdateDesc): New method. Creates a new UpdateDesc. + (getPolicy): New method. Returns the policy attribute of this update. + (getCheck): New method. Returns the check attribute for this update. + * netx/net/sourceforge/jnlp/resources/Messages.properties: + Add PTwoUpdates error. + 2010-08-19 Omair Majid Fixes rhbz601281 diff -r fe7d70ac2b1a -r fa8c9bfd3da5 netx/net/sourceforge/jnlp/JNLPFile.java --- a/netx/net/sourceforge/jnlp/JNLPFile.java Fri Aug 20 17:06:32 2010 -0400 +++ b/netx/net/sourceforge/jnlp/JNLPFile.java Fri Aug 20 17:22:24 2010 -0400 @@ -82,6 +82,8 @@ public class JNLPFile { /** information */ protected List info; + + protected UpdateDesc update; /** resources */ protected List resources; @@ -345,6 +347,13 @@ public class JNLPFile { } /** + * Returns the update section of the JNLP file. + */ + public UpdateDesc getUpdate() { + return update; + } + + /** * Returns the security section of the JNLP file. */ public SecurityDesc getSecurity() { @@ -561,6 +570,7 @@ public class JNLPFile { codeBase = parser.getCodeBase(); sourceLocation = parser.getFileLocation() != null ? parser.getFileLocation() : location; info = parser.getInfo(root); + update = parser.getUpdate(root); resources = parser.getResources(root, false); // false == not a j2se/java resources section launchType = parser.getLauncher(root); security = parser.getSecurity(root); diff -r fe7d70ac2b1a -r fa8c9bfd3da5 netx/net/sourceforge/jnlp/Parser.java --- a/netx/net/sourceforge/jnlp/Parser.java Fri Aug 20 17:06:32 2010 -0400 +++ b/netx/net/sourceforge/jnlp/Parser.java Fri Aug 20 17:22:24 2010 -0400 @@ -25,6 +25,8 @@ import java.util.*; //import org.w3c.dom.*; // class for using Tiny XML | NanoXML //import org.xml.sax.*; //import gd.xml.tiny.*; +import net.sourceforge.jnlp.UpdateDesc.Check; +import net.sourceforge.jnlp.UpdateDesc.Policy; import net.sourceforge.jnlp.runtime.JNLPRuntime; import net.sourceforge.nanoxml.*; @@ -176,6 +178,53 @@ class Parser { */ public Version getSpecVersion() { return spec; + } + + public UpdateDesc getUpdate(Node parent) throws ParseException { + UpdateDesc updateDesc = null; + Node child = parent.getFirstChild(); + while (child != null) { + if (child.getNodeName().equals("update")) { + if (strict && updateDesc != null) { + throw new ParseException(R("PTwoUpdates")); + } + + Node node = child; + + Check check; + String checkValue = getAttribute(node, "check", "timeout"); + if (checkValue.equals("always")) { + check = Check.ALWAYS; + } else if (checkValue.equals("timeout")) { + check = Check.TIMEOUT; + } else if (checkValue.equals("background")) { + check = Check.BACKGROUND; + } else { + check = Check.TIMEOUT; + } + + String policyString = getAttribute(node, "policy", "always"); + Policy policy; + if (policyString.equals("always")) { + policy = Policy.ALWAYS; + } else if (policyString.equals("prompt-update")) { + policy = Policy.PROMPT_UPDATE; + } else if (policyString.equals("prompt-run")) { + policy = Policy.PROMPT_RUN; + } else { + policy = Policy.ALWAYS; + } + + updateDesc = new UpdateDesc(check, policy); + } + + child = child.getNextSibling(); + } + + if (updateDesc == null) { + updateDesc = new UpdateDesc(Check.TIMEOUT, Policy.ALWAYS); + } + return updateDesc; } // @@ -1267,4 +1316,5 @@ class Parser { return encoding; } + } diff -r fe7d70ac2b1a -r fa8c9bfd3da5 netx/net/sourceforge/jnlp/UpdateDesc.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/netx/net/sourceforge/jnlp/UpdateDesc.java Fri Aug 20 17:22:24 2010 -0400 @@ -0,0 +1,70 @@ +package net.sourceforge.jnlp; + +/** + * Represents an 'update' element in a JNLP file. This element describes when to + * check for updates and what actions to take if updates are available + * + * @see Check + * @see Policy + */ +public class UpdateDesc { + + /** + * Describes when/how long to check for updates. + */ + public enum Check { + /** Always check for updates before launching the application */ + ALWAYS, + + /** + * Default. Check for updates until a certain timeout. If the update + * check is not completed by timeout, launch the cached application and + * continue updating in the background + */ + TIMEOUT, + + /** Check for application updates in the background */ + BACKGROUND + } + + /** + * Describes what to do when the Runtime knows there is an applicatFion + * update before the application is launched. + */ + public enum Policy { + /** + * Default. Always download updates without any user prompt and then launch the + * application + */ + ALWAYS, + + /** + * Prompt the user asking whether the user wants to download and run the + * updated application or run the version in the cache + */ + PROMPT_UPDATE, + + /** + * Prompts the user asking to download and run the latest version of the + * application or abort running + */ + PROMPT_RUN, + } + + private Check check; + private Policy policy; + + public UpdateDesc(Check check, Policy policy) { + this.check = check; + this.policy = policy; + } + + public Check getCheck() { + return this.check; + } + + public Policy getPolicy() { + return this.policy; + } + +} diff -r fe7d70ac2b1a -r fa8c9bfd3da5 netx/net/sourceforge/jnlp/resources/Messages.properties --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Aug 20 17:06:32 2010 -0400 +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Aug 20 17:22:24 2010 -0400 @@ -88,6 +88,7 @@ PTwoMenus=Only one menu element allowed PTwoMenus=Only one menu element allowed PTwoTitles=Only one title element allowed PTwoIcons=Only one icon element allowed +PTwoUpdates=Only one update element is allowed PUnknownApplet=Unknown Applet PBadWidth=Invalid applet width. PBadHeight=Invalid applet height. From theuserbl at hotmail.com Sat Aug 21 06:56:17 2010 From: theuserbl at hotmail.com (theUser BL) Date: Sat, 21 Aug 2010 13:56:17 +0000 Subject: German Java developer are angry about Oracle Message-ID: Hi! I already have send this news the day before yesterday to OSNews.com. But it is still not published. Also I have send it to Slashdot. But I think it could this could be interesting for you and if it is published on OSNews or Slashdot it is then old. In germany the news was on the different news-sides, but not on international news sides. Greatings theuserbl ------------------------------------- The german iJUG (interest-network of Java User Groups) have published its statement about Oracle: http://www.ijug.eu/index.php?option=com_content&view=article&id=22:java-entwickler-sind-veraergert-ueber-die-informationspolitik-von-oracle&catid=2:news&Itemid=4 The german iJUG is a umbrella organization of nine german Java User Groups and a german Oracle User Group. The iJUG criticised that on the last events of Oracle nothing was said about the future of Java. Additional the common Blogs and Twitter places publishing a lot of lesser informations. A different problem is seen, that Oracle don't say anything about the relationship between its OpenSource products and the commercial variants like on GlassFish. "Oracle always say, its the same products with different license", said iJUG board member and leader of the Java User Group Erlangen/N?rnberg Oliver Szymanski, "but currently don't exists a evidence for it". Additional the behavior with OpenJDK7 and the future of JDK7 is unclear. After the disappointed session of Oracle on the Java Forum Stattgart in Germany it stand in discussion, if the Java-Community should take the future of Java in its own hand. "For example you could much stronger agree for a further stage of OpenJDK", said Tobias Frech from the Java User Group Stuttgart. "JavaFX wants the community as OpenSource, too, to have the possibility to further develop it". Kristian Rink from the Java User Group Saxony thinks to the same direction: "The technical aspects of the JVM should be within the scope of the JCP completly from the community and interested stakeholder done." For the JVM and JDK should be - in his opinion - the existing Sun-implementation as product-proof implementation by an Oracle-extern, open and company-independend unit like Apache or the Eclipse realised, which besiedes long-term ensuring of availability both technologies for development/evolution and priduct-distribution, additional respect the interests of the stakeholder in technical details and realizing it, without to be too much handicapped with the own product- and project-planing. Concretely the users have questions like: - Will be Java in the future further on created within the JCP? When yes, when will be a JSR for Java 7 start? - Comming license-changes for the Java runtime, the JDK or JavaFX, especially with a view of the current lawsuit Oracle/Google? - What plans Oracle to do long-term with duplications of much programs under one roof (GlassFish / WebLogic, Sun JDK / JRockit, Netbeans / JDeveloper)? - Will Oracle be hold the Sun-policy, to not deploy its own patent rights against Open-Source-implementations? - What happens with the Java Store? - What happens with the former Sun employees? The Java-Community is relative big and heterogeneous. There exists lot of commercial and non-commercail units, which its business operations, projects and activities have based on Java as the current ecosystem and which have hence a legitimate interest to have a continuousness of the status quo. Java-developer telling however the iJUG permanent about project, where the use of Java would be sensible, but because of different reasons fail and other technologies have been used. "We giving Oracle time until the JavaOne on september", Fried Saacke sum up. "If there will be nothing satisfiable communicated, we will think about alternative strategies." The iJUG have already spoken with Oracle about the mentioned problems and the company have appreciated it. Now the user waiting urging, that the producer appropriate react. From dj at linuxfromscratch.org Sun Aug 22 15:46:28 2010 From: dj at linuxfromscratch.org (DJ Lucas) Date: Sun, 22 Aug 2010 17:46:28 -0500 Subject: For users of --with-openjdk In-Reply-To: <4C66DBB9.4070707@linuxfromscratch.org> References: <20100810111600.GF27843@rivendell.middle-earth.co.uk> <4C6234EC.7020809@linuxfromscratch.org> <20100811181112.GL10867@rivendell.middle-earth.co.uk> <4C633B7F.3080101@linuxfromscratch.org> <4C6484B8.6090007@linuxfromscratch.org> <20100813004137.GP10867@rivendell.middle-earth.co.uk> <4C64A128.2010300@linuxfromscratch.org> <20100813195739.GX10867@rivendell.middle-earth.co.uk> <4C66DBB9.4070707@linuxfromscratch.org> Message-ID: <4C71A8C4.8040808@linuxfromscratch.org> On 08/14/2010 01:08 PM, DJ Lucas wrote: > > Excellent! That's one more done. Applied locally. So now, I have > nothing in my 1.9 that is not in 1.10 except the attached patch which > gets me a 1.9 build to completion (ignore the 1.9 in the name, is for > 1.10). I will try tip in a few moments, but don't expect a confirmation > until tomorrow. Current 1.10 snapshot completed as expected (with the previously attached patch) using 1.8.1 as system JDK. > BTW, for reference, machine is x86_64 with only 32bit > toolchain. Not so sure I like the unattended testsuite results, so I > reran them without the screen saver active, and the results still are > not looking so good to me. Are there some test suite changes that need > to come back with the Xrender changes? > Many of the failing tests are commented out in 7 for various reasons. I'm not sure if the removals apply directly to IcedTea6 (and haven't had the time to verify, only applied). I've copied the entire blocks from excludelist.jdk.jtx locally (and removed the ones that pass for me or that aren't included in 6) and the results _look_ better, but still not 100%. Here are the removed tests per icedtea7 (with comments): # Failed due to java.lang.UnsatisfiedLinkError: sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String java/awt/FullScreen/BufferStrategyExceptionTest/BufferStrategyExceptionTest.java sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java sun/java2d/OpenGL/GradientPaints.java sun/java2d/pipe/MutableColorTest/MutableColorTest.java sun/java2d/SunGraphics2D/DrawImageBilinear.java sun/java2d/SunGraphics2D/PolyVertTest.java sun/java2d/SunGraphics2D/SimplePrimQuality.java # sun.awt.SunToolkit$OperationTimedOut java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html # Errors # Can't find source file: DisplayModeChanger.java java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java # java.lang.RuntimeException: Ratio of blue to red is too great: 0.13329928498467825 java/awt/Graphics2D/DrawString/RotTransText.java # java.lang.RuntimeException: Step 1: Error: can't bring a focus on Frame by clicking on it java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java # Access denied (java.awt.AWTPermission createRobot) java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html # java.lang.RuntimeException: TestFAILED: some of the testcases are failed java/awt/xembed/server/RunTestXEmbed.java # java.lang.StackOverflowError java/beans/XMLEncoder/javax_swing_tree_TreePath.java # `main' threw exception: java.lang.RuntimeException: java.lang.RuntimeException: Invalid result of the ColorConvertOp for ColorSpace:CS_LINEAR_RGB Data type:TYPE_BYTE. Golden image:BufferedImage at 7b2be1bd: type = 5 ColorModel: #pixelBits = 24 numComponents = 3 color space = java.awt.color.ICC_ColorSpace at 7df17e77 transparency = 1 has alpha = false isAlphaPre = false ByteInterleavedRaster: width = 256 height = 256 #numDataElements 3 dataOff[0] = 2 sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java # `main' threw exception: java.lang.RuntimeException: java.lang.RuntimeException: Invalid result of the ColorConvertOp for ColorSpace:CS_LINEAR_RGB Image type:TYPE_INT_ARGB. Golden image:LRGB.png sun/java2d/cmm/ColorConvertOp/ColConvDCMTest.java sun/java2d/cmm/ColorConvertOp/MTColConvTest.java # java.lang.RuntimeException: Test failed at 0-0 rgb=0xffb7c7d5 sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java # Failed with exit code 1 sun/nio/cs/Test4200310.sh Although probably obvious from previous message, here are the results with the above tests removed in latest 1.9 snapshot (just to keep it in a single message): --------------- jtreg console summary for hotspot --------------- Test results: passed: 86 --------------- jtreg console summary for langtools --------------- Error: tools/javac/processing/6499119/ClassProcessor.java FAILED: tools/javac/InterfaceAssert.java Test results: passed: 1,377; failed: 1; error: 1 --------------- jtreg console summary for jdk --------------- FAILED: com/sun/net/httpserver/bugs/B6361557.java FAILED: java/awt/Focus/ToFrontFocusTest/ToFrontFocus.html FAILED: java/awt/font/TextLayout/TextLayoutBounds.java FAILED: java/awt/Frame/DynamicLayout/DynamicLayout.java FAILED: java/awt/GraphicsDevice/CloneConfigsTest.java FAILED: java/awt/print/PrinterJob/ExceptionTest.java FAILED: java/net/MulticastSocket/NoLoopbackPackets.java FAILED: java/net/URL/TestHttps.java FAILED: java/nio/charset/Charset/NIOCharsetAvailabilityTest.java FAILED: java/rmi/transport/pinLastArguments/PinLastArguments.java MyDeflater had end() called MyInflater had end() called FAILED: javax/swing/plaf/synth/Test6933784.java FAILED: sun/java2d/OpenGL/DrawBufImgOp.java FAILED: sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java FAILED: sun/nio/cs/TestSJIS0213.java FAILED: sun/security/validator/CertReplace.java Error: tools/launcher/MultipleJRE.sh Test results: passed: 3,283; failed: 15; error: 1 I'll be digging through them as time permits. BTW, is there a quick way to run the tests with verbosity? I set VERBOSE=true in the environment, with no change in the output. Also, I had a segfault in langtools once when redirecting.. 'make VERBOSE=true check 2>&1 | tee -a ../jdktest.log' but it hasn't happened since. Not sure what that was. -- DJ Lucas -- This message has been scanned for viruses and dangerous content, and is believed to be clean. From denisl at openscg.com Sun Aug 22 20:59:10 2010 From: denisl at openscg.com (Lussier, Denis) Date: Sun, 22 Aug 2010 23:59:10 -0400 Subject: German Java developer are angry about Oracle In-Reply-To: References: Message-ID: I'm personally very interested in these topics, but... IMHO these are business issues for Oracle to work through and I believe its best to not superficially discuss them in the OpenJDK mailing lists. On Sat, Aug 21, 2010 at 9:56 AM, theUser BL wrote: > > Hi! > > I already have send this news the day before yesterday to OSNews.com. But > it is still not published.... -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100822/0ebb1b98/attachment.html From bugzilla-daemon at icedtea.classpath.org Mon Aug 23 07:52:24 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 23 Aug 2010 14:52:24 +0000 Subject: [Bug 531] install thinkingrock 3.1.2 start get erroe and crash Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=531 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Component|IcedTea6 |Zero -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From ahughes at redhat.com Mon Aug 23 07:58:00 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 23 Aug 2010 15:58:00 +0100 Subject: Bug in make scripts for IcedTea6 HEAD In-Reply-To: <4C695920.20105@redhat.com> References: <4C695920.20105@redhat.com> Message-ID: <20100823145800.GB16992@rivendell.middle-earth.co.uk> On 17:28 Mon 16 Aug , Pavel Tisnovsky wrote: > Hi, > > after I successfully build IcedTea6 HEAD from > http://icedtea.classpath.org/hg/icedtea6 I tried to run command "make > clean dist", but it printed this error message: > > rm -f stamps/bootstrap-directory-symlink.stamp > rm -f /jck/icedtea6/bootstrap/jdk1.6.0 > rm -f stamps/bootstrap-directory-symlink-ecj.stamp > { test ! -d icedtea6-1.10pre || { find icedtea6-1.10pre -type d ! -perm > -200 -exec chmod u+w {} ';' && rm -fr icedtea6-1.10pre; }; } > mkdir icedtea6-1.10pre > mkdir -p -- icedtea6-1.10pre//jck/icedtea6 > icedtea6-1.10pre//jck/icedtea6/patches > icedtea6-1.10pre//jck/icedtea6/rewriter/com/redhat/rewriter > icedtea6-1.10pre/. icedtea6-1.10pre/rewriter icedtea6-1.10pre/scripts > icedtea6-1.10pre/tapset icedtea6-1.10pre/test > cp: cannot stat `.//jck/icedtea6/netx': No such file or directory > make: *** [distdir] Error 1 > > I ran this command from directory /jck/icedtea6 but the string > "icedtea6-1.10pre/" is inserted before the path. > > Any suggestions? > > Pavel T. What options are you passing to configure to begin with? Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Mon Aug 23 07:58:43 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 23 Aug 2010 15:58:43 +0100 Subject: [1.7 & 1.8 BRANCH APPROVAL] Font and PaX patches In-Reply-To: <20100813123514.GT10867@rivendell.middle-earth.co.uk> References: <20100813123514.GT10867@rivendell.middle-earth.co.uk> Message-ID: <20100823145843.GC16992@rivendell.middle-earth.co.uk> On 13:35 Fri 13 Aug , Dr Andrew John Hughes wrote: > I'd like to backport the following fixes to 1.7 & 1.8: > > changeset: 2076:3fd44a9bb9a3 > user: Andrew John Hughes > date: Wed Aug 11 21:04:10 2010 +0100 > summary: G244901: Skip test_gamma on hardened (PaX-enabled) kernels > http://icedtea.classpath.org/hg/icedtea6/rev/cb463b94b82d > > changeset: 2077:be9c0d303dfc > user: Andrew John Hughes > date: Wed Aug 11 21:05:04 2010 +0100 > summary: G266295: Provide font configuration for Gentoo. > http://icedtea.classpath.org/hg/icedtea6/rev/fc45c67366b9 > > changeset: 2078:8dbe3de24290 > tag: tip > user: Andrew John Hughes > date: Fri Aug 13 00:35:50 2010 +0100 > summary: Add a font configuration for RHEL6. > http://icedtea.classpath.org/hg/icedtea6/rev/e8dfb4f0000d > > The backports include the NEWS updates in http://icedtea.classpath.org/hg/icedtea6/rev/fe41bee26224. > > Ok to push? > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 Ping. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From bugzilla-daemon at icedtea.classpath.org Mon Aug 23 09:03:57 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 23 Aug 2010 16:03:57 +0000 Subject: [Bug 365] IntelliJ IDEA crashes due to SIGSEGV in libjvm.so+0x4760e6 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=365 ------- Comment #6 from sites at keesvanbochove.nl 2010-08-23 16:03 ------- Apparently the same here: # An unexpected error has been detected by Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007fa6a0ee1113, pid=402, tid=1084266832 # # Java VM: OpenJDK 64-Bit Server VM (1.6.0_0-b11 mixed mode linux-amd64) # Problematic frame: # V [libjvm.so+0x472113] # # An error report file with more information is saved as: # /home/kees/projects/gscf/hs_err_pid402.log # # If you would like to submit a bug report, please visit: # http://icedtea.classpath.org/bugzilla # Aborted -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From asu at redhat.com Mon Aug 23 09:08:44 2010 From: asu at redhat.com (Andrew Su) Date: Mon, 23 Aug 2010 12:08:44 -0400 (EDT) Subject: [RFC] Removing of unknow app tag from applet's parser. In-Reply-To: <1714319046.1278901282579416777.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <797317893.1280721282579724359.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Hello, This is a patch to remove the unused app tag from the parser in PluginAppletViewer.java. This should not break any existing webpages. Ok to commit? Thanks, Andrew -------------- next part -------------- A non-text attachment was scrubbed... Name: removeAppTagParsing.patch Type: text/x-patch Size: 2841 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100823/81151307/removeAppTagParsing.patch From bugzilla-daemon at icedtea.classpath.org Mon Aug 23 09:13:40 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 23 Aug 2010 16:13:40 +0000 Subject: [Bug 501] OpenJDK SIGSEGV [libjvm.so+0x1c1937] Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=501 ------- Comment #3 from sites at keesvanbochove.nl 2010-08-23 16:13 ------- Created an attachment (id=401) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=401&action=view) error log -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Aug 23 09:15:41 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 23 Aug 2010 16:15:41 +0000 Subject: [Bug 365] IntelliJ IDEA crashes due to SIGSEGV in libjvm.so+0x4760e6 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=365 ------- Comment #7 from sites at keesvanbochove.nl 2010-08-23 16:15 ------- Created an attachment (id=402) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=402&action=view) error log of a similar error (large mem usage) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From ahughes at redhat.com Mon Aug 23 09:26:03 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 23 Aug 2010 17:26:03 +0100 Subject: [RFC] netx: dont try to render null images In-Reply-To: <4C6974E1.2080905@redhat.com> References: <4C6974E1.2080905@redhat.com> Message-ID: <20100823162603.GD16992@rivendell.middle-earth.co.uk> On 13:26 Mon 16 Aug , Omair Majid wrote: > Hi, > > The current splash screen code for Netx has a bug where it tries to > display an image even if the image was not read successfully. The patch > checks if the image is null and skips drawing the splash screen in that > case. > > Any comments? > > Cheers, > Omair > diff -r c73c4672031a netx/net/sourceforge/jnlp/JNLPSplashScreen.java > --- a/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Tue Aug 10 14:52:56 2010 -0400 > +++ b/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Mon Aug 16 13:08:34 2010 -0400 > @@ -44,6 +44,12 @@ > try { > splashImage = ImageIO.read(resourceTracker > .getCacheFile(splashImageUrl)); > + if (splashImage == null) { > + if (JNLPRuntime.isDebug()) { > + System.err.println("Error loading splash image: " + url); > + } > + return; > + } > } catch (IOException e) { > if (JNLPRuntime.isDebug()) { > System.err.println("Error loading splash image: " + url); Seems like a sensible fix to me. Approved for HEAD, 1.7, 1.8 and 1.9 (assuming it affects all of them). Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ptisnovs at redhat.com Mon Aug 23 09:45:43 2010 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Mon, 23 Aug 2010 18:45:43 +0200 Subject: Bug in make scripts for IcedTea6 HEAD In-Reply-To: <20100823145800.GB16992@rivendell.middle-earth.co.uk> References: <4C695920.20105@redhat.com> <20100823145800.GB16992@rivendell.middle-earth.co.uk> Message-ID: <4C72A5B7.1000209@redhat.com> Dr Andrew John Hughes wrote: > On 17:28 Mon 16 Aug , Pavel Tisnovsky wrote: >> Hi, >> >> after I successfully build IcedTea6 HEAD from >> http://icedtea.classpath.org/hg/icedtea6 I tried to run command "make >> clean dist", but it printed this error message: >> >> rm -f stamps/bootstrap-directory-symlink.stamp >> rm -f /jck/icedtea6/bootstrap/jdk1.6.0 >> rm -f stamps/bootstrap-directory-symlink-ecj.stamp >> { test ! -d icedtea6-1.10pre || { find icedtea6-1.10pre -type d ! -perm >> -200 -exec chmod u+w {} ';' && rm -fr icedtea6-1.10pre; }; } >> mkdir icedtea6-1.10pre >> mkdir -p -- icedtea6-1.10pre//jck/icedtea6 >> icedtea6-1.10pre//jck/icedtea6/patches >> icedtea6-1.10pre//jck/icedtea6/rewriter/com/redhat/rewriter >> icedtea6-1.10pre/. icedtea6-1.10pre/rewriter icedtea6-1.10pre/scripts >> icedtea6-1.10pre/tapset icedtea6-1.10pre/test >> cp: cannot stat `.//jck/icedtea6/netx': No such file or directory >> make: *** [distdir] Error 1 >> >> I ran this command from directory /jck/icedtea6 but the string >> "icedtea6-1.10pre/" is inserted before the path. >> >> Any suggestions? >> >> Pavel T. > > What options are you passing to configure to begin with? ./configure --disable-bootstrap --disable-plugin --with-parallel-jobs=4 > > Thanks, From ahughes at redhat.com Mon Aug 23 10:17:05 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Mon, 23 Aug 2010 18:17:05 +0100 Subject: Repeated attempt to open non-existent libsunwjdga.so for Awt/Swing apps in IcedTea6 HEAD In-Reply-To: <4C6A71E1.4000801@redhat.com> References: <4C6A71E1.4000801@redhat.com> Message-ID: <20100823171052.GA21532@rivendell.middle-earth.co.uk> On 13:26 Tue 17 Aug , Pavel Tisnovsky wrote: > Hi, > > I've found that IcedTea6 HEAD's JRE repeatedly tries to open > non-existent library libsunwjdga.so when some Awt or Swing based > application is started. Do anyone know if this is correct behaviour or > do we have to add rules for this library to our build scripts? > > Grepped messages from Strace are stored in attachment. > > Pavel > [pid 21427] open("/jck/j2sdk-image/jre/lib/amd64/xawt/libsunwjdga.so", O_RDONLY) = -1 ENOENT (No such file or directory) > [pid 21427] open("/jck/j2sdk-image/jre/lib/amd64/xawt/../libsunwjdga.so", O_RDONLY) = -1 ENOENT (No such file or directory) > [pid 21427] open("/jck/j2sdk-image/bin/../jre/lib/amd64/jli/libsunwjdga.so", O_RDONLY) = -1 ENOENT (No such file or directory) > [pid 21427] open("/jck/j2sdk-image/jre/lib/amd64/server/libsunwjdga.so", O_RDONLY) = -1 ENOENT (No such file or directory) > [pid 21427] open("/jck/j2sdk-image/jre/lib/amd64/libsunwjdga.so", O_RDONLY) = -1 ENOENT (No such file or directory) > [pid 21427] open("/lib64/tls/x86_64/libsunwjdga.so", O_RDONLY) = -1 ENOENT (No such file or directory) > [pid 21427] open("/lib64/tls/libsunwjdga.so", O_RDONLY) = -1 ENOENT (No such file or directory) > [pid 21427] open("/lib64/x86_64/libsunwjdga.so", O_RDONLY) = -1 ENOENT (No such file or directory) > [pid 21427] open("/lib64/libsunwjdga.so", O_RDONLY) = -1 ENOENT (No such file or directory) > [pid 21427] open("/usr/lib64/tls/x86_64/libsunwjdga.so", O_RDONLY) = -1 ENOENT (No such file or directory) > [pid 21427] open("/usr/lib64/tls/libsunwjdga.so", O_RDONLY) = -1 ENOENT (No such file or directory) > [pid 21427] open("/usr/lib64/x86_64/libsunwjdga.so", O_RDONLY) = -1 ENOENT (No such file or directory) > [pid 21427] open("/usr/lib64/libsunwjdga.so", O_RDONLY) = -1 ENOENT (No such file or directory) It's a SPARC Solaris only library. >From make/sun/Makefile: ifneq ($(PLATFORM), windows) ifndef OPENJDK ifeq ($(PLATFORM), solaris) ifneq ($(ARCH), amd64) DGA_SUBDIR = jdga endif endif endif See http://www.oracle.com/technetwork/java/javase/java2d-142140.html#gcgkf 'On SPARC hardware, if the framebuffer supports Sun's DGA (Direct Graphics Access) X server extension, and Java 2D has a corresponding module for accessing the framebuffer, DGA will be used for rendering to the screen.' The dlopen invocation in src/solaris/native/sun/java2d/x11/X11SurfaceData.c is not conditional, so it occurs on all POSIX platforms, despite the library only being built on SPARC Solaris. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From dbhole at redhat.com Mon Aug 23 10:30:54 2010 From: dbhole at redhat.com (Deepak Bhole) Date: Mon, 23 Aug 2010 13:30:54 -0400 Subject: [RFC] Removing of unknow app tag from applet's parser. In-Reply-To: <797317893.1280721282579724359.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> References: <1714319046.1278901282579416777.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> <797317893.1280721282579724359.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com> Message-ID: <20100823173054.GG25512@redhat.com> * Andrew Su [2010-08-23 12:09]: > Hello, > > This is a patch to remove the unused app tag from the parser in PluginAppletViewer.java. > This should not break any existing webpages. > > Ok to commit? > Okay to commit to HEAD, 1.7, 1.8 and 1.9 Cheers, Deepak > Thanks, > Andrew > diff -r fa8c9bfd3da5 ChangeLog > --- a/ChangeLog Fri Aug 20 17:22:24 2010 -0400 > +++ b/ChangeLog Mon Aug 23 11:34:55 2010 -0400 > @@ -1,3 +1,8 @@ > +2010-08-23 Andrew Su > + > + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > + (parse): Removed parsing for unknown tag. > + > 2010-08-20 Omair Majid > > * netx/net/sourceforge/jnlp/JNLPFile.java > diff -r fa8c9bfd3da5 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java > --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri Aug 20 17:22:24 2010 -0400 > +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Aug 23 11:34:55 2010 -0400 > @@ -2124,40 +2124,6 @@ > atts.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1))); > } > } > - else if (nm.equalsIgnoreCase("app")) { > - statusMsgStream.println(appNotLongerSupportedWarning); > - Hashtable atts2 = scanTag(in); > - nm = (String)atts2.get("class"); > - if (nm != null) { > - atts2.remove("class"); > - atts2.put("code", nm + ".class"); > - } > - nm = (String)atts2.get("src"); > - if (nm != null) { > - atts2.remove("src"); > - atts2.put("codebase", nm); > - } > - if (atts2.get("width") == null || !isInt(atts2.get("width"))) { > - atts2.put("width", "1000"); > - atts2.put("widthPercentage", 100); > - } else if (((String) atts.get("width")).endsWith("%")) { > - String w = (String) atts.get("width"); > - atts2.put("width", "100"); > - atts2.put("widthPercentage", Integer.parseInt(w.substring(0, w.length() -1))); > - } > - > - if (atts2.get("height") == null || !isInt(atts2.get("height"))) { > - atts2.put("height", "1000"); > - atts2.put("heightPercentage", 100); > - } else if (((String) atts.get("height")).endsWith("%")) { > - String h = (String) atts.get("height"); > - atts2.put("height", "100"); > - atts2.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1))); > - } > - > - printTag(statusMsgStream, atts2); > - statusMsgStream.println(); > - } > } > } > } From asu at icedtea.classpath.org Mon Aug 23 12:22:43 2010 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Mon, 23 Aug 2010 19:22:43 +0000 Subject: /hg/icedtea6: 2010-08-23 Andrew Su Message-ID: changeset 518927fb2498 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=518927fb2498 author: Andrew Su date: Mon Aug 23 15:23:46 2010 -0400 2010-08-23 Andrew Su * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (parse): Removed parsing for unknown tag. diffstat: 2 files changed, 5 insertions(+), 34 deletions(-) ChangeLog | 5 ++ plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 34 -------------- diffs (56 lines): diff -r fa8c9bfd3da5 -r 518927fb2498 ChangeLog --- a/ChangeLog Fri Aug 20 17:22:24 2010 -0400 +++ b/ChangeLog Mon Aug 23 15:23:46 2010 -0400 @@ -1,3 +1,8 @@ 2010-08-20 Omair Majid + + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (parse): Removed parsing for unknown tag. + 2010-08-20 Omair Majid * netx/net/sourceforge/jnlp/JNLPFile.java diff -r fa8c9bfd3da5 -r 518927fb2498 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri Aug 20 17:22:24 2010 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Aug 23 15:23:46 2010 -0400 @@ -2124,40 +2124,6 @@ import com.sun.jndi.toolkit.url.UrlUtil; atts.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1))); } } - else if (nm.equalsIgnoreCase("app")) { - statusMsgStream.println(appNotLongerSupportedWarning); - Hashtable atts2 = scanTag(in); - nm = (String)atts2.get("class"); - if (nm != null) { - atts2.remove("class"); - atts2.put("code", nm + ".class"); - } - nm = (String)atts2.get("src"); - if (nm != null) { - atts2.remove("src"); - atts2.put("codebase", nm); - } - if (atts2.get("width") == null || !isInt(atts2.get("width"))) { - atts2.put("width", "1000"); - atts2.put("widthPercentage", 100); - } else if (((String) atts.get("width")).endsWith("%")) { - String w = (String) atts.get("width"); - atts2.put("width", "100"); - atts2.put("widthPercentage", Integer.parseInt(w.substring(0, w.length() -1))); - } - - if (atts2.get("height") == null || !isInt(atts2.get("height"))) { - atts2.put("height", "1000"); - atts2.put("heightPercentage", 100); - } else if (((String) atts.get("height")).endsWith("%")) { - String h = (String) atts.get("height"); - atts2.put("height", "100"); - atts2.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1))); - } - - printTag(statusMsgStream, atts2); - statusMsgStream.println(); - } } } } From asu at icedtea.classpath.org Mon Aug 23 14:02:51 2010 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Mon, 23 Aug 2010 21:02:51 +0000 Subject: /hg/release/icedtea-1.9: 2010-08-23 Andrew Su Message-ID: changeset b6d5c31b16fe in /hg/release/icedtea-1.9 details: http://icedtea.classpath.org/hg/release/icedtea-1.9?cmd=changeset;node=b6d5c31b16fe author: Andrew Su date: Mon Aug 23 17:03:48 2010 -0400 2010-08-23 Andrew Su * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (parse): Removed parsing for unknown tag. diffstat: 2 files changed, 5 insertions(+), 34 deletions(-) ChangeLog | 5 +++ plugin/icedtea/sun/applet/PluginAppletViewer.java | 34 --------------------- diffs (56 lines): diff -r 731ecb3e1771 -r b6d5c31b16fe ChangeLog --- a/ChangeLog Tue Apr 07 19:26:59 2009 +0100 +++ b/ChangeLog Mon Aug 23 17:03:48 2010 -0400 @@ -1,3 +1,8 @@ 2009-04-07 Andrew John Hughes + + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (parse): Removed parsing for unknown tag. + 2009-04-07 Andrew John Hughes * NEWS, diff -r 731ecb3e1771 -r b6d5c31b16fe plugin/icedtea/sun/applet/PluginAppletViewer.java --- a/plugin/icedtea/sun/applet/PluginAppletViewer.java Tue Apr 07 19:26:59 2009 +0100 +++ b/plugin/icedtea/sun/applet/PluginAppletViewer.java Mon Aug 23 17:03:48 2010 -0400 @@ -1761,40 +1761,6 @@ import sun.misc.Ref; atts.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1))); } } - else if (nm.equalsIgnoreCase("app")) { - statusMsgStream.println(appNotLongerSupportedWarning); - Hashtable atts2 = scanTag(in); - nm = (String)atts2.get("class"); - if (nm != null) { - atts2.remove("class"); - atts2.put("code", nm + ".class"); - } - nm = (String)atts2.get("src"); - if (nm != null) { - atts2.remove("src"); - atts2.put("codebase", nm); - } - if (atts2.get("width") == null || !isInt(atts2.get("width"))) { - atts2.put("width", "1000"); - atts2.put("widthPercentage", 100); - } else if (((String) atts.get("width")).endsWith("%")) { - String w = (String) atts.get("width"); - atts2.put("width", "100"); - atts2.put("widthPercentage", Integer.parseInt(w.substring(0, w.length() -1))); - } - - if (atts2.get("height") == null || !isInt(atts2.get("height"))) { - atts2.put("height", "1000"); - atts2.put("heightPercentage", 100); - } else if (((String) atts.get("height")).endsWith("%")) { - String h = (String) atts.get("height"); - atts2.put("height", "100"); - atts2.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1))); - } - - printTag(statusMsgStream, atts2); - statusMsgStream.println(); - } } } } From asu at icedtea.classpath.org Mon Aug 23 14:33:05 2010 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Mon, 23 Aug 2010 21:33:05 +0000 Subject: /hg/release/icedtea-1.9: Backed out changeset b6d5c31b16fe Message-ID: changeset 2786abf763ce in /hg/release/icedtea-1.9 details: http://icedtea.classpath.org/hg/release/icedtea-1.9?cmd=changeset;node=2786abf763ce author: Andrew Su date: Mon Aug 23 17:31:40 2010 -0400 Backed out changeset b6d5c31b16fe Commited to wrong branch. diffstat: 2 files changed, 34 insertions(+), 5 deletions(-) ChangeLog | 5 --- plugin/icedtea/sun/applet/PluginAppletViewer.java | 34 +++++++++++++++++++++ diffs (56 lines): diff -r b6d5c31b16fe -r 2786abf763ce ChangeLog --- a/ChangeLog Mon Aug 23 17:03:48 2010 -0400 +++ b/ChangeLog Mon Aug 23 17:31:40 2010 -0400 @@ -1,8 +1,3 @@ 2010-08-23 Andrew Su -2010-08-23 Andrew Su - - * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java - (parse): Removed parsing for unknown tag. - 2009-04-07 Andrew John Hughes * NEWS, diff -r b6d5c31b16fe -r 2786abf763ce plugin/icedtea/sun/applet/PluginAppletViewer.java --- a/plugin/icedtea/sun/applet/PluginAppletViewer.java Mon Aug 23 17:03:48 2010 -0400 +++ b/plugin/icedtea/sun/applet/PluginAppletViewer.java Mon Aug 23 17:31:40 2010 -0400 @@ -1761,6 +1761,40 @@ import sun.misc.Ref; atts.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1))); } } + else if (nm.equalsIgnoreCase("app")) { + statusMsgStream.println(appNotLongerSupportedWarning); + Hashtable atts2 = scanTag(in); + nm = (String)atts2.get("class"); + if (nm != null) { + atts2.remove("class"); + atts2.put("code", nm + ".class"); + } + nm = (String)atts2.get("src"); + if (nm != null) { + atts2.remove("src"); + atts2.put("codebase", nm); + } + if (atts2.get("width") == null || !isInt(atts2.get("width"))) { + atts2.put("width", "1000"); + atts2.put("widthPercentage", 100); + } else if (((String) atts.get("width")).endsWith("%")) { + String w = (String) atts.get("width"); + atts2.put("width", "100"); + atts2.put("widthPercentage", Integer.parseInt(w.substring(0, w.length() -1))); + } + + if (atts2.get("height") == null || !isInt(atts2.get("height"))) { + atts2.put("height", "1000"); + atts2.put("heightPercentage", 100); + } else if (((String) atts.get("height")).endsWith("%")) { + String h = (String) atts.get("height"); + atts2.put("height", "100"); + atts2.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1))); + } + + printTag(statusMsgStream, atts2); + statusMsgStream.println(); + } } } } From asu at icedtea.classpath.org Mon Aug 23 14:41:17 2010 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Mon, 23 Aug 2010 21:41:17 +0000 Subject: /hg/release/icedtea6-1.8: Removed condition for parsing unknown ... Message-ID: changeset 617fcc039423 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=617fcc039423 author: Andrew Su date: Mon Aug 23 17:41:38 2010 -0400 Removed condition for parsing unknown app tag. diffstat: 2 files changed, 5 insertions(+), 34 deletions(-) ChangeLog | 5 ++ plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 34 -------------- diffs (56 lines): diff -r 4a022b4a3319 -r 617fcc039423 ChangeLog --- a/ChangeLog Mon Aug 09 11:30:52 2010 -0400 +++ b/ChangeLog Mon Aug 23 17:41:38 2010 -0400 @@ -1,3 +1,8 @@ 2010-08-09 Omair Majid + + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (parse): Removed parsing for unknown tag. + 2010-08-09 Omair Majid * NEWS: Update with support for spec 1.6 diff -r 4a022b4a3319 -r 617fcc039423 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Aug 09 11:30:52 2010 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Aug 23 17:41:38 2010 -0400 @@ -2124,40 +2124,6 @@ import com.sun.jndi.toolkit.url.UrlUtil; atts.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1))); } } - else if (nm.equalsIgnoreCase("app")) { - statusMsgStream.println(appNotLongerSupportedWarning); - Hashtable atts2 = scanTag(in); - nm = (String)atts2.get("class"); - if (nm != null) { - atts2.remove("class"); - atts2.put("code", nm + ".class"); - } - nm = (String)atts2.get("src"); - if (nm != null) { - atts2.remove("src"); - atts2.put("codebase", nm); - } - if (atts2.get("width") == null || !isInt(atts2.get("width"))) { - atts2.put("width", "1000"); - atts2.put("widthPercentage", 100); - } else if (((String) atts.get("width")).endsWith("%")) { - String w = (String) atts.get("width"); - atts2.put("width", "100"); - atts2.put("widthPercentage", Integer.parseInt(w.substring(0, w.length() -1))); - } - - if (atts2.get("height") == null || !isInt(atts2.get("height"))) { - atts2.put("height", "1000"); - atts2.put("heightPercentage", 100); - } else if (((String) atts.get("height")).endsWith("%")) { - String h = (String) atts.get("height"); - atts2.put("height", "100"); - atts2.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1))); - } - - printTag(statusMsgStream, atts2); - statusMsgStream.println(); - } } } } From asu at icedtea.classpath.org Mon Aug 23 14:48:27 2010 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Mon, 23 Aug 2010 21:48:27 +0000 Subject: /hg/release/icedtea6-1.9: Removed block for parsing unknow ... Message-ID: changeset 933fec08a004 in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=933fec08a004 author: Andrew Su date: Mon Aug 23 17:49:28 2010 -0400 Removed block for parsing unknow tag for applet. diffstat: 2 files changed, 5 insertions(+), 34 deletions(-) ChangeLog | 5 ++ plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 34 -------------- diffs (56 lines): diff -r 7816c6d7a641 -r 933fec08a004 ChangeLog --- a/ChangeLog Mon Aug 09 17:08:38 2010 -0400 +++ b/ChangeLog Mon Aug 23 17:49:28 2010 -0400 @@ -1,3 +1,8 @@ 2010-08-09 Deepak Bhole + + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (parse): Removed parsing for unknown tag. + 2010-08-09 Deepak Bhole * Makefile.am: diff -r 7816c6d7a641 -r 933fec08a004 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Aug 09 17:08:38 2010 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Aug 23 17:49:28 2010 -0400 @@ -2124,40 +2124,6 @@ import com.sun.jndi.toolkit.url.UrlUtil; atts.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1))); } } - else if (nm.equalsIgnoreCase("app")) { - statusMsgStream.println(appNotLongerSupportedWarning); - Hashtable atts2 = scanTag(in); - nm = (String)atts2.get("class"); - if (nm != null) { - atts2.remove("class"); - atts2.put("code", nm + ".class"); - } - nm = (String)atts2.get("src"); - if (nm != null) { - atts2.remove("src"); - atts2.put("codebase", nm); - } - if (atts2.get("width") == null || !isInt(atts2.get("width"))) { - atts2.put("width", "1000"); - atts2.put("widthPercentage", 100); - } else if (((String) atts.get("width")).endsWith("%")) { - String w = (String) atts.get("width"); - atts2.put("width", "100"); - atts2.put("widthPercentage", Integer.parseInt(w.substring(0, w.length() -1))); - } - - if (atts2.get("height") == null || !isInt(atts2.get("height"))) { - atts2.put("height", "1000"); - atts2.put("heightPercentage", 100); - } else if (((String) atts.get("height")).endsWith("%")) { - String h = (String) atts.get("height"); - atts2.put("height", "100"); - atts2.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1))); - } - - printTag(statusMsgStream, atts2); - statusMsgStream.println(); - } } } } From asu at icedtea.classpath.org Mon Aug 23 14:52:12 2010 From: asu at icedtea.classpath.org (asu at icedtea.classpath.org) Date: Mon, 23 Aug 2010 21:52:12 +0000 Subject: /hg/release/icedtea6-1.7: Removed block for parsing unknow ... Message-ID: changeset ede047fd9f09 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=ede047fd9f09 author: Andrew Su date: Mon Aug 23 17:53:05 2010 -0400 Removed block for parsing unknow tag for applet. diffstat: 2 files changed, 5 insertions(+), 34 deletions(-) ChangeLog | 5 ++ plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 34 -------------- diffs (56 lines): diff -r daffd234afbd -r ede047fd9f09 ChangeLog --- a/ChangeLog Mon Aug 09 11:26:49 2010 -0400 +++ b/ChangeLog Mon Aug 23 17:53:05 2010 -0400 @@ -1,3 +1,8 @@ 2010-08-09 Omair Majid + + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (parse): Removed parsing for unknown tag. + 2010-08-09 Omair Majid * NEWS: Update for this fix. diff -r daffd234afbd -r ede047fd9f09 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Aug 09 11:26:49 2010 -0400 +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Mon Aug 23 17:53:05 2010 -0400 @@ -2124,40 +2124,6 @@ import com.sun.jndi.toolkit.url.UrlUtil; atts.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1))); } } - else if (nm.equalsIgnoreCase("app")) { - statusMsgStream.println(appNotLongerSupportedWarning); - Hashtable atts2 = scanTag(in); - nm = (String)atts2.get("class"); - if (nm != null) { - atts2.remove("class"); - atts2.put("code", nm + ".class"); - } - nm = (String)atts2.get("src"); - if (nm != null) { - atts2.remove("src"); - atts2.put("codebase", nm); - } - if (atts2.get("width") == null || !isInt(atts2.get("width"))) { - atts2.put("width", "1000"); - atts2.put("widthPercentage", 100); - } else if (((String) atts.get("width")).endsWith("%")) { - String w = (String) atts.get("width"); - atts2.put("width", "100"); - atts2.put("widthPercentage", Integer.parseInt(w.substring(0, w.length() -1))); - } - - if (atts2.get("height") == null || !isInt(atts2.get("height"))) { - atts2.put("height", "1000"); - atts2.put("heightPercentage", 100); - } else if (((String) atts.get("height")).endsWith("%")) { - String h = (String) atts.get("height"); - atts2.put("height", "100"); - atts2.put("heightPercentage", Integer.parseInt(h.substring(0, h.length() -1))); - } - - printTag(statusMsgStream, atts2); - statusMsgStream.println(); - } } } } From doko at ubuntu.com Mon Aug 23 23:49:36 2010 From: doko at ubuntu.com (Matthias Klose) Date: Tue, 24 Aug 2010 08:49:36 +0200 Subject: [patch] update cacao changeset to fix build failures on armel and s390 Message-ID: <4C736B80.1070201@ubuntu.com> fixing cacao build failures on armel and s390, this should go to the 6-1.9 branch, icedtea6 and icedtea7. -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: cacao.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100824/ae20bd16/cacao.diff From doko at ubuntu.com Mon Aug 23 23:59:41 2010 From: doko at ubuntu.com (Matthias Klose) Date: Tue, 24 Aug 2010 08:59:41 +0200 Subject: [patch] fix hotspot build with small SC_ARG_MAX Message-ID: <4C736DDD.9040009@ubuntu.com> hotspot uses overlong command lines, and the build will fail when building on a machine where SC_ARG_MAX is limited. This patch works around this limitation by using a file list for compiling the agent classes, and generating the file list with Makefile features instead of shell code. Matthias -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: too-many-args-ftbfs.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100824/f0d2844e/too-many-args-ftbfs.diff From doko at ubuntu.com Tue Aug 24 00:06:53 2010 From: doko at ubuntu.com (Matthias Klose) Date: Tue, 24 Aug 2010 09:06:53 +0200 Subject: [patch] fix hotspot build with small SC_ARG_MAX In-Reply-To: <4C736DDD.9040009@ubuntu.com> References: <4C736DDD.9040009@ubuntu.com> Message-ID: <4C736F8D.7000605@ubuntu.com> On 24.08.2010 08:59, Matthias Klose wrote: > hotspot uses overlong command lines, and the build will fail when building on a > machine where SC_ARG_MAX is limited. > > This patch works around this limitation by using a file list for compiling the > agent classes, and generating the file list with Makefile features instead of > shell code. here is the corresponding patch for icedtea, proposing for the 6-1.8 branch and newer, and icedtea7. Matthias -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: args.diff Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100824/aa794411/args.diff From bugzilla-daemon at icedtea.classpath.org Tue Aug 24 04:07:36 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 24 Aug 2010 11:07:36 +0000 Subject: [Bug 365] IntelliJ IDEA crashes due to SIGSEGV in libjvm.so+0x4760e6 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=365 ------- Comment #8 from aph at redhat.com 2010-08-24 11:07 ------- This is a very out-of-date release. Please update and see if the problem persists. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From ahughes at redhat.com Tue Aug 24 05:46:45 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 24 Aug 2010 13:46:45 +0100 Subject: [RFC] netx: add support for reading and parsing element In-Reply-To: <20100819192400.GE15742@redhat.com> References: <4C6D81CC.4080805@redhat.com> <20100819192400.GE15742@redhat.com> Message-ID: <20100824124645.GC30937@bree.middle-earth.co.uk> On 14:24 Thu 19 Aug , Deepak Bhole wrote: > > Looks good. Please commit to 1.7, 1.8, 1.9 and HEAD. > > Note: The changes to honour these flags will be going in HEAD only, but > since attached patch does not affect functionality, we might as well put > it in all. The lesser differences to deal with, the better. > I don't think we shouldn't be adding chunks of new code to the release branches just so that patching is easier. It's simplest to leave this in place now that it's committed and the new code is not invoked, but please keep release branch changes to bug fixes only in future. I know you're eager to get plugin and NetX changes out to users quicker. Now that HEAD is 1.10, we can look at moving the plugin and NetX into a separate tree altogether, so they can have a separate release stream. The biggest stumbling block I can foresee is that we currently patch the OpenJDK source code in order to build the plugin. So getting it to build against a plain OpenJDK6 build (from http://hg.openjdk.java.net/jdk6/jdk6) first of all would be a good idea. > Thanks, > Deepak > > * Omair Majid [2010-08-19 14:11]: > > Hi, > > > > The attached patch adds support for netx to read and parse the > > contents of the element in JNLP files. This element is used > > to decide how updates to the application are handled. > > > > Any comments? > > > > Cheers, > > Omair > > > diff -r c73c4672031a netx/net/sourceforge/jnlp/JNLPFile.java > > --- a/netx/net/sourceforge/jnlp/JNLPFile.java Tue Aug 10 14:52:56 2010 -0400 > > +++ b/netx/net/sourceforge/jnlp/JNLPFile.java Thu Aug 19 14:10:06 2010 -0400 > > @@ -83,6 +83,8 @@ > > /** information */ > > protected List info; > > > > + protected UpdateDesc update; > > + > > /** resources */ > > protected List resources; > > > > @@ -345,6 +347,13 @@ > > } > > > > /** > > + * Returns the update section of the JNLP file. > > + */ > > + public UpdateDesc getUpdate() { > > + return update; > > + } > > + > > + /** > > * Returns the security section of the JNLP file. > > */ > > public SecurityDesc getSecurity() { > > @@ -561,6 +570,7 @@ > > codeBase = parser.getCodeBase(); > > sourceLocation = parser.getFileLocation() != null ? parser.getFileLocation() : location; > > info = parser.getInfo(root); > > + update = parser.getUpdate(root); > > resources = parser.getResources(root, false); // false == not a j2se/java resources section > > launchType = parser.getLauncher(root); > > security = parser.getSecurity(root); > > diff -r c73c4672031a netx/net/sourceforge/jnlp/Parser.java > > --- a/netx/net/sourceforge/jnlp/Parser.java Tue Aug 10 14:52:56 2010 -0400 > > +++ b/netx/net/sourceforge/jnlp/Parser.java Thu Aug 19 14:10:06 2010 -0400 > > @@ -25,6 +25,8 @@ > > //import org.w3c.dom.*; // class for using Tiny XML | NanoXML > > //import org.xml.sax.*; > > //import gd.xml.tiny.*; > > +import net.sourceforge.jnlp.UpdateDesc.Check; > > +import net.sourceforge.jnlp.UpdateDesc.Policy; > > import net.sourceforge.jnlp.runtime.JNLPRuntime; > > import net.sourceforge.nanoxml.*; > > > > @@ -178,6 +180,53 @@ > > return spec; > > } > > > > + public UpdateDesc getUpdate(Node parent) throws ParseException { > > + UpdateDesc updateDesc = null; > > + Node child = parent.getFirstChild(); > > + while (child != null) { > > + if (child.getNodeName().equals("update")) { > > + if (strict && updateDesc != null) { > > + throw new ParseException(R("PTwoUpdates")); > > + } > > + > > + Node node = child; > > + > > + Check check; > > + String checkValue = getAttribute(node, "check", "timeout"); > > + if (checkValue.equals("always")) { > > + check = Check.ALWAYS; > > + } else if (checkValue.equals("timeout")) { > > + check = Check.TIMEOUT; > > + } else if (checkValue.equals("background")) { > > + check = Check.BACKGROUND; > > + } else { > > + check = Check.TIMEOUT; > > + } > > + > > + String policyString = getAttribute(node, "policy", "always"); > > + Policy policy; > > + if (policyString.equals("always")) { > > + policy = Policy.ALWAYS; > > + } else if (policyString.equals("prompt-update")) { > > + policy = Policy.PROMPT_UPDATE; > > + } else if (policyString.equals("prompt-run")) { > > + policy = Policy.PROMPT_RUN; > > + } else { > > + policy = Policy.ALWAYS; > > + } > > + > > + updateDesc = new UpdateDesc(check, policy); > > + } > > + > > + child = child.getNextSibling(); > > + } > > + > > + if (updateDesc == null) { > > + updateDesc = new UpdateDesc(Check.TIMEOUT, Policy.ALWAYS); > > + } > > + return updateDesc; > > + } > > + > > // > > // This section loads the resources elements > > // > > @@ -1267,4 +1316,5 @@ > > > > return encoding; > > } > > + > > } > > diff -r c73c4672031a netx/net/sourceforge/jnlp/UpdateDesc.java > > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > > +++ b/netx/net/sourceforge/jnlp/UpdateDesc.java Thu Aug 19 14:10:06 2010 -0400 > > @@ -0,0 +1,70 @@ > > +package net.sourceforge.jnlp; > > + > > +/** > > + * Represents an 'update' element in a JNLP file. This element describes when to > > + * check for updates and what actions to take if updates are available > > + * > > + * @see Check > > + * @see Policy > > + */ > > +public class UpdateDesc { > > + > > + /** > > + * Describes when/how long to check for updates. > > + */ > > + public enum Check { > > + /** Always check for updates before launching the application */ > > + ALWAYS, > > + > > + /** > > + * Default. Check for updates until a certain timeout. If the update > > + * check is not completed by timeout, launch the cached application and > > + * continue updating in the background > > + */ > > + TIMEOUT, > > + > > + /** Check for application updates in the background */ > > + BACKGROUND > > + } > > + > > + /** > > + * Describes what to do when the Runtime knows there is an applicatFion > > + * update before the application is launched. > > + */ > > + public enum Policy { > > + /** > > + * Default. Always download updates without any user prompt and then launch the > > + * application > > + */ > > + ALWAYS, > > + > > + /** > > + * Prompt the user asking whether the user wants to download and run the > > + * updated application or run the version in the cache > > + */ > > + PROMPT_UPDATE, > > + > > + /** > > + * Prompts the user asking to download and run the latest version of the > > + * application or abort running > > + */ > > + PROMPT_RUN, > > + } > > + > > + private Check check; > > + private Policy policy; > > + > > + public UpdateDesc(Check check, Policy policy) { > > + this.check = check; > > + this.policy = policy; > > + } > > + > > + public Check getCheck() { > > + return this.check; > > + } > > + > > + public Policy getPolicy() { > > + return this.policy; > > + } > > + > > +} > > diff -r c73c4672031a netx/net/sourceforge/jnlp/resources/Messages.properties > > --- a/netx/net/sourceforge/jnlp/resources/Messages.properties Tue Aug 10 14:52:56 2010 -0400 > > +++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Thu Aug 19 14:10:06 2010 -0400 > > @@ -88,6 +88,7 @@ > > PTwoMenus=Only one menu element allowed > > PTwoTitles=Only one title element allowed > > PTwoIcons=Only one icon element allowed > > +PTwoUpdates=Only one update element is allowed > > PUnknownApplet=Unknown Applet > > PBadWidth=Invalid applet width. > > PBadHeight=Invalid applet height. > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Aug 24 06:13:46 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 24 Aug 2010 14:13:46 +0100 Subject: [patch] fix hotspot build with small SC_ARG_MAX In-Reply-To: <4C736F8D.7000605@ubuntu.com> References: <4C736DDD.9040009@ubuntu.com> <4C736F8D.7000605@ubuntu.com> Message-ID: <20100824131346.GA31737@bree.middle-earth.co.uk> On 09:06 Tue 24 Aug , Matthias Klose wrote: > On 24.08.2010 08:59, Matthias Klose wrote: > > hotspot uses overlong command lines, and the build will fail when building on a > > machine where SC_ARG_MAX is limited. > > > > This patch works around this limitation by using a file list for compiling the > > agent classes, and generating the file list with Makefile features instead of > > shell code. > > here is the corresponding patch for icedtea, proposing for the 6-1.8 branch and > newer, and icedtea7. > > Matthias > Approved for IcedTea6 1.7, 1.8, 1.9 and HEAD, but please drop the unneeded 'icedtea-' prefix on the patch name. For IcedTea7, can you please apply too-many-args.patch to http://hg.openjdk.java.net/icedtea/jdk7/hotspot directly rather than adding it to IcedTea. > * patches/icedtea-too-many-args.diff: Fix build failure with > small SC_ARG_MAX. > * Makefile.am (ICEDTEA_PATCHES): Apply the above. > * patches/ecj/icedtea-hotspot.patch: Update. > > diff -r 933fec08a004 Makefile.am > --- a/Makefile.am Mon Aug 23 17:49:28 2010 -0400 > +++ b/Makefile.am Tue Aug 24 09:06:25 2010 +0200 > @@ -289,7 +289,8 @@ > patches/fonts-rhel.patch \ > patches/fonts-gentoo.patch \ > patches/ipv4-mapped-ipv6-addresses.patch \ > - patches/openjdk/6795060-icu_crash.patch > + patches/openjdk/6795060-icu_crash.patch \ > + patches/icedtea-too-many-args.diff > > if WITH_RHINO > ICEDTEA_PATCHES += \ > diff -r 933fec08a004 patches/ecj/icedtea-hotspot.patch > --- a/patches/ecj/icedtea-hotspot.patch Mon Aug 23 17:49:28 2010 -0400 > +++ b/patches/ecj/icedtea-hotspot.patch Tue Aug 24 09:06:25 2010 +0200 > @@ -1,14 +1,14 @@ > diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make > --- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2010-03-29 21:34:15.000000000 +0100 > +++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2010-03-29 21:41:28.000000000 +0100 > -@@ -74,8 +74,8 @@ > - mkdir -p $(SA_CLASSDIR); \ > - fi > +@@ -80,8 +80,8 @@ > + $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) > + $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) > > -- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1) > -- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2) > -+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1) > -+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2) > +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) > +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) > ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) > ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) > > $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer > $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) > diff -r 933fec08a004 patches/icedtea-too-many-args.diff > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/patches/icedtea-too-many-args.diff Tue Aug 24 09:06:25 2010 +0200 > @@ -0,0 +1,46 @@ > +--- openjdk/hotspot/make/linux/makefiles/sa.make.orig 2010-06-21 23:12:13.000000000 +0200 > ++++ openjdk/hotspot/make/linux/makefiles/sa.make 2010-06-28 01:11:27.022322578 +0200 > +@@ -45,6 +45,9 @@ > + AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) > + AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) > + > ++AGENT_FILES1_LIST := $(TOPDIR)/../agent1.classes.list > ++AGENT_FILES2_LIST := $(TOPDIR)/../agent2.classes.list > ++ > + SA_CLASSDIR = $(GENERATED)/saclasses > + > + SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)" > +@@ -59,7 +62,7 @@ > + $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ > + fi > + > +-$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) > ++$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) agent_files_preclean > + $(QUIETLY) echo "Making $@" > + $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ > + echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ > +@@ -74,8 +77,11 @@ > + mkdir -p $(SA_CLASSDIR); \ > + fi > + > +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1) > +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2) > ++ $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) > ++ $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) > ++ > ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) > ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) > + > + $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer > + $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) > +@@ -92,6 +98,10 @@ > + $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext > + $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext > + > ++agent_files_preclean: > ++ rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) > ++ > + clean: > + rm -rf $(SA_CLASSDIR) > + rm -rf $(GENERATED)/sa-jdi.jar > ++ rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From doko at ubuntu.com Tue Aug 24 06:29:06 2010 From: doko at ubuntu.com (Matthias Klose) Date: Tue, 24 Aug 2010 15:29:06 +0200 Subject: [patch] fix hotspot build with small SC_ARG_MAX In-Reply-To: <20100824131346.GA31737@bree.middle-earth.co.uk> References: <4C736DDD.9040009@ubuntu.com> <4C736F8D.7000605@ubuntu.com> <20100824131346.GA31737@bree.middle-earth.co.uk> Message-ID: <4C73C922.9070008@ubuntu.com> On 24.08.2010 15:13, Dr Andrew John Hughes wrote: > For IcedTea7, can you please apply too-many-args.patch to http://hg.openjdk.java.net/icedtea/jdk7/hotspot directly > rather than adding it to IcedTea. well, up to now, my patches were ignored. will this one be better? Matthias From omajid at redhat.com Tue Aug 24 06:33:09 2010 From: omajid at redhat.com (Omair Majid) Date: Tue, 24 Aug 2010 09:33:09 -0400 Subject: [RFC] netx: add support for reading and parsing element In-Reply-To: <20100824124645.GC30937@bree.middle-earth.co.uk> References: <4C6D81CC.4080805@redhat.com> <20100819192400.GE15742@redhat.com> <20100824124645.GC30937@bree.middle-earth.co.uk> Message-ID: <4C73CA15.8020707@redhat.com> On 08/24/2010 08:46 AM, Dr Andrew John Hughes wrote: > On 14:24 Thu 19 Aug , Deepak Bhole wrote: >> >> Looks good. Please commit to 1.7, 1.8, 1.9 and HEAD. >> >> Note: The changes to honour these flags will be going in HEAD only, but >> since attached patch does not affect functionality, we might as well put >> it in all. The lesser differences to deal with, the better. >> > > I don't think we shouldn't be adding chunks of new code to the release > branches just so that patching is easier. > Personally, I agree. > It's simplest to leave this in place now that it's committed and the > new code is not invoked, but please keep release branch changes to bug > fixes only in future. > I havent actually committed this changeset to any of the branches except HEAD yet. Actually, I dont think I will commit this to any other branches at all. The changeset does (or should do) nothing, so there is no point in backporting it. Cheers, Omair From christian.thalinger at oracle.com Tue Aug 24 06:37:41 2010 From: christian.thalinger at oracle.com (Christian Thalinger) Date: Tue, 24 Aug 2010 15:37:41 +0200 Subject: [patch] fix hotspot build with small SC_ARG_MAX In-Reply-To: <4C736DDD.9040009@ubuntu.com> References: <4C736DDD.9040009@ubuntu.com> Message-ID: <1282657061.1282.3.camel@macbook> [Moved distro-pkg-dev on Bcc.] On Tue, 2010-08-24 at 08:59 +0200, Matthias Klose wrote: > hotspot uses overlong command lines, and the build will fail when building on a > machine where SC_ARG_MAX is limited. > > This patch works around this limitation by using a file list for compiling the > agent classes, and generating the file list with Makefile features instead of > shell code. I don't know very much about building the agent but this seems like a good patch to me. I will give it a try... -- Christian From omajid at icedtea.classpath.org Tue Aug 24 07:03:03 2010 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Tue, 24 Aug 2010 14:03:03 +0000 Subject: /hg/release/icedtea6-1.7: netx: check for possible null in splas... Message-ID: changeset 819f823a4c6f in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=819f823a4c6f author: omajid date: Tue Aug 24 10:02:56 2010 -0400 netx: check for possible null in splash screen code 2010-08-24 Omair Majid Fixes rhbz601281 * NEWS: Update with this fix. * netx/net/sourceforge/jnlp/JNLPSplashScreen.java (setSplashImageURL): Check for possible null. diffstat: 3 files changed, 14 insertions(+) ChangeLog | 7 +++++++ NEWS | 1 + rt/net/sourceforge/jnlp/JNLPSplashScreen.java | 6 ++++++ diffs (41 lines): diff -r ede047fd9f09 -r 819f823a4c6f ChangeLog --- a/ChangeLog Mon Aug 23 17:53:05 2010 -0400 +++ b/ChangeLog Tue Aug 24 10:02:56 2010 -0400 @@ -1,3 +1,10 @@ 2010-08-23 Andrew Su +2010-08-24 Omair Majid + + Fixes rhbz601281 + * NEWS: Update with this fix. + * netx/net/sourceforge/jnlp/JNLPSplashScreen.java + (setSplashImageURL): Check for possible null. + 2010-08-23 Andrew Su * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java diff -r ede047fd9f09 -r 819f823a4c6f NEWS --- a/NEWS Mon Aug 23 17:53:05 2010 -0400 +++ b/NEWS Tue Aug 24 10:02:56 2010 -0400 @@ -4,6 +4,7 @@ New in release 1.7.5 (XXXX-XX-XX): - Fix browser command in BasicService.showDocument(URL) - Run programs that inherit main(String[]) in their main-class - Work with JNLP files that use spec version 1.6 + - RH601281: Possible NullPointerException in splash screen code New in release 1.7.4 (2010-07-28): diff -r ede047fd9f09 -r 819f823a4c6f rt/net/sourceforge/jnlp/JNLPSplashScreen.java --- a/rt/net/sourceforge/jnlp/JNLPSplashScreen.java Mon Aug 23 17:53:05 2010 -0400 +++ b/rt/net/sourceforge/jnlp/JNLPSplashScreen.java Tue Aug 24 10:02:56 2010 -0400 @@ -44,6 +44,12 @@ public class JNLPSplashScreen extends JF try { splashImage = ImageIO.read(resourceTracker .getCacheFile(splashImageUrl)); + if (splashImage == null) { + if (JNLPRuntime.isDebug()) { + System.err.println("Error loading splash image: " + url); + } + return; + } } catch (IOException e) { if (JNLPRuntime.isDebug()) { System.err.println("Error loading splash image: " + url); From omajid at icedtea.classpath.org Tue Aug 24 07:07:47 2010 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Tue, 24 Aug 2010 14:07:47 +0000 Subject: /hg/release/icedtea6-1.8: netx: check for possible null in splas... Message-ID: changeset 3ec77b8b0bcd in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=3ec77b8b0bcd author: omajid date: Tue Aug 24 10:07:23 2010 -0400 netx: check for possible null in splash screen code 2010-08-24 Omair Majid Fixes rhbz601281 * NEWS: Update with this fix. * netx/net/sourceforge/jnlp/JNLPSplashScreen.java (setSplashImageURL): Check for possible null. diffstat: 3 files changed, 14 insertions(+) ChangeLog | 7 +++++++ NEWS | 1 + netx/net/sourceforge/jnlp/JNLPSplashScreen.java | 6 ++++++ diffs (41 lines): diff -r 617fcc039423 -r 3ec77b8b0bcd ChangeLog --- a/ChangeLog Mon Aug 23 17:41:38 2010 -0400 +++ b/ChangeLog Tue Aug 24 10:07:23 2010 -0400 @@ -1,3 +1,10 @@ 2010-08-23 Andrew Su +2010-08-24 Omair Majid + + Fixes rhbz601281 + * NEWS: Update with this fix. + * netx/net/sourceforge/jnlp/JNLPSplashScreen.java + (setSplashImageURL): Check for possible null. + 2010-08-23 Andrew Su * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java diff -r 617fcc039423 -r 3ec77b8b0bcd NEWS --- a/NEWS Mon Aug 23 17:41:38 2010 -0400 +++ b/NEWS Tue Aug 24 10:07:23 2010 -0400 @@ -4,6 +4,7 @@ New in release 1.8.2 (XXXX-XX-XX): - Fix browser command in BasicService.showDocument(URL) - Run programs that inherit main(String[]) in their main-class - Run JNLP files that use 1.6 as the spec version + - RH601281: Possible NullPointerException in splash screen code New in release 1.8.1 (2010-07-28): diff -r 617fcc039423 -r 3ec77b8b0bcd netx/net/sourceforge/jnlp/JNLPSplashScreen.java --- a/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Mon Aug 23 17:41:38 2010 -0400 +++ b/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Tue Aug 24 10:07:23 2010 -0400 @@ -44,6 +44,12 @@ public class JNLPSplashScreen extends JF try { splashImage = ImageIO.read(resourceTracker .getCacheFile(splashImageUrl)); + if (splashImage == null) { + if (JNLPRuntime.isDebug()) { + System.err.println("Error loading splash image: " + url); + } + return; + } } catch (IOException e) { if (JNLPRuntime.isDebug()) { System.err.println("Error loading splash image: " + url); From omajid at icedtea.classpath.org Tue Aug 24 07:11:56 2010 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Tue, 24 Aug 2010 14:11:56 +0000 Subject: /hg/release/icedtea6-1.9: netx: check for possible null in splas... Message-ID: changeset d59cbcab0fe4 in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=d59cbcab0fe4 author: omajid date: Tue Aug 24 10:11:26 2010 -0400 netx: check for possible null in splash screen code 2010-08-24 Omair Majid Fixes rhbz601281 * NEWS: Update with this fix. * netx/net/sourceforge/jnlp/JNLPSplashScreen.java (setSplashImageURL): Check for possible null. diffstat: 3 files changed, 14 insertions(+) ChangeLog | 7 +++++++ NEWS | 1 + netx/net/sourceforge/jnlp/JNLPSplashScreen.java | 6 ++++++ diffs (41 lines): diff -r 933fec08a004 -r d59cbcab0fe4 ChangeLog --- a/ChangeLog Mon Aug 23 17:49:28 2010 -0400 +++ b/ChangeLog Tue Aug 24 10:11:26 2010 -0400 @@ -1,3 +1,10 @@ 2010-08-23 Andrew Su +2010-08-24 Omair Majid + + Fixes rhbz601281 + * NEWS: Update with this fix. + * netx/net/sourceforge/jnlp/JNLPSplashScreen.java + (setSplashImageURL): Check for possible null. + 2010-08-23 Andrew Su * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java diff -r 933fec08a004 -r d59cbcab0fe4 NEWS --- a/NEWS Mon Aug 23 17:49:28 2010 -0400 +++ b/NEWS Tue Aug 24 10:11:26 2010 -0400 @@ -721,6 +721,7 @@ New in release 1.9 (2010-XX-XX): - Fix browser command in BasicService.showDocument(URL) - Run programs that inherit main(String[]) in their main-class - Run JNLP files that use spec version 1.6 + - RH601281: Possible NullPointerException in splash screen code New in release 1.8.1 (2010-07-28): diff -r 933fec08a004 -r d59cbcab0fe4 netx/net/sourceforge/jnlp/JNLPSplashScreen.java --- a/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Mon Aug 23 17:49:28 2010 -0400 +++ b/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Tue Aug 24 10:11:26 2010 -0400 @@ -44,6 +44,12 @@ public class JNLPSplashScreen extends JF try { splashImage = ImageIO.read(resourceTracker .getCacheFile(splashImageUrl)); + if (splashImage == null) { + if (JNLPRuntime.isDebug()) { + System.err.println("Error loading splash image: " + url); + } + return; + } } catch (IOException e) { if (JNLPRuntime.isDebug()) { System.err.println("Error loading splash image: " + url); From omajid at redhat.com Tue Aug 24 07:13:30 2010 From: omajid at redhat.com (Omair Majid) Date: Tue, 24 Aug 2010 10:13:30 -0400 Subject: [RFC] netx: dont try to render null images In-Reply-To: <20100823162603.GD16992@rivendell.middle-earth.co.uk> References: <4C6974E1.2080905@redhat.com> <20100823162603.GD16992@rivendell.middle-earth.co.uk> Message-ID: <4C73D38A.9000202@redhat.com> On 08/23/2010 12:26 PM, Dr Andrew John Hughes wrote: > On 13:26 Mon 16 Aug , Omair Majid wrote: >> Hi, >> >> The current splash screen code for Netx has a bug where it tries to >> display an image even if the image was not read successfully. The patch >> checks if the image is null and skips drawing the splash screen in that >> case. >> >> Any comments? >> >> Cheers, >> Omair > > > Seems like a sensible fix to me. Approved for HEAD, 1.7, 1.8 and 1.9 (assuming it affects all of them). > > Thanks, Pushed to all branches. Cheers, Omair From ahughes at redhat.com Tue Aug 24 07:58:36 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 24 Aug 2010 15:58:36 +0100 Subject: [RFC] netx: add support for reading and parsing element In-Reply-To: <4C73CA15.8020707@redhat.com> References: <4C6D81CC.4080805@redhat.com> <20100819192400.GE15742@redhat.com> <20100824124645.GC30937@bree.middle-earth.co.uk> <4C73CA15.8020707@redhat.com> Message-ID: <20100824145836.GB31737@bree.middle-earth.co.uk> On 09:33 Tue 24 Aug , Omair Majid wrote: > On 08/24/2010 08:46 AM, Dr Andrew John Hughes wrote: > > On 14:24 Thu 19 Aug , Deepak Bhole wrote: > >> > >> Looks good. Please commit to 1.7, 1.8, 1.9 and HEAD. > >> > >> Note: The changes to honour these flags will be going in HEAD only, but > >> since attached patch does not affect functionality, we might as well put > >> it in all. The lesser differences to deal with, the better. > >> > > > > I don't think we shouldn't be adding chunks of new code to the release > > branches just so that patching is easier. > > > > Personally, I agree. > > > It's simplest to leave this in place now that it's committed and the > > new code is not invoked, but please keep release branch changes to bug > > fixes only in future. > > > > I havent actually committed this changeset to any of the branches except > HEAD yet. Actually, I dont think I will commit this to any other > branches at all. The changeset does (or should do) nothing, so there is > no point in backporting it. Ah, I didn't realise that. I didn't see mails for it, but thought that might just be because I had a week's worth of mail to dig through :-) > > Cheers, > Omair -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Aug 24 08:00:23 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 24 Aug 2010 16:00:23 +0100 Subject: [patch] fix hotspot build with small SC_ARG_MAX In-Reply-To: <4C73C922.9070008@ubuntu.com> References: <4C736DDD.9040009@ubuntu.com> <4C736F8D.7000605@ubuntu.com> <20100824131346.GA31737@bree.middle-earth.co.uk> <4C73C922.9070008@ubuntu.com> Message-ID: <20100824150022.GC31737@bree.middle-earth.co.uk> On 15:29 Tue 24 Aug , Matthias Klose wrote: > On 24.08.2010 15:13, Dr Andrew John Hughes wrote: > > For IcedTea7, can you please apply too-many-args.patch to http://hg.openjdk.java.net/icedtea/jdk7/hotspot directly > > rather than adding it to IcedTea. > > well, up to now, my patches were ignored. will this one be better? > > Matthias Well, for the IcedTea forest, I've just approved it. It just needs committing. But you may not even need to do that, as it sounds like twisti is looking at it for integration upstream. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From omajid at redhat.com Tue Aug 24 08:11:09 2010 From: omajid at redhat.com (Omair Majid) Date: Tue, 24 Aug 2010 11:11:09 -0400 Subject: Backport S6438179 from openjdk6 to icedtea6-1.9 Message-ID: <4C73E10D.5020408@redhat.com> Hi, I would like to backport the fix for S6438179: "XToolkit.isTraySupported() result has nothing to do with the system tray" [1] from openjdk6 to icedtea6-1.9. This fixes RH569121. Any concerns? Cheers, Omair [1] http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/ac23e40d3880 From bugzilla-daemon at icedtea.classpath.org Tue Aug 24 08:15:21 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 24 Aug 2010 15:15:21 +0000 Subject: [Bug 365] IntelliJ IDEA crashes due to SIGSEGV in libjvm.so+0x4760e6 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=365 ------- Comment #9 from gnu_andrew at member.fsf.org 2010-08-24 15:15 ------- I'm assuming this is the version of IcedTea packaged by Debian. Have you reported it as a Debian bug? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From doko at ubuntu.com Tue Aug 24 08:17:19 2010 From: doko at ubuntu.com (Matthias Klose) Date: Tue, 24 Aug 2010 17:17:19 +0200 Subject: Backport S6438179 from openjdk6 to icedtea6-1.9 In-Reply-To: <4C73E10D.5020408@redhat.com> References: <4C73E10D.5020408@redhat.com> Message-ID: <4C73E27F.4030809@ubuntu.com> On 24.08.2010 17:11, Omair Majid wrote: > Hi, > > I would like to backport the fix for S6438179: "XToolkit.isTraySupported() > result has nothing to do with the system tray" [1] from openjdk6 to > icedtea6-1.9. This fixes RH569121. please to icedtea6-1.8 as well, if possible. Matthias From ahughes at redhat.com Tue Aug 24 08:21:14 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 24 Aug 2010 16:21:14 +0100 Subject: [patch] update cacao changeset to fix build failures on armel and s390 In-Reply-To: <4C736B80.1070201@ubuntu.com> References: <4C736B80.1070201@ubuntu.com> Message-ID: <20100824152114.GE31737@bree.middle-earth.co.uk> On 08:49 Tue 24 Aug , Matthias Klose wrote: > fixing cacao build failures on armel and s390, this should go to the 6-1.9 > branch, icedtea6 and icedtea7. > Approved. I think version-parsing.patch was already dropped from 7, and I just never got round to it with 6 :-( > > * Makefile.am: Bump cacao version to changeset including build > fixes for ARM and S390. > * patches/cacao/version-parsing.patch: Remove, applied upstream. > > diff -r 933fec08a004 Makefile.am > --- a/Makefile.am Mon Aug 23 17:49:28 2010 -0400 > +++ b/Makefile.am Tue Aug 24 08:43:36 2010 +0200 > @@ -5,8 +5,8 @@ > OPENJDK_VERSION = b20 > OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ > > -CACAO_VERSION = dd4532afd08a > -CACAO_SHA256SUM = fc876403aeb46c6c16693cfc75ba0a2e581f7a98ddd02ac7f2bf4fc5c20765b4 > +CACAO_VERSION = e321b101a9ee > +CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444 > CACAO_BASE_URL = http://mips.complang.tuwien.ac.at > CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2 > CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 > @@ -306,8 +306,7 @@ > patches/cacao/launcher.patch \ > patches/cacao/arm-arch-defines.patch \ > patches/cacao/jsig.patch \ > - patches/cacao/memory.patch \ > - patches/cacao/version-parsing.patch > + patches/cacao/memory.patch > endif > > if WITH_CACAO -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Aug 24 08:39:14 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 24 Aug 2010 16:39:14 +0100 Subject: Possible regression between IcedTea6-1.8 and IcedTea6-1.9 In-Reply-To: <4C6A582A.6040303@redhat.com> References: <4C6420E8.3090901@redhat.com> <20100812164513.GN10867@rivendell.middle-earth.co.uk> <4C6A582A.6040303@redhat.com> Message-ID: <20100824153914.GG31737@bree.middle-earth.co.uk> On 11:36 Tue 17 Aug , Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: > > On 18:27 Thu 12 Aug , Pavel Tisnovsky wrote: > >> Hi all, > >> > >> I tried to find out why some new regression tests does not pass on the > >> IcedTea6 HEAD and - by the way - I may have found the regression between > >> IcedTea6 IcedTea6-1.8 and-1.9. > >> > >> When the following very simple test is run with option > >> -Dsun.java2d.opengl set to True and I run it inside VNC session (ie > >> without acceleration): > >> > >> import javax.swing.JPanel; > >> > >> public class Test extends JPanel { > >> public Test() { > >> } > >> > >> public static void main(String[] args) > >> { > >> Test t = new Test(); > >> System.out.println("Test Passed."); > >> } > >> } > >> > >> It simply wrote warning message in IcedTea6-1.8: > >> > >> /temp/icedtea6-1.8/openjdk/build/linux-amd64/j2sdk-image/bin/java > >> -Dsun.java2d.opengl=True Test > >> Could not enable OpenGL pipeline for default config on screen 0 > >> Test Passed. > >> > >> but it failed in IcedTea6-1.9 (and HEAD too): > >> > >> /temp/icedtea6-1.9/openjdk.build/j2sdk-image/bin/java > >> -Dsun.java2d.opengl=True Test > >> Exception in thread "main" java.lang.UnsatisfiedLinkError: > >> sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String; > >> at sun.java2d.opengl.OGLContext.getOGLIdString(Native Method) > >> at > >> sun.java2d.opengl.GLXGraphicsConfig$1.run(GLXGraphicsConfig.java:126) > >> at > >> sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run(OGLRenderQueue.java:220) > >> ~ > >> > >> > >> Tested on RHEL5 x86_64 in VNC session, DISPLAY is set to :2.0 (it's > >> correct, of course). > >> > >> Do anyone remember that we did any changes in XRender or java2d.opengl > >> packages between 1.8 and 1.9? > >> > >> PS: at least these regression tests fail due to issue mentioned above: > >> FAILED: sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java > >> FAILED: sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java > >> FAILED: > >> sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java > >> FAILED: sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java > >> FAILED: > >> sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java > >> FAILED: sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java > >> FAILED: sun/java2d/OpenGL/DrawBufImgOp.java > >> FAILED: sun/java2d/OpenGL/GradientPaints.java > >> FAILED: sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java > >> FAILED: sun/java2d/pipe/MutableColorTest/MutableColorTest.java > >> > >> Cheers > >> Pavel > > > > As discussed on the mailing list, XRender was updated to the new version: > > > > http://icedtea.classpath.org/hg/release/icedtea6-1.9/rev/9da4f50c13c0 > > > > Part of this involved updating the pipeline code which XRender relies on > > (see the patch). Both are 7 backports. Have you checked whether the > > same tests fail in 7? > > I think that this issue could be solved by the patch stored in > attachment [OGLContext.patch] because OGLContext.o is already included > in xawt.so (which is correct) but it does not exist JNI link to native > function OGLContext.getOGLIdString(). > > Is it possible to add this patch to IcedTea6 or (preferably) add its > contents to existing patch 6961633-xrender-02.patch? > Please add this in a new patch. The existing patch (as the bug ID implies) is an export of an upstream changeset, so we don't want to mix non-upstreamed changes in with that. Speaking of which, this should go upstream too. Did you check if the tests fail in OpenJDK7? > But I found another issue: when I run the test against IcedTea6 with the > patch applied JRE failed due to fatal error - see attachment > [hs_err_pid32222.log]. It's quite strange for me because libGL.so > contains function glGetString(). I have to further investigate why this > call failed (I run the test in VNC session which can be one possible > source of failure). It does contain glGetString. Indeed, it's crashing in that function, not OpenJDK code. > > > > > Note: There is no 1.9 release yet. The branch was created specifically > > so we'd find stuff like this before release :-) > > --- openjdk-old/jdk/make/sun/xawt/mapfile-vers 2010-08-16 16:54:21.000000000 +0200 > +++ openjdk/jdk/make/sun/xawt/mapfile-vers 2010-08-16 16:54:21.000000000 +0200 > @@ -300,6 +300,7 @@ > Java_java_awt_FileDialog_initIDs; > Java_sun_awt_X11_XWindow_initIDs; > > + Java_sun_java2d_opengl_OGLContext_getOGLIdString; > Java_sun_java2d_opengl_OGLMaskFill_maskFill; > Java_sun_java2d_opengl_OGLRenderer_drawPoly; > Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer; > # > # A fatal error has been detected by the Java Runtime Environment: > # > # SIGSEGV (0xb) at pc=0x0000003e3a451cee, pid=32222, tid=1075607872 > # > # JRE version: 6.0_20-b20 > # Java VM: OpenJDK 64-Bit Server VM (17.0-b16 mixed mode linux-amd64 ) > # Derivative: IcedTea6 1.10pre+r552e98f1c215 > # Distribution: Built on Red Hat Enterprise Linux Server release 5.5 (Tikanga) (Mon Aug 16 23:21:18 CEST 2010) > # Problematic frame: > # C [libGL.so.1+0x51cee] glGetString+0xe > # > # If you would like to submit a bug report, please include > # instructions how to reproduce the bug and visit: > # http://icedtea.classpath.org/bugzilla > # The crash happened outside the Java Virtual Machine in native code. > # See problematic frame for where to report the bug. > # > > --------------- T H R E A D --------------- > > Current thread (0x00002aab38101800): JavaThread "Java2D Queue Flusher" daemon [_thread_in_native, id=32241, stack(0x00000000400c7000,0x00000000401c8000)] > > siginfo:si_signo=SIGSEGV: si_errno=0, si_code=128 (), si_addr=0x0000000000000000 > > Registers: > RAX=0x0000000005418830, RBX=0x00002aab36d40100, RCX=0x0000000005418830, RDX=0x0000003e39216280 > RSP=0x00000000401c67b8, RBP=0x00000000401c6800, RSI=0x00000000401c7a10, RDI=0x0000000000001f00 > R8 =0x00002ae1480c1ec0, R9 =0x00002aab3803a9c8, R10=0x0000000000000000, R11=0x6f69746172656e65 > R12=0x00002aab38101800, R13=0x00002aab36b309f8, R14=0x00000000401c6870, R15=0x00002aab36b309e7 > RIP=0x0000003e3a451cee, EFL=0x0000000000010246, CSGSFS=0x0000000000000033, ERR=0x0000000000000000 > TRAPNO=0x000000000000000d > > Top of Stack: (sp=0x00000000401c67b8) > 0x00000000401c67b8: 00002aab36b1a95c 00000000401c68c8 > 0x00000000401c67c8: 00002aab381019c8 00000000401c6878 > 0x00000000401c67d8: 00002aaaaeac3d28 00002aab38101800 > 0x00000000401c67e8: 00002aaaaeac3d28 00000000401c6870 > 0x00000000401c67f8: 00002aab38101800 00000000401c6858 > 0x00000000401c6808: 00002aaaab35e9c6 0000000005493198 > 0x00000000401c6818: 00000000401c6818 00002aaaaeac3d28 > 0x00000000401c6828: 00000000401c6870 00002aaaaeac7620 > 0x00000000401c6838: 0000000000000000 00002aaaaeac3d28 > 0x00000000401c6848: 0000000000000000 00000000401c6878 > 0x00000000401c6858: 00000000401c68c8 00002aaaab352973 > 0x00000000401c6868: 00002aaaaeac6d00 00002aaaab35b89b > 0x00000000401c6878: 0000000000000000 00002aab0be66098 > 0x00000000401c6888: 00000000401c6888 00002aaaaeac86f5 > 0x00000000401c6898: 00000000401c68d8 00002aaaaeac8ad8 > 0x00000000401c68a8: 0000000000000000 00002aaaaeac8710 > 0x00000000401c68b8: 00000000401c6878 00000000401c68d8 > 0x00000000401c68c8: 00000000401c6930 00002aaaab352cf4 > 0x00000000401c68d8: 00002aab0be66390 0000000000000001 > 0x00000000401c68e8: 00002aab0be66208 00000000401c68e0 > 0x00000000401c68f8: 00002aaaaeac2667 00000000401c6958 > 0x00000000401c6908: 00002aaaaeac2c10 0000000000000000 > 0x00000000401c6918: 00002aaaaeac2770 00000000401c68d8 > 0x00000000401c6928: 00000000401c6958 00000000401c69c0 > 0x00000000401c6938: 00002aaaab34d3fb 0000000000000000 > 0x00000000401c6948: 0000000000000000 0000000000000000 > 0x00000000401c6958: 00002aab0be66208 0000000000001fa0 > 0x00000000401c6968: 00002aaaab34d379 00000000401c6b90 > 0x00000000401c6978: 0000000000000001 00002aab38101800 > 0x00000000401c6988: 0000000005493140 00000000401c6a10 > 0x00000000401c6998: 00000000401c6ce8 00002aab0000000a > 0x00000000401c69a8: 00002aaaaeac2770 00002aaaab35d420 > > Instructions: (pc=0x0000003e3a451cee) > 0x0000003e3a451cde: 00 00 57 e8 ea d5 ff ff 5f 4c 8b 98 98 08 00 00 > 0x0000003e3a451cee: 41 ff e3 0f 1f 80 00 00 00 00 0f 1f 84 00 00 00 > > Stack: [0x00000000400c7000,0x00000000401c8000], sp=0x00000000401c67b8, free space=3fd0000000000000018k > Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) > C [libGL.so.1+0x51cee] glGetString+0xe > j sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String;+0 > j sun.java2d.opengl.GLXGraphicsConfig$1.run()V+5 > j sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run()V+95 > v ~StubRoutines::call_stub > V [libjvm.so+0x411955] > V [libjvm.so+0x4108d8] > V [libjvm.so+0x4111f4] > V [libjvm.so+0x41138b] > V [libjvm.so+0x4704c0] > V [libjvm.so+0x6f77fd] > V [libjvm.so+0x5f5c14] > > Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) > j sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String;+0 > j sun.java2d.opengl.GLXGraphicsConfig$1.run()V+5 > j sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run()V+95 > v ~StubRoutines::call_stub > > --------------- P R O C E S S --------------- > > Java Threads: ( => current thread ) > =>0x00002aab38101800 JavaThread "Java2D Queue Flusher" daemon [_thread_in_native, id=32241, stack(0x00000000400c7000,0x00000000401c8000)] > 0x00002aab38092800 JavaThread "Java2D Disposer" daemon [_thread_blocked, id=32240, stack(0x00000000408b7000,0x00000000409b8000)] > 0x00002aab38025800 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=32238, stack(0x0000000041d0d000,0x0000000041e0e000)] > 0x00002aab38023000 JavaThread "CompilerThread1" daemon [_thread_blocked, id=32237, stack(0x000000004122d000,0x000000004132e000)] > 0x00002aab38020000 JavaThread "CompilerThread0" daemon [_thread_blocked, id=32236, stack(0x000000004112c000,0x000000004122d000)] > 0x00002aab3801d800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=32235, stack(0x000000004102b000,0x000000004112c000)] > 0x0000000005489000 JavaThread "Finalizer" daemon [_thread_blocked, id=32234, stack(0x0000000040c75000,0x0000000040d76000)] > 0x0000000005487000 JavaThread "Reference Handler" daemon [_thread_blocked, id=32233, stack(0x0000000040b74000,0x0000000040c75000)] > 0x0000000005411000 JavaThread "main" [_thread_blocked, id=32223, stack(0x0000000041404000,0x0000000041505000)] > > Other Threads: > 0x0000000005480800 VMThread [stack: 0x0000000040a73000,0x0000000040b74000] [id=32232] > 0x00002aab38028000 WatcherThread [stack: 0x0000000041e37000,0x0000000041f38000] [id=32239] > > VM state:not at safepoint (normal execution) > > VM Mutex/Monitor currently owned by a thread: None > > Heap > PSYoungGen total 37184K, used 1912K [0x00002aab0bd70000, 0x00002aab0e6f0000, 0x00002aab35610000) > eden space 31872K, 6% used [0x00002aab0bd70000,0x00002aab0bf4e1b8,0x00002aab0dc90000) > from space 5312K, 0% used [0x00002aab0e1c0000,0x00002aab0e1c0000,0x00002aab0e6f0000) > to space 5312K, 0% used [0x00002aab0dc90000,0x00002aab0dc90000,0x00002aab0e1c0000) > PSOldGen total 85120K, used 0K [0x00002aaab8c10000, 0x00002aaabdf30000, 0x00002aab0bd70000) > object space 85120K, 0% used [0x00002aaab8c10000,0x00002aaab8c10000,0x00002aaabdf30000) > PSPermGen total 21248K, used 6882K [0x00002aaaae410000, 0x00002aaaaf8d0000, 0x00002aaab8c10000) > object space 21248K, 32% used [0x00002aaaae410000,0x00002aaaaeac8b60,0x00002aaaaf8d0000) > > Dynamic libraries: > 00400000-00409000 r-xp 00000000 fd:00 9011299 /jck/j2sdk-image/bin/java > 00608000-00609000 rw-p 00008000 fd:00 9011299 /jck/j2sdk-image/bin/java > 0540a000-05507000 rw-p 0540a000 00:00 0 [heap] > 400c7000-400ca000 ---p 400c7000 00:00 0 > 400ca000-401c8000 rw-p 400ca000 00:00 0 > 408b7000-408ba000 ---p 408b7000 00:00 0 > 408ba000-409b8000 rw-p 408ba000 00:00 0 > 40a73000-40a74000 ---p 40a73000 00:00 0 > 40a74000-40b74000 rw-p 40a74000 00:00 0 > 40b74000-40b77000 ---p 40b74000 00:00 0 > 40b77000-40c75000 rw-p 40b77000 00:00 0 > 40c75000-40c78000 ---p 40c75000 00:00 0 > 40c78000-40d76000 rw-p 40c78000 00:00 0 > 4102b000-4102e000 ---p 4102b000 00:00 0 > 4102e000-4112c000 rw-p 4102e000 00:00 0 > 4112c000-4112f000 ---p 4112c000 00:00 0 > 4112f000-4122d000 rw-p 4112f000 00:00 0 > 4122d000-41230000 ---p 4122d000 00:00 0 > 41230000-4132e000 rw-p 41230000 00:00 0 > 41404000-41407000 ---p 41404000 00:00 0 > 41407000-41505000 rw-p 41407000 00:00 0 > 41505000-41506000 ---p 41505000 00:00 0 > 41506000-41606000 rw-p 41506000 00:00 0 > 41606000-41607000 ---p 41606000 00:00 0 > 41607000-41707000 rw-p 41607000 00:00 0 > 41707000-41708000 ---p 41707000 00:00 0 > 41708000-41808000 rw-p 41708000 00:00 0 > 41808000-41809000 ---p 41808000 00:00 0 > 41809000-41909000 rw-p 41809000 00:00 0 > 41909000-4190a000 ---p 41909000 00:00 0 > 4190a000-41a0a000 rw-p 4190a000 00:00 0 > 41a0a000-41a0b000 ---p 41a0a000 00:00 0 > 41a0b000-41b0b000 rw-p 41a0b000 00:00 0 > 41b0b000-41b0c000 ---p 41b0b000 00:00 0 > 41b0c000-41c0c000 rw-p 41b0c000 00:00 0 > 41c0c000-41c0d000 ---p 41c0c000 00:00 0 > 41c0d000-41d0d000 rw-p 41c0d000 00:00 0 > 41d0d000-41d10000 ---p 41d0d000 00:00 0 > 41d10000-41e0e000 rw-p 41d10000 00:00 0 > 41e37000-41e38000 ---p 41e37000 00:00 0 > 41e38000-41f38000 rw-p 41e38000 00:00 0 > 3e38400000-3e3841c000 r-xp 00000000 fd:00 55083144 /lib64/ld-2.5.so > 3e3861b000-3e3861c000 r--p 0001b000 fd:00 55083144 /lib64/ld-2.5.so > 3e3861c000-3e3861d000 rw-p 0001c000 fd:00 55083144 /lib64/ld-2.5.so > 3e38800000-3e3894e000 r-xp 00000000 fd:00 55083145 /lib64/libc-2.5.so > 3e3894e000-3e38b4d000 ---p 0014e000 fd:00 55083145 /lib64/libc-2.5.so > 3e38b4d000-3e38b51000 r--p 0014d000 fd:00 55083145 /lib64/libc-2.5.so > 3e38b51000-3e38b52000 rw-p 00151000 fd:00 55083145 /lib64/libc-2.5.so > 3e38b52000-3e38b57000 rw-p 3e38b52000 00:00 0 > 3e38c00000-3e38c02000 r-xp 00000000 fd:00 55083147 /lib64/libdl-2.5.so > 3e38c02000-3e38e02000 ---p 00002000 fd:00 55083147 /lib64/libdl-2.5.so > 3e38e02000-3e38e03000 r--p 00002000 fd:00 55083147 /lib64/libdl-2.5.so > 3e38e03000-3e38e04000 rw-p 00003000 fd:00 55083147 /lib64/libdl-2.5.so > 3e39000000-3e39016000 r-xp 00000000 fd:00 55083146 /lib64/libpthread-2.5.so > 3e39016000-3e39215000 ---p 00016000 fd:00 55083146 /lib64/libpthread-2.5.so > 3e39215000-3e39216000 r--p 00015000 fd:00 55083146 /lib64/libpthread-2.5.so > 3e39216000-3e39217000 rw-p 00016000 fd:00 55083146 /lib64/libpthread-2.5.so > 3e39217000-3e3921b000 rw-p 3e39217000 00:00 0 > 3e39400000-3e39482000 r-xp 00000000 fd:00 55083148 /lib64/libm-2.5.so > 3e39482000-3e39681000 ---p 00082000 fd:00 55083148 /lib64/libm-2.5.so > 3e39681000-3e39682000 r--p 00081000 fd:00 55083148 /lib64/libm-2.5.so > 3e39682000-3e39683000 rw-p 00082000 fd:00 55083148 /lib64/libm-2.5.so > 3e39800000-3e39814000 r-xp 00000000 fd:00 52035672 /usr/lib64/libz.so.1.2.3 > 3e39814000-3e39a13000 ---p 00014000 fd:00 52035672 /usr/lib64/libz.so.1.2.3 > 3e39a13000-3e39a14000 rw-p 00013000 fd:00 52035672 /usr/lib64/libz.so.1.2.3 > 3e39c00000-3e39c07000 r-xp 00000000 fd:00 55083154 /lib64/librt-2.5.so > 3e39c07000-3e39e07000 ---p 00007000 fd:00 55083154 /lib64/librt-2.5.so > 3e39e07000-3e39e08000 r--p 00007000 fd:00 55083154 /lib64/librt-2.5.so > 3e39e08000-3e39e09000 rw-p 00008000 fd:00 55083154 /lib64/librt-2.5.so > 3e3a000000-3e3a007000 r-xp 00000000 fd:00 30682405 /usr/lib64/libdrm.so.2.0.0 > 3e3a007000-3e3a207000 ---p 00007000 fd:00 30682405 /usr/lib64/libdrm.so.2.0.0 > 3e3a207000-3e3a208000 rw-p 00007000 fd:00 30682405 /usr/lib64/libdrm.so.2.0.0 > 3e3a400000-3e3a46e000 r-xp 00000000 fd:00 30682407 /usr/lib64/libGL.so.1.2 > 3e3a46e000-3e3a66e000 ---p 0006e000 fd:00 30682407 /usr/lib64/libGL.so.1.2 > 3e3a66e000-3e3a678000 rw-p 0006e000 fd:00 30682407 /usr/lib64/libGL.so.1.2 > 3e3a678000-3e3a67a000 rw-p 3e3a678000 00:00 0 > 3e3b000000-3e3b005000 r-xp 00000000 fd:00 52035782 /usr/lib64/libXdmcp.so.6.0.0 > 3e3b005000-3e3b204000 ---p 00005000 fd:00 52035782 /usr/lib64/libXdmcp.so.6.0.0 > 3e3b204000-3e3b205000 rw-p 00004000 fd:00 52035782 /usr/lib64/libXdmcp.so.6.0.0 > 3e3b400000-3e3b505000 r-xp 00000000 fd:00 52035783 /usr/lib64/libX11.so.6.2.0 > 3e3b505000-3e3b705000 ---p 00105000 fd:00 52035783 /usr/lib64/libX11.so.6.2.0 > 3e3b705000-3e3b70c000 rw-p 00105000 fd:00 52035783 /usr/lib64/libX11.so.6.2.0 > 3e3b800000-3e3b802000 r-xp 00000000 fd:00 52035673 /usr/lib64/libXau.so.6.0.0 > 3e3b802000-3e3ba01000 ---p 00002000 fd:00 52035673 /usr/lib64/libXau.so.6.0.0 > 3e3ba01000-3e3ba02000 rw-p 00001000 fd:00 52035673 /usr/lib64/libXau.so.6.0.0 > 3e3bc00000-3e3bc15000 r-xp 00000000 fd:00 55083150 /lib64/libnsl-2.5.so > 3e3bc15000-3e3be14000 ---p 00015000 fd:00 55083150 /lib64/libnsl-2.5.so > 3e3be14000-3e3be15000 r--p 00014000 fd:00 55083150 /lib64/libnsl-2.5.so > 3e3be15000-3e3be16000 rw-p 00015000 fd:00 55083150 /lib64/libnsl-2.5.so > 3e3be16000-3e3be18000 rw-p 3e3be16000 00:00 0 > 3e3cc00000-3e3cc10000 r-xp 00000000 fd:00 52035784 /usr/lib64/libXext.so.6.4.0 > 3e3cc10000-3e3ce10000 ---p 00010000 fd:00 52035784 /usr/lib64/libXext.so.6.4.0 > 3e3ce10000-3e3ce11000 rw-p 00010000 fd:00 52035784 /usr/lib64/libXext.so.6.4.0 > 3e3d400000-3e3d405000 r-xp 00000000 fd:00 52035785 /usr/lib64/libXxf86vm.so.1.0.0 > 3e3d405000-3e3d604000 ---p 00005000 fd:00 52035785 /usr/lib64/libXxf86vm.so.1.0.0 > 3e3d604000-3e3d605000 rw-p 00004000 fd:00 52035785 /usr/lib64/libXxf86vm.so.1.0.0 > 3e3dc00000-3e3dc7f000 r-xp 00000000 fd:00 52035816 /usr/lib64/libfreetype.so.6.3.10 > 3e3dc7f000-3e3de7f000 ---p 0007f000 fd:00 52035816 /usr/lib64/libfreetype.so.6.3.10 > 3e3de7f000-3e3de84000 rw-p 0007f000 fd:00 52035816 /usr/lib64/libfreetype.so.6.3.10 > 3e3e400000-3e3e409000 r-xp 00000000 fd:00 52035819 /usr/lib64/libXrender.so.1.3.0 > 3e3e409000-3e3e608000 ---p 00009000 fd:00 52035819 /usr/lib64/libXrender.so.1.3.0 > 3e3e608000-3e3e609000 rw-p 00008000 fd:00 52035819 /usr/lib64/libXrender.so.1.3.0 > 3e43c00000-3e43c08000 r-xp 00000000 fd:00 52035824 /usr/lib64/libXi.so.6.0.0 > 3e43c08000-3e43e07000 ---p 00008000 fd:00 52035824 /usr/lib64/libXi.so.6.0.0 > 3e43e07000-3e43e08000 rw-p 00007000 fd:00 52035824 /usr/lib64/libXi.so.6.0.0 > 3e45c00000-3e45c0d000 r-xp 00000000 fd:00 55083149 /lib64/libgcc_s-4.1.2-20080825.so.1 > 3e45c0d000-3e45e0d000 ---p 0000d000 fd:00 55083149 /lib64/libgcc_s-4.1.2-20080825.so.1 > 3e45e0d000-3e45e0e000 rw-p 0000d000 fd:00 55083149 /lib64/libgcc_s-4.1.2-20080825.so.1 > 3e4b600000-3e4b605000 r-xp 00000000 fd:00 52035905 /usr/lib64/libXtst.so.6.1.0 > 3e4b605000-3e4b805000 ---p 00005000 fd:00 52035905 /usr/lib64/libXtst.so.6.1.0 > 3e4b805000-3e4b806000 rw-p 00005000 fd:00 52035905 /usr/lib64/libXtst.so.6.1.0 > 2aaaaaac0000-2aaaaaace000 r-xp 00000000 fd:00 9699523 /jck/j2sdk-image/jre/lib/amd64/libverify.so > 2aaaaaace000-2aaaaaccd000 ---p 0000e000 fd:00 9699523 /jck/j2sdk-image/jre/lib/amd64/libverify.so > 2aaaaaccd000-2aaaaaccf000 rw-p 0000d000 fd:00 9699523 /jck/j2sdk-image/jre/lib/amd64/libverify.so > 2aaaaaccf000-2aaaaacfa000 r-xp 00000000 fd:00 9699499 /jck/j2sdk-image/jre/lib/amd64/libjava.so > 2aaaaacfa000-2aaaaaefa000 ---p 0002b000 fd:00 9699499 /jck/j2sdk-image/jre/lib/amd64/libjava.so > 2aaaaaefa000-2aaaaaefe000 rw-p 0002b000 fd:00 9699499 /jck/j2sdk-image/jre/lib/amd64/libjava.so > 2aaaaaefe000-2aaaaaeff000 r--p 2aaaaaefe000 00:00 0 > 2aaaaaeff000-2aaaaaf00000 rw-p 2aaaaaeff000 00:00 0 > 2aaaaaf00000-2aaaaaf08000 r-xp 00000000 fd:00 9830466 /jck/j2sdk-image/jre/lib/amd64/native_threads/libhpi.so > 2aaaaaf08000-2aaaab107000 ---p 00008000 fd:00 9830466 /jck/j2sdk-image/jre/lib/amd64/native_threads/libhpi.so > 2aaaab107000-2aaaab108000 rw-p 00007000 fd:00 9830466 /jck/j2sdk-image/jre/lib/amd64/native_threads/libhpi.so > 2aaaab108000-2aaaab109000 rw-p 2aaaab108000 00:00 0 > 2aaaab109000-2aaaab13e000 r--s 00000000 fd:00 7110950 /var/db/nscd/passwd > 2aaaab13e000-2aaaab146000 rw-s 00000000 fd:00 42600011 /tmp/hsperfdata_ptisnovs/32222 > 2aaaab146000-2aaaab14d000 r-xp 00000000 fd:00 9699526 /jck/j2sdk-image/jre/lib/amd64/libzip.so > 2aaaab14d000-2aaaab34c000 ---p 00007000 fd:00 9699526 /jck/j2sdk-image/jre/lib/amd64/libzip.so > 2aaaab34c000-2aaaab34d000 rw-p 00006000 fd:00 9699526 /jck/j2sdk-image/jre/lib/amd64/libzip.so > 2aaaab34d000-2aaaab5bd000 rwxp 2aaaab34d000 00:00 0 > 2aaaab5bd000-2aaaae34d000 rw-p 2aaaab5bd000 00:00 0 > 2aaaae34d000-2aaaae357000 rw-p 2aaaae34d000 00:00 0 > 2aaaae357000-2aaaae40d000 rw-p 2aaaae357000 00:00 0 > 2aaaae410000-2aaaaf8d0000 rw-p 2aaaae410000 00:00 0 > 2aaaaf8d0000-2aaab8c10000 rw-p 2aaaaf8d0000 00:00 0 > 2aaab8c10000-2aaabdf30000 rw-p 2aaab8c10000 00:00 0 > 2aaabdf30000-2aab0bd70000 rw-p 2aaabdf30000 00:00 0 > 2aab0bd70000-2aab0e6f0000 rw-p 2aab0bd70000 00:00 0 > 2aab0e6f0000-2aab35610000 rw-p 2aab0e6f0000 00:00 0 > 2aab35610000-2aab3561b000 rw-p 2aab35610000 00:00 0 > 2aab3561b000-2aab35664000 rw-p 2aab3561b000 00:00 0 > 2aab35664000-2aab3568e000 rw-p 2aab35664000 00:00 0 > 2aab3568e000-2aab358fc000 rw-p 2aab3568e000 00:00 0 > 2aab358fc000-2aab35912000 rw-p 2aab358fc000 00:00 0 > 2aab35912000-2aab35a49000 rw-p 2aab35912000 00:00 0 > 2aab35a49000-2aab35a74000 rw-p 2aab35a49000 00:00 0 > 2aab35a74000-2aab35ce3000 rw-p 2aab35a74000 00:00 0 > 2aab35ce3000-2aab35cee000 rw-p 2aab35ce3000 00:00 0 > 2aab35cee000-2aab35d37000 rw-p 2aab35cee000 00:00 0 > 2aab35d37000-2aab35d5f000 rw-p 2aab35d37000 00:00 0 > 2aab35d5f000-2aab35eed000 r--s 038af000 fd:00 9109772 /jck/j2sdk-image/jre/lib/rt.jar > 2aab35eed000-2aab35f1f000 rw-p 2aab35eed000 00:00 0 > 2aab35f1f000-2aab35f25000 r--s 00043000 fd:00 9109782 /jck/j2sdk-image/jre/lib/netx.jar > 2aab35f25000-2aab3682e000 rw-p 2aab35f25000 00:00 0 > 2aab3682e000-2aab368c4000 r-xp 00000000 fd:00 9699503 /jck/j2sdk-image/jre/lib/amd64/libawt.so > 2aab368c4000-2aab36ac4000 ---p 00096000 fd:00 9699503 /jck/j2sdk-image/jre/lib/amd64/libawt.so > 2aab36ac4000-2aab36acf000 rw-p 00096000 fd:00 9699503 /jck/j2sdk-image/jre/lib/amd64/libawt.so > 2aab36acf000-2aab36af4000 rw-p 2aab36acf000 00:00 0 > 2aab36af4000-2aab36b3d000 r-xp 00000000 fd:00 9732309 /jck/j2sdk-image/jre/lib/amd64/xawt/libmawt.so > 2aab36b3d000-2aab36d3c000 ---p 00049000 fd:00 9732309 /jck/j2sdk-image/jre/lib/amd64/xawt/libmawt.so > 2aab36d3c000-2aab36d3f000 rw-p 00048000 fd:00 9732309 /jck/j2sdk-image/jre/lib/amd64/xawt/libmawt.so > 2aab36d3f000-2aab36d41000 rw-p 2aab36d3f000 00:00 0 > 2aab36d41000-2aab36d85000 r-xp 00000000 fd:00 9699507 /jck/j2sdk-image/jre/lib/amd64/libfontmanager.so > 2aab36d85000-2aab36f84000 ---p 00044000 fd:00 9699507 /jck/j2sdk-image/jre/lib/amd64/libfontmanager.so > 2aab36f84000-2aab36f88000 rw-p 00043000 fd:00 9699507 /jck/j2sdk-image/jre/lib/amd64/libfontmanager.so > 2aab36f88000-2aab36f98000 rw-p 2aab36f88000 00:00 0 > 2aab36f98000-2aab36f9f000 r--s 00000000 fd:00 7111498 /var/cache/fontconfig/beeeeb3dfe132a8a0633a017c99ce0c0-x86-64.cache-2 > 2aab36f9f000-2aab36fa4000 r--s 00000000 fd:00 7111021 /var/cache/fontconfig/b64a443fb29fd68918eee3276c922bf0-x86-64.cache-2 > 2aab36fa4000-2aab36fa5000 r--s 00000000 fd:00 7111040 /var/cache/fontconfig/c09c2e2d9ddef970513e4a68e1d4f7be-x86-64.cache-2 > 2aab36fa5000-2aab36fb0000 r--s 00000000 fd:00 7111203 /var/cache/fontconfig/e19de935dec46bbf3ed114ee4965548a-x86-64.cache-2 > 2aab36fb0000-2aab36fb3000 r--s 00000000 fd:00 7111204 /var/cache/fontconfig/e3ead4b767b8819993a6fa3ae306afa9-x86-64.cache-2 > 2aab36fb3000-2aab36fba000 r--s 00000000 fd:00 7110996 /var/cache/fontconfig/7ddba6133ef499da58de5e8c586d3b75-x86-64.cache-2 > 2aab36fba000-2aab36fbb000 r--s 00000000 fd:00 7111049 /var/cache/fontconfig/602d1f86cc7d0d7fcaea57cc0415ba86-x86-64.cache-2 > 2aab36fbb000-2aab36fc2000 r--s 00000000 fd:00 7111018 /var/cache/fontconfig/76339d7a19b7d8e4649c5ddbf17c0441-x86-64.cache-2 > 2aab36fc2000-2aab36fc3000 r--s 00000000 fd:00 7111019 /var/cache/fontconfig/c1e0ebede0a5820dfb31314ce531f395-x86-64.cache-2 > 2aab36fc3000-2aab36fc4000 r--s 00000000 fd:00 7111017 /var/cache/fontconfig/a47204c0282682fca292504963454f06-x86-64.cache-2 > 2aab36fc4000-2aab36fc5000 r--s 00000000 fd:00 7111037 /var/cache/fontconfig/ec08f7e2aac04ad6751b56b654659de6-x86-64.cache-2 > 2aab36fc5000-2aab36fc6000 r--s 00000000 fd:00 7111047 /var/cache/fontconfig/a0ed530305610ad915aa8f21f0d94463-x86-64.cache-2 > 2aab36fc6000-2aab36fc7000 r--s 00000000 fd:00 7111020 /var/cache/fontconfig/31b8f98acd9832a15daf4d1a0b40239b-x86-64.cache-2 > 2aab36fc7000-2aab36fc8000 r--s 00000000 fd:00 7111038 /var/cache/fontconfig/fc7f808eb72d8a281e1f12def2851241-x86-64.cache-2 > 2aab36fc8000-2aab36fc9000 r--s 00000000 fd:00 7111031 /var/cache/fontconfig/b0c8039c3bbcc6f1976d33b66b56fc83-x86-64.cache-2 > 2aab36fc9000-2aab36fca000 r--s 00000000 fd:00 7111025 /var/cache/fontconfig/31e4bfa78c57c1d34653a253fb01b172-x86-64.cache-2 > 2aab36fca000-2aab36fcf000 r--s 00000000 fd:00 7111041 /var/cache/fontconfig/a3ef620b97f3ad86e0ccce6d4afaa4cc-x86-64.cache-2 > 2aab36fcf000-2aab36fd0000 r--s 00000000 fd:00 7111042 /var/cache/fontconfig/49aab29dc58e529ef78a6d0aaa3ba41d-x86-64.cache-2 > 2aab36fd0000-2aab36fd8000 r--s 00000000 fd:00 7111206 /var/cache/fontconfig/b79f3aaa7d385a141ab53ec885cc22a8-x86-64.cache-2 > 2aab36fd8000-2aab36fda000 r--s 00000000 fd:00 7111205 /var/cache/fontconfig/87f5e051180a7a75f16eb6fe7dbd3749-x86-64.cache-2 > 2aab36fda000-2aab36fdd000 r--s 00000000 fd:00 7111034 /var/cache/fontconfig/fdb4a018037c133ed2ff41d1378148d0-x86-64.cache-2 > 2aab36fdd000-2aab36fe0000 r--s 00000000 fd:00 7111029 /var/cache/fontconfig/ae30b330df83ba0e904b3d2eb05b9c75-x86-64.cache-2 > 2aab36fe0000-2aab36ff6000 r--s 00000000 fd:00 7111030 /var/cache/fontconfig/d066cc093611c74861a22d5ef60b042c-x86-64.cache-2 > 2aab36ff6000-2aab36ffa000 r--s 00000000 fd:00 7111035 /var/cache/fontconfig/00413c8acffd3c2ef5e4f42b8b36cd9a-x86-64.cache-2 > 2aab36ffa000-2aab36ffe000 r--s 00000000 fd:00 7111046 /var/cache/fontconfig/177aa5f8e4784b879645141d1d73ae7a-x86-64.cache-2 > 2aab36ffe000-2aab37012000 r-xp 00000000 fd:00 9699501 /jck/j2sdk-image/jre/lib/amd64/libnet.so > 2aab37012000-2aab37211000 ---p 00014000 fd:00 9699501 /jck/j2sdk-image/jre/lib/amd64/libnet.so > 2aab37211000-2aab37212000 rw-p 00013000 fd:00 9699501 /jck/j2sdk-image/jre/lib/amd64/libnet.so > 2aab37212000-2aab37219000 r-xp 00000000 fd:00 9699502 /jck/j2sdk-image/jre/lib/amd64/libnio.so > 2aab37219000-2aab37419000 ---p 00007000 fd:00 9699502 /jck/j2sdk-image/jre/lib/amd64/libnio.so > 2aab37419000-2aab3741a000 rw-p 00007000 fd:00 9699502 /jck/j2sdk-image/jre/lib/amd64/libnio.so > 2aab3741a000-2aab37420000 r--s 000fc000 fd:00 9109749 /jck/j2sdk-image/jre/lib/resources.jar > 2aab38000000-2aab38103000 rw-p 2aab38000000 00:00 0 > 2aab38103000-2aab3c000000 ---p 2aab38103000 00:00 0 > 2aab3c000000-2aab3f5d7000 r--p 00000000 fd:00 30680677 /usr/lib/locale/locale-archive > 2ae147373000-2ae147374000 rw-p 2ae147373000 00:00 0 > 2ae147388000-2ae147389000 rw-p 2ae147388000 00:00 0 > 2ae147389000-2ae14738d000 r-xp 00000000 fd:00 10780772 /jck/j2sdk-image/jre/lib/amd64/jli/libjli.so > 2ae14738d000-2ae14758c000 ---p 00004000 fd:00 10780772 /jck/j2sdk-image/jre/lib/amd64/jli/libjli.so > 2ae14758c000-2ae14758d000 rw-p 00003000 fd:00 10780772 /jck/j2sdk-image/jre/lib/amd64/jli/libjli.so > 2ae14758d000-2ae147590000 rw-p 2ae14758d000 00:00 0 > 2ae147590000-2ae147e26000 r-xp 00000000 fd:00 10322184 /jck/j2sdk-image/jre/lib/amd64/server/libjvm.so > 2ae147e26000-2ae148026000 ---p 00896000 fd:00 10322184 /jck/j2sdk-image/jre/lib/amd64/server/libjvm.so > 2ae148026000-2ae1480b6000 rw-p 00896000 fd:00 10322184 /jck/j2sdk-image/jre/lib/amd64/server/libjvm.so > 2ae1480b6000-2ae1480ef000 rw-p 2ae1480b6000 00:00 0 > 7fff9efb4000-7fff9efc9000 rw-p 7ffffffea000 00:00 0 [stack] > ffffffffff600000-ffffffffffe00000 ---p 00000000 00:00 0 [vdso] > > VM Arguments: > jvm_args: -Dsun.java2d.opengl=true > java_command: Test > Launcher Type: SUN_STANDARD > > Environment Variables: > PATH=/usr/kerberos/bin:/usr/local/bin:/bin:/usr/bin:/home/brq/ptisnovs/bin > LD_LIBRARY_PATH=/jck/j2sdk-image/jre/lib/amd64/server:/jck/j2sdk-image/jre/lib/amd64:/jck/j2sdk-image/jre/../lib/amd64 > SHELL=/bin/bash > DISPLAY=:42.0 > > Signal Handlers: > SIGSEGV: [libjvm.so+0x73d6c0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > SIGBUS: [libjvm.so+0x73d6c0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > SIGFPE: [libjvm.so+0x5f18f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > SIGPIPE: [libjvm.so+0x5f18f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > SIGXFSZ: [libjvm.so+0x5f18f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > SIGILL: [libjvm.so+0x5f18f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000 > SIGUSR2: [libjvm.so+0x5f4d90], sa_mask[0]=0x00000000, sa_flags=0x10000004 > SIGHUP: [libjvm.so+0x5f2cb0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > SIGINT: [libjvm.so+0x5f2cb0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > SIGTERM: [libjvm.so+0x5f2cb0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > SIGQUIT: [libjvm.so+0x5f2cb0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > > > --------------- S Y S T E M --------------- > > OS:Red Hat Enterprise Linux Server release 5.5 (Tikanga) > > uname:Linux 2.6.18-194.3.1.el5 #1 SMP Sun May 2 04:17:42 EDT 2010 x86_64 > libc:glibc 2.5 NPTL 2.5 > rlimit: STACK 10240k, CORE 0k, NPROC infinity, NOFILE 2048, AS infinity > load average:1.82 1.97 1.63 > > CPU:total 8 (8 cores per cpu, 2 threads per core) family 6 model 30 stepping 5, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, ht > > Memory: 4k page, physical 8164756k(3153180k free), swap 1020116k(1019980k free) > > vm_info: OpenJDK 64-Bit Server VM (17.0-b16) for linux-amd64 JRE (1.6.0_20-b20), built on Aug 16 2010 23:33:12 by "ptisnovs" with gcc 4.1.2 20080704 (Red Hat 4.1.2-48) > > time: Mon Aug 16 23:48:47 2010 > elapsed time: 0 seconds > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Aug 24 11:33:46 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 24 Aug 2010 19:33:46 +0100 Subject: Backport S6438179 from openjdk6 to icedtea6-1.9 In-Reply-To: <4C73E10D.5020408@redhat.com> References: <4C73E10D.5020408@redhat.com> Message-ID: <20100824183346.GA25539@rivendell.middle-earth.co.uk> On 11:11 Tue 24 Aug , Omair Majid wrote: > Hi, > > I would like to backport the fix for S6438179: > "XToolkit.isTraySupported() result has nothing to do with the system > tray" [1] from openjdk6 to icedtea6-1.9. This fixes RH569121. > > Any concerns? > This seems similar to the OpenType case. If we backport this fix, we really should backport that too. How about we commit this fix to HEAD, give it another two weeks (so the 7th of September) and then consider this again? They can both probably go into 1.7, 1.8 and 1.9 if no issues occur in the meantime. Certainly, I'd like to see them have chance to be built by developers and tested by the various autobuilders before hitting release branches. That might be a sensible policy for most backports. I don't think we should be blindly applying to branches at the same time as HEAD. Instead, they should have some 'soak time' in HEAD, much the same as backports have some time in OpenJDK7 before being backported to 6. With regard to NetX and the plugin, there's no regular test cycle for these, which is a shame. It really has a different stability level to the rest of IcedTea so I think the separation mentioned in the previous e-mail is the right way to go with that. > Cheers, > Omair > > > [1] http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/ac23e40d3880 -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From bugzilla-daemon at icedtea.classpath.org Tue Aug 24 13:06:55 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 24 Aug 2010 20:06:55 +0000 Subject: [Bug 429] cacao+Icedtea6 on ARM build failure on armv7l systems Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=429 stefan at complang.tuwien.ac.at changed: What |Removed |Added ---------------------------------------------------------------------------- AssignedTo|unassigned at icedtea.classpath|doko at ubuntu.com |.org | ------- Comment #7 from stefan at complang.tuwien.ac.at 2010-08-24 20:06 ------- The problem is that this happens on my SheevaPlug (armv5tel, Fedora ARM) now: main: os::dlopen failed: /home/sr/build-native/cacao/src/cacao/.libs/libjvm.so: undefined symbol: __sync_val_compare_and_swap_4 Googling for this is inconclusive, but at least it seems to indicate that only the ARM platform is affected. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. You are the assignee for the bug, or are watching the assignee. From dbhole at redhat.com Tue Aug 24 14:27:12 2010 From: dbhole at redhat.com (Deepak Bhole) Date: Tue, 24 Aug 2010 17:27:12 -0400 Subject: [RFC] netx: add support for reading and parsing element In-Reply-To: <4C73CA15.8020707@redhat.com> References: <4C6D81CC.4080805@redhat.com> <20100819192400.GE15742@redhat.com> <20100824124645.GC30937@bree.middle-earth.co.uk> <4C73CA15.8020707@redhat.com> Message-ID: <20100824212712.GA10675@redhat.com> * Omair Majid [2010-08-24 09:33]: > On 08/24/2010 08:46 AM, Dr Andrew John Hughes wrote: > >On 14:24 Thu 19 Aug , Deepak Bhole wrote: > >> > >>Looks good. Please commit to 1.7, 1.8, 1.9 and HEAD. > >> > >>Note: The changes to honour these flags will be going in HEAD only, but > >>since attached patch does not affect functionality, we might as well put > >>it in all. The lesser differences to deal with, the better. > >> > > > >I don't think we shouldn't be adding chunks of new code to the release > >branches just so that patching is easier. > > > > Personally, I agree. > Fair enough. OK. Only to HEAD then. Deepak > >It's simplest to leave this in place now that it's committed and the > >new code is not invoked, but please keep release branch changes to bug > >fixes only in future. > > > > I havent actually committed this changeset to any of the branches > except HEAD yet. Actually, I dont think I will commit this to any > other branches at all. The changeset does (or should do) nothing, so > there is no point in backporting it. > > Cheers, > Omair From andrew at icedtea.classpath.org Tue Aug 24 15:19:40 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Tue, 24 Aug 2010 22:19:40 +0000 Subject: /hg/icedtea6: Include NimbusLookAndFeel as one of the bootstrap ... Message-ID: changeset 6f017e9047ab in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6f017e9047ab author: Andrew John Hughes date: Tue Aug 24 23:19:33 2010 +0100 Include NimbusLookAndFeel as one of the bootstrap classes to avoid conflicts with older versions in previous IcedTea6 releases. 2010-08-24 Andrew John Hughes * Makefile.am: Compile NimbusLookAndFeel as a bootstrap class so the older version from IcedTea6 1.8 is not used when bootstrapping with it. diffstat: 2 files changed, 8 insertions(+) ChangeLog | 7 +++++++ Makefile.am | 1 + diffs (25 lines): diff -r 518927fb2498 -r 6f017e9047ab ChangeLog --- a/ChangeLog Mon Aug 23 15:23:46 2010 -0400 +++ b/ChangeLog Tue Aug 24 23:19:33 2010 +0100 @@ -1,3 +1,10 @@ 2010-08-23 Andrew Su +2010-08-24 Andrew John Hughes + + * Makefile.am: Compile NimbusLookAndFeel as a + bootstrap class so the older version from + IcedTea6 1.8 is not used when bootstrapping + with it. + 2010-08-23 Andrew Su * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java diff -r 518927fb2498 -r 6f017e9047ab Makefile.am --- a/Makefile.am Mon Aug 23 15:23:46 2010 -0400 +++ b/Makefile.am Tue Aug 24 23:19:33 2010 +0100 @@ -91,6 +91,7 @@ ICEDTEA_BOOTSTRAP_CLASSES = \ ICEDTEA_BOOTSTRAP_CLASSES = \ $(SHARE)/javax/swing/plaf/basic/BasicDirectoryModel.java \ $(SHARE)/javax/management/StandardMBean.java \ + $(SHARE)/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java \ $(NETX_BOOTSTRAP_CLASSES) # Flags From kelly.ohair at oracle.com Tue Aug 24 16:28:20 2010 From: kelly.ohair at oracle.com (Kelly O'Hair) Date: Tue, 24 Aug 2010 16:28:20 -0700 Subject: [patch] fix hotspot build with small SC_ARG_MAX In-Reply-To: <4C736DDD.9040009@ubuntu.com> References: <4C736DDD.9040009@ubuntu.com> Message-ID: Looks ok to me. I think this is basically this bug: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6561870 -kto On Aug 23, 2010, at 11:59 PM, Matthias Klose wrote: > hotspot uses overlong command lines, and the build will fail when > building on a machine where SC_ARG_MAX is limited. > > This patch works around this limitation by using a file list for > compiling the agent classes, and generating the file list with > Makefile features instead of shell code. > > Matthias > From ptisnovs at redhat.com Wed Aug 25 01:47:38 2010 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Wed, 25 Aug 2010 10:47:38 +0200 Subject: Possible regression between IcedTea6-1.8 and IcedTea6-1.9 In-Reply-To: <20100824153914.GG31737@bree.middle-earth.co.uk> References: <4C6420E8.3090901@redhat.com> <20100812164513.GN10867@rivendell.middle-earth.co.uk> <4C6A582A.6040303@redhat.com> <20100824153914.GG31737@bree.middle-earth.co.uk> Message-ID: <4C74D8AA.6040005@redhat.com> Dr Andrew John Hughes wrote: > On 11:36 Tue 17 Aug , Pavel Tisnovsky wrote: >> Dr Andrew John Hughes wrote: >>> On 18:27 Thu 12 Aug , Pavel Tisnovsky wrote: >>>> Hi all, >>>> >>>> I tried to find out why some new regression tests does not pass on the >>>> IcedTea6 HEAD and - by the way - I may have found the regression between >>>> IcedTea6 IcedTea6-1.8 and-1.9. >>>> >>>> When the following very simple test is run with option >>>> -Dsun.java2d.opengl set to True and I run it inside VNC session (ie >>>> without acceleration): >>>> >>>> import javax.swing.JPanel; >>>> >>>> public class Test extends JPanel { >>>> public Test() { >>>> } >>>> >>>> public static void main(String[] args) >>>> { >>>> Test t = new Test(); >>>> System.out.println("Test Passed."); >>>> } >>>> } >>>> >>>> It simply wrote warning message in IcedTea6-1.8: >>>> >>>> /temp/icedtea6-1.8/openjdk/build/linux-amd64/j2sdk-image/bin/java >>>> -Dsun.java2d.opengl=True Test >>>> Could not enable OpenGL pipeline for default config on screen 0 >>>> Test Passed. >>>> >>>> but it failed in IcedTea6-1.9 (and HEAD too): >>>> >>>> /temp/icedtea6-1.9/openjdk.build/j2sdk-image/bin/java >>>> -Dsun.java2d.opengl=True Test >>>> Exception in thread "main" java.lang.UnsatisfiedLinkError: >>>> sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String; >>>> at sun.java2d.opengl.OGLContext.getOGLIdString(Native Method) >>>> at >>>> sun.java2d.opengl.GLXGraphicsConfig$1.run(GLXGraphicsConfig.java:126) >>>> at >>>> sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run(OGLRenderQueue.java:220) >>>> ~ >>>> >>>> >>>> Tested on RHEL5 x86_64 in VNC session, DISPLAY is set to :2.0 (it's >>>> correct, of course). >>>> >>>> Do anyone remember that we did any changes in XRender or java2d.opengl >>>> packages between 1.8 and 1.9? >>>> >>>> PS: at least these regression tests fail due to issue mentioned above: >>>> FAILED: sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java >>>> FAILED: sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java >>>> FAILED: >>>> sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java >>>> FAILED: sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java >>>> FAILED: >>>> sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java >>>> FAILED: sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java >>>> FAILED: sun/java2d/OpenGL/DrawBufImgOp.java >>>> FAILED: sun/java2d/OpenGL/GradientPaints.java >>>> FAILED: sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java >>>> FAILED: sun/java2d/pipe/MutableColorTest/MutableColorTest.java >>>> >>>> Cheers >>>> Pavel >>> As discussed on the mailing list, XRender was updated to the new version: >>> >>> http://icedtea.classpath.org/hg/release/icedtea6-1.9/rev/9da4f50c13c0 >>> >>> Part of this involved updating the pipeline code which XRender relies on >>> (see the patch). Both are 7 backports. Have you checked whether the >>> same tests fail in 7? >> I think that this issue could be solved by the patch stored in >> attachment [OGLContext.patch] because OGLContext.o is already included >> in xawt.so (which is correct) but it does not exist JNI link to native >> function OGLContext.getOGLIdString(). >> >> Is it possible to add this patch to IcedTea6 or (preferably) add its >> contents to existing patch 6961633-xrender-02.patch? >> > > Please add this in a new patch. The existing patch (as the bug ID implies) > is an export of an upstream changeset, so we don't want to mix non-upstreamed > changes in with that. I'm going to push the patch to IcedTea6 HEAD and IcedTea6-1.9, is it ok? > > Speaking of which, this should go upstream too. Did you check if the tests > fail in OpenJDK7? > >> But I found another issue: when I run the test against IcedTea6 with the >> patch applied JRE failed due to fatal error - see attachment >> [hs_err_pid32222.log]. It's quite strange for me because libGL.so >> contains function glGetString(). I have to further investigate why this >> call failed (I run the test in VNC session which can be one possible >> source of failure). > > It does contain glGetString. Indeed, it's crashing in that function, not OpenJDK code. > >>> Note: There is no 1.9 release yet. The branch was created specifically >>> so we'd find stuff like this before release :-) > >> --- openjdk-old/jdk/make/sun/xawt/mapfile-vers 2010-08-16 16:54:21.000000000 +0200 >> +++ openjdk/jdk/make/sun/xawt/mapfile-vers 2010-08-16 16:54:21.000000000 +0200 >> @@ -300,6 +300,7 @@ >> Java_java_awt_FileDialog_initIDs; >> Java_sun_awt_X11_XWindow_initIDs; >> >> + Java_sun_java2d_opengl_OGLContext_getOGLIdString; >> Java_sun_java2d_opengl_OGLMaskFill_maskFill; >> Java_sun_java2d_opengl_OGLRenderer_drawPoly; >> Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer; > >> # >> # A fatal error has been detected by the Java Runtime Environment: >> # >> # SIGSEGV (0xb) at pc=0x0000003e3a451cee, pid=32222, tid=1075607872 >> # >> # JRE version: 6.0_20-b20 >> # Java VM: OpenJDK 64-Bit Server VM (17.0-b16 mixed mode linux-amd64 ) >> # Derivative: IcedTea6 1.10pre+r552e98f1c215 >> # Distribution: Built on Red Hat Enterprise Linux Server release 5.5 (Tikanga) (Mon Aug 16 23:21:18 CEST 2010) >> # Problematic frame: >> # C [libGL.so.1+0x51cee] glGetString+0xe >> # >> # If you would like to submit a bug report, please include >> # instructions how to reproduce the bug and visit: >> # http://icedtea.classpath.org/bugzilla >> # The crash happened outside the Java Virtual Machine in native code. >> # See problematic frame for where to report the bug. >> # >> >> --------------- T H R E A D --------------- >> >> Current thread (0x00002aab38101800): JavaThread "Java2D Queue Flusher" daemon [_thread_in_native, id=32241, stack(0x00000000400c7000,0x00000000401c8000)] >> >> siginfo:si_signo=SIGSEGV: si_errno=0, si_code=128 (), si_addr=0x0000000000000000 >> >> Registers: >> RAX=0x0000000005418830, RBX=0x00002aab36d40100, RCX=0x0000000005418830, RDX=0x0000003e39216280 >> RSP=0x00000000401c67b8, RBP=0x00000000401c6800, RSI=0x00000000401c7a10, RDI=0x0000000000001f00 >> R8 =0x00002ae1480c1ec0, R9 =0x00002aab3803a9c8, R10=0x0000000000000000, R11=0x6f69746172656e65 >> R12=0x00002aab38101800, R13=0x00002aab36b309f8, R14=0x00000000401c6870, R15=0x00002aab36b309e7 >> RIP=0x0000003e3a451cee, EFL=0x0000000000010246, CSGSFS=0x0000000000000033, ERR=0x0000000000000000 >> TRAPNO=0x000000000000000d >> >> Top of Stack: (sp=0x00000000401c67b8) >> 0x00000000401c67b8: 00002aab36b1a95c 00000000401c68c8 >> 0x00000000401c67c8: 00002aab381019c8 00000000401c6878 >> 0x00000000401c67d8: 00002aaaaeac3d28 00002aab38101800 >> 0x00000000401c67e8: 00002aaaaeac3d28 00000000401c6870 >> 0x00000000401c67f8: 00002aab38101800 00000000401c6858 >> 0x00000000401c6808: 00002aaaab35e9c6 0000000005493198 >> 0x00000000401c6818: 00000000401c6818 00002aaaaeac3d28 >> 0x00000000401c6828: 00000000401c6870 00002aaaaeac7620 >> 0x00000000401c6838: 0000000000000000 00002aaaaeac3d28 >> 0x00000000401c6848: 0000000000000000 00000000401c6878 >> 0x00000000401c6858: 00000000401c68c8 00002aaaab352973 >> 0x00000000401c6868: 00002aaaaeac6d00 00002aaaab35b89b >> 0x00000000401c6878: 0000000000000000 00002aab0be66098 >> 0x00000000401c6888: 00000000401c6888 00002aaaaeac86f5 >> 0x00000000401c6898: 00000000401c68d8 00002aaaaeac8ad8 >> 0x00000000401c68a8: 0000000000000000 00002aaaaeac8710 >> 0x00000000401c68b8: 00000000401c6878 00000000401c68d8 >> 0x00000000401c68c8: 00000000401c6930 00002aaaab352cf4 >> 0x00000000401c68d8: 00002aab0be66390 0000000000000001 >> 0x00000000401c68e8: 00002aab0be66208 00000000401c68e0 >> 0x00000000401c68f8: 00002aaaaeac2667 00000000401c6958 >> 0x00000000401c6908: 00002aaaaeac2c10 0000000000000000 >> 0x00000000401c6918: 00002aaaaeac2770 00000000401c68d8 >> 0x00000000401c6928: 00000000401c6958 00000000401c69c0 >> 0x00000000401c6938: 00002aaaab34d3fb 0000000000000000 >> 0x00000000401c6948: 0000000000000000 0000000000000000 >> 0x00000000401c6958: 00002aab0be66208 0000000000001fa0 >> 0x00000000401c6968: 00002aaaab34d379 00000000401c6b90 >> 0x00000000401c6978: 0000000000000001 00002aab38101800 >> 0x00000000401c6988: 0000000005493140 00000000401c6a10 >> 0x00000000401c6998: 00000000401c6ce8 00002aab0000000a >> 0x00000000401c69a8: 00002aaaaeac2770 00002aaaab35d420 >> >> Instructions: (pc=0x0000003e3a451cee) >> 0x0000003e3a451cde: 00 00 57 e8 ea d5 ff ff 5f 4c 8b 98 98 08 00 00 >> 0x0000003e3a451cee: 41 ff e3 0f 1f 80 00 00 00 00 0f 1f 84 00 00 00 >> >> Stack: [0x00000000400c7000,0x00000000401c8000], sp=0x00000000401c67b8, free space=3fd0000000000000018k >> Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) >> C [libGL.so.1+0x51cee] glGetString+0xe >> j sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String;+0 >> j sun.java2d.opengl.GLXGraphicsConfig$1.run()V+5 >> j sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run()V+95 >> v ~StubRoutines::call_stub >> V [libjvm.so+0x411955] >> V [libjvm.so+0x4108d8] >> V [libjvm.so+0x4111f4] >> V [libjvm.so+0x41138b] >> V [libjvm.so+0x4704c0] >> V [libjvm.so+0x6f77fd] >> V [libjvm.so+0x5f5c14] >> >> Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) >> j sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String;+0 >> j sun.java2d.opengl.GLXGraphicsConfig$1.run()V+5 >> j sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run()V+95 >> v ~StubRoutines::call_stub >> >> --------------- P R O C E S S --------------- >> >> Java Threads: ( => current thread ) >> =>0x00002aab38101800 JavaThread "Java2D Queue Flusher" daemon [_thread_in_native, id=32241, stack(0x00000000400c7000,0x00000000401c8000)] >> 0x00002aab38092800 JavaThread "Java2D Disposer" daemon [_thread_blocked, id=32240, stack(0x00000000408b7000,0x00000000409b8000)] >> 0x00002aab38025800 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=32238, stack(0x0000000041d0d000,0x0000000041e0e000)] >> 0x00002aab38023000 JavaThread "CompilerThread1" daemon [_thread_blocked, id=32237, stack(0x000000004122d000,0x000000004132e000)] >> 0x00002aab38020000 JavaThread "CompilerThread0" daemon [_thread_blocked, id=32236, stack(0x000000004112c000,0x000000004122d000)] >> 0x00002aab3801d800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=32235, stack(0x000000004102b000,0x000000004112c000)] >> 0x0000000005489000 JavaThread "Finalizer" daemon [_thread_blocked, id=32234, stack(0x0000000040c75000,0x0000000040d76000)] >> 0x0000000005487000 JavaThread "Reference Handler" daemon [_thread_blocked, id=32233, stack(0x0000000040b74000,0x0000000040c75000)] >> 0x0000000005411000 JavaThread "main" [_thread_blocked, id=32223, stack(0x0000000041404000,0x0000000041505000)] >> >> Other Threads: >> 0x0000000005480800 VMThread [stack: 0x0000000040a73000,0x0000000040b74000] [id=32232] >> 0x00002aab38028000 WatcherThread [stack: 0x0000000041e37000,0x0000000041f38000] [id=32239] >> >> VM state:not at safepoint (normal execution) >> >> VM Mutex/Monitor currently owned by a thread: None >> >> Heap >> PSYoungGen total 37184K, used 1912K [0x00002aab0bd70000, 0x00002aab0e6f0000, 0x00002aab35610000) >> eden space 31872K, 6% used [0x00002aab0bd70000,0x00002aab0bf4e1b8,0x00002aab0dc90000) >> from space 5312K, 0% used [0x00002aab0e1c0000,0x00002aab0e1c0000,0x00002aab0e6f0000) >> to space 5312K, 0% used [0x00002aab0dc90000,0x00002aab0dc90000,0x00002aab0e1c0000) >> PSOldGen total 85120K, used 0K [0x00002aaab8c10000, 0x00002aaabdf30000, 0x00002aab0bd70000) >> object space 85120K, 0% used [0x00002aaab8c10000,0x00002aaab8c10000,0x00002aaabdf30000) >> PSPermGen total 21248K, used 6882K [0x00002aaaae410000, 0x00002aaaaf8d0000, 0x00002aaab8c10000) >> object space 21248K, 32% used [0x00002aaaae410000,0x00002aaaaeac8b60,0x00002aaaaf8d0000) >> >> Dynamic libraries: >> 00400000-00409000 r-xp 00000000 fd:00 9011299 /jck/j2sdk-image/bin/java >> 00608000-00609000 rw-p 00008000 fd:00 9011299 /jck/j2sdk-image/bin/java >> 0540a000-05507000 rw-p 0540a000 00:00 0 [heap] >> 400c7000-400ca000 ---p 400c7000 00:00 0 >> 400ca000-401c8000 rw-p 400ca000 00:00 0 >> 408b7000-408ba000 ---p 408b7000 00:00 0 >> 408ba000-409b8000 rw-p 408ba000 00:00 0 >> 40a73000-40a74000 ---p 40a73000 00:00 0 >> 40a74000-40b74000 rw-p 40a74000 00:00 0 >> 40b74000-40b77000 ---p 40b74000 00:00 0 >> 40b77000-40c75000 rw-p 40b77000 00:00 0 >> 40c75000-40c78000 ---p 40c75000 00:00 0 >> 40c78000-40d76000 rw-p 40c78000 00:00 0 >> 4102b000-4102e000 ---p 4102b000 00:00 0 >> 4102e000-4112c000 rw-p 4102e000 00:00 0 >> 4112c000-4112f000 ---p 4112c000 00:00 0 >> 4112f000-4122d000 rw-p 4112f000 00:00 0 >> 4122d000-41230000 ---p 4122d000 00:00 0 >> 41230000-4132e000 rw-p 41230000 00:00 0 >> 41404000-41407000 ---p 41404000 00:00 0 >> 41407000-41505000 rw-p 41407000 00:00 0 >> 41505000-41506000 ---p 41505000 00:00 0 >> 41506000-41606000 rw-p 41506000 00:00 0 >> 41606000-41607000 ---p 41606000 00:00 0 >> 41607000-41707000 rw-p 41607000 00:00 0 >> 41707000-41708000 ---p 41707000 00:00 0 >> 41708000-41808000 rw-p 41708000 00:00 0 >> 41808000-41809000 ---p 41808000 00:00 0 >> 41809000-41909000 rw-p 41809000 00:00 0 >> 41909000-4190a000 ---p 41909000 00:00 0 >> 4190a000-41a0a000 rw-p 4190a000 00:00 0 >> 41a0a000-41a0b000 ---p 41a0a000 00:00 0 >> 41a0b000-41b0b000 rw-p 41a0b000 00:00 0 >> 41b0b000-41b0c000 ---p 41b0b000 00:00 0 >> 41b0c000-41c0c000 rw-p 41b0c000 00:00 0 >> 41c0c000-41c0d000 ---p 41c0c000 00:00 0 >> 41c0d000-41d0d000 rw-p 41c0d000 00:00 0 >> 41d0d000-41d10000 ---p 41d0d000 00:00 0 >> 41d10000-41e0e000 rw-p 41d10000 00:00 0 >> 41e37000-41e38000 ---p 41e37000 00:00 0 >> 41e38000-41f38000 rw-p 41e38000 00:00 0 >> 3e38400000-3e3841c000 r-xp 00000000 fd:00 55083144 /lib64/ld-2.5.so >> 3e3861b000-3e3861c000 r--p 0001b000 fd:00 55083144 /lib64/ld-2.5.so >> 3e3861c000-3e3861d000 rw-p 0001c000 fd:00 55083144 /lib64/ld-2.5.so >> 3e38800000-3e3894e000 r-xp 00000000 fd:00 55083145 /lib64/libc-2.5.so >> 3e3894e000-3e38b4d000 ---p 0014e000 fd:00 55083145 /lib64/libc-2.5.so >> 3e38b4d000-3e38b51000 r--p 0014d000 fd:00 55083145 /lib64/libc-2.5.so >> 3e38b51000-3e38b52000 rw-p 00151000 fd:00 55083145 /lib64/libc-2.5.so >> 3e38b52000-3e38b57000 rw-p 3e38b52000 00:00 0 >> 3e38c00000-3e38c02000 r-xp 00000000 fd:00 55083147 /lib64/libdl-2.5.so >> 3e38c02000-3e38e02000 ---p 00002000 fd:00 55083147 /lib64/libdl-2.5.so >> 3e38e02000-3e38e03000 r--p 00002000 fd:00 55083147 /lib64/libdl-2.5.so >> 3e38e03000-3e38e04000 rw-p 00003000 fd:00 55083147 /lib64/libdl-2.5.so >> 3e39000000-3e39016000 r-xp 00000000 fd:00 55083146 /lib64/libpthread-2.5.so >> 3e39016000-3e39215000 ---p 00016000 fd:00 55083146 /lib64/libpthread-2.5.so >> 3e39215000-3e39216000 r--p 00015000 fd:00 55083146 /lib64/libpthread-2.5.so >> 3e39216000-3e39217000 rw-p 00016000 fd:00 55083146 /lib64/libpthread-2.5.so >> 3e39217000-3e3921b000 rw-p 3e39217000 00:00 0 >> 3e39400000-3e39482000 r-xp 00000000 fd:00 55083148 /lib64/libm-2.5.so >> 3e39482000-3e39681000 ---p 00082000 fd:00 55083148 /lib64/libm-2.5.so >> 3e39681000-3e39682000 r--p 00081000 fd:00 55083148 /lib64/libm-2.5.so >> 3e39682000-3e39683000 rw-p 00082000 fd:00 55083148 /lib64/libm-2.5.so >> 3e39800000-3e39814000 r-xp 00000000 fd:00 52035672 /usr/lib64/libz.so.1.2.3 >> 3e39814000-3e39a13000 ---p 00014000 fd:00 52035672 /usr/lib64/libz.so.1.2.3 >> 3e39a13000-3e39a14000 rw-p 00013000 fd:00 52035672 /usr/lib64/libz.so.1.2.3 >> 3e39c00000-3e39c07000 r-xp 00000000 fd:00 55083154 /lib64/librt-2.5.so >> 3e39c07000-3e39e07000 ---p 00007000 fd:00 55083154 /lib64/librt-2.5.so >> 3e39e07000-3e39e08000 r--p 00007000 fd:00 55083154 /lib64/librt-2.5.so >> 3e39e08000-3e39e09000 rw-p 00008000 fd:00 55083154 /lib64/librt-2.5.so >> 3e3a000000-3e3a007000 r-xp 00000000 fd:00 30682405 /usr/lib64/libdrm.so.2.0.0 >> 3e3a007000-3e3a207000 ---p 00007000 fd:00 30682405 /usr/lib64/libdrm.so.2.0.0 >> 3e3a207000-3e3a208000 rw-p 00007000 fd:00 30682405 /usr/lib64/libdrm.so.2.0.0 >> 3e3a400000-3e3a46e000 r-xp 00000000 fd:00 30682407 /usr/lib64/libGL.so.1.2 >> 3e3a46e000-3e3a66e000 ---p 0006e000 fd:00 30682407 /usr/lib64/libGL.so.1.2 >> 3e3a66e000-3e3a678000 rw-p 0006e000 fd:00 30682407 /usr/lib64/libGL.so.1.2 >> 3e3a678000-3e3a67a000 rw-p 3e3a678000 00:00 0 >> 3e3b000000-3e3b005000 r-xp 00000000 fd:00 52035782 /usr/lib64/libXdmcp.so.6.0.0 >> 3e3b005000-3e3b204000 ---p 00005000 fd:00 52035782 /usr/lib64/libXdmcp.so.6.0.0 >> 3e3b204000-3e3b205000 rw-p 00004000 fd:00 52035782 /usr/lib64/libXdmcp.so.6.0.0 >> 3e3b400000-3e3b505000 r-xp 00000000 fd:00 52035783 /usr/lib64/libX11.so.6.2.0 >> 3e3b505000-3e3b705000 ---p 00105000 fd:00 52035783 /usr/lib64/libX11.so.6.2.0 >> 3e3b705000-3e3b70c000 rw-p 00105000 fd:00 52035783 /usr/lib64/libX11.so.6.2.0 >> 3e3b800000-3e3b802000 r-xp 00000000 fd:00 52035673 /usr/lib64/libXau.so.6.0.0 >> 3e3b802000-3e3ba01000 ---p 00002000 fd:00 52035673 /usr/lib64/libXau.so.6.0.0 >> 3e3ba01000-3e3ba02000 rw-p 00001000 fd:00 52035673 /usr/lib64/libXau.so.6.0.0 >> 3e3bc00000-3e3bc15000 r-xp 00000000 fd:00 55083150 /lib64/libnsl-2.5.so >> 3e3bc15000-3e3be14000 ---p 00015000 fd:00 55083150 /lib64/libnsl-2.5.so >> 3e3be14000-3e3be15000 r--p 00014000 fd:00 55083150 /lib64/libnsl-2.5.so >> 3e3be15000-3e3be16000 rw-p 00015000 fd:00 55083150 /lib64/libnsl-2.5.so >> 3e3be16000-3e3be18000 rw-p 3e3be16000 00:00 0 >> 3e3cc00000-3e3cc10000 r-xp 00000000 fd:00 52035784 /usr/lib64/libXext.so.6.4.0 >> 3e3cc10000-3e3ce10000 ---p 00010000 fd:00 52035784 /usr/lib64/libXext.so.6.4.0 >> 3e3ce10000-3e3ce11000 rw-p 00010000 fd:00 52035784 /usr/lib64/libXext.so.6.4.0 >> 3e3d400000-3e3d405000 r-xp 00000000 fd:00 52035785 /usr/lib64/libXxf86vm.so.1.0.0 >> 3e3d405000-3e3d604000 ---p 00005000 fd:00 52035785 /usr/lib64/libXxf86vm.so.1.0.0 >> 3e3d604000-3e3d605000 rw-p 00004000 fd:00 52035785 /usr/lib64/libXxf86vm.so.1.0.0 >> 3e3dc00000-3e3dc7f000 r-xp 00000000 fd:00 52035816 /usr/lib64/libfreetype.so.6.3.10 >> 3e3dc7f000-3e3de7f000 ---p 0007f000 fd:00 52035816 /usr/lib64/libfreetype.so.6.3.10 >> 3e3de7f000-3e3de84000 rw-p 0007f000 fd:00 52035816 /usr/lib64/libfreetype.so.6.3.10 >> 3e3e400000-3e3e409000 r-xp 00000000 fd:00 52035819 /usr/lib64/libXrender.so.1.3.0 >> 3e3e409000-3e3e608000 ---p 00009000 fd:00 52035819 /usr/lib64/libXrender.so.1.3.0 >> 3e3e608000-3e3e609000 rw-p 00008000 fd:00 52035819 /usr/lib64/libXrender.so.1.3.0 >> 3e43c00000-3e43c08000 r-xp 00000000 fd:00 52035824 /usr/lib64/libXi.so.6.0.0 >> 3e43c08000-3e43e07000 ---p 00008000 fd:00 52035824 /usr/lib64/libXi.so.6.0.0 >> 3e43e07000-3e43e08000 rw-p 00007000 fd:00 52035824 /usr/lib64/libXi.so.6.0.0 >> 3e45c00000-3e45c0d000 r-xp 00000000 fd:00 55083149 /lib64/libgcc_s-4.1.2-20080825.so.1 >> 3e45c0d000-3e45e0d000 ---p 0000d000 fd:00 55083149 /lib64/libgcc_s-4.1.2-20080825.so.1 >> 3e45e0d000-3e45e0e000 rw-p 0000d000 fd:00 55083149 /lib64/libgcc_s-4.1.2-20080825.so.1 >> 3e4b600000-3e4b605000 r-xp 00000000 fd:00 52035905 /usr/lib64/libXtst.so.6.1.0 >> 3e4b605000-3e4b805000 ---p 00005000 fd:00 52035905 /usr/lib64/libXtst.so.6.1.0 >> 3e4b805000-3e4b806000 rw-p 00005000 fd:00 52035905 /usr/lib64/libXtst.so.6.1.0 >> 2aaaaaac0000-2aaaaaace000 r-xp 00000000 fd:00 9699523 /jck/j2sdk-image/jre/lib/amd64/libverify.so >> 2aaaaaace000-2aaaaaccd000 ---p 0000e000 fd:00 9699523 /jck/j2sdk-image/jre/lib/amd64/libverify.so >> 2aaaaaccd000-2aaaaaccf000 rw-p 0000d000 fd:00 9699523 /jck/j2sdk-image/jre/lib/amd64/libverify.so >> 2aaaaaccf000-2aaaaacfa000 r-xp 00000000 fd:00 9699499 /jck/j2sdk-image/jre/lib/amd64/libjava.so >> 2aaaaacfa000-2aaaaaefa000 ---p 0002b000 fd:00 9699499 /jck/j2sdk-image/jre/lib/amd64/libjava.so >> 2aaaaaefa000-2aaaaaefe000 rw-p 0002b000 fd:00 9699499 /jck/j2sdk-image/jre/lib/amd64/libjava.so >> 2aaaaaefe000-2aaaaaeff000 r--p 2aaaaaefe000 00:00 0 >> 2aaaaaeff000-2aaaaaf00000 rw-p 2aaaaaeff000 00:00 0 >> 2aaaaaf00000-2aaaaaf08000 r-xp 00000000 fd:00 9830466 /jck/j2sdk-image/jre/lib/amd64/native_threads/libhpi.so >> 2aaaaaf08000-2aaaab107000 ---p 00008000 fd:00 9830466 /jck/j2sdk-image/jre/lib/amd64/native_threads/libhpi.so >> 2aaaab107000-2aaaab108000 rw-p 00007000 fd:00 9830466 /jck/j2sdk-image/jre/lib/amd64/native_threads/libhpi.so >> 2aaaab108000-2aaaab109000 rw-p 2aaaab108000 00:00 0 >> 2aaaab109000-2aaaab13e000 r--s 00000000 fd:00 7110950 /var/db/nscd/passwd >> 2aaaab13e000-2aaaab146000 rw-s 00000000 fd:00 42600011 /tmp/hsperfdata_ptisnovs/32222 >> 2aaaab146000-2aaaab14d000 r-xp 00000000 fd:00 9699526 /jck/j2sdk-image/jre/lib/amd64/libzip.so >> 2aaaab14d000-2aaaab34c000 ---p 00007000 fd:00 9699526 /jck/j2sdk-image/jre/lib/amd64/libzip.so >> 2aaaab34c000-2aaaab34d000 rw-p 00006000 fd:00 9699526 /jck/j2sdk-image/jre/lib/amd64/libzip.so >> 2aaaab34d000-2aaaab5bd000 rwxp 2aaaab34d000 00:00 0 >> 2aaaab5bd000-2aaaae34d000 rw-p 2aaaab5bd000 00:00 0 >> 2aaaae34d000-2aaaae357000 rw-p 2aaaae34d000 00:00 0 >> 2aaaae357000-2aaaae40d000 rw-p 2aaaae357000 00:00 0 >> 2aaaae410000-2aaaaf8d0000 rw-p 2aaaae410000 00:00 0 >> 2aaaaf8d0000-2aaab8c10000 rw-p 2aaaaf8d0000 00:00 0 >> 2aaab8c10000-2aaabdf30000 rw-p 2aaab8c10000 00:00 0 >> 2aaabdf30000-2aab0bd70000 rw-p 2aaabdf30000 00:00 0 >> 2aab0bd70000-2aab0e6f0000 rw-p 2aab0bd70000 00:00 0 >> 2aab0e6f0000-2aab35610000 rw-p 2aab0e6f0000 00:00 0 >> 2aab35610000-2aab3561b000 rw-p 2aab35610000 00:00 0 >> 2aab3561b000-2aab35664000 rw-p 2aab3561b000 00:00 0 >> 2aab35664000-2aab3568e000 rw-p 2aab35664000 00:00 0 >> 2aab3568e000-2aab358fc000 rw-p 2aab3568e000 00:00 0 >> 2aab358fc000-2aab35912000 rw-p 2aab358fc000 00:00 0 >> 2aab35912000-2aab35a49000 rw-p 2aab35912000 00:00 0 >> 2aab35a49000-2aab35a74000 rw-p 2aab35a49000 00:00 0 >> 2aab35a74000-2aab35ce3000 rw-p 2aab35a74000 00:00 0 >> 2aab35ce3000-2aab35cee000 rw-p 2aab35ce3000 00:00 0 >> 2aab35cee000-2aab35d37000 rw-p 2aab35cee000 00:00 0 >> 2aab35d37000-2aab35d5f000 rw-p 2aab35d37000 00:00 0 >> 2aab35d5f000-2aab35eed000 r--s 038af000 fd:00 9109772 /jck/j2sdk-image/jre/lib/rt.jar >> 2aab35eed000-2aab35f1f000 rw-p 2aab35eed000 00:00 0 >> 2aab35f1f000-2aab35f25000 r--s 00043000 fd:00 9109782 /jck/j2sdk-image/jre/lib/netx.jar >> 2aab35f25000-2aab3682e000 rw-p 2aab35f25000 00:00 0 >> 2aab3682e000-2aab368c4000 r-xp 00000000 fd:00 9699503 /jck/j2sdk-image/jre/lib/amd64/libawt.so >> 2aab368c4000-2aab36ac4000 ---p 00096000 fd:00 9699503 /jck/j2sdk-image/jre/lib/amd64/libawt.so >> 2aab36ac4000-2aab36acf000 rw-p 00096000 fd:00 9699503 /jck/j2sdk-image/jre/lib/amd64/libawt.so >> 2aab36acf000-2aab36af4000 rw-p 2aab36acf000 00:00 0 >> 2aab36af4000-2aab36b3d000 r-xp 00000000 fd:00 9732309 /jck/j2sdk-image/jre/lib/amd64/xawt/libmawt.so >> 2aab36b3d000-2aab36d3c000 ---p 00049000 fd:00 9732309 /jck/j2sdk-image/jre/lib/amd64/xawt/libmawt.so >> 2aab36d3c000-2aab36d3f000 rw-p 00048000 fd:00 9732309 /jck/j2sdk-image/jre/lib/amd64/xawt/libmawt.so >> 2aab36d3f000-2aab36d41000 rw-p 2aab36d3f000 00:00 0 >> 2aab36d41000-2aab36d85000 r-xp 00000000 fd:00 9699507 /jck/j2sdk-image/jre/lib/amd64/libfontmanager.so >> 2aab36d85000-2aab36f84000 ---p 00044000 fd:00 9699507 /jck/j2sdk-image/jre/lib/amd64/libfontmanager.so >> 2aab36f84000-2aab36f88000 rw-p 00043000 fd:00 9699507 /jck/j2sdk-image/jre/lib/amd64/libfontmanager.so >> 2aab36f88000-2aab36f98000 rw-p 2aab36f88000 00:00 0 >> 2aab36f98000-2aab36f9f000 r--s 00000000 fd:00 7111498 /var/cache/fontconfig/beeeeb3dfe132a8a0633a017c99ce0c0-x86-64.cache-2 >> 2aab36f9f000-2aab36fa4000 r--s 00000000 fd:00 7111021 /var/cache/fontconfig/b64a443fb29fd68918eee3276c922bf0-x86-64.cache-2 >> 2aab36fa4000-2aab36fa5000 r--s 00000000 fd:00 7111040 /var/cache/fontconfig/c09c2e2d9ddef970513e4a68e1d4f7be-x86-64.cache-2 >> 2aab36fa5000-2aab36fb0000 r--s 00000000 fd:00 7111203 /var/cache/fontconfig/e19de935dec46bbf3ed114ee4965548a-x86-64.cache-2 >> 2aab36fb0000-2aab36fb3000 r--s 00000000 fd:00 7111204 /var/cache/fontconfig/e3ead4b767b8819993a6fa3ae306afa9-x86-64.cache-2 >> 2aab36fb3000-2aab36fba000 r--s 00000000 fd:00 7110996 /var/cache/fontconfig/7ddba6133ef499da58de5e8c586d3b75-x86-64.cache-2 >> 2aab36fba000-2aab36fbb000 r--s 00000000 fd:00 7111049 /var/cache/fontconfig/602d1f86cc7d0d7fcaea57cc0415ba86-x86-64.cache-2 >> 2aab36fbb000-2aab36fc2000 r--s 00000000 fd:00 7111018 /var/cache/fontconfig/76339d7a19b7d8e4649c5ddbf17c0441-x86-64.cache-2 >> 2aab36fc2000-2aab36fc3000 r--s 00000000 fd:00 7111019 /var/cache/fontconfig/c1e0ebede0a5820dfb31314ce531f395-x86-64.cache-2 >> 2aab36fc3000-2aab36fc4000 r--s 00000000 fd:00 7111017 /var/cache/fontconfig/a47204c0282682fca292504963454f06-x86-64.cache-2 >> 2aab36fc4000-2aab36fc5000 r--s 00000000 fd:00 7111037 /var/cache/fontconfig/ec08f7e2aac04ad6751b56b654659de6-x86-64.cache-2 >> 2aab36fc5000-2aab36fc6000 r--s 00000000 fd:00 7111047 /var/cache/fontconfig/a0ed530305610ad915aa8f21f0d94463-x86-64.cache-2 >> 2aab36fc6000-2aab36fc7000 r--s 00000000 fd:00 7111020 /var/cache/fontconfig/31b8f98acd9832a15daf4d1a0b40239b-x86-64.cache-2 >> 2aab36fc7000-2aab36fc8000 r--s 00000000 fd:00 7111038 /var/cache/fontconfig/fc7f808eb72d8a281e1f12def2851241-x86-64.cache-2 >> 2aab36fc8000-2aab36fc9000 r--s 00000000 fd:00 7111031 /var/cache/fontconfig/b0c8039c3bbcc6f1976d33b66b56fc83-x86-64.cache-2 >> 2aab36fc9000-2aab36fca000 r--s 00000000 fd:00 7111025 /var/cache/fontconfig/31e4bfa78c57c1d34653a253fb01b172-x86-64.cache-2 >> 2aab36fca000-2aab36fcf000 r--s 00000000 fd:00 7111041 /var/cache/fontconfig/a3ef620b97f3ad86e0ccce6d4afaa4cc-x86-64.cache-2 >> 2aab36fcf000-2aab36fd0000 r--s 00000000 fd:00 7111042 /var/cache/fontconfig/49aab29dc58e529ef78a6d0aaa3ba41d-x86-64.cache-2 >> 2aab36fd0000-2aab36fd8000 r--s 00000000 fd:00 7111206 /var/cache/fontconfig/b79f3aaa7d385a141ab53ec885cc22a8-x86-64.cache-2 >> 2aab36fd8000-2aab36fda000 r--s 00000000 fd:00 7111205 /var/cache/fontconfig/87f5e051180a7a75f16eb6fe7dbd3749-x86-64.cache-2 >> 2aab36fda000-2aab36fdd000 r--s 00000000 fd:00 7111034 /var/cache/fontconfig/fdb4a018037c133ed2ff41d1378148d0-x86-64.cache-2 >> 2aab36fdd000-2aab36fe0000 r--s 00000000 fd:00 7111029 /var/cache/fontconfig/ae30b330df83ba0e904b3d2eb05b9c75-x86-64.cache-2 >> 2aab36fe0000-2aab36ff6000 r--s 00000000 fd:00 7111030 /var/cache/fontconfig/d066cc093611c74861a22d5ef60b042c-x86-64.cache-2 >> 2aab36ff6000-2aab36ffa000 r--s 00000000 fd:00 7111035 /var/cache/fontconfig/00413c8acffd3c2ef5e4f42b8b36cd9a-x86-64.cache-2 >> 2aab36ffa000-2aab36ffe000 r--s 00000000 fd:00 7111046 /var/cache/fontconfig/177aa5f8e4784b879645141d1d73ae7a-x86-64.cache-2 >> 2aab36ffe000-2aab37012000 r-xp 00000000 fd:00 9699501 /jck/j2sdk-image/jre/lib/amd64/libnet.so >> 2aab37012000-2aab37211000 ---p 00014000 fd:00 9699501 /jck/j2sdk-image/jre/lib/amd64/libnet.so >> 2aab37211000-2aab37212000 rw-p 00013000 fd:00 9699501 /jck/j2sdk-image/jre/lib/amd64/libnet.so >> 2aab37212000-2aab37219000 r-xp 00000000 fd:00 9699502 /jck/j2sdk-image/jre/lib/amd64/libnio.so >> 2aab37219000-2aab37419000 ---p 00007000 fd:00 9699502 /jck/j2sdk-image/jre/lib/amd64/libnio.so >> 2aab37419000-2aab3741a000 rw-p 00007000 fd:00 9699502 /jck/j2sdk-image/jre/lib/amd64/libnio.so >> 2aab3741a000-2aab37420000 r--s 000fc000 fd:00 9109749 /jck/j2sdk-image/jre/lib/resources.jar >> 2aab38000000-2aab38103000 rw-p 2aab38000000 00:00 0 >> 2aab38103000-2aab3c000000 ---p 2aab38103000 00:00 0 >> 2aab3c000000-2aab3f5d7000 r--p 00000000 fd:00 30680677 /usr/lib/locale/locale-archive >> 2ae147373000-2ae147374000 rw-p 2ae147373000 00:00 0 >> 2ae147388000-2ae147389000 rw-p 2ae147388000 00:00 0 >> 2ae147389000-2ae14738d000 r-xp 00000000 fd:00 10780772 /jck/j2sdk-image/jre/lib/amd64/jli/libjli.so >> 2ae14738d000-2ae14758c000 ---p 00004000 fd:00 10780772 /jck/j2sdk-image/jre/lib/amd64/jli/libjli.so >> 2ae14758c000-2ae14758d000 rw-p 00003000 fd:00 10780772 /jck/j2sdk-image/jre/lib/amd64/jli/libjli.so >> 2ae14758d000-2ae147590000 rw-p 2ae14758d000 00:00 0 >> 2ae147590000-2ae147e26000 r-xp 00000000 fd:00 10322184 /jck/j2sdk-image/jre/lib/amd64/server/libjvm.so >> 2ae147e26000-2ae148026000 ---p 00896000 fd:00 10322184 /jck/j2sdk-image/jre/lib/amd64/server/libjvm.so >> 2ae148026000-2ae1480b6000 rw-p 00896000 fd:00 10322184 /jck/j2sdk-image/jre/lib/amd64/server/libjvm.so >> 2ae1480b6000-2ae1480ef000 rw-p 2ae1480b6000 00:00 0 >> 7fff9efb4000-7fff9efc9000 rw-p 7ffffffea000 00:00 0 [stack] >> ffffffffff600000-ffffffffffe00000 ---p 00000000 00:00 0 [vdso] >> >> VM Arguments: >> jvm_args: -Dsun.java2d.opengl=true >> java_command: Test >> Launcher Type: SUN_STANDARD >> >> Environment Variables: >> PATH=/usr/kerberos/bin:/usr/local/bin:/bin:/usr/bin:/home/brq/ptisnovs/bin >> LD_LIBRARY_PATH=/jck/j2sdk-image/jre/lib/amd64/server:/jck/j2sdk-image/jre/lib/amd64:/jck/j2sdk-image/jre/../lib/amd64 >> SHELL=/bin/bash >> DISPLAY=:42.0 >> >> Signal Handlers: >> SIGSEGV: [libjvm.so+0x73d6c0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 >> SIGBUS: [libjvm.so+0x73d6c0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 >> SIGFPE: [libjvm.so+0x5f18f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 >> SIGPIPE: [libjvm.so+0x5f18f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 >> SIGXFSZ: [libjvm.so+0x5f18f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 >> SIGILL: [libjvm.so+0x5f18f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 >> SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000 >> SIGUSR2: [libjvm.so+0x5f4d90], sa_mask[0]=0x00000000, sa_flags=0x10000004 >> SIGHUP: [libjvm.so+0x5f2cb0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 >> SIGINT: [libjvm.so+0x5f2cb0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 >> SIGTERM: [libjvm.so+0x5f2cb0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 >> SIGQUIT: [libjvm.so+0x5f2cb0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 >> >> >> --------------- S Y S T E M --------------- >> >> OS:Red Hat Enterprise Linux Server release 5.5 (Tikanga) >> >> uname:Linux 2.6.18-194.3.1.el5 #1 SMP Sun May 2 04:17:42 EDT 2010 x86_64 >> libc:glibc 2.5 NPTL 2.5 >> rlimit: STACK 10240k, CORE 0k, NPROC infinity, NOFILE 2048, AS infinity >> load average:1.82 1.97 1.63 >> >> CPU:total 8 (8 cores per cpu, 2 threads per core) family 6 model 30 stepping 5, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, ht >> >> Memory: 4k page, physical 8164756k(3153180k free), swap 1020116k(1019980k free) >> >> vm_info: OpenJDK 64-Bit Server VM (17.0-b16) for linux-amd64 JRE (1.6.0_20-b20), built on Aug 16 2010 23:33:12 by "ptisnovs" with gcc 4.1.2 20080704 (Red Hat 4.1.2-48) >> >> time: Mon Aug 16 23:48:47 2010 >> elapsed time: 0 seconds >> > > From ahughes at redhat.com Wed Aug 25 06:24:52 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 25 Aug 2010 14:24:52 +0100 Subject: Possible regression between IcedTea6-1.8 and IcedTea6-1.9 In-Reply-To: <4C74D8AA.6040005@redhat.com> References: <4C6420E8.3090901@redhat.com> <20100812164513.GN10867@rivendell.middle-earth.co.uk> <4C6A582A.6040303@redhat.com> <20100824153914.GG31737@bree.middle-earth.co.uk> <4C74D8AA.6040005@redhat.com> Message-ID: <20100825132452.GA26213@rivendell.middle-earth.co.uk> On 10:47 Wed 25 Aug , Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: > > On 11:36 Tue 17 Aug , Pavel Tisnovsky wrote: > >> Dr Andrew John Hughes wrote: > >>> On 18:27 Thu 12 Aug , Pavel Tisnovsky wrote: > >>>> Hi all, > >>>> > >>>> I tried to find out why some new regression tests does not pass on the > >>>> IcedTea6 HEAD and - by the way - I may have found the regression between > >>>> IcedTea6 IcedTea6-1.8 and-1.9. > >>>> > >>>> When the following very simple test is run with option > >>>> -Dsun.java2d.opengl set to True and I run it inside VNC session (ie > >>>> without acceleration): > >>>> > >>>> import javax.swing.JPanel; > >>>> > >>>> public class Test extends JPanel { > >>>> public Test() { > >>>> } > >>>> > >>>> public static void main(String[] args) > >>>> { > >>>> Test t = new Test(); > >>>> System.out.println("Test Passed."); > >>>> } > >>>> } > >>>> > >>>> It simply wrote warning message in IcedTea6-1.8: > >>>> > >>>> /temp/icedtea6-1.8/openjdk/build/linux-amd64/j2sdk-image/bin/java > >>>> -Dsun.java2d.opengl=True Test > >>>> Could not enable OpenGL pipeline for default config on screen 0 > >>>> Test Passed. > >>>> > >>>> but it failed in IcedTea6-1.9 (and HEAD too): > >>>> > >>>> /temp/icedtea6-1.9/openjdk.build/j2sdk-image/bin/java > >>>> -Dsun.java2d.opengl=True Test > >>>> Exception in thread "main" java.lang.UnsatisfiedLinkError: > >>>> sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String; > >>>> at sun.java2d.opengl.OGLContext.getOGLIdString(Native Method) > >>>> at > >>>> sun.java2d.opengl.GLXGraphicsConfig$1.run(GLXGraphicsConfig.java:126) > >>>> at > >>>> sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run(OGLRenderQueue.java:220) > >>>> ~ > >>>> > >>>> > >>>> Tested on RHEL5 x86_64 in VNC session, DISPLAY is set to :2.0 (it's > >>>> correct, of course). > >>>> > >>>> Do anyone remember that we did any changes in XRender or java2d.opengl > >>>> packages between 1.8 and 1.9? > >>>> > >>>> PS: at least these regression tests fail due to issue mentioned above: > >>>> FAILED: sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java > >>>> FAILED: sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java > >>>> FAILED: > >>>> sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java > >>>> FAILED: sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java > >>>> FAILED: > >>>> sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java > >>>> FAILED: sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java > >>>> FAILED: sun/java2d/OpenGL/DrawBufImgOp.java > >>>> FAILED: sun/java2d/OpenGL/GradientPaints.java > >>>> FAILED: sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java > >>>> FAILED: sun/java2d/pipe/MutableColorTest/MutableColorTest.java > >>>> > >>>> Cheers > >>>> Pavel > >>> As discussed on the mailing list, XRender was updated to the new version: > >>> > >>> http://icedtea.classpath.org/hg/release/icedtea6-1.9/rev/9da4f50c13c0 > >>> > >>> Part of this involved updating the pipeline code which XRender relies on > >>> (see the patch). Both are 7 backports. Have you checked whether the > >>> same tests fail in 7? > >> I think that this issue could be solved by the patch stored in > >> attachment [OGLContext.patch] because OGLContext.o is already included > >> in xawt.so (which is correct) but it does not exist JNI link to native > >> function OGLContext.getOGLIdString(). > >> > >> Is it possible to add this patch to IcedTea6 or (preferably) add its > >> contents to existing patch 6961633-xrender-02.patch? > >> > > > > Please add this in a new patch. The existing patch (as the bug ID implies) > > is an export of an upstream changeset, so we don't want to mix non-upstreamed > > changes in with that. > > I'm going to push the patch to IcedTea6 HEAD and IcedTea6-1.9, is it ok? > Yes, meant to say that in my first e-mail. Please add as patches/opengl-jni-fix.patch or something similar. > > > > Speaking of which, this should go upstream too. Did you check if the tests > > fail in OpenJDK7? > > > >> But I found another issue: when I run the test against IcedTea6 with the > >> patch applied JRE failed due to fatal error - see attachment > >> [hs_err_pid32222.log]. It's quite strange for me because libGL.so > >> contains function glGetString(). I have to further investigate why this > >> call failed (I run the test in VNC session which can be one possible > >> source of failure). > > > > It does contain glGetString. Indeed, it's crashing in that function, not OpenJDK code. > > > >>> Note: There is no 1.9 release yet. The branch was created specifically > >>> so we'd find stuff like this before release :-) > > > >> --- openjdk-old/jdk/make/sun/xawt/mapfile-vers 2010-08-16 16:54:21.000000000 +0200 > >> +++ openjdk/jdk/make/sun/xawt/mapfile-vers 2010-08-16 16:54:21.000000000 +0200 > >> @@ -300,6 +300,7 @@ > >> Java_java_awt_FileDialog_initIDs; > >> Java_sun_awt_X11_XWindow_initIDs; > >> > >> + Java_sun_java2d_opengl_OGLContext_getOGLIdString; > >> Java_sun_java2d_opengl_OGLMaskFill_maskFill; > >> Java_sun_java2d_opengl_OGLRenderer_drawPoly; > >> Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer; > > > >> # > >> # A fatal error has been detected by the Java Runtime Environment: > >> # > >> # SIGSEGV (0xb) at pc=0x0000003e3a451cee, pid=32222, tid=1075607872 > >> # > >> # JRE version: 6.0_20-b20 > >> # Java VM: OpenJDK 64-Bit Server VM (17.0-b16 mixed mode linux-amd64 ) > >> # Derivative: IcedTea6 1.10pre+r552e98f1c215 > >> # Distribution: Built on Red Hat Enterprise Linux Server release 5.5 (Tikanga) (Mon Aug 16 23:21:18 CEST 2010) > >> # Problematic frame: > >> # C [libGL.so.1+0x51cee] glGetString+0xe > >> # > >> # If you would like to submit a bug report, please include > >> # instructions how to reproduce the bug and visit: > >> # http://icedtea.classpath.org/bugzilla > >> # The crash happened outside the Java Virtual Machine in native code. > >> # See problematic frame for where to report the bug. > >> # > >> > >> --------------- T H R E A D --------------- > >> > >> Current thread (0x00002aab38101800): JavaThread "Java2D Queue Flusher" daemon [_thread_in_native, id=32241, stack(0x00000000400c7000,0x00000000401c8000)] > >> > >> siginfo:si_signo=SIGSEGV: si_errno=0, si_code=128 (), si_addr=0x0000000000000000 > >> > >> Registers: > >> RAX=0x0000000005418830, RBX=0x00002aab36d40100, RCX=0x0000000005418830, RDX=0x0000003e39216280 > >> RSP=0x00000000401c67b8, RBP=0x00000000401c6800, RSI=0x00000000401c7a10, RDI=0x0000000000001f00 > >> R8 =0x00002ae1480c1ec0, R9 =0x00002aab3803a9c8, R10=0x0000000000000000, R11=0x6f69746172656e65 > >> R12=0x00002aab38101800, R13=0x00002aab36b309f8, R14=0x00000000401c6870, R15=0x00002aab36b309e7 > >> RIP=0x0000003e3a451cee, EFL=0x0000000000010246, CSGSFS=0x0000000000000033, ERR=0x0000000000000000 > >> TRAPNO=0x000000000000000d > >> > >> Top of Stack: (sp=0x00000000401c67b8) > >> 0x00000000401c67b8: 00002aab36b1a95c 00000000401c68c8 > >> 0x00000000401c67c8: 00002aab381019c8 00000000401c6878 > >> 0x00000000401c67d8: 00002aaaaeac3d28 00002aab38101800 > >> 0x00000000401c67e8: 00002aaaaeac3d28 00000000401c6870 > >> 0x00000000401c67f8: 00002aab38101800 00000000401c6858 > >> 0x00000000401c6808: 00002aaaab35e9c6 0000000005493198 > >> 0x00000000401c6818: 00000000401c6818 00002aaaaeac3d28 > >> 0x00000000401c6828: 00000000401c6870 00002aaaaeac7620 > >> 0x00000000401c6838: 0000000000000000 00002aaaaeac3d28 > >> 0x00000000401c6848: 0000000000000000 00000000401c6878 > >> 0x00000000401c6858: 00000000401c68c8 00002aaaab352973 > >> 0x00000000401c6868: 00002aaaaeac6d00 00002aaaab35b89b > >> 0x00000000401c6878: 0000000000000000 00002aab0be66098 > >> 0x00000000401c6888: 00000000401c6888 00002aaaaeac86f5 > >> 0x00000000401c6898: 00000000401c68d8 00002aaaaeac8ad8 > >> 0x00000000401c68a8: 0000000000000000 00002aaaaeac8710 > >> 0x00000000401c68b8: 00000000401c6878 00000000401c68d8 > >> 0x00000000401c68c8: 00000000401c6930 00002aaaab352cf4 > >> 0x00000000401c68d8: 00002aab0be66390 0000000000000001 > >> 0x00000000401c68e8: 00002aab0be66208 00000000401c68e0 > >> 0x00000000401c68f8: 00002aaaaeac2667 00000000401c6958 > >> 0x00000000401c6908: 00002aaaaeac2c10 0000000000000000 > >> 0x00000000401c6918: 00002aaaaeac2770 00000000401c68d8 > >> 0x00000000401c6928: 00000000401c6958 00000000401c69c0 > >> 0x00000000401c6938: 00002aaaab34d3fb 0000000000000000 > >> 0x00000000401c6948: 0000000000000000 0000000000000000 > >> 0x00000000401c6958: 00002aab0be66208 0000000000001fa0 > >> 0x00000000401c6968: 00002aaaab34d379 00000000401c6b90 > >> 0x00000000401c6978: 0000000000000001 00002aab38101800 > >> 0x00000000401c6988: 0000000005493140 00000000401c6a10 > >> 0x00000000401c6998: 00000000401c6ce8 00002aab0000000a > >> 0x00000000401c69a8: 00002aaaaeac2770 00002aaaab35d420 > >> > >> Instructions: (pc=0x0000003e3a451cee) > >> 0x0000003e3a451cde: 00 00 57 e8 ea d5 ff ff 5f 4c 8b 98 98 08 00 00 > >> 0x0000003e3a451cee: 41 ff e3 0f 1f 80 00 00 00 00 0f 1f 84 00 00 00 > >> > >> Stack: [0x00000000400c7000,0x00000000401c8000], sp=0x00000000401c67b8, free space=3fd0000000000000018k > >> Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) > >> C [libGL.so.1+0x51cee] glGetString+0xe > >> j sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String;+0 > >> j sun.java2d.opengl.GLXGraphicsConfig$1.run()V+5 > >> j sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run()V+95 > >> v ~StubRoutines::call_stub > >> V [libjvm.so+0x411955] > >> V [libjvm.so+0x4108d8] > >> V [libjvm.so+0x4111f4] > >> V [libjvm.so+0x41138b] > >> V [libjvm.so+0x4704c0] > >> V [libjvm.so+0x6f77fd] > >> V [libjvm.so+0x5f5c14] > >> > >> Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) > >> j sun.java2d.opengl.OGLContext.getOGLIdString()Ljava/lang/String;+0 > >> j sun.java2d.opengl.GLXGraphicsConfig$1.run()V+5 > >> j sun.java2d.opengl.OGLRenderQueue$QueueFlusher.run()V+95 > >> v ~StubRoutines::call_stub > >> > >> --------------- P R O C E S S --------------- > >> > >> Java Threads: ( => current thread ) > >> =>0x00002aab38101800 JavaThread "Java2D Queue Flusher" daemon [_thread_in_native, id=32241, stack(0x00000000400c7000,0x00000000401c8000)] > >> 0x00002aab38092800 JavaThread "Java2D Disposer" daemon [_thread_blocked, id=32240, stack(0x00000000408b7000,0x00000000409b8000)] > >> 0x00002aab38025800 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=32238, stack(0x0000000041d0d000,0x0000000041e0e000)] > >> 0x00002aab38023000 JavaThread "CompilerThread1" daemon [_thread_blocked, id=32237, stack(0x000000004122d000,0x000000004132e000)] > >> 0x00002aab38020000 JavaThread "CompilerThread0" daemon [_thread_blocked, id=32236, stack(0x000000004112c000,0x000000004122d000)] > >> 0x00002aab3801d800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=32235, stack(0x000000004102b000,0x000000004112c000)] > >> 0x0000000005489000 JavaThread "Finalizer" daemon [_thread_blocked, id=32234, stack(0x0000000040c75000,0x0000000040d76000)] > >> 0x0000000005487000 JavaThread "Reference Handler" daemon [_thread_blocked, id=32233, stack(0x0000000040b74000,0x0000000040c75000)] > >> 0x0000000005411000 JavaThread "main" [_thread_blocked, id=32223, stack(0x0000000041404000,0x0000000041505000)] > >> > >> Other Threads: > >> 0x0000000005480800 VMThread [stack: 0x0000000040a73000,0x0000000040b74000] [id=32232] > >> 0x00002aab38028000 WatcherThread [stack: 0x0000000041e37000,0x0000000041f38000] [id=32239] > >> > >> VM state:not at safepoint (normal execution) > >> > >> VM Mutex/Monitor currently owned by a thread: None > >> > >> Heap > >> PSYoungGen total 37184K, used 1912K [0x00002aab0bd70000, 0x00002aab0e6f0000, 0x00002aab35610000) > >> eden space 31872K, 6% used [0x00002aab0bd70000,0x00002aab0bf4e1b8,0x00002aab0dc90000) > >> from space 5312K, 0% used [0x00002aab0e1c0000,0x00002aab0e1c0000,0x00002aab0e6f0000) > >> to space 5312K, 0% used [0x00002aab0dc90000,0x00002aab0dc90000,0x00002aab0e1c0000) > >> PSOldGen total 85120K, used 0K [0x00002aaab8c10000, 0x00002aaabdf30000, 0x00002aab0bd70000) > >> object space 85120K, 0% used [0x00002aaab8c10000,0x00002aaab8c10000,0x00002aaabdf30000) > >> PSPermGen total 21248K, used 6882K [0x00002aaaae410000, 0x00002aaaaf8d0000, 0x00002aaab8c10000) > >> object space 21248K, 32% used [0x00002aaaae410000,0x00002aaaaeac8b60,0x00002aaaaf8d0000) > >> > >> Dynamic libraries: > >> 00400000-00409000 r-xp 00000000 fd:00 9011299 /jck/j2sdk-image/bin/java > >> 00608000-00609000 rw-p 00008000 fd:00 9011299 /jck/j2sdk-image/bin/java > >> 0540a000-05507000 rw-p 0540a000 00:00 0 [heap] > >> 400c7000-400ca000 ---p 400c7000 00:00 0 > >> 400ca000-401c8000 rw-p 400ca000 00:00 0 > >> 408b7000-408ba000 ---p 408b7000 00:00 0 > >> 408ba000-409b8000 rw-p 408ba000 00:00 0 > >> 40a73000-40a74000 ---p 40a73000 00:00 0 > >> 40a74000-40b74000 rw-p 40a74000 00:00 0 > >> 40b74000-40b77000 ---p 40b74000 00:00 0 > >> 40b77000-40c75000 rw-p 40b77000 00:00 0 > >> 40c75000-40c78000 ---p 40c75000 00:00 0 > >> 40c78000-40d76000 rw-p 40c78000 00:00 0 > >> 4102b000-4102e000 ---p 4102b000 00:00 0 > >> 4102e000-4112c000 rw-p 4102e000 00:00 0 > >> 4112c000-4112f000 ---p 4112c000 00:00 0 > >> 4112f000-4122d000 rw-p 4112f000 00:00 0 > >> 4122d000-41230000 ---p 4122d000 00:00 0 > >> 41230000-4132e000 rw-p 41230000 00:00 0 > >> 41404000-41407000 ---p 41404000 00:00 0 > >> 41407000-41505000 rw-p 41407000 00:00 0 > >> 41505000-41506000 ---p 41505000 00:00 0 > >> 41506000-41606000 rw-p 41506000 00:00 0 > >> 41606000-41607000 ---p 41606000 00:00 0 > >> 41607000-41707000 rw-p 41607000 00:00 0 > >> 41707000-41708000 ---p 41707000 00:00 0 > >> 41708000-41808000 rw-p 41708000 00:00 0 > >> 41808000-41809000 ---p 41808000 00:00 0 > >> 41809000-41909000 rw-p 41809000 00:00 0 > >> 41909000-4190a000 ---p 41909000 00:00 0 > >> 4190a000-41a0a000 rw-p 4190a000 00:00 0 > >> 41a0a000-41a0b000 ---p 41a0a000 00:00 0 > >> 41a0b000-41b0b000 rw-p 41a0b000 00:00 0 > >> 41b0b000-41b0c000 ---p 41b0b000 00:00 0 > >> 41b0c000-41c0c000 rw-p 41b0c000 00:00 0 > >> 41c0c000-41c0d000 ---p 41c0c000 00:00 0 > >> 41c0d000-41d0d000 rw-p 41c0d000 00:00 0 > >> 41d0d000-41d10000 ---p 41d0d000 00:00 0 > >> 41d10000-41e0e000 rw-p 41d10000 00:00 0 > >> 41e37000-41e38000 ---p 41e37000 00:00 0 > >> 41e38000-41f38000 rw-p 41e38000 00:00 0 > >> 3e38400000-3e3841c000 r-xp 00000000 fd:00 55083144 /lib64/ld-2.5.so > >> 3e3861b000-3e3861c000 r--p 0001b000 fd:00 55083144 /lib64/ld-2.5.so > >> 3e3861c000-3e3861d000 rw-p 0001c000 fd:00 55083144 /lib64/ld-2.5.so > >> 3e38800000-3e3894e000 r-xp 00000000 fd:00 55083145 /lib64/libc-2.5.so > >> 3e3894e000-3e38b4d000 ---p 0014e000 fd:00 55083145 /lib64/libc-2.5.so > >> 3e38b4d000-3e38b51000 r--p 0014d000 fd:00 55083145 /lib64/libc-2.5.so > >> 3e38b51000-3e38b52000 rw-p 00151000 fd:00 55083145 /lib64/libc-2.5.so > >> 3e38b52000-3e38b57000 rw-p 3e38b52000 00:00 0 > >> 3e38c00000-3e38c02000 r-xp 00000000 fd:00 55083147 /lib64/libdl-2.5.so > >> 3e38c02000-3e38e02000 ---p 00002000 fd:00 55083147 /lib64/libdl-2.5.so > >> 3e38e02000-3e38e03000 r--p 00002000 fd:00 55083147 /lib64/libdl-2.5.so > >> 3e38e03000-3e38e04000 rw-p 00003000 fd:00 55083147 /lib64/libdl-2.5.so > >> 3e39000000-3e39016000 r-xp 00000000 fd:00 55083146 /lib64/libpthread-2.5.so > >> 3e39016000-3e39215000 ---p 00016000 fd:00 55083146 /lib64/libpthread-2.5.so > >> 3e39215000-3e39216000 r--p 00015000 fd:00 55083146 /lib64/libpthread-2.5.so > >> 3e39216000-3e39217000 rw-p 00016000 fd:00 55083146 /lib64/libpthread-2.5.so > >> 3e39217000-3e3921b000 rw-p 3e39217000 00:00 0 > >> 3e39400000-3e39482000 r-xp 00000000 fd:00 55083148 /lib64/libm-2.5.so > >> 3e39482000-3e39681000 ---p 00082000 fd:00 55083148 /lib64/libm-2.5.so > >> 3e39681000-3e39682000 r--p 00081000 fd:00 55083148 /lib64/libm-2.5.so > >> 3e39682000-3e39683000 rw-p 00082000 fd:00 55083148 /lib64/libm-2.5.so > >> 3e39800000-3e39814000 r-xp 00000000 fd:00 52035672 /usr/lib64/libz.so.1.2.3 > >> 3e39814000-3e39a13000 ---p 00014000 fd:00 52035672 /usr/lib64/libz.so.1.2.3 > >> 3e39a13000-3e39a14000 rw-p 00013000 fd:00 52035672 /usr/lib64/libz.so.1.2.3 > >> 3e39c00000-3e39c07000 r-xp 00000000 fd:00 55083154 /lib64/librt-2.5.so > >> 3e39c07000-3e39e07000 ---p 00007000 fd:00 55083154 /lib64/librt-2.5.so > >> 3e39e07000-3e39e08000 r--p 00007000 fd:00 55083154 /lib64/librt-2.5.so > >> 3e39e08000-3e39e09000 rw-p 00008000 fd:00 55083154 /lib64/librt-2.5.so > >> 3e3a000000-3e3a007000 r-xp 00000000 fd:00 30682405 /usr/lib64/libdrm.so.2.0.0 > >> 3e3a007000-3e3a207000 ---p 00007000 fd:00 30682405 /usr/lib64/libdrm.so.2.0.0 > >> 3e3a207000-3e3a208000 rw-p 00007000 fd:00 30682405 /usr/lib64/libdrm.so.2.0.0 > >> 3e3a400000-3e3a46e000 r-xp 00000000 fd:00 30682407 /usr/lib64/libGL.so.1.2 > >> 3e3a46e000-3e3a66e000 ---p 0006e000 fd:00 30682407 /usr/lib64/libGL.so.1.2 > >> 3e3a66e000-3e3a678000 rw-p 0006e000 fd:00 30682407 /usr/lib64/libGL.so.1.2 > >> 3e3a678000-3e3a67a000 rw-p 3e3a678000 00:00 0 > >> 3e3b000000-3e3b005000 r-xp 00000000 fd:00 52035782 /usr/lib64/libXdmcp.so.6.0.0 > >> 3e3b005000-3e3b204000 ---p 00005000 fd:00 52035782 /usr/lib64/libXdmcp.so.6.0.0 > >> 3e3b204000-3e3b205000 rw-p 00004000 fd:00 52035782 /usr/lib64/libXdmcp.so.6.0.0 > >> 3e3b400000-3e3b505000 r-xp 00000000 fd:00 52035783 /usr/lib64/libX11.so.6.2.0 > >> 3e3b505000-3e3b705000 ---p 00105000 fd:00 52035783 /usr/lib64/libX11.so.6.2.0 > >> 3e3b705000-3e3b70c000 rw-p 00105000 fd:00 52035783 /usr/lib64/libX11.so.6.2.0 > >> 3e3b800000-3e3b802000 r-xp 00000000 fd:00 52035673 /usr/lib64/libXau.so.6.0.0 > >> 3e3b802000-3e3ba01000 ---p 00002000 fd:00 52035673 /usr/lib64/libXau.so.6.0.0 > >> 3e3ba01000-3e3ba02000 rw-p 00001000 fd:00 52035673 /usr/lib64/libXau.so.6.0.0 > >> 3e3bc00000-3e3bc15000 r-xp 00000000 fd:00 55083150 /lib64/libnsl-2.5.so > >> 3e3bc15000-3e3be14000 ---p 00015000 fd:00 55083150 /lib64/libnsl-2.5.so > >> 3e3be14000-3e3be15000 r--p 00014000 fd:00 55083150 /lib64/libnsl-2.5.so > >> 3e3be15000-3e3be16000 rw-p 00015000 fd:00 55083150 /lib64/libnsl-2.5.so > >> 3e3be16000-3e3be18000 rw-p 3e3be16000 00:00 0 > >> 3e3cc00000-3e3cc10000 r-xp 00000000 fd:00 52035784 /usr/lib64/libXext.so.6.4.0 > >> 3e3cc10000-3e3ce10000 ---p 00010000 fd:00 52035784 /usr/lib64/libXext.so.6.4.0 > >> 3e3ce10000-3e3ce11000 rw-p 00010000 fd:00 52035784 /usr/lib64/libXext.so.6.4.0 > >> 3e3d400000-3e3d405000 r-xp 00000000 fd:00 52035785 /usr/lib64/libXxf86vm.so.1.0.0 > >> 3e3d405000-3e3d604000 ---p 00005000 fd:00 52035785 /usr/lib64/libXxf86vm.so.1.0.0 > >> 3e3d604000-3e3d605000 rw-p 00004000 fd:00 52035785 /usr/lib64/libXxf86vm.so.1.0.0 > >> 3e3dc00000-3e3dc7f000 r-xp 00000000 fd:00 52035816 /usr/lib64/libfreetype.so.6.3.10 > >> 3e3dc7f000-3e3de7f000 ---p 0007f000 fd:00 52035816 /usr/lib64/libfreetype.so.6.3.10 > >> 3e3de7f000-3e3de84000 rw-p 0007f000 fd:00 52035816 /usr/lib64/libfreetype.so.6.3.10 > >> 3e3e400000-3e3e409000 r-xp 00000000 fd:00 52035819 /usr/lib64/libXrender.so.1.3.0 > >> 3e3e409000-3e3e608000 ---p 00009000 fd:00 52035819 /usr/lib64/libXrender.so.1.3.0 > >> 3e3e608000-3e3e609000 rw-p 00008000 fd:00 52035819 /usr/lib64/libXrender.so.1.3.0 > >> 3e43c00000-3e43c08000 r-xp 00000000 fd:00 52035824 /usr/lib64/libXi.so.6.0.0 > >> 3e43c08000-3e43e07000 ---p 00008000 fd:00 52035824 /usr/lib64/libXi.so.6.0.0 > >> 3e43e07000-3e43e08000 rw-p 00007000 fd:00 52035824 /usr/lib64/libXi.so.6.0.0 > >> 3e45c00000-3e45c0d000 r-xp 00000000 fd:00 55083149 /lib64/libgcc_s-4.1.2-20080825.so.1 > >> 3e45c0d000-3e45e0d000 ---p 0000d000 fd:00 55083149 /lib64/libgcc_s-4.1.2-20080825.so.1 > >> 3e45e0d000-3e45e0e000 rw-p 0000d000 fd:00 55083149 /lib64/libgcc_s-4.1.2-20080825.so.1 > >> 3e4b600000-3e4b605000 r-xp 00000000 fd:00 52035905 /usr/lib64/libXtst.so.6.1.0 > >> 3e4b605000-3e4b805000 ---p 00005000 fd:00 52035905 /usr/lib64/libXtst.so.6.1.0 > >> 3e4b805000-3e4b806000 rw-p 00005000 fd:00 52035905 /usr/lib64/libXtst.so.6.1.0 > >> 2aaaaaac0000-2aaaaaace000 r-xp 00000000 fd:00 9699523 /jck/j2sdk-image/jre/lib/amd64/libverify.so > >> 2aaaaaace000-2aaaaaccd000 ---p 0000e000 fd:00 9699523 /jck/j2sdk-image/jre/lib/amd64/libverify.so > >> 2aaaaaccd000-2aaaaaccf000 rw-p 0000d000 fd:00 9699523 /jck/j2sdk-image/jre/lib/amd64/libverify.so > >> 2aaaaaccf000-2aaaaacfa000 r-xp 00000000 fd:00 9699499 /jck/j2sdk-image/jre/lib/amd64/libjava.so > >> 2aaaaacfa000-2aaaaaefa000 ---p 0002b000 fd:00 9699499 /jck/j2sdk-image/jre/lib/amd64/libjava.so > >> 2aaaaaefa000-2aaaaaefe000 rw-p 0002b000 fd:00 9699499 /jck/j2sdk-image/jre/lib/amd64/libjava.so > >> 2aaaaaefe000-2aaaaaeff000 r--p 2aaaaaefe000 00:00 0 > >> 2aaaaaeff000-2aaaaaf00000 rw-p 2aaaaaeff000 00:00 0 > >> 2aaaaaf00000-2aaaaaf08000 r-xp 00000000 fd:00 9830466 /jck/j2sdk-image/jre/lib/amd64/native_threads/libhpi.so > >> 2aaaaaf08000-2aaaab107000 ---p 00008000 fd:00 9830466 /jck/j2sdk-image/jre/lib/amd64/native_threads/libhpi.so > >> 2aaaab107000-2aaaab108000 rw-p 00007000 fd:00 9830466 /jck/j2sdk-image/jre/lib/amd64/native_threads/libhpi.so > >> 2aaaab108000-2aaaab109000 rw-p 2aaaab108000 00:00 0 > >> 2aaaab109000-2aaaab13e000 r--s 00000000 fd:00 7110950 /var/db/nscd/passwd > >> 2aaaab13e000-2aaaab146000 rw-s 00000000 fd:00 42600011 /tmp/hsperfdata_ptisnovs/32222 > >> 2aaaab146000-2aaaab14d000 r-xp 00000000 fd:00 9699526 /jck/j2sdk-image/jre/lib/amd64/libzip.so > >> 2aaaab14d000-2aaaab34c000 ---p 00007000 fd:00 9699526 /jck/j2sdk-image/jre/lib/amd64/libzip.so > >> 2aaaab34c000-2aaaab34d000 rw-p 00006000 fd:00 9699526 /jck/j2sdk-image/jre/lib/amd64/libzip.so > >> 2aaaab34d000-2aaaab5bd000 rwxp 2aaaab34d000 00:00 0 > >> 2aaaab5bd000-2aaaae34d000 rw-p 2aaaab5bd000 00:00 0 > >> 2aaaae34d000-2aaaae357000 rw-p 2aaaae34d000 00:00 0 > >> 2aaaae357000-2aaaae40d000 rw-p 2aaaae357000 00:00 0 > >> 2aaaae410000-2aaaaf8d0000 rw-p 2aaaae410000 00:00 0 > >> 2aaaaf8d0000-2aaab8c10000 rw-p 2aaaaf8d0000 00:00 0 > >> 2aaab8c10000-2aaabdf30000 rw-p 2aaab8c10000 00:00 0 > >> 2aaabdf30000-2aab0bd70000 rw-p 2aaabdf30000 00:00 0 > >> 2aab0bd70000-2aab0e6f0000 rw-p 2aab0bd70000 00:00 0 > >> 2aab0e6f0000-2aab35610000 rw-p 2aab0e6f0000 00:00 0 > >> 2aab35610000-2aab3561b000 rw-p 2aab35610000 00:00 0 > >> 2aab3561b000-2aab35664000 rw-p 2aab3561b000 00:00 0 > >> 2aab35664000-2aab3568e000 rw-p 2aab35664000 00:00 0 > >> 2aab3568e000-2aab358fc000 rw-p 2aab3568e000 00:00 0 > >> 2aab358fc000-2aab35912000 rw-p 2aab358fc000 00:00 0 > >> 2aab35912000-2aab35a49000 rw-p 2aab35912000 00:00 0 > >> 2aab35a49000-2aab35a74000 rw-p 2aab35a49000 00:00 0 > >> 2aab35a74000-2aab35ce3000 rw-p 2aab35a74000 00:00 0 > >> 2aab35ce3000-2aab35cee000 rw-p 2aab35ce3000 00:00 0 > >> 2aab35cee000-2aab35d37000 rw-p 2aab35cee000 00:00 0 > >> 2aab35d37000-2aab35d5f000 rw-p 2aab35d37000 00:00 0 > >> 2aab35d5f000-2aab35eed000 r--s 038af000 fd:00 9109772 /jck/j2sdk-image/jre/lib/rt.jar > >> 2aab35eed000-2aab35f1f000 rw-p 2aab35eed000 00:00 0 > >> 2aab35f1f000-2aab35f25000 r--s 00043000 fd:00 9109782 /jck/j2sdk-image/jre/lib/netx.jar > >> 2aab35f25000-2aab3682e000 rw-p 2aab35f25000 00:00 0 > >> 2aab3682e000-2aab368c4000 r-xp 00000000 fd:00 9699503 /jck/j2sdk-image/jre/lib/amd64/libawt.so > >> 2aab368c4000-2aab36ac4000 ---p 00096000 fd:00 9699503 /jck/j2sdk-image/jre/lib/amd64/libawt.so > >> 2aab36ac4000-2aab36acf000 rw-p 00096000 fd:00 9699503 /jck/j2sdk-image/jre/lib/amd64/libawt.so > >> 2aab36acf000-2aab36af4000 rw-p 2aab36acf000 00:00 0 > >> 2aab36af4000-2aab36b3d000 r-xp 00000000 fd:00 9732309 /jck/j2sdk-image/jre/lib/amd64/xawt/libmawt.so > >> 2aab36b3d000-2aab36d3c000 ---p 00049000 fd:00 9732309 /jck/j2sdk-image/jre/lib/amd64/xawt/libmawt.so > >> 2aab36d3c000-2aab36d3f000 rw-p 00048000 fd:00 9732309 /jck/j2sdk-image/jre/lib/amd64/xawt/libmawt.so > >> 2aab36d3f000-2aab36d41000 rw-p 2aab36d3f000 00:00 0 > >> 2aab36d41000-2aab36d85000 r-xp 00000000 fd:00 9699507 /jck/j2sdk-image/jre/lib/amd64/libfontmanager.so > >> 2aab36d85000-2aab36f84000 ---p 00044000 fd:00 9699507 /jck/j2sdk-image/jre/lib/amd64/libfontmanager.so > >> 2aab36f84000-2aab36f88000 rw-p 00043000 fd:00 9699507 /jck/j2sdk-image/jre/lib/amd64/libfontmanager.so > >> 2aab36f88000-2aab36f98000 rw-p 2aab36f88000 00:00 0 > >> 2aab36f98000-2aab36f9f000 r--s 00000000 fd:00 7111498 /var/cache/fontconfig/beeeeb3dfe132a8a0633a017c99ce0c0-x86-64.cache-2 > >> 2aab36f9f000-2aab36fa4000 r--s 00000000 fd:00 7111021 /var/cache/fontconfig/b64a443fb29fd68918eee3276c922bf0-x86-64.cache-2 > >> 2aab36fa4000-2aab36fa5000 r--s 00000000 fd:00 7111040 /var/cache/fontconfig/c09c2e2d9ddef970513e4a68e1d4f7be-x86-64.cache-2 > >> 2aab36fa5000-2aab36fb0000 r--s 00000000 fd:00 7111203 /var/cache/fontconfig/e19de935dec46bbf3ed114ee4965548a-x86-64.cache-2 > >> 2aab36fb0000-2aab36fb3000 r--s 00000000 fd:00 7111204 /var/cache/fontconfig/e3ead4b767b8819993a6fa3ae306afa9-x86-64.cache-2 > >> 2aab36fb3000-2aab36fba000 r--s 00000000 fd:00 7110996 /var/cache/fontconfig/7ddba6133ef499da58de5e8c586d3b75-x86-64.cache-2 > >> 2aab36fba000-2aab36fbb000 r--s 00000000 fd:00 7111049 /var/cache/fontconfig/602d1f86cc7d0d7fcaea57cc0415ba86-x86-64.cache-2 > >> 2aab36fbb000-2aab36fc2000 r--s 00000000 fd:00 7111018 /var/cache/fontconfig/76339d7a19b7d8e4649c5ddbf17c0441-x86-64.cache-2 > >> 2aab36fc2000-2aab36fc3000 r--s 00000000 fd:00 7111019 /var/cache/fontconfig/c1e0ebede0a5820dfb31314ce531f395-x86-64.cache-2 > >> 2aab36fc3000-2aab36fc4000 r--s 00000000 fd:00 7111017 /var/cache/fontconfig/a47204c0282682fca292504963454f06-x86-64.cache-2 > >> 2aab36fc4000-2aab36fc5000 r--s 00000000 fd:00 7111037 /var/cache/fontconfig/ec08f7e2aac04ad6751b56b654659de6-x86-64.cache-2 > >> 2aab36fc5000-2aab36fc6000 r--s 00000000 fd:00 7111047 /var/cache/fontconfig/a0ed530305610ad915aa8f21f0d94463-x86-64.cache-2 > >> 2aab36fc6000-2aab36fc7000 r--s 00000000 fd:00 7111020 /var/cache/fontconfig/31b8f98acd9832a15daf4d1a0b40239b-x86-64.cache-2 > >> 2aab36fc7000-2aab36fc8000 r--s 00000000 fd:00 7111038 /var/cache/fontconfig/fc7f808eb72d8a281e1f12def2851241-x86-64.cache-2 > >> 2aab36fc8000-2aab36fc9000 r--s 00000000 fd:00 7111031 /var/cache/fontconfig/b0c8039c3bbcc6f1976d33b66b56fc83-x86-64.cache-2 > >> 2aab36fc9000-2aab36fca000 r--s 00000000 fd:00 7111025 /var/cache/fontconfig/31e4bfa78c57c1d34653a253fb01b172-x86-64.cache-2 > >> 2aab36fca000-2aab36fcf000 r--s 00000000 fd:00 7111041 /var/cache/fontconfig/a3ef620b97f3ad86e0ccce6d4afaa4cc-x86-64.cache-2 > >> 2aab36fcf000-2aab36fd0000 r--s 00000000 fd:00 7111042 /var/cache/fontconfig/49aab29dc58e529ef78a6d0aaa3ba41d-x86-64.cache-2 > >> 2aab36fd0000-2aab36fd8000 r--s 00000000 fd:00 7111206 /var/cache/fontconfig/b79f3aaa7d385a141ab53ec885cc22a8-x86-64.cache-2 > >> 2aab36fd8000-2aab36fda000 r--s 00000000 fd:00 7111205 /var/cache/fontconfig/87f5e051180a7a75f16eb6fe7dbd3749-x86-64.cache-2 > >> 2aab36fda000-2aab36fdd000 r--s 00000000 fd:00 7111034 /var/cache/fontconfig/fdb4a018037c133ed2ff41d1378148d0-x86-64.cache-2 > >> 2aab36fdd000-2aab36fe0000 r--s 00000000 fd:00 7111029 /var/cache/fontconfig/ae30b330df83ba0e904b3d2eb05b9c75-x86-64.cache-2 > >> 2aab36fe0000-2aab36ff6000 r--s 00000000 fd:00 7111030 /var/cache/fontconfig/d066cc093611c74861a22d5ef60b042c-x86-64.cache-2 > >> 2aab36ff6000-2aab36ffa000 r--s 00000000 fd:00 7111035 /var/cache/fontconfig/00413c8acffd3c2ef5e4f42b8b36cd9a-x86-64.cache-2 > >> 2aab36ffa000-2aab36ffe000 r--s 00000000 fd:00 7111046 /var/cache/fontconfig/177aa5f8e4784b879645141d1d73ae7a-x86-64.cache-2 > >> 2aab36ffe000-2aab37012000 r-xp 00000000 fd:00 9699501 /jck/j2sdk-image/jre/lib/amd64/libnet.so > >> 2aab37012000-2aab37211000 ---p 00014000 fd:00 9699501 /jck/j2sdk-image/jre/lib/amd64/libnet.so > >> 2aab37211000-2aab37212000 rw-p 00013000 fd:00 9699501 /jck/j2sdk-image/jre/lib/amd64/libnet.so > >> 2aab37212000-2aab37219000 r-xp 00000000 fd:00 9699502 /jck/j2sdk-image/jre/lib/amd64/libnio.so > >> 2aab37219000-2aab37419000 ---p 00007000 fd:00 9699502 /jck/j2sdk-image/jre/lib/amd64/libnio.so > >> 2aab37419000-2aab3741a000 rw-p 00007000 fd:00 9699502 /jck/j2sdk-image/jre/lib/amd64/libnio.so > >> 2aab3741a000-2aab37420000 r--s 000fc000 fd:00 9109749 /jck/j2sdk-image/jre/lib/resources.jar > >> 2aab38000000-2aab38103000 rw-p 2aab38000000 00:00 0 > >> 2aab38103000-2aab3c000000 ---p 2aab38103000 00:00 0 > >> 2aab3c000000-2aab3f5d7000 r--p 00000000 fd:00 30680677 /usr/lib/locale/locale-archive > >> 2ae147373000-2ae147374000 rw-p 2ae147373000 00:00 0 > >> 2ae147388000-2ae147389000 rw-p 2ae147388000 00:00 0 > >> 2ae147389000-2ae14738d000 r-xp 00000000 fd:00 10780772 /jck/j2sdk-image/jre/lib/amd64/jli/libjli.so > >> 2ae14738d000-2ae14758c000 ---p 00004000 fd:00 10780772 /jck/j2sdk-image/jre/lib/amd64/jli/libjli.so > >> 2ae14758c000-2ae14758d000 rw-p 00003000 fd:00 10780772 /jck/j2sdk-image/jre/lib/amd64/jli/libjli.so > >> 2ae14758d000-2ae147590000 rw-p 2ae14758d000 00:00 0 > >> 2ae147590000-2ae147e26000 r-xp 00000000 fd:00 10322184 /jck/j2sdk-image/jre/lib/amd64/server/libjvm.so > >> 2ae147e26000-2ae148026000 ---p 00896000 fd:00 10322184 /jck/j2sdk-image/jre/lib/amd64/server/libjvm.so > >> 2ae148026000-2ae1480b6000 rw-p 00896000 fd:00 10322184 /jck/j2sdk-image/jre/lib/amd64/server/libjvm.so > >> 2ae1480b6000-2ae1480ef000 rw-p 2ae1480b6000 00:00 0 > >> 7fff9efb4000-7fff9efc9000 rw-p 7ffffffea000 00:00 0 [stack] > >> ffffffffff600000-ffffffffffe00000 ---p 00000000 00:00 0 [vdso] > >> > >> VM Arguments: > >> jvm_args: -Dsun.java2d.opengl=true > >> java_command: Test > >> Launcher Type: SUN_STANDARD > >> > >> Environment Variables: > >> PATH=/usr/kerberos/bin:/usr/local/bin:/bin:/usr/bin:/home/brq/ptisnovs/bin > >> LD_LIBRARY_PATH=/jck/j2sdk-image/jre/lib/amd64/server:/jck/j2sdk-image/jre/lib/amd64:/jck/j2sdk-image/jre/../lib/amd64 > >> SHELL=/bin/bash > >> DISPLAY=:42.0 > >> > >> Signal Handlers: > >> SIGSEGV: [libjvm.so+0x73d6c0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > >> SIGBUS: [libjvm.so+0x73d6c0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > >> SIGFPE: [libjvm.so+0x5f18f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > >> SIGPIPE: [libjvm.so+0x5f18f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > >> SIGXFSZ: [libjvm.so+0x5f18f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > >> SIGILL: [libjvm.so+0x5f18f0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > >> SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000 > >> SIGUSR2: [libjvm.so+0x5f4d90], sa_mask[0]=0x00000000, sa_flags=0x10000004 > >> SIGHUP: [libjvm.so+0x5f2cb0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > >> SIGINT: [libjvm.so+0x5f2cb0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > >> SIGTERM: [libjvm.so+0x5f2cb0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > >> SIGQUIT: [libjvm.so+0x5f2cb0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 > >> > >> > >> --------------- S Y S T E M --------------- > >> > >> OS:Red Hat Enterprise Linux Server release 5.5 (Tikanga) > >> > >> uname:Linux 2.6.18-194.3.1.el5 #1 SMP Sun May 2 04:17:42 EDT 2010 x86_64 > >> libc:glibc 2.5 NPTL 2.5 > >> rlimit: STACK 10240k, CORE 0k, NPROC infinity, NOFILE 2048, AS infinity > >> load average:1.82 1.97 1.63 > >> > >> CPU:total 8 (8 cores per cpu, 2 threads per core) family 6 model 30 stepping 5, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3, sse4.1, sse4.2, popcnt, ht > >> > >> Memory: 4k page, physical 8164756k(3153180k free), swap 1020116k(1019980k free) > >> > >> vm_info: OpenJDK 64-Bit Server VM (17.0-b16) for linux-amd64 JRE (1.6.0_20-b20), built on Aug 16 2010 23:33:12 by "ptisnovs" with gcc 4.1.2 20080704 (Red Hat 4.1.2-48) > >> > >> time: Mon Aug 16 23:48:47 2010 > >> elapsed time: 0 seconds > >> > > > > > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From daniel.daugherty at oracle.com Wed Aug 25 06:13:22 2010 From: daniel.daugherty at oracle.com (Daniel D. Daugherty) Date: Wed, 25 Aug 2010 07:13:22 -0600 Subject: [patch] fix hotspot build with small SC_ARG_MAX In-Reply-To: References: <4C736DDD.9040009@ubuntu.com> Message-ID: <4C7516F2.3090605@oracle.com> Moved distro-pkg-dev at ... to the Bcc list. Kelly, This is the right bug. I moved it to jvm/hotspot/svc_agent. Christian was planning to check out this patch. I'll check with him to see if he want me to take care of this via RT_Baseline. In either case, we'll have to push the change through JPRT and we'll set the contributed by line to Matthias... Dan On 8/24/2010 5:28 PM, Kelly O'Hair wrote: > Looks ok to me. I think this is basically this bug: > > http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6561870 > > -kto > > On Aug 23, 2010, at 11:59 PM, Matthias Klose wrote: > >> hotspot uses overlong command lines, and the build will fail when >> building on a machine where SC_ARG_MAX is limited. >> >> This patch works around this limitation by using a file list for >> compiling the agent classes, and generating the file list with >> Makefile features instead of shell code. >> >> Matthias >> > From ahughes at redhat.com Wed Aug 25 08:34:29 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 25 Aug 2010 16:34:29 +0100 Subject: For users of --with-openjdk In-Reply-To: <4C66DBB9.4070707@linuxfromscratch.org> References: <20100810111600.GF27843@rivendell.middle-earth.co.uk> <4C6234EC.7020809@linuxfromscratch.org> <20100811181112.GL10867@rivendell.middle-earth.co.uk> <4C633B7F.3080101@linuxfromscratch.org> <4C6484B8.6090007@linuxfromscratch.org> <20100813004137.GP10867@rivendell.middle-earth.co.uk> <4C64A128.2010300@linuxfromscratch.org> <20100813195739.GX10867@rivendell.middle-earth.co.uk> <4C66DBB9.4070707@linuxfromscratch.org> Message-ID: <20100825153429.GH26213@rivendell.middle-earth.co.uk> On 13:08 Sat 14 Aug , DJ Lucas wrote: > On 08/13/2010 02:57 PM, Dr Andrew John Hughes wrote: > > On 20:34 Thu 12 Aug , DJ Lucas wrote: > >> On 08/12/2010 07:41 PM, Dr Andrew John Hughes wrote: > >>> On 18:33 Thu 12 Aug , DJ Lucas wrote: > >>>> On 08/11/2010 07:08 PM, DJ Lucas wrote: > >>>> > >>>>> > >>> > >>> With regard to your previous e-mail, I think you're right that the sun.awt.Toolkit > >>> fix is insufficent. It was the result of only considering the two existing configurations; > >>> gcj+bootstrap, icedtea+no-bootstrap, with the intent of speeding up the no-bootstrap > >>> case. In the no-bootstrap case, the built rt files aren't used so it was a waste of > >>> time building them. So instead of removing the conditional altogether, I'd go for > >>> changing it to a BOOTSTRAPPING conditional. > >>> > >> > >> OK, will do. > >> > > > > I've pushed this. > > Got it locally now. Thanks. > > >>>> > >>>> The correct fix is to include $(SHARE)/javax/swing/plaf in > >>>> ICEDTEA_BOOTSTRAP_DIRS (as I am still using the 1.8.1 nimbus classes in > >>>> this particular case). Again, given the larger target of possible > >>>> system JDKs, I wonder if it would be best to build rt.jar from scratch > >>>> rather than copying from the system version and updating selectively > >>>> (for similar reason to rebuilding tools.jar unconditionally as mentioned > >>>> earlier in this thread). > >>> > >>> I've been thinking about this a bit. It's quite a weird one. The failure > >>> is due to a hack needed for backporting Nimbus to JDK6. The SynthLookAndFeel > >>> class has to know about a possible subclass, NimbusLookAndFeel, because we can't > >>> add the needed method to the appropriate interface/superclass, as was done in > >>> 7. So the synth look and feel now depends on the nimbus one being built before. > >>> > >>> In 1.8.1, you have an older version of NimbusLookAndFeel which is what causes the > >>> complaint. In icedtea-no-bootstrap mode (and straight OpenJDK builds), we fixed > >>> this by building Nimbus first. However, gcj can't generate Nimbus; so in bootstrap > >>> mode, you'll see that we pass DISABLE_NIMBUS=true in the Makefile and the files > >>> are instead compiled from pre-generated versions in the rt.stamp stage. > >>> > >>> I'm guessing this doesn't work for the icedtea-bootstrap mode because it doesn't > >>> pull in as many classes to rebuild as gcj does (presumably because Sun classes which > >>> are built when using gcj are found in rt.jar when using IcedTea). Your fix seems > >>> correct, though for IcedTea, removing the DISABLE_NIMBUS line would also work. > >> > >> No, my proposed fix is not correct. Disabling Nimbus in the stage1 > >> build is the only working fix for both targets. Will do locally. > > > > I don't understand. It already is disabled and bootstrapping with gcj works fine. > > No, it was me who did not understand. I misread your previous comments. > Sorry for the confusion. I was referring to including > $(SHARE)/javax/swing/plaf/synth in ICETEA_BOOTSTRAP_DIRS on a gcj build. > IIUC, this will not work with a gcj bootstrap (though I haven't tried > it yet). If that is true, then it has to be conditional. Also, I did > not remove DISABLE_NIMBUS="true", but rather changed it to false > conditionally, and that resulted in the same error, so I went back to > the extra classes refresh in rt.jar. Attached patch works for me, but > there is probably already a way to determine what the host JDK is, but > it escapes me at the moment if it is there already. As of now, I am > basically working from tip with the exception of OpenType font support, > but I'll go back and build tip with the result of tonight's build to > verify anyway. > I think I found a simpler fix for this. At least, it works when bootstrapping with both IcedTea6 1.8 and gcj 4.5.1. Basically, instead of trying to build the whole of javax.swing.plaf.synth, we just build NimbusLookAndFeel which is the class this is outdated in 1.8: http://icedtea.classpath.org/hg/icedtea6/rev/6f017e9047ab Let me know if this works for you as well. > > > > > > If someone wants to test a JDK as a bootstrap JDK, and they find > > issues, we'll try to fix them where appropriate. There aren't really > > any specific versions, it's more a case of what people are willing to > > actively maintain. If someone is willing to step up and keep doing > > regular builds with a certain system JDK, it'll be supported. > > I'll be happy to continue down my current path whenever I am able to. > I'm always going to want to keep up with the current closed JDK. > Great! > > > >> BTW, 1.8 worked well enough with the -2 patch I posted a link to earlier > >> for my target (1.8.1->1.8.1) > > > > Yeah I guessed it would without the OpenGL change. It's probably worth > > fixing that on the 1.9 branch too so we don't regress from 1.8. > > Attached patch will have to be moved appropriately for 1.9 branch (if > accepted) and could be done in the same location for 1.10 in FIND_JAVAC. > These changes will just be in 1.10. I want them to have plenty of soak time before being used generally. > > > > With regard to your patch for that, I don't think testing the VM is > > correct; it may get fixed in later versions of gcj and other VMs than > > gcj use that javah. I think (part of) the issue is > > http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40188 again, which there > > is already a configure test for in IcedTea7. So I'll backport that. > > The other part of the issue is that gjavah doesn't seem to handle > > inner classes implicitly. > > Excellent! That's one more done. Applied locally. So now, I have > nothing in my 1.9 that is not in 1.10 except the attached patch which > gets me a 1.9 build to completion (ignore the 1.9 in the name, is for > 1.10). I will try tip in a few moments, but don't expect a confirmation > until tomorrow. BTW, for reference, machine is x86_64 with only 32bit > toolchain. Not so sure I like the unattended testsuite results, so I > reran them without the screen saver active, and the results still are > not looking so good to me. Are there some test suite changes that need > to come back with the Xrender changes? > Pavel has been looking into the Xrender test breakages which also affect OpenJDK7: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009988.html So it looks like Oracle made changes without fixing the tests. Pavel now has a fix which should be committed shortly. On JDK, I don't think there's ever been a 100% pass, and some aren't even stable tests. So you're looking more for regressions between builds. To my knowledge, the HotSpot and langtools suites should all pass (and take a considerably shorter time to run). > --------------- jtreg console summary for hotspot --------------- > Test results: passed: 86 > --------------- jtreg console summary for langtools --------------- > Error: tools/javac/processing/6499119/ClassProcessor.java > FAILED: tools/javac/InterfaceAssert.java > Test results: passed: 1,377; failed: 1; error: 1 > --------------- jtreg console summary for jdk --------------- > FAILED: com/sun/net/httpserver/bugs/B6361557.java > FAILED: > java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java > FAILED: java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java > FAILED: java/awt/font/TextLayout/TextLayoutBounds.java > FAILED: java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java > FAILED: > java/awt/FullScreen/BufferStrategyExceptionTest/BufferStrategyExceptionTest.java > FAILED: > java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java > FAILED: java/awt/Graphics2D/DrawString/RotTransText.java > FAILED: java/awt/GraphicsDevice/CloneConfigsTest.java > FAILED: java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html > FAILED: java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html > FAILED: java/awt/print/PrinterJob/ExceptionTest.java > FAILED: java/awt/xembed/server/RunTestXEmbed.java > FAILED: java/beans/XMLEncoder/javax_swing_tree_TreePath.java > FAILED: java/net/MulticastSocket/NoLoopbackPackets.java > FAILED: java/net/URL/TestHttps.java > FAILED: java/nio/charset/Charset/NIOCharsetAvailabilityTest.java > FAILED: java/rmi/transport/pinLastArguments/PinLastArguments.java > MyDeflater had end() called > MyInflater had end() called > FAILED: javax/swing/plaf/synth/Test6933784.java > FAILED: sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java > FAILED: sun/java2d/cmm/ColorConvertOp/ColConvDCMTest.java > FAILED: sun/java2d/cmm/ColorConvertOp/MTColConvTest.java > FAILED: sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java > FAILED: sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java > FAILED: > sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java > FAILED: sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java > FAILED: > sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java > FAILED: sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java > FAILED: sun/java2d/OpenGL/DrawBufImgOp.java > FAILED: sun/java2d/OpenGL/GradientPaints.java > FAILED: sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java > FAILED: sun/java2d/pipe/MutableColorTest/MutableColorTest.java > FAILED: sun/java2d/SunGraphics2D/DrawImageBilinear.java > FAILED: sun/java2d/SunGraphics2D/PolyVertTest.java > FAILED: sun/java2d/SunGraphics2D/SimplePrimQuality.java > FAILED: sun/nio/cs/Test4200310.sh > FAILED: sun/nio/cs/TestSJIS0213.java > Test results: passed: 3,287; failed: 37 > : # kill testsuite processes still hanging > nothing to cleanup > make[1]: Leaving directory `/home/dj/icedtea6-1-9-7816c6d7a641' > > > DirectX? I'm fairly sure those are expected to fail at least. :-) > > > > > > > The JCK only applies to binaries. So it would only allow you to test > > a binary that you built and provided to users. Anyone using the > > script (just like anyone using a Gentoo source ebuild) would have to > > license the JCK and test it themselves. > > > > If binaries aren't your primary target, I wouldn't put too much weight > > on it. The Free JTreg test suite is already integrated with IcedTea > > (try 'make check') and can be used to check the sanity of your > > builds. Others > > (http://openjdk.java.net/groups/conformance/JckAccess/jck-access.html) > > already run the JCK on binaries built from the same sources. > > Getting OT for this part of the discussion, but I just want it to verify > that the book instructions work as I expect them to. As far as > providing a 'compatible' binary version, I could probably just piggy > back off of the RedHat RPM with rpm2tgz or similar. That is the other > reason for wanting to use icedtea to bootstrap icedtea--historically, > building JDK from scratch has always been optional (and was dropped > shortly after OpenJDK was announced as the JRL source releases were > lagging behind quite a bit at that time), but there has always been an > upstream jdk*{arch}*.bin to install from, whereas there currently is not > (or not that I'm aware of) for IcedTea6. > I don't know anthing about the JRL source code; looking at that would taint developers of Free Java. The Fedora RPMs are probably the best choice if you want a binary, as these have passed the TCK: http://magazine.redhat.com/2008/07/08/java-in-fedora-first/. That and all the distro packages AFAIK are based on IcedTea. Oracle don't make OpenJDK builds available and such builds would not include a plugin or Web Start support, as these are added by IcedTea. > -- DJ Lucas > > -- > This message has been scanned for viruses and > dangerous content, and is believed to be clean. > > diff -Naur icedtea6-1-9-7816c6d7a641-orig/acinclude.m4 icedtea6-1-9-7816c6d7a641/acinclude.m4 > --- icedtea6-1-9-7816c6d7a641-orig/acinclude.m4 2010-08-14 00:18:37.000000000 -0500 > +++ icedtea6-1-9-7816c6d7a641/acinclude.m4 2010-08-14 01:38:43.000000000 -0500 > @@ -139,6 +139,9 @@ > AC_MSG_ERROR([cannot find a Java compiler, try --with-javac or --with-ecj]) > fi > AC_SUBST(JAVAC) > + dnl If system javac is derived from Oracle, need synth update in rt > + javac_link=`basename $(readlink -f ${JAVAC})` > + AM_CONDITIONAL([NEED_RT_SYNTH_UPDATE], test x"${javac_link}" = "xjavac") > ]) > > AC_DEFUN([IT_FIND_ECJ], > diff -Naur icedtea6-1-9-7816c6d7a641-orig/Makefile.am icedtea6-1-9-7816c6d7a641/Makefile.am > --- icedtea6-1-9-7816c6d7a641-orig/Makefile.am 2010-08-14 00:18:37.000000000 -0500 > +++ icedtea6-1-9-7816c6d7a641/Makefile.am 2010-08-14 01:37:53.000000000 -0500 > @@ -74,7 +74,14 @@ > $(SHARE)/javax/net/ssl \ > $(SHARE)/javax/script \ > $(SHARE)/javax/security/auth/kerberos \ > - $(SHARE)/javax/security/sasl \ > + $(SHARE)/javax/security/sasl > + > +if NEED_RT_SYNTH_UPDATE > +ICEDTEA_BOOTSTRAP_DIRS += \ > + $(SHARE)/javax/swing/plaf/synth > +endif > + > +ICEDTEA_BOOTSTRAP_DIRS += \ > $(LANGTOOLS)/com/sun/mirror \ > $(LANGTOOLS)/com/sun/tools/apt > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ptisnovs at redhat.com Wed Aug 25 09:05:16 2010 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Wed, 25 Aug 2010 18:05:16 +0200 Subject: [1.7 & 1.8 BRANCH APPROVAL] Font and PaX patches In-Reply-To: <20100813123514.GT10867@rivendell.middle-earth.co.uk> References: <20100813123514.GT10867@rivendell.middle-earth.co.uk> Message-ID: <4C753F3C.6040803@redhat.com> Dr Andrew John Hughes wrote: > I'd like to backport the following fixes to 1.7 & 1.8: > > changeset: 2076:3fd44a9bb9a3 > user: Andrew John Hughes > date: Wed Aug 11 21:04:10 2010 +0100 > summary: G244901: Skip test_gamma on hardened (PaX-enabled) kernels > http://icedtea.classpath.org/hg/icedtea6/rev/cb463b94b82d > > changeset: 2077:be9c0d303dfc > user: Andrew John Hughes > date: Wed Aug 11 21:05:04 2010 +0100 > summary: G266295: Provide font configuration for Gentoo. > http://icedtea.classpath.org/hg/icedtea6/rev/fc45c67366b9 > > changeset: 2078:8dbe3de24290 > tag: tip > user: Andrew John Hughes > date: Fri Aug 13 00:35:50 2010 +0100 > summary: Add a font configuration for RHEL6. > http://icedtea.classpath.org/hg/icedtea6/rev/e8dfb4f0000d > > The backports include the NEWS updates in http://icedtea.classpath.org/hg/icedtea6/rev/fe41bee26224. > > Ok to push? Hi Andrew, these patches seems to be good from my perspective. The patch for RHEL6 fixes font rendering issue on this system. Cheers Pavel T. From andrew at icedtea.classpath.org Wed Aug 25 09:11:33 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 25 Aug 2010 16:11:33 +0000 Subject: /hg/release/icedtea6-1.7: 4 new changesets Message-ID: changeset 7987f496f107 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=7987f496f107 author: Andrew John Hughes date: Fri Aug 06 21:56:25 2010 +0100 G244901: Skip test_gamma on hardened (PaX-enabled) kernels 2010-08-06 Andrew John Hughes Fix build on PAX-enabled kernels. https://bugs.gentoo.org/244901 * Makefile.am: (ICEDTEA_PATCHES): Add test_gamma patch if PAX is enabled. (ICEDTEA_ECJ_PATCHES): Add test_gamma patch if PAX not enabled (and thus not already patched). * NEWS: Mention new bug fix. * acinclude.m4: (IT_CHECK_FOR_PAX): Check for a PaX-enabled kernel. * configure.ac: Call above macro. * patches/ecj/icedtea-hotspot.patch: Remove test_gamma segment into separate patch. * patches/ecj/no-test_gamma.patch: test_gamma patch for non- PaX-enabled kernels (i.e. bootstrap build only). * patches/no-test_gamma.patch: test_gamma patch for PaX- enabled kernels. changeset 8e9ea0b338da in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=8e9ea0b338da author: Andrew John Hughes date: Wed Aug 11 20:55:25 2010 +0100 G266295: Provide font configuration for Gentoo. 2010-08-02 Andrew John Hughes * Makefile.am: Add patch below. * patches/fonts-gentoo.patch: Add a font configuration for Gentoo (currently a copy of Fedora's). * NEWS: Updated. changeset 4ed5f5c9cba8 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=4ed5f5c9cba8 author: Andrew John Hughes date: Thu Aug 12 23:54:09 2010 +0100 Add a font configuration for RHEL6. 2010-07-30 Andrew John Hughes * Makefile.am: Add patch below. * patches/fonts-rhel.patch: Add a font configuration for RHEL6 (currently a copy of Fedora's). * NEWS: Updated and move previous additions to correct place. changeset c18673769bc8 in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=c18673769bc8 author: Andrew John Hughes date: Wed Aug 25 17:11:27 2010 +0100 Merge diffstat: 13 files changed, 983 insertions(+), 82 deletions(-) ChangeLog | 56 + Makefile.am | 12 NEWS | 6 acinclude.m4 | 11 configure.ac | 1 patches/ecj/icedtea-hotspot.patch | 46 - patches/ecj/no-test_gamma.patch | 46 + patches/fonts-gentoo.patch | 406 ++++++++++++++ patches/fonts-rhel.patch | 393 +++++++++++++ patches/no-test_gamma.patch | 46 + plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 34 - rt/net/sourceforge/jnlp/JNLPSplashScreen.java | 6 rt/net/sourceforge/jnlp/Parser.java | 2 diffs (truncated from 1178 to 500 lines): diff -r c5c7cfebb101 -r c18673769bc8 ChangeLog --- a/ChangeLog Thu Aug 05 17:52:08 2010 -0400 +++ b/ChangeLog Wed Aug 25 17:11:27 2010 +0100 @@ -1,3 +1,59 @@ 2010-08-05 Omair Majid + + * Makefile.am: Add patch below. + * patches/fonts-rhel.patch: + Add a font configuration for RHEL6 + (currently a copy of Fedora's). + * NEWS: Updated and move previous additions + to correct place. + +2010-08-02 Andrew John Hughes + + Fixes http://bugs.gentoo.org/show_bug.cgi?id=266295 + * Makefile.am: Add patch below. + * patches/fonts-gentoo.patch: + Add a font configuration for Gentoo + (currently a copy of Fedora's). + * NEWS: Updated. + +2010-08-06 Andrew John Hughes + + Fix build on PAX-enabled kernels. + https://bugs.gentoo.org/244901 + * Makefile.am: + (ICEDTEA_PATCHES): Add test_gamma patch + if PAX is enabled. + (ICEDTEA_ECJ_PATCHES): Add test_gamma patch + if PAX not enabled (and thus not already patched). + * NEWS: Mention new bug fix. + * acinclude.m4: + (IT_CHECK_FOR_PAX): Check for a PaX-enabled kernel. + * configure.ac: Call above macro. + * patches/ecj/icedtea-hotspot.patch: Remove + test_gamma segment into separate patch. + * patches/ecj/no-test_gamma.patch: test_gamma + patch for non-PaX-enabled kernels (i.e. bootstrap + build only). + * patches/no-test_gamma.patch: test_gamma patch + for PaX-enabled kernels. + +2010-08-24 Omair Majid + + Fixes rhbz601281 + * NEWS: Update with this fix. + * netx/net/sourceforge/jnlp/JNLPSplashScreen.java + (setSplashImageURL): Check for possible null. + +2010-08-23 Andrew Su + + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (parse): Removed parsing for unknown tag. + +2010-08-09 Omair Majid + + * NEWS: Update for this fix. + * rt/net/sourceforge/jnlp/Parser.java: Add 1.6 to supportedVersions. + 2010-08-05 Omair Majid * NEWS: Update with netx bugfix. diff -r c5c7cfebb101 -r c18673769bc8 Makefile.am --- a/Makefile.am Thu Aug 05 17:52:08 2010 -0400 +++ b/Makefile.am Wed Aug 25 17:11:27 2010 +0100 @@ -343,7 +343,9 @@ ICEDTEA_PATCHES = \ patches/openjdk/6917485-docs-corba.patch \ patches/openjdk/6921068-docs-specdefault.patch \ patches/openjdk/6668231-ssl_cert.patch \ - patches/openjdk/6963870-swing_npe.patch + patches/openjdk/6963870-swing_npe.patch \ + patches/fonts-gentoo.patch \ + patches/fonts-rhel.patch if WITH_RHINO ICEDTEA_PATCHES += \ @@ -403,6 +405,10 @@ ICEDTEA_PATCHES += patches/hotspot/origi patches/openjdk/6822370-reentrantreadwritelock.patch endif +if HAS_PAX +ICEDTEA_PATCHES += patches/no-test_gamma.patch +endif + ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES) # Bootstrapping patches @@ -412,6 +418,10 @@ ICEDTEA_ECJ_PATCHES = patches/ecj/icedte patches/ecj/icedtea-hotspot.patch \ patches/ecj/icedtea-spp.patch \ patches/ecj/icedtea-jopt.patch + +if !HAS_PAX +ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch +endif # OpenJDK build environment. if ZERO_BUILD diff -r c5c7cfebb101 -r c18673769bc8 NEWS --- a/NEWS Thu Aug 05 17:52:08 2010 -0400 +++ b/NEWS Wed Aug 25 17:11:27 2010 +0100 @@ -1,8 +1,14 @@ New in release 1.7.5 (XXXX-XX-XX): New in release 1.7.5 (XXXX-XX-XX): +* Fixes + - G244901: Skip test_gamma on hardened (PaX-enabled) kernels + - G266295: Provide font configuration for Gentoo. + - Provide font configuration for RHEL 6. * NetX - Fix browser command in BasicService.showDocument(URL) - Run programs that inherit main(String[]) in their main-class + - Work with JNLP files that use spec version 1.6 + - RH601281: Possible NullPointerException in splash screen code New in release 1.7.4 (2010-07-28): diff -r c5c7cfebb101 -r c18673769bc8 acinclude.m4 --- a/acinclude.m4 Thu Aug 05 17:52:08 2010 -0400 +++ b/acinclude.m4 Wed Aug 25 17:11:27 2010 +0100 @@ -1339,3 +1339,14 @@ fi fi ]) +AC_DEFUN_ONCE([IT_CHECK_FOR_PAX],[ +AC_CACHE_CHECK([if a PaX-enabled kernel is running], it_cv_pax, [ +if grep '^PaX:' /proc/self/status >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_pax=yes; +else + it_cv_pax=no; +fi +]) +AM_CONDITIONAL([HAS_PAX], test x"${it_cv_pax}" = "xyes") +AC_PROVIDE([$0])dnl +]) diff -r c5c7cfebb101 -r c18673769bc8 configure.ac --- a/configure.ac Thu Aug 05 17:52:08 2010 -0400 +++ b/configure.ac Wed Aug 25 17:11:27 2010 +0100 @@ -48,6 +48,7 @@ AC_CHECK_GCC_VERSION AC_CHECK_GCC_VERSION AC_CHECK_FOR_OPENJDK IT_CHECK_NUMBER_OF_PARALLEL_JOBS +IT_CHECK_FOR_PAX AC_MSG_CHECKING([for a NetBeans installation]) AC_ARG_WITH([netbeans-home], diff -r c5c7cfebb101 -r c18673769bc8 patches/ecj/icedtea-hotspot.patch --- a/patches/ecj/icedtea-hotspot.patch Thu Aug 05 17:52:08 2010 -0400 +++ b/patches/ecj/icedtea-hotspot.patch Wed Aug 25 17:11:27 2010 +0100 @@ -1,49 +1,3 @@ diff -Nru openjdk-ecj.orig/hotspot/make/ -diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile ---- openjdk-ecj.orig/hotspot/make/linux/Makefile 2008-10-24 10:16:06.000000000 +0100 -+++ openjdk-ecj/hotspot/make/linux/Makefile 2008-10-24 13:32:48.000000000 +0100 -@@ -287,42 +287,36 @@ - - $(TARGETS_C2): $(SUBDIRS_C2) - cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_TIERED): $(SUBDIRS_TIERED) - cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_C1): $(SUBDIRS_C1) - cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_CORE): $(SUBDIRS_CORE) - cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_ZERO): $(SUBDIRS_ZERO) - cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_SHARK): $(SUBDIRS_SHARK) - cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install - endif diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make --- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2008-10-24 10:16:06.000000000 +0100 +++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2008-10-24 13:32:48.000000000 +0100 diff -r c5c7cfebb101 -r c18673769bc8 patches/ecj/no-test_gamma.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/no-test_gamma.patch Wed Aug 25 17:11:27 2010 +0100 @@ -0,0 +1,46 @@ +diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile +--- openjdk-ecj.orig/hotspot/make/linux/Makefile 2010-03-29 21:34:14.000000000 +0100 ++++ openjdk-ecj/hotspot/make/linux/Makefile 2010-03-29 21:40:39.000000000 +0100 +@@ -287,42 +287,36 @@ + + $(TARGETS_C2): $(SUBDIRS_C2) + cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_TIERED): $(SUBDIRS_TIERED) + cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_C1): $(SUBDIRS_C1) + cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_CORE): $(SUBDIRS_CORE) + cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_ZERO): $(SUBDIRS_ZERO) + cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_SHARK): $(SUBDIRS_SHARK) + cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install + endif diff -r c5c7cfebb101 -r c18673769bc8 patches/fonts-gentoo.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/fonts-gentoo.patch Wed Aug 25 17:11:27 2010 +0100 @@ -0,0 +1,406 @@ +diff -Nru openjdk.orig/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile +--- openjdk.orig/jdk/make/sun/awt/Makefile 2009-10-14 18:17:15.000000000 +0100 ++++ openjdk/jdk/make/sun/awt/Makefile 2010-08-06 23:44:04.676912020 +0100 +@@ -387,7 +387,8 @@ + fontconfig.properties \ + fontconfig.SuSE.properties \ + fontconfig.Ubuntu.properties \ +- fontconfig.Fedora.properties ++ fontconfig.Fedora.properties \ ++ fontconfig.Gentoo.properties + else + + FONTCONFIGS_SRC = $(CLOSED_SRC)/solaris/classes/sun/awt/fontconfigs +diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Gentoo.properties openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Gentoo.properties +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Gentoo.properties 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Gentoo.properties 2010-08-06 23:43:45.720667808 +0100 +@@ -0,0 +1,376 @@ ++# ++# Copyright (c) 2007, Oracle and/or its affiliates. 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. Oracle designates this ++# particular file as subject to the "Classpath" exception as provided ++# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++# or visit www.oracle.com if you need additional information or have any ++# questions. ++# ++ ++# Version ++ ++# Uses Fedora 9 fonts and file paths. ++version=1 ++ ++# Component Font Mappings ++ ++dialog.plain.latin-1=DejaVu Sans ++dialog.plain.japanese-x0208=Sazanami Gothic ++dialog.plain.korean=Baekmuk Gulim ++dialog.plain.chinese-big5=AR PL ShanHeiSun Uni ++dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.plain.bengali=Lohit Bengali ++dialog.plain.gujarati=Lohit Gujarati ++dialog.plain.hindi=Lohit Hindi ++dialog.plain.malayalam=Lohit Malayalam ++dialog.plain.oriya=Lohit Oriya ++dialog.plain.punjabi=Lohit Punjabi ++dialog.plain.tamil=Lohit Tamil ++dialog.plain.telugu=Lohit Telugu ++dialog.plain.sinhala=LKLUG ++ ++dialog.bold.latin-1=DejaVu Sans Bold ++dialog.bold.japanese-x0208=Sazanami Gothic ++dialog.bold.korean=Baekmuk Gulim ++dialog.bold.chinese-big5=AR PL ShanHeiSun Uni ++dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.bold.bengali=Lohit Bengali ++dialog.bold.gujarati=Lohit Gujarati ++dialog.bold.hindi=Lohit Hindi ++dialog.bold.malayalam=Lohit Malayalam ++dialog.bold.oriya=Lohit Oriya ++dialog.bold.punjabi=Lohit Punjabi ++dialog.bold.tamil=Lohit Tamil ++dialog.bold.telugu=Lohit Telugu ++dialog.bold.sinhala=LKLUG ++ ++dialog.italic.latin-1=DejaVu Sans Oblique ++dialog.italic.japanese-x0208=Sazanami Gothic ++dialog.italic.korean=Baekmuk Gulim ++dialog.italic.chinese-big5=AR PL ShanHeiSun Uni ++dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.italic.bengali=Lohit Bengali ++dialog.italic.gujarati=Lohit Gujarati ++dialog.italic.hindi=Lohit Hindi ++dialog.italic.malayalam=Lohit Malayalam ++dialog.italic.oriya=Lohit Oriya ++dialog.italic.punjabi=Lohit Punjabi ++dialog.italic.tamil=Lohit Tamil ++dialog.italic.telugu=Lohit Telugu ++dialog.italic.sinhala=LKLUG ++ ++dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique ++dialog.bolditalic.japanese-x0208=Sazanami Gothic ++dialog.bolditalic.korean=Baekmuk Gulim ++dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni ++dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.bolditalic.bengali=Lohit Bengali ++dialog.bolditalic.gujarati=Lohit Gujarati ++dialog.bolditalic.hindi=Lohit Hindi ++dialog.bolditalic.malayalam=Lohit Malayalam ++dialog.bolditalic.oriya=Lohit Oriya ++dialog.bolditalic.punjabi=Lohit Punjabi ++dialog.bolditalic.tamil=Lohit Tamil ++dialog.bolditalic.telugu=Lohit Telugu ++dialog.bolditalic.sinhala=LKLUG ++ ++sansserif.plain.latin-1=DejaVu Sans ++sansserif.plain.japanese-x0208=Sazanami Gothic ++sansserif.plain.korean=Baekmuk Gulim ++sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni ++sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.plain.bengali=Lohit Bengali ++sansserif.plain.gujarati=Lohit Gujarati ++sansserif.plain.hindi=Lohit Hindi ++sansserif.plain.malayalam=Lohit Malayalam ++sansserif.plain.oriya=Lohit Oriya ++sansserif.plain.punjabi=Lohit Punjabi ++sansserif.plain.tamil=Lohit Tamil ++sansserif.plain.telugu=Lohit Telugu ++sansserif.plain.sinhala=LKLUG ++ ++sansserif.bold.latin-1=DejaVu Sans Bold ++sansserif.bold.japanese-x0208=Sazanami Gothic ++sansserif.bold.korean=Baekmuk Gulim ++sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni ++sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.bold.bengali=Lohit Bengali ++sansserif.bold.gujarati=Lohit Gujarati ++sansserif.bold.hindi=Lohit Hindi ++sansserif.bold.malayalam=Lohit Malayalam ++sansserif.bold.oriya=Lohit Oriya ++sansserif.bold.punjabi=Lohit Punjabi ++sansserif.bold.tamil=Lohit Tamil ++sansserif.bold.telugu=Lohit Telugu ++sansserif.bold.sinhala=LKLUG ++ ++sansserif.italic.latin-1=DejaVu Sans Oblique ++sansserif.italic.japanese-x0208=Sazanami Gothic ++sansserif.italic.korean=Baekmuk Gulim ++sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni ++sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.italic.bengali=Lohit Bengali ++sansserif.italic.gujarati=Lohit Gujarati ++sansserif.italic.hindi=Lohit Hindi ++sansserif.italic.malayalam=Lohit Malayalam ++sansserif.italic.oriya=Lohit Oriya ++sansserif.italic.punjabi=Lohit Punjabi ++sansserif.italic.tamil=Lohit Tamil ++sansserif.italic.telugu=Lohit Telugu ++sansserif.italic.sinhala=LKLUG ++ ++sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique ++sansserif.bolditalic.japanese-x0208=Sazanami Gothic ++sansserif.bolditalic.korean=Baekmuk Gulim ++sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni ++sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.bolditalic.bengali=Lohit Bengali ++sansserif.bolditalic.gujarati=Lohit Gujarati ++sansserif.bolditalic.hindi=Lohit Hindi ++sansserif.bolditalic.malayalam=Lohit Malayalam ++sansserif.bolditalic.oriya=Lohit Oriya ++sansserif.bolditalic.punjabi=Lohit Punjabi ++sansserif.bolditalic.tamil=Lohit Tamil ++sansserif.bolditalic.telugu=Lohit Telugu ++sansserif.bolditalic.sinhala=LKLUG ++ ++serif.plain.latin-1=DejaVu Serif ++serif.plain.japanese-x0208=Sazanami Mincho ++serif.plain.korean=Baekmuk Batang ++serif.plain.chinese-big5=AR PL ZenKai Uni ++serif.plain.chinese-gb18030=AR PL ZenKai Uni ++serif.plain.bengali=Lohit Bengali ++serif.plain.gujarati=Lohit Gujarati ++serif.plain.hindi=Lohit Hindi ++serif.plain.malayalam=Lohit Malayalam ++serif.plain.oriya=Lohit Oriya ++serif.plain.punjabi=Lohit Punjabi ++serif.plain.tamil=Lohit Tamil ++serif.plain.telugu=Lohit Telugu ++serif.plain.sinhala=LKLUG ++ ++serif.bold.latin-1=DejaVu Serif Bold ++serif.bold.japanese-x0208=Sazanami Mincho ++serif.bold.korean=Baekmuk Batang ++serif.bold.chinese-big5=AR PL ZenKai Uni ++serif.bold.chinese-gb18030=AR PL ZenKai Uni ++serif.bold.bengali=Lohit Bengali ++serif.bold.gujarati=Lohit Gujarati ++serif.bold.hindi=Lohit Hindi ++serif.bold.malayalam=Lohit Malayalam ++serif.bold.oriya=Lohit Oriya ++serif.bold.punjabi=Lohit Punjabi ++serif.bold.tamil=Lohit Tamil ++serif.bold.telugu=Lohit Telugu ++serif.bold.sinhala=LKLUG ++ ++serif.italic.latin-1=DejaVu Serif Oblique ++serif.italic.japanese-x0208=Sazanami Mincho ++serif.italic.korean=Baekmuk Batang ++serif.italic.chinese-big5=AR PL ZenKai Uni ++serif.italic.chinese-gb18030=AR PL ZenKai Uni ++serif.italic.bengali=Lohit Bengali ++serif.italic.gujarati=Lohit Gujarati ++serif.italic.hindi=Lohit Hindi ++serif.italic.malayalam=Lohit Malayalam ++serif.italic.oriya=Lohit Oriya ++serif.italic.punjabi=Lohit Punjabi ++serif.italic.tamil=Lohit Tamil ++serif.italic.telugu=Lohit Telugu ++serif.italic.sinhala=LKLUG ++ ++serif.bolditalic.latin-1=DejaVu Serif Bold Oblique ++serif.bolditalic.japanese-x0208=Sazanami Mincho ++serif.bolditalic.korean=Baekmuk Batang ++serif.bolditalic.chinese-big5=AR PL ZenKai Uni ++serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni ++serif.bolditalic.bengali=Lohit Bengali ++serif.bolditalic.gujarati=Lohit Gujarati ++serif.bolditalic.hindi=Lohit Hindi ++serif.bolditalic.malayalam=Lohit Malayalam ++serif.bolditalic.oriya=Lohit Oriya ++serif.bolditalic.punjabi=Lohit Punjabi ++serif.bolditalic.tamil=Lohit Tamil ++serif.bolditalic.telugu=Lohit Telugu ++serif.bolditalic.sinhala=LKLUG ++ ++monospaced.plain.latin-1=DejaVu Sans Mono ++monospaced.plain.japanese-x0208=Sazanami Gothic ++monospaced.plain.korean=Baekmuk Gulim ++monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni ++monospaced.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++monospaced.plain.bengali=Lohit Bengali ++monospaced.plain.gujarati=Lohit Gujarati ++monospaced.plain.hindi=Lohit Hindi ++monospaced.plain.malayalam=Lohit Malayalam ++monospaced.plain.oriya=Lohit Oriya ++monospaced.plain.punjabi=Lohit Punjabi ++monospaced.plain.tamil=Lohit Tamil ++monospaced.plain.telugu=Lohit Telugu ++monospaced.plain.sinhala=LKLUG ++ ++monospaced.bold.latin-1=DejaVu Sans Mono Bold ++monospaced.bold.japanese-x0208=Sazanami Gothic ++monospaced.bold.korean=Baekmuk Gulim From andrew at icedtea.classpath.org Wed Aug 25 09:13:16 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 25 Aug 2010 16:13:16 +0000 Subject: /hg/release/icedtea6-1.8: 4 new changesets Message-ID: changeset 3fd44a9bb9a3 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=3fd44a9bb9a3 author: Andrew John Hughes date: Wed Aug 11 21:04:10 2010 +0100 G244901: Skip test_gamma on hardened (PaX-enabled) kernels 2010-08-06 Andrew John Hughes Fix build on PAX-enabled kernels. https://bugs.gentoo.org/244901 * Makefile.am: (ICEDTEA_PATCHES): Add test_gamma patch if PAX is enabled. (ICEDTEA_ECJ_PATCHES): Add test_gamma patch if PAX not enabled (and thus not already patched). * NEWS: Mention new bug fix. * acinclude.m4: (IT_CHECK_FOR_PAX): Check for a PaX-enabled kernel. * configure.ac: Call above macro. * patches/ecj/icedtea-hotspot.patch: Remove test_gamma segment into separate patch. * patches/ecj/no-test_gamma.patch: test_gamma patch for non- PaX-enabled kernels (i.e. bootstrap build only). * patches/no-test_gamma.patch: test_gamma patch for PaX- enabled kernels. changeset be9c0d303dfc in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=be9c0d303dfc author: Andrew John Hughes date: Wed Aug 11 21:05:04 2010 +0100 G266295: Provide font configuration for Gentoo. 2010-08-02 Andrew John Hughes * Makefile.am: Add patch below. * patches/fonts-gentoo.patch: Add a font configuration for Gentoo (currently a copy of Fedora's). * NEWS: Updated. changeset 8dbe3de24290 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=8dbe3de24290 author: Andrew John Hughes date: Fri Aug 13 00:35:50 2010 +0100 Add a font configuration for RHEL6. 2010-07-30 Andrew John Hughes * Makefile.am: Add patch below. * patches/fonts-rhel.patch: Add a font configuration for RHEL6 (currently a copy of Fedora's). * NEWS: Updated and move previous additions to correct place. changeset 01d87c70057a in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=01d87c70057a author: Andrew John Hughes date: Wed Aug 25 17:13:03 2010 +0100 Merge diffstat: 12 files changed, 976 insertions(+), 81 deletions(-) ChangeLog | 51 + Makefile.am | 12 NEWS | 5 acinclude.m4 | 11 configure.ac | 1 netx/net/sourceforge/jnlp/JNLPSplashScreen.java | 6 patches/ecj/icedtea-hotspot.patch | 46 - patches/ecj/no-test_gamma.patch | 46 + patches/fonts-gentoo.patch | 406 ++++++++++++++ patches/fonts-rhel.patch | 393 +++++++++++++ patches/no-test_gamma.patch | 46 + plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 34 - diffs (truncated from 1164 to 500 lines): diff -r 4a022b4a3319 -r 01d87c70057a ChangeLog --- a/ChangeLog Mon Aug 09 11:30:52 2010 -0400 +++ b/ChangeLog Wed Aug 25 17:13:03 2010 +0100 @@ -1,3 +1,54 @@ 2010-08-09 Omair Majid + + * Makefile.am: Add patch below. + * patches/fonts-rhel.patch: + Add a font configuration for RHEL6 + (currently a copy of Fedora's). + * NEWS: Updated and move previous additions + to correct place. + +2010-08-02 Andrew John Hughes + + Fixes http://bugs.gentoo.org/show_bug.cgi?id=266295 + * Makefile.am: Add patch below. + * patches/fonts-gentoo.patch: + Add a font configuration for Gentoo + (currently a copy of Fedora's). + * NEWS: Updated. + +2010-08-06 Andrew John Hughes + + Fix build on PAX-enabled kernels. + https://bugs.gentoo.org/244901 + * Makefile.am: + (ICEDTEA_PATCHES): Add test_gamma patch + if PAX is enabled. + (ICEDTEA_ECJ_PATCHES): Add test_gamma patch + if PAX not enabled (and thus not already patched). + * NEWS: Mention new bug fix. + * acinclude.m4: + (IT_CHECK_FOR_PAX): Check for a PaX-enabled kernel. + * configure.ac: Call above macro. + * patches/ecj/icedtea-hotspot.patch: Remove + test_gamma segment into separate patch. + * patches/ecj/no-test_gamma.patch: test_gamma + patch for non-PaX-enabled kernels (i.e. bootstrap + build only). + * patches/no-test_gamma.patch: test_gamma patch + for PaX-enabled kernels. + +2010-08-24 Omair Majid + + Fixes rhbz601281 + * NEWS: Update with this fix. + * netx/net/sourceforge/jnlp/JNLPSplashScreen.java + (setSplashImageURL): Check for possible null. + +2010-08-23 Andrew Su + + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + (parse): Removed parsing for unknown tag. + 2010-08-09 Omair Majid * NEWS: Update with support for spec 1.6 diff -r 4a022b4a3319 -r 01d87c70057a Makefile.am --- a/Makefile.am Mon Aug 09 11:30:52 2010 -0400 +++ b/Makefile.am Wed Aug 25 17:13:03 2010 +0100 @@ -329,7 +329,9 @@ ICEDTEA_PATCHES = \ patches/icedtea-nss-6763530.patch \ patches/nss-debug.patch \ patches/icedtea-override-redirect-metacity.patch \ - patches/openjdk/6678385.patch + patches/openjdk/6678385.patch \ + patches/fonts-gentoo.patch \ + patches/fonts-rhel.patch if WITH_RHINO ICEDTEA_PATCHES += \ @@ -399,6 +401,10 @@ ICEDTEA_PATCHES += patches/hotspot/origi patches/openjdk/6822370-reentrantreadwritelock.patch endif +if HAS_PAX +ICEDTEA_PATCHES += patches/no-test_gamma.patch +endif + ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES) # Bootstrapping patches @@ -418,6 +424,10 @@ endif endif ICEDTEA_ECJ_PATCHES += $(DISTRIBUTION_ECJ_PATCHES) + +if !HAS_PAX +ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch +endif # OpenJDK build environment. if ZERO_BUILD diff -r 4a022b4a3319 -r 01d87c70057a NEWS --- a/NEWS Mon Aug 09 11:30:52 2010 -0400 +++ b/NEWS Wed Aug 25 17:13:03 2010 +0100 @@ -1,9 +1,14 @@ New in release 1.8.2 (XXXX-XX-XX): New in release 1.8.2 (XXXX-XX-XX): +* Fixes: + - G244901: Skip test_gamma on hardened (PaX-enabled) kernels + - G266295: Provide font configuration for Gentoo. + - Provide font configuration for RHEL 6. - NetX: - Fix browser command in BasicService.showDocument(URL) - Run programs that inherit main(String[]) in their main-class - Run JNLP files that use 1.6 as the spec version + - RH601281: Possible NullPointerException in splash screen code New in release 1.8.1 (2010-07-28): diff -r 4a022b4a3319 -r 01d87c70057a acinclude.m4 --- a/acinclude.m4 Mon Aug 09 11:30:52 2010 -0400 +++ b/acinclude.m4 Wed Aug 25 17:13:03 2010 +0100 @@ -1485,6 +1485,17 @@ fi fi ]) +AC_DEFUN_ONCE([IT_CHECK_FOR_PAX],[ +AC_CACHE_CHECK([if a PaX-enabled kernel is running], it_cv_pax, [ +if grep '^PaX:' /proc/self/status >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_pax=yes; +else + it_cv_pax=no; +fi +]) +AM_CONDITIONAL([HAS_PAX], test x"${it_cv_pax}" = "xyes") +AC_PROVIDE([$0])dnl +]) AC_DEFUN_ONCE([IT_OBTAIN_DEFAULT_LIBDIR], [ dnl find the system library directory diff -r 4a022b4a3319 -r 01d87c70057a configure.ac --- a/configure.ac Mon Aug 09 11:30:52 2010 -0400 +++ b/configure.ac Wed Aug 25 17:13:03 2010 +0100 @@ -50,6 +50,7 @@ AC_CHECK_GCC_VERSION AC_CHECK_GCC_VERSION AC_CHECK_FOR_OPENJDK IT_CHECK_NUMBER_OF_PARALLEL_JOBS +IT_CHECK_FOR_PAX AC_MSG_CHECKING([for a NetBeans installation]) AC_ARG_WITH([netbeans-home], diff -r 4a022b4a3319 -r 01d87c70057a netx/net/sourceforge/jnlp/JNLPSplashScreen.java --- a/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Mon Aug 09 11:30:52 2010 -0400 +++ b/netx/net/sourceforge/jnlp/JNLPSplashScreen.java Wed Aug 25 17:13:03 2010 +0100 @@ -44,6 +44,12 @@ public class JNLPSplashScreen extends JF try { splashImage = ImageIO.read(resourceTracker .getCacheFile(splashImageUrl)); + if (splashImage == null) { + if (JNLPRuntime.isDebug()) { + System.err.println("Error loading splash image: " + url); + } + return; + } } catch (IOException e) { if (JNLPRuntime.isDebug()) { System.err.println("Error loading splash image: " + url); diff -r 4a022b4a3319 -r 01d87c70057a patches/ecj/icedtea-hotspot.patch --- a/patches/ecj/icedtea-hotspot.patch Mon Aug 09 11:30:52 2010 -0400 +++ b/patches/ecj/icedtea-hotspot.patch Wed Aug 25 17:13:03 2010 +0100 @@ -1,49 +1,3 @@ diff -Nru openjdk-ecj.orig/hotspot/make/ -diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile ---- openjdk-ecj.orig/hotspot/make/linux/Makefile 2008-10-24 10:16:06.000000000 +0100 -+++ openjdk-ecj/hotspot/make/linux/Makefile 2008-10-24 13:32:48.000000000 +0100 -@@ -287,42 +287,36 @@ - - $(TARGETS_C2): $(SUBDIRS_C2) - cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_TIERED): $(SUBDIRS_TIERED) - cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_C1): $(SUBDIRS_C1) - cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_CORE): $(SUBDIRS_CORE) - cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_ZERO): $(SUBDIRS_ZERO) - cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install - endif - - $(TARGETS_SHARK): $(SUBDIRS_SHARK) - cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) -- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma - ifdef INSTALL - cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install - endif diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make --- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2008-10-24 10:16:06.000000000 +0100 +++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2008-10-24 13:32:48.000000000 +0100 diff -r 4a022b4a3319 -r 01d87c70057a patches/ecj/no-test_gamma.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/ecj/no-test_gamma.patch Wed Aug 25 17:13:03 2010 +0100 @@ -0,0 +1,46 @@ +diff -Nru openjdk-ecj.orig/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile +--- openjdk-ecj.orig/hotspot/make/linux/Makefile 2010-03-29 21:34:14.000000000 +0100 ++++ openjdk-ecj/hotspot/make/linux/Makefile 2010-03-29 21:40:39.000000000 +0100 +@@ -287,42 +287,36 @@ + + $(TARGETS_C2): $(SUBDIRS_C2) + cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_TIERED): $(SUBDIRS_TIERED) + cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_C1): $(SUBDIRS_C1) + cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_CORE): $(SUBDIRS_CORE) + cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_ZERO): $(SUBDIRS_ZERO) + cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install + endif + + $(TARGETS_SHARK): $(SUBDIRS_SHARK) + cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) +- cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma + ifdef INSTALL + cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install + endif diff -r 4a022b4a3319 -r 01d87c70057a patches/fonts-gentoo.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/fonts-gentoo.patch Wed Aug 25 17:13:03 2010 +0100 @@ -0,0 +1,406 @@ +diff -Nru openjdk.orig/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile +--- openjdk.orig/jdk/make/sun/awt/Makefile 2009-10-14 18:17:15.000000000 +0100 ++++ openjdk/jdk/make/sun/awt/Makefile 2010-08-06 23:44:04.676912020 +0100 +@@ -387,7 +387,8 @@ + fontconfig.properties \ + fontconfig.SuSE.properties \ + fontconfig.Ubuntu.properties \ +- fontconfig.Fedora.properties ++ fontconfig.Fedora.properties \ ++ fontconfig.Gentoo.properties + else + + FONTCONFIGS_SRC = $(CLOSED_SRC)/solaris/classes/sun/awt/fontconfigs +diff -Nru openjdk.orig/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Gentoo.properties openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Gentoo.properties +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Gentoo.properties 1970-01-01 01:00:00.000000000 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Gentoo.properties 2010-08-06 23:43:45.720667808 +0100 +@@ -0,0 +1,376 @@ ++# ++# Copyright (c) 2007, Oracle and/or its affiliates. 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. Oracle designates this ++# particular file as subject to the "Classpath" exception as provided ++# by Oracle 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++# or visit www.oracle.com if you need additional information or have any ++# questions. ++# ++ ++# Version ++ ++# Uses Fedora 9 fonts and file paths. ++version=1 ++ ++# Component Font Mappings ++ ++dialog.plain.latin-1=DejaVu Sans ++dialog.plain.japanese-x0208=Sazanami Gothic ++dialog.plain.korean=Baekmuk Gulim ++dialog.plain.chinese-big5=AR PL ShanHeiSun Uni ++dialog.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.plain.bengali=Lohit Bengali ++dialog.plain.gujarati=Lohit Gujarati ++dialog.plain.hindi=Lohit Hindi ++dialog.plain.malayalam=Lohit Malayalam ++dialog.plain.oriya=Lohit Oriya ++dialog.plain.punjabi=Lohit Punjabi ++dialog.plain.tamil=Lohit Tamil ++dialog.plain.telugu=Lohit Telugu ++dialog.plain.sinhala=LKLUG ++ ++dialog.bold.latin-1=DejaVu Sans Bold ++dialog.bold.japanese-x0208=Sazanami Gothic ++dialog.bold.korean=Baekmuk Gulim ++dialog.bold.chinese-big5=AR PL ShanHeiSun Uni ++dialog.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.bold.bengali=Lohit Bengali ++dialog.bold.gujarati=Lohit Gujarati ++dialog.bold.hindi=Lohit Hindi ++dialog.bold.malayalam=Lohit Malayalam ++dialog.bold.oriya=Lohit Oriya ++dialog.bold.punjabi=Lohit Punjabi ++dialog.bold.tamil=Lohit Tamil ++dialog.bold.telugu=Lohit Telugu ++dialog.bold.sinhala=LKLUG ++ ++dialog.italic.latin-1=DejaVu Sans Oblique ++dialog.italic.japanese-x0208=Sazanami Gothic ++dialog.italic.korean=Baekmuk Gulim ++dialog.italic.chinese-big5=AR PL ShanHeiSun Uni ++dialog.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.italic.bengali=Lohit Bengali ++dialog.italic.gujarati=Lohit Gujarati ++dialog.italic.hindi=Lohit Hindi ++dialog.italic.malayalam=Lohit Malayalam ++dialog.italic.oriya=Lohit Oriya ++dialog.italic.punjabi=Lohit Punjabi ++dialog.italic.tamil=Lohit Tamil ++dialog.italic.telugu=Lohit Telugu ++dialog.italic.sinhala=LKLUG ++ ++dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique ++dialog.bolditalic.japanese-x0208=Sazanami Gothic ++dialog.bolditalic.korean=Baekmuk Gulim ++dialog.bolditalic.chinese-big5=AR PL ShanHeiSun Uni ++dialog.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++dialog.bolditalic.bengali=Lohit Bengali ++dialog.bolditalic.gujarati=Lohit Gujarati ++dialog.bolditalic.hindi=Lohit Hindi ++dialog.bolditalic.malayalam=Lohit Malayalam ++dialog.bolditalic.oriya=Lohit Oriya ++dialog.bolditalic.punjabi=Lohit Punjabi ++dialog.bolditalic.tamil=Lohit Tamil ++dialog.bolditalic.telugu=Lohit Telugu ++dialog.bolditalic.sinhala=LKLUG ++ ++sansserif.plain.latin-1=DejaVu Sans ++sansserif.plain.japanese-x0208=Sazanami Gothic ++sansserif.plain.korean=Baekmuk Gulim ++sansserif.plain.chinese-big5=AR PL ShanHeiSun Uni ++sansserif.plain.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.plain.bengali=Lohit Bengali ++sansserif.plain.gujarati=Lohit Gujarati ++sansserif.plain.hindi=Lohit Hindi ++sansserif.plain.malayalam=Lohit Malayalam ++sansserif.plain.oriya=Lohit Oriya ++sansserif.plain.punjabi=Lohit Punjabi ++sansserif.plain.tamil=Lohit Tamil ++sansserif.plain.telugu=Lohit Telugu ++sansserif.plain.sinhala=LKLUG ++ ++sansserif.bold.latin-1=DejaVu Sans Bold ++sansserif.bold.japanese-x0208=Sazanami Gothic ++sansserif.bold.korean=Baekmuk Gulim ++sansserif.bold.chinese-big5=AR PL ShanHeiSun Uni ++sansserif.bold.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.bold.bengali=Lohit Bengali ++sansserif.bold.gujarati=Lohit Gujarati ++sansserif.bold.hindi=Lohit Hindi ++sansserif.bold.malayalam=Lohit Malayalam ++sansserif.bold.oriya=Lohit Oriya ++sansserif.bold.punjabi=Lohit Punjabi ++sansserif.bold.tamil=Lohit Tamil ++sansserif.bold.telugu=Lohit Telugu ++sansserif.bold.sinhala=LKLUG ++ ++sansserif.italic.latin-1=DejaVu Sans Oblique ++sansserif.italic.japanese-x0208=Sazanami Gothic ++sansserif.italic.korean=Baekmuk Gulim ++sansserif.italic.chinese-big5=AR PL ShanHeiSun Uni ++sansserif.italic.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.italic.bengali=Lohit Bengali ++sansserif.italic.gujarati=Lohit Gujarati ++sansserif.italic.hindi=Lohit Hindi ++sansserif.italic.malayalam=Lohit Malayalam ++sansserif.italic.oriya=Lohit Oriya ++sansserif.italic.punjabi=Lohit Punjabi ++sansserif.italic.tamil=Lohit Tamil ++sansserif.italic.telugu=Lohit Telugu ++sansserif.italic.sinhala=LKLUG ++ ++sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique ++sansserif.bolditalic.japanese-x0208=Sazanami Gothic ++sansserif.bolditalic.korean=Baekmuk Gulim ++sansserif.bolditalic.chinese-big5=AR PL ShanHeiSun Uni ++sansserif.bolditalic.chinese-gb18030=AR PL ShanHeiSun Uni ++sansserif.bolditalic.bengali=Lohit Bengali ++sansserif.bolditalic.gujarati=Lohit Gujarati ++sansserif.bolditalic.hindi=Lohit Hindi ++sansserif.bolditalic.malayalam=Lohit Malayalam ++sansserif.bolditalic.oriya=Lohit Oriya ++sansserif.bolditalic.punjabi=Lohit Punjabi ++sansserif.bolditalic.tamil=Lohit Tamil ++sansserif.bolditalic.telugu=Lohit Telugu ++sansserif.bolditalic.sinhala=LKLUG ++ ++serif.plain.latin-1=DejaVu Serif ++serif.plain.japanese-x0208=Sazanami Mincho ++serif.plain.korean=Baekmuk Batang ++serif.plain.chinese-big5=AR PL ZenKai Uni ++serif.plain.chinese-gb18030=AR PL ZenKai Uni ++serif.plain.bengali=Lohit Bengali ++serif.plain.gujarati=Lohit Gujarati ++serif.plain.hindi=Lohit Hindi ++serif.plain.malayalam=Lohit Malayalam ++serif.plain.oriya=Lohit Oriya ++serif.plain.punjabi=Lohit Punjabi ++serif.plain.tamil=Lohit Tamil ++serif.plain.telugu=Lohit Telugu ++serif.plain.sinhala=LKLUG ++ ++serif.bold.latin-1=DejaVu Serif Bold ++serif.bold.japanese-x0208=Sazanami Mincho ++serif.bold.korean=Baekmuk Batang ++serif.bold.chinese-big5=AR PL ZenKai Uni ++serif.bold.chinese-gb18030=AR PL ZenKai Uni ++serif.bold.bengali=Lohit Bengali ++serif.bold.gujarati=Lohit Gujarati ++serif.bold.hindi=Lohit Hindi ++serif.bold.malayalam=Lohit Malayalam ++serif.bold.oriya=Lohit Oriya ++serif.bold.punjabi=Lohit Punjabi ++serif.bold.tamil=Lohit Tamil ++serif.bold.telugu=Lohit Telugu ++serif.bold.sinhala=LKLUG ++ ++serif.italic.latin-1=DejaVu Serif Oblique ++serif.italic.japanese-x0208=Sazanami Mincho ++serif.italic.korean=Baekmuk Batang ++serif.italic.chinese-big5=AR PL ZenKai Uni ++serif.italic.chinese-gb18030=AR PL ZenKai Uni ++serif.italic.bengali=Lohit Bengali ++serif.italic.gujarati=Lohit Gujarati ++serif.italic.hindi=Lohit Hindi ++serif.italic.malayalam=Lohit Malayalam ++serif.italic.oriya=Lohit Oriya ++serif.italic.punjabi=Lohit Punjabi ++serif.italic.tamil=Lohit Tamil ++serif.italic.telugu=Lohit Telugu ++serif.italic.sinhala=LKLUG ++ ++serif.bolditalic.latin-1=DejaVu Serif Bold Oblique ++serif.bolditalic.japanese-x0208=Sazanami Mincho ++serif.bolditalic.korean=Baekmuk Batang ++serif.bolditalic.chinese-big5=AR PL ZenKai Uni ++serif.bolditalic.chinese-gb18030=AR PL ZenKai Uni ++serif.bolditalic.bengali=Lohit Bengali ++serif.bolditalic.gujarati=Lohit Gujarati ++serif.bolditalic.hindi=Lohit Hindi ++serif.bolditalic.malayalam=Lohit Malayalam ++serif.bolditalic.oriya=Lohit Oriya ++serif.bolditalic.punjabi=Lohit Punjabi ++serif.bolditalic.tamil=Lohit Tamil ++serif.bolditalic.telugu=Lohit Telugu ++serif.bolditalic.sinhala=LKLUG ++ ++monospaced.plain.latin-1=DejaVu Sans Mono ++monospaced.plain.japanese-x0208=Sazanami Gothic ++monospaced.plain.korean=Baekmuk Gulim ++monospaced.plain.chinese-big5=AR PL ShanHeiSun Uni From ahughes at redhat.com Wed Aug 25 09:16:01 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Wed, 25 Aug 2010 17:16:01 +0100 Subject: [1.7 & 1.8 BRANCH APPROVAL] Font and PaX patches In-Reply-To: <4C753F3C.6040803@redhat.com> References: <20100813123514.GT10867@rivendell.middle-earth.co.uk> <4C753F3C.6040803@redhat.com> Message-ID: <20100825161601.GJ26213@rivendell.middle-earth.co.uk> On 18:05 Wed 25 Aug , Pavel Tisnovsky wrote: > Dr Andrew John Hughes wrote: > > I'd like to backport the following fixes to 1.7 & 1.8: > > > > changeset: 2076:3fd44a9bb9a3 > > user: Andrew John Hughes > > date: Wed Aug 11 21:04:10 2010 +0100 > > summary: G244901: Skip test_gamma on hardened (PaX-enabled) kernels > > http://icedtea.classpath.org/hg/icedtea6/rev/cb463b94b82d > > > > changeset: 2077:be9c0d303dfc > > user: Andrew John Hughes > > date: Wed Aug 11 21:05:04 2010 +0100 > > summary: G266295: Provide font configuration for Gentoo. > > http://icedtea.classpath.org/hg/icedtea6/rev/fc45c67366b9 > > > > changeset: 2078:8dbe3de24290 > > tag: tip > > user: Andrew John Hughes > > date: Fri Aug 13 00:35:50 2010 +0100 > > summary: Add a font configuration for RHEL6. > > http://icedtea.classpath.org/hg/icedtea6/rev/e8dfb4f0000d > > > > The backports include the NEWS updates in http://icedtea.classpath.org/hg/icedtea6/rev/fe41bee26224. > > > > Ok to push? > > Hi Andrew, > > these patches seems to be good from my perspective. The patch for RHEL6 > fixes font rendering issue on this system. > > Cheers > Pavel T. Thanks. Pushed. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From omajid at icedtea.classpath.org Wed Aug 25 12:50:17 2010 From: omajid at icedtea.classpath.org (omajid at icedtea.classpath.org) Date: Wed, 25 Aug 2010 19:50:17 +0000 Subject: /hg/icedtea6: Backport S6438179: XToolkit.isTraySupported() resu... Message-ID: changeset 1fc64b023005 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1fc64b023005 author: omajid date: Wed Aug 25 15:49:56 2010 -0400 Backport S6438179: XToolkit.isTraySupported() result has nothing to do with the system tray 2010-08-25 Omair Majid Fixes RH569121, S6438179 * NEWS: Update with new backport. * Makefile.am (ICEDTEA_PATCHES): Apply new patch. * patches/openjdk/6438179-systray_check.patch: Backport of S6438179. diffstat: 4 files changed, 102 insertions(+), 1 deletion(-) ChangeLog | 7 ++ Makefile.am | 3 NEWS | 1 patches/openjdk/6438179-systray_check.patch | 92 +++++++++++++++++++++++++++ diffs (134 lines): diff -r 6f017e9047ab -r 1fc64b023005 ChangeLog --- a/ChangeLog Tue Aug 24 23:19:33 2010 +0100 +++ b/ChangeLog Wed Aug 25 15:49:56 2010 -0400 @@ -1,3 +1,10 @@ 2010-08-24 Andrew John Hughes + + Fixes RH569121, S6438179 + * NEWS: Update with new backport. + * Makefile.am (ICEDTEA_PATCHES): Apply new patch. + * patches/openjdk/6438179-systray_check.patch: Backport of S6438179. + 2010-08-24 Andrew John Hughes * Makefile.am: Compile NimbusLookAndFeel as a diff -r 6f017e9047ab -r 1fc64b023005 Makefile.am --- a/Makefile.am Tue Aug 24 23:19:33 2010 +0100 +++ b/Makefile.am Wed Aug 25 15:49:56 2010 -0400 @@ -289,7 +289,8 @@ ICEDTEA_PATCHES = \ patches/ipv4-mapped-ipv6-addresses.patch \ patches/openjdk/6795060-icu_crash.patch \ patches/openjdk/4356282-opentype.patch \ - patches/openjdk/6954424-opentype_javadoc.patch + patches/openjdk/6954424-opentype_javadoc.patch \ + patches/openjdk/6438179-systray_check.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r 6f017e9047ab -r 1fc64b023005 NEWS --- a/NEWS Tue Aug 24 23:19:33 2010 +0100 +++ b/NEWS Wed Aug 25 15:49:56 2010 -0400 @@ -12,6 +12,7 @@ New in release 1.10 (2010-XX-XX): * Backports from OpenJDK6 - S4356282, RH525870: RFE: T2K should be used to rasterize CID/CFF fonts - S6954424: Support OpenType/CFF fonts in JDK 7 + - S6438179: XToolkit.isTraySupported() result has nothing to do with the system tray * Netx - RH601281: Possible NullPointerException in splash screen code diff -r 6f017e9047ab -r 1fc64b023005 patches/openjdk/6438179-systray_check.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6438179-systray_check.patch Wed Aug 25 15:49:56 2010 -0400 @@ -0,0 +1,92 @@ +# HG changeset patch +# User omajid +# Date 1281710168 14400 +# Node ID ac23e40d3880c30085d7a76826145afbe73dd465 +# Parent 636250081b3b27e4b9f536903aa2ddad135f24f2 +6438179: XToolkit.isTraySupported() result has nothing to do with the system tray +Summary: Use System Tray Protocol Specification +Reviewed-by: prr, dcherepanov + +--- openjdk.orig/jdk/src/share/classes/java/awt/SystemTray.java Wed Aug 11 19:06:15 2010 +0100 ++++ openjdk/jdk/src/share/classes/java/awt/SystemTray.java Fri Aug 13 10:36:08 2010 -0400 +@@ -164,16 +164,14 @@ public class SystemTray { + if (GraphicsEnvironment.isHeadless()) { + throw new HeadlessException(); + } ++ ++ initializeSystemTrayIfNeeded(); ++ + if (!isSupported()) { + throw new UnsupportedOperationException( + "The system tray is not supported on the current platform."); + } + +- synchronized (SystemTray.class) { +- if (systemTray == null) { +- systemTray = new SystemTray(); +- } +- } + return systemTray; + } + +@@ -204,7 +202,7 @@ public class SystemTray { + */ + public static boolean isSupported() { + if (Toolkit.getDefaultToolkit() instanceof SunToolkit) { +- ++ initializeSystemTrayIfNeeded(); + return ((SunToolkit)Toolkit.getDefaultToolkit()).isTraySupported(); + + } else if (Toolkit.getDefaultToolkit() instanceof HeadlessToolkit) { +@@ -472,4 +470,12 @@ public class SystemTray { + security.checkPermission(SecurityConstants.ACCESS_SYSTEM_TRAY_PERMISSION); + } + } ++ ++ private static void initializeSystemTrayIfNeeded() { ++ synchronized (SystemTray.class) { ++ if (systemTray == null) { ++ systemTray = new SystemTray(); ++ } ++ } ++ } + } +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java Wed Aug 11 19:06:15 2010 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java Fri Aug 13 10:36:08 2010 -0400 +@@ -55,6 +55,19 @@ public class XSystemTrayPeer implements + return new Dimension(XTrayIconPeer.TRAY_ICON_HEIGHT, XTrayIconPeer.TRAY_ICON_WIDTH); + } + ++ boolean isAvailable() { ++ boolean available = false; ++ XToolkit.awtLock(); ++ try { ++ long selection_owner = XlibWrapper.XGetSelectionOwner(XToolkit.getDisplay(), ++ _NET_SYSTEM_TRAY.getAtom()); ++ available = (selection_owner != XConstants.None); ++ } finally { ++ XToolkit.awtUnlock(); ++ } ++ return available; ++ } ++ + // *********************************************************************** + // *********************************************************************** + +--- openjdk.orig/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Wed Aug 11 19:06:15 2010 +0100 ++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Fri Aug 13 10:36:08 2010 -0400 +@@ -1073,10 +1073,9 @@ public class XToolkit extends UNIXToolki + } + + public boolean isTraySupported() { +- int wm = XWM.getWMID(); +- if (wm == XWM.METACITY_WM || wm == XWM.KDE2_WM) +- { +- return true; ++ XSystemTrayPeer peer = XSystemTrayPeer.getPeerInstance(); ++ if (peer != null) { ++ return peer.isAvailable(); + } + return false; + } + From ptisnovs at icedtea.classpath.org Thu Aug 26 02:03:47 2010 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 26 Aug 2010 09:03:47 +0000 Subject: /hg/icedtea6: Fixed missing JNI link to native function OGLConte... Message-ID: changeset 627620efacc8 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=627620efacc8 author: ptisnovs date: Thu Aug 26 11:03:17 2010 +0200 Fixed missing JNI link to native function OGLContext.getOGLIdString() which causes many OpenGL-related regression tests to fail. diffstat: 3 files changed, 20 insertions(+), 1 deletion(-) ChangeLog | 8 ++++++++ Makefile.am | 3 ++- patches/opengl-jni-fix.patch | 10 ++++++++++ diffs (42 lines): diff -r 1fc64b023005 -r 627620efacc8 ChangeLog --- a/ChangeLog Wed Aug 25 15:49:56 2010 -0400 +++ b/ChangeLog Thu Aug 26 11:03:17 2010 +0200 @@ -1,3 +1,11 @@ 2010-08-25 Omair Majid + + * Makefile.am: + * patches/opengl-jni-fix.patch: + Fixed missing JNI link to native function + OGLContext.getOGLIdString() which causes + many OpenGL-related regression tests to fail. + 2010-08-25 Omair Majid Fixes RH569121, S6438179 diff -r 1fc64b023005 -r 627620efacc8 Makefile.am --- a/Makefile.am Wed Aug 25 15:49:56 2010 -0400 +++ b/Makefile.am Thu Aug 26 11:03:17 2010 +0200 @@ -325,7 +325,8 @@ if ENABLE_XRENDER if ENABLE_XRENDER ICEDTEA_PATCHES += patches/openjdk/6725214-direct3d-01.patch \ patches/openjdk/6307603-xrender-01.patch \ - patches/openjdk/6961633-xrender-02.patch + patches/openjdk/6961633-xrender-02.patch \ + patches/opengl-jni-fix.patch endif if ENABLE_NIO2 diff -r 1fc64b023005 -r 627620efacc8 patches/opengl-jni-fix.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/opengl-jni-fix.patch Thu Aug 26 11:03:17 2010 +0200 @@ -0,0 +1,10 @@ +--- openjdk-old/jdk/make/sun/xawt/mapfile-vers 2010-08-16 16:54:21.000000000 +0200 ++++ openjdk/jdk/make/sun/xawt/mapfile-vers 2010-08-16 16:54:21.000000000 +0200 +@@ -300,6 +300,7 @@ + Java_java_awt_FileDialog_initIDs; + Java_sun_awt_X11_XWindow_initIDs; + ++ Java_sun_java2d_opengl_OGLContext_getOGLIdString; + Java_sun_java2d_opengl_OGLMaskFill_maskFill; + Java_sun_java2d_opengl_OGLRenderer_drawPoly; + Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer; From ptisnovs at icedtea.classpath.org Thu Aug 26 02:14:28 2010 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 26 Aug 2010 09:14:28 +0000 Subject: /hg/release/icedtea6-1.9: Fixed missing JNI link to native funct... Message-ID: changeset adf4b68ed6af in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=adf4b68ed6af author: ptisnovs date: Thu Aug 26 11:14:01 2010 +0200 Fixed missing JNI link to native function OGLContext.getOGLIdString() which causes many OpenGL-related regression tests to fail. diffstat: 3 files changed, 20 insertions(+), 1 deletion(-) ChangeLog | 8 ++++++++ Makefile.am | 3 ++- patches/opengl-jni-fix.patch | 10 ++++++++++ diffs (42 lines): diff -r d59cbcab0fe4 -r adf4b68ed6af ChangeLog --- a/ChangeLog Tue Aug 24 10:11:26 2010 -0400 +++ b/ChangeLog Thu Aug 26 11:14:01 2010 +0200 @@ -1,3 +1,11 @@ 2010-08-24 Omair Majid + + * Makefile.am: + * patches/opengl-jni-fix.patch: + Fixed missing JNI link to native function + OGLContext.getOGLIdString() which causes + many OpenGL-related regression tests to fail. + 2010-08-24 Omair Majid Fixes rhbz601281 diff -r d59cbcab0fe4 -r adf4b68ed6af Makefile.am --- a/Makefile.am Tue Aug 24 10:11:26 2010 -0400 +++ b/Makefile.am Thu Aug 26 11:14:01 2010 +0200 @@ -324,7 +324,8 @@ if ENABLE_XRENDER if ENABLE_XRENDER ICEDTEA_PATCHES += patches/openjdk/6725214-direct3d-01.patch \ patches/openjdk/6307603-xrender-01.patch \ - patches/openjdk/6961633-xrender-02.patch + patches/openjdk/6961633-xrender-02.patch \ + patches/opengl-jni-fix.patch endif if ENABLE_NIO2 diff -r d59cbcab0fe4 -r adf4b68ed6af patches/opengl-jni-fix.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/opengl-jni-fix.patch Thu Aug 26 11:14:01 2010 +0200 @@ -0,0 +1,10 @@ +--- openjdk-old/jdk/make/sun/xawt/mapfile-vers 2010-08-16 16:54:21.000000000 +0200 ++++ openjdk/jdk/make/sun/xawt/mapfile-vers 2010-08-16 16:54:21.000000000 +0200 +@@ -300,6 +300,7 @@ + Java_java_awt_FileDialog_initIDs; + Java_sun_awt_X11_XWindow_initIDs; + ++ Java_sun_java2d_opengl_OGLContext_getOGLIdString; + Java_sun_java2d_opengl_OGLMaskFill_maskFill; + Java_sun_java2d_opengl_OGLRenderer_drawPoly; + Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer; From bugzilla-daemon at icedtea.classpath.org Thu Aug 26 08:20:51 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Aug 2010 15:20:51 +0000 Subject: [Bug 532] New: Eclipse 3.7 M1 crashes as it is starting up Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=532 Summary: Eclipse 3.7 M1 crashes as it is starting up Product: IcedTea Version: unspecified Platform: 64-bit OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: thedude_10160 at hotmail.com I was just loading Eclipse 3.7 M1 and it crashed. Luckily I ran it from the terminal because it crashes once in a while [hence why it's still a milestone release :)]. I got this output as it crashed: # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007fd16f8d047e, pid=8855, tid=140538343175952 # # JRE version: 6.0_18-b18 # Java VM: OpenJDK 64-Bit Server VM (14.0-b16 mixed mode linux-amd64 ) # Derivative: IcedTea6 1.8.1 # Distribution: Custom build (Fri Aug 20 13:23:56 UTC 2010) # Problematic frame: # C [libgobject-2.0.so.0+0x2e47e] g_type_check_instance_is_a+0xbe # # An error report file with more information is saved as: # /home/steven/.bin/eclipse/hs_err_pid8855.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # I have a massive log file (hs_err_pid8855.log as per above), but I don't know how to attach it and bugzilla won't let me paste it in because it is too long. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Aug 26 08:21:59 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Aug 2010 15:21:59 +0000 Subject: [Bug 532] Eclipse 3.7 M1 crashes as it is starting up Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=532 ------- Comment #1 from thedude_10160 at hotmail.com 2010-08-26 15:21 ------- Created an attachment (id=403) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=403&action=view) Error log -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Thu Aug 26 08:23:20 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Aug 2010 15:23:20 +0000 Subject: [Bug 532] Eclipse 3.7 M1 crashes as it is starting up Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=532 ------- Comment #2 from thedude_10160 at hotmail.com 2010-08-26 15:23 ------- Edit: I found a way to attached it :) Happy hunting through the log file if you are brave. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From doko at ubuntu.com Thu Aug 26 09:31:35 2010 From: doko at ubuntu.com (Matthias Klose) Date: Thu, 26 Aug 2010 18:31:35 +0200 Subject: [patch, visualvm] fix installation into DESTDIR, remove unused macro Message-ID: <4C7696E7.6030700@ubuntu.com> fix installation into DESTDIR, remove unused macro. The netbeans binary is not needed, saves some megabytes to install. Matthias -------------- next part -------------- A non-text attachment was scrubbed... Name: vvm.diff Type: text/x-diff Size: 3581 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100826/663985e2/vvm.diff From doko at icedtea.classpath.org Thu Aug 26 09:33:58 2010 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Thu, 26 Aug 2010 16:33:58 +0000 Subject: /hg/visualvm: Fix installation into DESTDIR, remove unused VV_FI... Message-ID: changeset 1ecd7fe24740 in /hg/visualvm details: http://icedtea.classpath.org/hg/visualvm?cmd=changeset;node=1ecd7fe24740 author: doko at ubuntu.com date: Thu Aug 26 18:25:49 2010 +0200 Fix installation into DESTDIR, remove unused VV_FIND_NETBEANS (the netbeans binary is not needed for the build). 2010-08-26 Matthias Klose * Makefile.am (install-exec-local): Honor DESTDIR. * acinclude.a4: Remove VV_FIND_NETBEANS check. * configure.ac: Don't call VV_FIND_NETBEANS. diffstat: 4 files changed, 20 insertions(+), 47 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 28 ++++++++++++++-------------- acinclude.m4 | 32 -------------------------------- configure.ac | 1 - diffs (107 lines): diff -r 7562d9776311 -r 1ecd7fe24740 ChangeLog --- a/ChangeLog Wed Jun 23 00:39:07 2010 +0100 +++ b/ChangeLog Thu Aug 26 18:25:49 2010 +0200 @@ -1,3 +1,9 @@ 2010-06-23 Andrew John Hughes + + * Makefile.am (install-exec-local): Honor DESTDIR. + * acinclude.a4: Remove VV_FIND_NETBEANS check. + * configure.ac: Don't call VV_FIND_NETBEANS. + 2010-06-23 Andrew John Hughes * Makefile.am: Install visualvm.desktop diff -r 7562d9776311 -r 1ecd7fe24740 Makefile.am --- a/Makefile.am Wed Jun 23 00:39:07 2010 +0100 +++ b/Makefile.am Thu Aug 26 18:25:49 2010 +0200 @@ -143,21 +143,21 @@ clean-visualvm: rm -f stamps/visualvm.stamp install-exec-local: - mkdir -p $(bindir) - mkdir -p $(libdir)/visualvm/etc - mkdir -p $(libdir)/visualvm/visualvm - mkdir -p $(datadir) + mkdir -p $(DESTDIR)$(bindir) + mkdir -p $(DESTDIR)$(libdir)/visualvm/etc + mkdir -p $(DESTDIR)$(libdir)/visualvm/visualvm + mkdir -p $(DESTDIR)$(datadir) sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \ visualvm/launcher/visualvm >> \ - $(bindir)/jvisualvm - chmod a+x $(bindir)/jvisualvm - cp visualvm/launcher/visualvm.conf $(libdir)/visualvm/etc - echo visualvm >> $(libdir)/visualvm/etc/visualvm.clusters - echo profiler3 >> $(libdir)/visualvm/etc/visualvm.clusters - cp -r visualvm/build/cluster/* $(libdir)/visualvm/visualvm - cp -r netbeans/nbbuild/netbeans_visualvm/$(NB_PLATFORM) $(libdir)/visualvm - cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 $(libdir)/visualvm - cp visualvm.desktop $(datadir) + $(DESTDIR)$(bindir)/jvisualvm + chmod a+x $(DESTDIR)$(bindir)/jvisualvm + cp visualvm/launcher/visualvm.conf $(DESTDIR)$(libdir)/visualvm/etc + echo visualvm >> $(DESTDIR)$(libdir)/visualvm/etc/visualvm.clusters + echo profiler >> $(DESTDIR)$(libdir)/visualvm/etc/visualvm.clusters + cp -r visualvm/build/cluster/* $(DESTDIR)$(libdir)/visualvm/visualvm + cp -r netbeans/nbbuild/netbeans_visualvm/platform $(DESTDIR)$(libdir)/visualvm + cp -r netbeans/nbbuild/netbeans_visualvm/profiler $(DESTDIR)$(libdir)/visualvm + cp visualvm.desktop $(DESTDIR)$(datadir) download-netbeans-profiler: stamps/download-netbeans-profiler.stamp @@ -169,4 +169,4 @@ extract-visualvm: stamps/extract-visualv nbplatform: stamps/nbplatform.stamp -visualvm: stamps/visualvm.stamp \ No newline at end of file +visualvm: stamps/visualvm.stamp diff -r 7562d9776311 -r 1ecd7fe24740 acinclude.m4 --- a/acinclude.m4 Wed Jun 23 00:39:07 2010 +0100 +++ b/acinclude.m4 Thu Aug 26 18:25:49 2010 +0200 @@ -1,35 +1,3 @@ AC_DEFUN([VV_FIND_NETBEANS], -AC_DEFUN([VV_FIND_NETBEANS], -[ - AC_MSG_CHECKING([if the location of NetBeans is specified]) - AC_ARG_WITH([netbeans], - [AS_HELP_STRING(--with-netbeans,specify location of netbeans)], - [ - if test "x${withval}" = "xyes"; then - NETBEANS=no - else - NETBEANS="${withval}" - fi - ], - [ - NETBEANS=no - ]) - AC_MSG_RESULT(${NETBEANS}) - if ! test -f "${NETBEANS}"; then - if test "x${NETBEANS}" = "xno"; then - NETBEANS= - else - AC_PATH_PROG(NETBEANS, "${NETBEANS}") - fi - fi - if test -z "${NETBEANS}"; then - AC_PATH_PROG(NETBEANS, "netbeans") - fi - if test -z "${NETBEANS}"; then - AC_MSG_ERROR("NetBeans was not found.") - fi - AC_SUBST(NETBEANS) -]) - AC_DEFUN([VV_WITH_NETBEANS_PROFILER_ZIP], [ AC_MSG_CHECKING(for a NetBeans profiler zip) diff -r 7562d9776311 -r 1ecd7fe24740 configure.ac --- a/configure.ac Wed Jun 23 00:39:07 2010 +0100 +++ b/configure.ac Thu Aug 26 18:25:49 2010 +0200 @@ -40,6 +40,5 @@ VV_SET_ARCH_SETTINGS VV_SET_ARCH_SETTINGS VV_WITH_NETBEANS_PROFILER_ZIP VV_WITH_VISUALVM_ZIP -VV_FIND_NETBEANS AC_OUTPUT From doko at icedtea.classpath.org Thu Aug 26 09:50:20 2010 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Thu, 26 Aug 2010 16:50:20 +0000 Subject: /hg/visualvm: Makefile.am (install-exec-local): Revert accidenti... Message-ID: changeset b1df771a3be3 in /hg/visualvm details: http://icedtea.classpath.org/hg/visualvm?cmd=changeset;node=b1df771a3be3 author: doko at ubuntu.com date: Thu Aug 26 18:50:04 2010 +0200 Makefile.am (install-exec-local): Revert accidential v1.3 change. diffstat: 1 file changed, 3 insertions(+), 3 deletions(-) Makefile.am | 6 +++--- diffs (17 lines): diff -r 1ecd7fe24740 -r b1df771a3be3 Makefile.am --- a/Makefile.am Thu Aug 26 18:25:49 2010 +0200 +++ b/Makefile.am Thu Aug 26 18:50:04 2010 +0200 @@ -153,10 +153,10 @@ install-exec-local: chmod a+x $(DESTDIR)$(bindir)/jvisualvm cp visualvm/launcher/visualvm.conf $(DESTDIR)$(libdir)/visualvm/etc echo visualvm >> $(DESTDIR)$(libdir)/visualvm/etc/visualvm.clusters - echo profiler >> $(DESTDIR)$(libdir)/visualvm/etc/visualvm.clusters + echo profiler3 >> $(DESTDIR)$(libdir)/visualvm/etc/visualvm.clusters cp -r visualvm/build/cluster/* $(DESTDIR)$(libdir)/visualvm/visualvm - cp -r netbeans/nbbuild/netbeans_visualvm/platform $(DESTDIR)$(libdir)/visualvm - cp -r netbeans/nbbuild/netbeans_visualvm/profiler $(DESTDIR)$(libdir)/visualvm + cp -r netbeans/nbbuild/netbeans_visualvm/$(NB_PLATFORM) $(DESTDIR)$(libdir)/visualvm + cp -r netbeans/nbbuild/netbeans_visualvm/profiler3 $(DESTDIR)$(libdir)/visualvm cp visualvm.desktop $(DESTDIR)$(datadir) download-netbeans-profiler: stamps/download-netbeans-profiler.stamp From bugzilla-daemon at icedtea.classpath.org Thu Aug 26 11:43:02 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 26 Aug 2010 18:43:02 +0000 Subject: [Bug 532] Eclipse 3.7 M1 crashes as it is starting up Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=532 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Platform|64-bit |x86_64 Resolution| |INVALID Version|unspecified |6-1.8 ------- Comment #3 from gnu_andrew at member.fsf.org 2010-08-26 18:42 ------- This crash occurs in glib and is triggered from Eclipse code. I suggest you file this bug with the Eclipse team as it doesn't appear to be an OpenJDK bug. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Aug 27 01:55:20 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Aug 2010 08:55:20 +0000 Subject: [Bug 533] New: compilation of icedtea-6-1.8.1 fails on test_gamma Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=533 Summary: compilation of icedtea-6-1.8.1 fails on test_gamma Product: IcedTea Version: 6-1.8.1 Platform: x86 URL: http://bugs.gentoo.org/show_bug.cgi?id=332959 OS/Version: Linux Status: NEW Severity: major Priority: P2 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: follettoonip at gmail.com compilation of specified icedtea source release fails on test_gamma. compilation log and hotspot log to follow I'm using: gcc-4.4.3, glibc-2.11.2-r0 binutils-2.20.1-r1 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Aug 27 01:56:23 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Aug 2010 08:56:23 +0000 Subject: [Bug 533] compilation of icedtea-6-1.8.1 fails on test_gamma Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=533 ------- Comment #1 from follettoonip at gmail.com 2010-08-27 08:56 ------- Created an attachment (id=404) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=404&action=view) build.log and hs_error files -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Aug 27 08:00:21 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Aug 2010 15:00:21 +0000 Subject: [Bug 365] IntelliJ IDEA crashes due to SIGSEGV in libjvm.so+0x4760e6 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=365 ------- Comment #10 from sites at keesvanbochove.nl 2010-08-27 15:00 ------- The strange thing is that this bug seems to be even cross-JDK. The latest Oracle/Sun JDK gave a similar error: # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0x00007fdca9d23972, pid=2633, tid=1075890512 # # JRE version: 6.0_20-b02 # Java VM: Java HotSpot(TM) 64-Bit Server VM (16.3-b01 mixed mode linux-amd64 ) # Problematic frame: # V [libjvm.so+0x698972] We experience this with running multiple Grails applications in a Tomcat, both Tomcat 6 and 7. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Fri Aug 27 09:51:14 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 27 Aug 2010 16:51:14 +0000 Subject: [Bug 365] IntelliJ IDEA crashes due to SIGSEGV in libjvm.so+0x4760e6 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=365 ------- Comment #11 from gnu_andrew at member.fsf.org 2010-08-27 16:51 ------- That's not really cross-JDK, given the same HotSpot code should be being used by both IcedTea and the proprietary Oracle binaries. What is interesting is that it persists into hs16 which suggests the bug may still exist in IcedTea, which is now on hs17. Your original post was for hs11. What we really need is a way of replicating this failure. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From dbhole at icedtea.classpath.org Fri Aug 27 11:02:03 2010 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Fri, 27 Aug 2010 18:02:03 +0000 Subject: /hg/icedtea6: Fix rhbz#560193 Message-ID: changeset ead30a628023 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ead30a628023 author: Deepak Bhole date: Fri Aug 27 13:59:35 2010 -0400 Fix rhbz#560193 Process nested jars in applet code only if size > 0 bytes. diffstat: 3 files changed, 15 insertions(+), 1 deletion(-) ChangeLog | 7 +++++++ netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 7 +++++++ plugin/icedteanp/IcedTeaNPPlugin.cc | 2 +- diffs (47 lines): diff -r 627620efacc8 -r ead30a628023 ChangeLog --- a/ChangeLog Thu Aug 26 11:03:17 2010 +0200 +++ b/ChangeLog Fri Aug 27 13:59:35 2010 -0400 @@ -1,3 +1,10 @@ 2010-08-16 Pavel Tisnovsky + + Fixes rhbz#560193 + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java + (activateJars): Process nested jar only if size > 0 bytes. + * plugin/icedteanp/IcedTeaNPPlugin.cc: Fixed file name in header. + 2010-08-16 Pavel Tisnovsky * Makefile.am: diff -r 627620efacc8 -r ead30a628023 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Aug 26 11:03:17 2010 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Aug 27 13:59:35 2010 -0400 @@ -638,13 +638,20 @@ public class JNLPClassLoader extends URL byte[] bytes = new byte[1024]; int read = is.read(bytes); + int fileSize = read; while (read > 0) { extractedJar.write(bytes, 0, read); read = is.read(bytes); + fileSize += read; } is.close(); extractedJar.close(); + + // 0 byte file? skip + if (fileSize <= 0) { + continue; + } JarSigner signer = new JarSigner(); signer.verifyJar(extractedJarLocation); diff -r 627620efacc8 -r ead30a628023 plugin/icedteanp/IcedTeaNPPlugin.cc --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Aug 26 11:03:17 2010 +0200 +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Aug 27 13:59:35 2010 -0400 @@ -1,4 +1,4 @@ -/* IcedTeaPlugin.cc -- web browser plugin to execute Java applets +/* IcedTeaNPPlugin.cc -- web browser plugin to execute Java applets Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. Copyright (C) 2009, 2010 Red Hat From dbhole at icedtea.classpath.org Fri Aug 27 11:52:28 2010 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Fri, 27 Aug 2010 18:52:28 +0000 Subject: /hg/release/icedtea6-1.8: Fix rhbz#560193 Message-ID: changeset 73442a614b23 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=73442a614b23 author: Deepak Bhole date: Fri Aug 27 14:50:02 2010 -0400 Fix rhbz#560193 Process nested jars in applet code only if size > 0 bytes. diffstat: 3 files changed, 16 insertions(+) ChangeLog | 7 +++++++ NEWS | 2 ++ netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 7 +++++++ diffs (50 lines): diff -r 01d87c70057a -r 73442a614b23 ChangeLog --- a/ChangeLog Wed Aug 25 17:13:03 2010 +0100 +++ b/ChangeLog Fri Aug 27 14:50:02 2010 -0400 @@ -1,3 +1,10 @@ 2010-07-30 Andrew John Hughes + + Fixes rhbz#560193 + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java + (activateJars): Process nested jar only if size > 0 bytes. + * NEWS: Updated. + 2010-07-30 Andrew John Hughes * Makefile.am: Add patch below. diff -r 01d87c70057a -r 73442a614b23 NEWS --- a/NEWS Wed Aug 25 17:13:03 2010 +0100 +++ b/NEWS Fri Aug 27 14:50:02 2010 -0400 @@ -9,6 +9,8 @@ New in release 1.8.2 (XXXX-XX-XX): - Run programs that inherit main(String[]) in their main-class - Run JNLP files that use 1.6 as the spec version - RH601281: Possible NullPointerException in splash screen code +* Plugin + - RH560193: Fix ziperror when applet jar contained another 0-byte jar New in release 1.8.1 (2010-07-28): diff -r 01d87c70057a -r 73442a614b23 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Aug 25 17:13:03 2010 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Aug 27 14:50:02 2010 -0400 @@ -638,13 +638,20 @@ public class JNLPClassLoader extends URL byte[] bytes = new byte[1024]; int read = is.read(bytes); + int fileSize = read; while (read > 0) { extractedJar.write(bytes, 0, read); read = is.read(bytes); + fileSize += read; } is.close(); extractedJar.close(); + + // 0 byte file? skip + if (fileSize <= 0) { + continue; + } JarSigner signer = new JarSigner(); signer.verifyJar(extractedJarLocation); From dbhole at icedtea.classpath.org Fri Aug 27 11:53:07 2010 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Fri, 27 Aug 2010 18:53:07 +0000 Subject: /hg/release/icedtea6-1.7: Fix rhbz#560193 Message-ID: changeset e508d944ca9d in /hg/release/icedtea6-1.7 details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=e508d944ca9d author: Deepak Bhole date: Fri Aug 27 14:46:25 2010 -0400 Fix rhbz#560193 Process nested jars in applet code only if size > 0 bytes. diffstat: 3 files changed, 16 insertions(+) ChangeLog | 7 +++++++ NEWS | 2 ++ rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 7 +++++++ diffs (50 lines): diff -r c18673769bc8 -r e508d944ca9d ChangeLog --- a/ChangeLog Wed Aug 25 17:11:27 2010 +0100 +++ b/ChangeLog Fri Aug 27 14:46:25 2010 -0400 @@ -1,3 +1,10 @@ 2010-07-30 Andrew John Hughes + + Fixes rhbz#560193 + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java + (activateJars): Process nested jar only if size > 0 bytes. + * NEWS: Updated. + 2010-07-30 Andrew John Hughes * Makefile.am: Add patch below. diff -r c18673769bc8 -r e508d944ca9d NEWS --- a/NEWS Wed Aug 25 17:11:27 2010 +0100 +++ b/NEWS Fri Aug 27 14:46:25 2010 -0400 @@ -9,6 +9,8 @@ New in release 1.7.5 (XXXX-XX-XX): - Run programs that inherit main(String[]) in their main-class - Work with JNLP files that use spec version 1.6 - RH601281: Possible NullPointerException in splash screen code +* Plugin + - RH560193: Fix ziperror when applet jar contained another 0-byte jar New in release 1.7.4 (2010-07-28): diff -r c18673769bc8 -r e508d944ca9d rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Aug 25 17:11:27 2010 +0100 +++ b/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Aug 27 14:46:25 2010 -0400 @@ -639,13 +639,20 @@ public class JNLPClassLoader extends URL byte[] bytes = new byte[1024]; int read = is.read(bytes); + int fileSize = read; while (read > 0) { extractedJar.write(bytes, 0, read); read = is.read(bytes); + fileSize += read; } is.close(); extractedJar.close(); + + // 0 byte file? skip + if (fileSize <= 0) { + continue; + } JarSigner signer = new JarSigner(); signer.verifyJar(extractedJarLocation); From dbhole at icedtea.classpath.org Fri Aug 27 11:53:48 2010 From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org) Date: Fri, 27 Aug 2010 18:53:48 +0000 Subject: /hg/release/icedtea6-1.9: Fix rhbz#560193 Message-ID: changeset 490708229ca2 in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=490708229ca2 author: Deepak Bhole date: Fri Aug 27 14:50:02 2010 -0400 Fix rhbz#560193 Process nested jars in applet code only if size > 0 bytes. diffstat: 3 files changed, 16 insertions(+) ChangeLog | 7 +++++++ NEWS | 2 ++ netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 7 +++++++ diffs (53 lines): diff -r adf4b68ed6af -r 490708229ca2 ChangeLog --- a/ChangeLog Thu Aug 26 11:14:01 2010 +0200 +++ b/ChangeLog Fri Aug 27 14:50:02 2010 -0400 @@ -164,6 +164,13 @@ 2010-08-02 Andrew John Hughes + + Fixes rhbz#560193 + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java + (activateJars): Process nested jar only if size > 0 bytes. + * NEWS: Updated. 2010-07-30 Andrew John Hughes diff -r adf4b68ed6af -r 490708229ca2 NEWS --- a/NEWS Thu Aug 26 11:14:01 2010 +0200 +++ b/NEWS Fri Aug 27 14:50:02 2010 -0400 @@ -722,6 +722,8 @@ New in release 1.9 (2010-XX-XX): - Run programs that inherit main(String[]) in their main-class - Run JNLP files that use spec version 1.6 - RH601281: Possible NullPointerException in splash screen code +* Plugin + - RH560193: Fix ziperror when applet jar contained another 0-byte jar New in release 1.8.1 (2010-07-28): diff -r adf4b68ed6af -r 490708229ca2 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Aug 26 11:14:01 2010 +0200 +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Aug 27 14:50:02 2010 -0400 @@ -638,13 +638,20 @@ public class JNLPClassLoader extends URL byte[] bytes = new byte[1024]; int read = is.read(bytes); + int fileSize = read; while (read > 0) { extractedJar.write(bytes, 0, read); read = is.read(bytes); + fileSize += read; } is.close(); extractedJar.close(); + + // 0 byte file? skip + if (fileSize <= 0) { + continue; + } JarSigner signer = new JarSigner(); signer.verifyJar(extractedJarLocation); From ahughes at redhat.com Fri Aug 27 12:23:07 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 27 Aug 2010 20:23:07 +0100 Subject: /hg/icedtea6: Fix rhbz#560193 In-Reply-To: References: Message-ID: <20100827192307.GB6429@bree.middle-earth.co.uk> On 18:02 Fri 27 Aug , dbhole at icedtea.classpath.org wrote: > changeset ead30a628023 in /hg/icedtea6 > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ead30a628023 > author: Deepak Bhole > date: Fri Aug 27 13:59:35 2010 -0400 > > Fix rhbz#560193 > > Process nested jars in applet code only if size > 0 bytes. > > > diffstat: > > 3 files changed, 15 insertions(+), 1 deletion(-) > ChangeLog | 7 +++++++ > netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 7 +++++++ > plugin/icedteanp/IcedTeaNPPlugin.cc | 2 +- > > diffs (47 lines): > > diff -r 627620efacc8 -r ead30a628023 ChangeLog > --- a/ChangeLog Thu Aug 26 11:03:17 2010 +0200 > +++ b/ChangeLog Fri Aug 27 13:59:35 2010 -0400 > @@ -1,3 +1,10 @@ 2010-08-16 Pavel Tisnovsky +2010-08-27 Deepak Bhole > + > + Fixes rhbz#560193 > + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > + (activateJars): Process nested jar only if size > 0 bytes. > + * plugin/icedteanp/IcedTeaNPPlugin.cc: Fixed file name in header. > + > 2010-08-16 Pavel Tisnovsky > > * Makefile.am: > diff -r 627620efacc8 -r ead30a628023 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Aug 26 11:03:17 2010 +0200 > +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Aug 27 13:59:35 2010 -0400 > @@ -638,13 +638,20 @@ public class JNLPClassLoader extends URL > > byte[] bytes = new byte[1024]; > int read = is.read(bytes); > + int fileSize = read; > while (read > 0) { > extractedJar.write(bytes, 0, read); > read = is.read(bytes); > + fileSize += read; > } > > is.close(); > extractedJar.close(); > + > + // 0 byte file? skip > + if (fileSize <= 0) { > + continue; > + } > > JarSigner signer = new JarSigner(); > signer.verifyJar(extractedJarLocation); > diff -r 627620efacc8 -r ead30a628023 plugin/icedteanp/IcedTeaNPPlugin.cc > --- a/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Aug 26 11:03:17 2010 +0200 > +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Aug 27 13:59:35 2010 -0400 > @@ -1,4 +1,4 @@ > -/* IcedTeaPlugin.cc -- web browser plugin to execute Java applets > +/* IcedTeaNPPlugin.cc -- web browser plugin to execute Java applets > Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. > Copyright (C) 2009, 2010 Red Hat > This patch looks good, but please run patches past another developer before pushing to release branches. It's good to have a quick sanity check on stuff we're going to be shipping to users. Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From dbhole at redhat.com Fri Aug 27 12:32:00 2010 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 27 Aug 2010 15:32:00 -0400 Subject: RFC: Patch to fix rhbz# 560193 Message-ID: <20100827193200.GA17402@redhat.com> Hi, I hastily (and mistakenly) committed this patch to the branches before posting it here. Attaching it now. If there are any objections, I will back out the changes. ChangeLog: 2010-08-27 Deepak Bhole Fixes rhbz#560193 * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (activateJars): Process nested jar only if size > 0 bytes. Cheers, Deepak -------------- next part -------------- A non-text attachment was scrubbed... Name: rhbz560193.patch Type: text/x-patch Size: 1288 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100827/1053dd65/rhbz560193.patch From dbhole at redhat.com Fri Aug 27 12:33:18 2010 From: dbhole at redhat.com (Deepak Bhole) Date: Fri, 27 Aug 2010 15:33:18 -0400 Subject: RFC: Patch to fix rhbz# 560193 In-Reply-To: <20100827193200.GA17402@redhat.com> References: <20100827193200.GA17402@redhat.com> Message-ID: <20100827193318.GB17402@redhat.com> * Deepak Bhole [2010-08-27 15:32]: > Hi, > > I hastily (and mistakenly) committed this patch to the branches before > posting it here. Attaching it now. If there are any objections, I will > back out the changes. > Oops.. just saw Andrew's message saying it was clean. Nevermind this RFC :) Deepak > ChangeLog: > > 2010-08-27 Deepak Bhole > > Fixes rhbz#560193 > * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > (activateJars): Process nested jar only if size > 0 bytes. > > > Cheers, > Deepak > diff -r 627620efacc8 -r ead30a628023 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java > --- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Aug 26 11:03:17 2010 +0200 > +++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Aug 27 13:59:35 2010 -0400 > @@ -638,13 +638,20 @@ > > byte[] bytes = new byte[1024]; > int read = is.read(bytes); > + int fileSize = read; > while (read > 0) { > extractedJar.write(bytes, 0, read); > read = is.read(bytes); > + fileSize += read; > } > > is.close(); > extractedJar.close(); > + > + // 0 byte file? skip > + if (fileSize <= 0) { > + continue; > + } > > JarSigner signer = new JarSigner(); > signer.verifyJar(extractedJarLocation); From doko at icedtea.classpath.org Fri Aug 27 14:47:19 2010 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Fri, 27 Aug 2010 21:47:19 +0000 Subject: /hg/icedtea6: Bump cacao version to changeset including build fi... Message-ID: changeset bf50b9b4cfa8 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bf50b9b4cfa8 author: doko at ubuntu.com date: Fri Aug 27 23:46:48 2010 +0200 Bump cacao version to changeset including build fixes for ARM and S390 2010-08-27 Matthias Klose * Makefile.am: Bump cacao version to changeset including build fixes for ARM and S390. * patches/cacao/version-parsing.patch: Remove, applied upstream. diffstat: 3 files changed, 9 insertions(+), 15 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 7 +++---- patches/cacao/version-parsing.patch | 11 ----------- diffs (52 lines): diff -r ead30a628023 -r bf50b9b4cfa8 ChangeLog --- a/ChangeLog Fri Aug 27 13:59:35 2010 -0400 +++ b/ChangeLog Fri Aug 27 23:46:48 2010 +0200 @@ -1,3 +1,9 @@ 2010-08-27 Deepak Bhole + + * Makefile.am: Bump cacao version to changeset including build + fixes for ARM and S390. + * patches/cacao/version-parsing.patch: Remove, applied upstream. + 2010-08-27 Deepak Bhole Fixes rhbz#560193 diff -r ead30a628023 -r bf50b9b4cfa8 Makefile.am --- a/Makefile.am Fri Aug 27 13:59:35 2010 -0400 +++ b/Makefile.am Fri Aug 27 23:46:48 2010 +0200 @@ -5,8 +5,8 @@ OPENJDK_VERSION = b20 OPENJDK_VERSION = b20 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ -CACAO_VERSION = dd4532afd08a -CACAO_SHA256SUM = fc876403aeb46c6c16693cfc75ba0a2e581f7a98ddd02ac7f2bf4fc5c20765b4 +CACAO_VERSION = e321b101a9ee +CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444 CACAO_BASE_URL = http://mips.complang.tuwien.ac.at CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 @@ -307,8 +307,7 @@ ICEDTEA_PATCHES += \ patches/cacao/launcher.patch \ patches/cacao/arm-arch-defines.patch \ patches/cacao/jsig.patch \ - patches/cacao/memory.patch \ - patches/cacao/version-parsing.patch + patches/cacao/memory.patch endif if WITH_CACAO diff -r ead30a628023 -r bf50b9b4cfa8 patches/cacao/version-parsing.patch --- a/patches/cacao/version-parsing.patch Fri Aug 27 13:59:35 2010 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- cacao/cacao/m4/version.m4~ 2010-06-23 16:18:58.000000000 +0100 -+++ cacao/cacao/m4/version.m4 2010-06-24 19:11:36.000000000 +0100 -@@ -29,7 +29,7 @@ - then - major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'` - minor=`echo "$version" | $SED -e 's/^[[0-9]]*\.//' -e 's/\.[[0-9a-z.+]]*$//'` -- micro=`echo "$version" | $SED -e 's/^[[0-9]]*\.[[0-9]]*\.//' -e 's/[[a-z.+]]*$//'` -+ micro=`echo "$version" | $SED -r -e 's/^[[0-9]]*\.[[0-9]]*\.([[0-9]]*).*/\1/'` - extra=`echo "$version" | $SED -e 's/^[[0-9]]*\.[[0-9]]*\.[[0-9]]*//'` - else - major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'` From doko at icedtea.classpath.org Fri Aug 27 14:51:22 2010 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Fri, 27 Aug 2010 21:51:22 +0000 Subject: /hg/release/icedtea6-1.9: Bump cacao version to changeset includ... Message-ID: changeset f24a287fb69d in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=f24a287fb69d author: doko at ubuntu.com date: Fri Aug 27 23:46:48 2010 +0200 Bump cacao version to changeset including build fixes for ARM and S390 2010-08-27 Matthias Klose * Makefile.am: Bump cacao version to changeset including build fixes for ARM and S390. * patches/cacao/version-parsing.patch: Remove, applied upstream. diffstat: 3 files changed, 9 insertions(+), 15 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 7 +++---- patches/cacao/version-parsing.patch | 11 ----------- diffs (55 lines): diff -r 490708229ca2 -r f24a287fb69d ChangeLog --- a/ChangeLog Fri Aug 27 14:50:02 2010 -0400 +++ b/ChangeLog Fri Aug 27 23:46:48 2010 +0200 @@ -164,6 +164,12 @@ 2010-08-02 Andrew John Hughes + + * Makefile.am: Bump cacao version to changeset including build + fixes for ARM and S390. + * patches/cacao/version-parsing.patch: Remove, applied upstream. 2010-08-27 Deepak Bhole diff -r 490708229ca2 -r f24a287fb69d Makefile.am --- a/Makefile.am Fri Aug 27 14:50:02 2010 -0400 +++ b/Makefile.am Fri Aug 27 23:46:48 2010 +0200 @@ -5,8 +5,8 @@ OPENJDK_VERSION = b20 OPENJDK_VERSION = b20 OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ -CACAO_VERSION = dd4532afd08a -CACAO_SHA256SUM = fc876403aeb46c6c16693cfc75ba0a2e581f7a98ddd02ac7f2bf4fc5c20765b4 +CACAO_VERSION = e321b101a9ee +CACAO_SHA256SUM = 46bc5b6212c199dc4a3dbebe6386fe15a8248625a5dffa17115aab394a298444 CACAO_BASE_URL = http://mips.complang.tuwien.ac.at CACAO_URL = $(CACAO_BASE_URL)/hg/cacao/archive/$(CACAO_VERSION).tar.bz2 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 @@ -306,8 +306,7 @@ ICEDTEA_PATCHES += \ patches/cacao/launcher.patch \ patches/cacao/arm-arch-defines.patch \ patches/cacao/jsig.patch \ - patches/cacao/memory.patch \ - patches/cacao/version-parsing.patch + patches/cacao/memory.patch endif if WITH_CACAO diff -r 490708229ca2 -r f24a287fb69d patches/cacao/version-parsing.patch --- a/patches/cacao/version-parsing.patch Fri Aug 27 14:50:02 2010 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- cacao/cacao/m4/version.m4~ 2010-06-23 16:18:58.000000000 +0100 -+++ cacao/cacao/m4/version.m4 2010-06-24 19:11:36.000000000 +0100 -@@ -29,7 +29,7 @@ - then - major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'` - minor=`echo "$version" | $SED -e 's/^[[0-9]]*\.//' -e 's/\.[[0-9a-z.+]]*$//'` -- micro=`echo "$version" | $SED -e 's/^[[0-9]]*\.[[0-9]]*\.//' -e 's/[[a-z.+]]*$//'` -+ micro=`echo "$version" | $SED -r -e 's/^[[0-9]]*\.[[0-9]]*\.([[0-9]]*).*/\1/'` - extra=`echo "$version" | $SED -e 's/^[[0-9]]*\.[[0-9]]*\.[[0-9]]*//'` - else - major=`echo "$version" | $SED -e 's/\.[[0-9a-z.+]]*$//'` From doko at icedtea.classpath.org Fri Aug 27 14:59:31 2010 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Fri, 27 Aug 2010 21:59:31 +0000 Subject: /hg/icedtea6: Fix hotspot build with small SC_ARG_MAX Message-ID: changeset b1cf18e3cb6c in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b1cf18e3cb6c author: doko at ubuntu.com date: Fri Aug 27 23:59:00 2010 +0200 Fix hotspot build with small SC_ARG_MAX 2010-08-27 Matthias Klose * patches/icedtea-too-many-args.diff: Fix build failure with small SC_ARG_MAX. * Makefile.am (ICEDTEA_PATCHES): Apply the above. * patches/ecj/icedtea-hotspot.patch: Update. diffstat: 3 files changed, 16 insertions(+), 8 deletions(-) ChangeLog | 7 +++++++ Makefile.am | 3 ++- patches/ecj/icedtea-hotspot.patch | 14 +++++++------- diffs (52 lines): diff -r bf50b9b4cfa8 -r b1cf18e3cb6c ChangeLog --- a/ChangeLog Fri Aug 27 23:46:48 2010 +0200 +++ b/ChangeLog Fri Aug 27 23:59:00 2010 +0200 @@ -1,3 +1,10 @@ 2010-08-27 Matthias Klose + + * patches/icedtea-too-many-args.diff: Fix build failure with + small SC_ARG_MAX. + * Makefile.am (ICEDTEA_PATCHES): Apply the above. + * patches/ecj/icedtea-hotspot.patch: Update. + 2010-08-27 Matthias Klose * Makefile.am: Bump cacao version to changeset including build diff -r bf50b9b4cfa8 -r b1cf18e3cb6c Makefile.am --- a/Makefile.am Fri Aug 27 23:46:48 2010 +0200 +++ b/Makefile.am Fri Aug 27 23:59:00 2010 +0200 @@ -290,7 +290,8 @@ ICEDTEA_PATCHES = \ patches/openjdk/6795060-icu_crash.patch \ patches/openjdk/4356282-opentype.patch \ patches/openjdk/6954424-opentype_javadoc.patch \ - patches/openjdk/6438179-systray_check.patch + patches/openjdk/6438179-systray_check.patch \ + patches/icedtea-too-many-args.diff if WITH_RHINO ICEDTEA_PATCHES += \ diff -r bf50b9b4cfa8 -r b1cf18e3cb6c patches/ecj/icedtea-hotspot.patch --- a/patches/ecj/icedtea-hotspot.patch Fri Aug 27 23:46:48 2010 +0200 +++ b/patches/ecj/icedtea-hotspot.patch Fri Aug 27 23:59:00 2010 +0200 @@ -1,14 +1,14 @@ diff -Nru openjdk-ecj.orig/hotspot/make/ diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make --- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2010-03-29 21:34:15.000000000 +0100 +++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2010-03-29 21:41:28.000000000 +0100 -@@ -74,8 +74,8 @@ - mkdir -p $(SA_CLASSDIR); \ - fi +@@ -80,8 +80,8 @@ + $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) + $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) -- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1) -- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2) -+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1) -+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2) +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) From andrew at icedtea.classpath.org Fri Aug 27 15:40:06 2010 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Fri, 27 Aug 2010 22:40:06 +0000 Subject: /hg/icedtea6: PR398: hotspot hs16 / 6b17 build failure on sparc Message-ID: changeset 133ae13dda61 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=133ae13dda61 author: Andrew John Hughes date: Fri Aug 27 23:39:58 2010 +0100 PR398: hotspot hs16 / 6b17 build failure on sparc 2010-08-27 Andrew John Hughes PR398, S6951319: * Makefile.am: Add new patch. * patches/openjdk/6951319-sparc_build_fixes.patch: Backport of 6951319 to fix build issues on GNU/Linux+SPARC. * patches/systemtap.patch: Rerolled against 6951319. * NEWS: Updated. diffstat: 5 files changed, 672 insertions(+), 16 deletions(-) ChangeLog | 9 Makefile.am | 1 NEWS | 3 patches/openjdk/6951319-sparc_build_fixes.patch | 642 +++++++++++++++++++++++ patches/systemtap.patch | 33 - diffs (truncated from 796 to 500 lines): diff -r b1cf18e3cb6c -r 133ae13dda61 ChangeLog --- a/ChangeLog Fri Aug 27 23:59:00 2010 +0200 +++ b/ChangeLog Fri Aug 27 23:39:58 2010 +0100 @@ -1,3 +1,12 @@ 2010-08-27 Matthias Klose + + PR398, S6951319: + * Makefile.am: Add new patch. + * patches/openjdk/6951319-sparc_build_fixes.patch: + Backport of 6951319 to fix build issues on GNU/Linux+SPARC. + * patches/systemtap.patch: Rerolled against 6951319. + * NEWS: Updated. + 2010-08-27 Matthias Klose * patches/icedtea-too-many-args.diff: Fix build failure with diff -r b1cf18e3cb6c -r 133ae13dda61 Makefile.am --- a/Makefile.am Fri Aug 27 23:59:00 2010 +0200 +++ b/Makefile.am Fri Aug 27 23:39:58 2010 +0100 @@ -291,6 +291,7 @@ ICEDTEA_PATCHES = \ patches/openjdk/4356282-opentype.patch \ patches/openjdk/6954424-opentype_javadoc.patch \ patches/openjdk/6438179-systray_check.patch \ + patches/openjdk/6951319-sparc_build_fixes.patch \ patches/icedtea-too-many-args.diff if WITH_RHINO diff -r b1cf18e3cb6c -r 133ae13dda61 NEWS --- a/NEWS Fri Aug 27 23:59:00 2010 +0200 +++ b/NEWS Fri Aug 27 23:39:58 2010 +0100 @@ -13,7 +13,8 @@ New in release 1.10 (2010-XX-XX): - S4356282, RH525870: RFE: T2K should be used to rasterize CID/CFF fonts - S6954424: Support OpenType/CFF fonts in JDK 7 - S6438179: XToolkit.isTraySupported() result has nothing to do with the system tray -* Netx + - S6951319: enable solaris builds using Sun Studio 12 update 1 (fixes PR398) +* NetX - RH601281: Possible NullPointerException in splash screen code New in release 1.9 (2010-XX-XX): diff -r b1cf18e3cb6c -r 133ae13dda61 patches/openjdk/6951319-sparc_build_fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6951319-sparc_build_fixes.patch Fri Aug 27 23:39:58 2010 +0100 @@ -0,0 +1,642 @@ +# HG changeset patch +# User jcoomes +# Date 1282936351 -3600 +# Node ID 379b95785a1faacbe5261b7517159718e139e57b +# Parent 13f94cc872531ff5b81d1551edf7145f73864c74 +6951319: enable solaris builds using Sun Studio 12 update 1 +Reviewed-by: kamg, ysr, dholmes, johnc + +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/amd64.make +--- openjdk.orig/hotspot/make/solaris/makefiles/amd64.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/amd64.make Fri Aug 27 20:12:31 2010 +0100 +@@ -33,14 +33,8 @@ + # + ifeq ("${Platform_compiler}", "sparcWorks") + +-# Temporary until C++ compiler is fixed +- +-# _lwp_create_interpose must have a frame +-OPT_CFLAGS/os_solaris_x86_64.o = -xO1 +- + # Temporary until SS10 C++ compiler is fixed + OPT_CFLAGS/generateOptoStub.o = -xO2 +-OPT_CFLAGS/thread.o = -xO2 + + else + +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/fastdebug.make +--- openjdk.orig/hotspot/make/solaris/makefiles/fastdebug.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/fastdebug.make Fri Aug 27 20:12:31 2010 +0100 +@@ -36,15 +36,15 @@ + ifeq ("${Platform_compiler}", "sparcWorks") + OPT_CFLAGS/SLOWER = -xO2 + +-# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876) + ifeq ($(COMPILER_REV_NUMERIC), 509) +- # To avoid jvm98 crash +- OPT_CFLAGS/instanceKlass.o = $(OPT_CFLAGS/SLOWER) +- # Not clear this workaround could be skipped in some cases. +- OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) +- OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) +- OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) +-endif ++# To avoid jvm98 crash ++OPT_CFLAGS/instanceKlass.o = $(OPT_CFLAGS/SLOWER) ++endif # COMPILER_NUMERIC_REV == 509 ++ ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++# dtrace cannot handle tail call optimization (6672627, 6693876) ++OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) ++endif # COMPILER_NUMERIC_REV >= 509 + + ifeq ($(COMPILER_REV_NUMERIC), 505) + # CC 5.5 has bug 4908364 with -xO4 (Fixed in 5.6) +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/i486.make +--- openjdk.orig/hotspot/make/solaris/makefiles/i486.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/i486.make Fri Aug 27 20:12:31 2010 +0100 +@@ -33,25 +33,6 @@ + # Special case flags for compilers and compiler versions on i486. + # + ifeq ("${Platform_compiler}", "sparcWorks") +- +-# _lwp_create_interpose must have a frame +-OPT_CFLAGS/os_solaris_x86.o = -xO1 +-else +- +-ifeq ("${Platform_compiler}", "gcc") +-# gcc +-# _lwp_create_interpose must have a frame +-OPT_CFLAGS/os_solaris_x86.o = -fno-omit-frame-pointer +-# +-else +-# error +-_JUNK2_ := $(shell echo >&2 \ +- "*** ERROR: this compiler is not yet supported by this code base!") +- @exit 1 +-endif +-endif +- +-ifeq ("${Platform_compiler}", "sparcWorks") + # ILD is gone as of SS11 (5.8), not supported in SS10 (5.7) + ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \< 507), 1) + # +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/launcher.make +--- openjdk.orig/hotspot/make/solaris/makefiles/launcher.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/launcher.make Fri Aug 27 20:12:31 2010 +0100 +@@ -80,15 +80,12 @@ + } > $@ + + $(LAUNCHER): $(LAUNCHER.o) $(LIBJVM) $(LAUNCHER_MAPFILE) ++ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) ++ @echo Linking launcher... ++ $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK) + $(QUIETLY) \ +- case "$(CFLAGS_BROWSE)" in \ +- -sbfast|-xsbfast) \ +- ;; \ +- *) \ +- echo Linking launcher...; \ +- $(LINK_LAUNCHER/PRE_HOOK) \ +- $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(LAUNCHER.o) $(LIBS_LAUNCHER); \ +- $(LINK_LAUNCHER/POST_HOOK) \ +- [ -f $(LAUNCHER_G) ] || { ln -s $@ $(LAUNCHER_G); }; \ +- ;; \ +- esac ++ $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(LAUNCHER.o) $(LIBS_LAUNCHER) ++ $(QUIETLY) $(LINK_LAUNCHER/POST_HOOK) ++ [ -f $(LAUNCHER_G) ] || ln -s $@ $(LAUNCHER_G) ++endif # filter -sbfast -xsbfast ++ +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/optimized.make +--- openjdk.orig/hotspot/make/solaris/makefiles/optimized.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/optimized.make Fri Aug 27 20:12:31 2010 +0100 +@@ -32,13 +32,10 @@ + # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files) + ifeq ("${Platform_compiler}", "sparcWorks") + +-# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876) +-ifeq ($(COMPILER_REV_NUMERIC),509) +- # Not clear this workaround could be skipped in some cases. +- OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) -g +- OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) -g +- OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) -g +-endif ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++# dtrace cannot handle tail call optimization (6672627, 6693876) ++OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) ++endif # COMPILER_NUMERIC_REV >= 509 + + # Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12) + ifeq ($(COMPILER_REV_NUMERIC),508) +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/product.make +--- openjdk.orig/hotspot/make/solaris/makefiles/product.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/product.make Fri Aug 27 20:12:31 2010 +0100 +@@ -40,13 +40,10 @@ + # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files) + ifeq ("${Platform_compiler}", "sparcWorks") + +-# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876) +-ifeq ($(COMPILER_REV_NUMERIC),509) +- # Not clear this workaround could be skipped in some cases. +- OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) -g +- OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) -g +- OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) -g +-endif ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++# dtrace cannot handle tail call optimization (6672627, 6693876) ++OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) ++endif # COMPILER_NUMERIC_REV >= 509 + + # Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12) + ifeq ($(COMPILER_REV_NUMERIC),508) +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/sparcWorks.make +--- openjdk.orig/hotspot/make/solaris/makefiles/sparcWorks.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/sparcWorks.make Fri Aug 27 20:12:31 2010 +0100 +@@ -48,27 +48,33 @@ + # Pick which compiler is validated + ifeq ($(JRE_RELEASE_VER),1.6.0) + # Validated compiler for JDK6 is SS11 (5.8) +- VALIDATED_COMPILER_REV := 5.8 +- VALIDATED_C_COMPILER_REV := 5.8 ++ VALIDATED_COMPILER_REVS := 5.8 ++ VALIDATED_C_COMPILER_REVS := 5.8 + else +- # Validated compiler for JDK7 is SS12 (5.9) +- VALIDATED_COMPILER_REV := 5.9 +- VALIDATED_C_COMPILER_REV := 5.9 ++ # Validated compilers for JDK7 are SS12 (5.9) or SS12 update 1 (5.10) ++ VALIDATED_COMPILER_REVS := 5.9 5.10 ++ VALIDATED_C_COMPILER_REVS := 5.9 5.10 + endif + +-# Warning messages about not using the above validated version +-ENFORCE_COMPILER_REV${ENFORCE_COMPILER_REV} := ${VALIDATED_COMPILER_REV} +-ifneq (${COMPILER_REV},${ENFORCE_COMPILER_REV}) +-dummy_target_to_enforce_compiler_rev:=\ +-$(shell echo >&2 WARNING: You are using CC version ${COMPILER_REV} \ +-and should be using version ${ENFORCE_COMPILER_REV}. Set ENFORCE_COMPILER_REV=${COMPILER_REV} to avoid this warning.) ++# Warning messages about not using the above validated versions ++ENFORCE_COMPILER_REV${ENFORCE_COMPILER_REV} := $(strip ${VALIDATED_COMPILER_REVS}) ++ifeq ($(filter ${ENFORCE_COMPILER_REV},${COMPILER_REV}),) ++PRINTABLE_CC_REVS := $(subst $(shell echo ' '), or ,${ENFORCE_COMPILER_REV}) ++dummy_var_to_enforce_compiler_rev := $(shell \ ++ echo >&2 WARNING: You are using CC version ${COMPILER_REV} and \ ++ should be using version ${PRINTABLE_CC_REVS}.; \ ++ echo >&2 Set ENFORCE_COMPILER_REV=${COMPILER_REV} to avoid this \ ++ warning.) + endif + +-ENFORCE_C_COMPILER_REV${ENFORCE_C_COMPILER_REV} := ${VALIDATED_C_COMPILER_REV} +-ifneq (${C_COMPILER_REV},${ENFORCE_C_COMPILER_REV}) +-dummy_target_to_enforce_c_compiler_rev:=\ +-$(shell echo >&2 WARNING: You are using cc version ${C_COMPILER_REV} \ +-and should be using version ${ENFORCE_C_COMPILER_REV}. Set ENFORCE_C_COMPILER_REV=${C_COMPILER_REV} to avoid this warning.) ++ENFORCE_C_COMPILER_REV${ENFORCE_C_COMPILER_REV} := $(strip ${VALIDATED_C_COMPILER_REVS}) ++ifeq ($(filter ${ENFORCE_C_COMPILER_REV},${C_COMPILER_REV}),) ++PRINTABLE_C_REVS := $(subst $(shell echo ' '), or ,${ENFORCE_C_COMPILER_REV}) ++dummy_var_to_enforce_c_compiler_rev := $(shell \ ++ echo >&2 WARNING: You are using cc version ${C_COMPILER_REV} and \ ++ should be using version ${PRINTABLE_C_REVS}.; \ ++ echo >&2 Set ENFORCE_C_COMPILER_REV=${C_COMPILER_REV} to avoid this \ ++ warning.) + endif + + COMPILER_REV_NUMERIC := $(shell echo $(COMPILER_REV) | awk -F. '{ print $$1 * 100 + $$2 }') +@@ -139,6 +145,13 @@ + OPT_CFLAGS/O2=-xO2 + OPT_CFLAGS/NOOPT=-xO1 + ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++ifeq ($(Platform_arch), x86) ++OPT_CFLAGS/NO_TAIL_CALL_OPT = -Wu,-O~yz ++OPT_CCFLAGS/NO_TAIL_CALL_OPT = -Qoption ube -O~yz ++endif # Platform_arch == x86 ++endif # COMPILER_REV_NUMERIC >= 509 ++ + ################################################# + # Begin current (>=5.6) Forte compiler options # + ################################################# +@@ -181,10 +194,7 @@ + + ifeq ("${Platform_arch_model}", "x86_32") + +-OPT_CFLAGS=-xtarget=pentium $(EXTRA_OPT_CFLAGS) +- +-# UBE (CC 5.5) has bug 4923569 with -xO4 +-OPT_CFLAGS+=-xO3 ++OPT_CFLAGS=-xtarget=pentium -xO4 $(EXTRA_OPT_CFLAGS) + + endif # 32bit x86 + +@@ -461,7 +471,7 @@ + # The -g0 setting allows the C++ frontend to inline, which is a big win. + + # Special global options for SS12 +-ifeq ($(COMPILER_REV_NUMERIC),509) ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) + # There appears to be multiple issues with the new Dwarf2 debug format, so + # we tell the compiler to use the older 'stabs' debug format all the time. + # Note that this needs to be used in optimized compiles too to be 100%. +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/vm.make +--- openjdk.orig/hotspot/make/solaris/makefiles/vm.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/vm.make Fri Aug 27 20:12:31 2010 +0100 +@@ -174,19 +174,16 @@ + endif + # making the library: + $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) +- $(QUIETLY) \ +- case "$(CFLAGS_BROWSE)" in \ +- -sbfast|-xsbfast) \ +- ;; \ +- *) \ +- echo Linking vm...; \ +- $(LINK_LIB.CC/PRE_HOOK) \ +- $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ +- $(LINK_LIB.CC/POST_HOOK) \ +- rm -f $@.1; ln -s $@ $@.1; \ +- [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ +- ;; \ +- esac ++ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) ++ @echo Linking vm... ++ $(QUIETLY) $(LINK_LIB.CC/PRE_HOOK) ++ $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM) ++ $(QUIETLY) $(LINK_LIB.CC/POST_HOOK) ++ $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1 ++ $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G) ++ $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1 ++endif # filter -sbfast -xsbfast ++ + + DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) + +diff -r 13f94cc87253 -r 379b95785a1f src/cpu/sparc/vm/assembler_sparc.hpp +--- openjdk.orig/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp Fri Aug 27 20:12:31 2010 +0100 +@@ -2239,7 +2239,7 @@ + AddressLiteral constant_oop_address(jobject obj); // find_index + inline void set_oop (jobject obj, Register d); // uses allocate_oop_address + inline void set_oop_constant (jobject obj, Register d); // uses constant_oop_address +- inline void set_oop (AddressLiteral& obj_addr, Register d); // same as load_address ++ inline void set_oop (const AddressLiteral& obj_addr, Register d); // same as load_address + + void set_narrow_oop( jobject obj, Register d ); + +diff -r 13f94cc87253 -r 379b95785a1f src/cpu/sparc/vm/assembler_sparc.inline.hpp +--- openjdk.orig/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Fri Aug 27 20:12:31 2010 +0100 +@@ -707,7 +707,7 @@ + } + + +-inline void MacroAssembler::set_oop(AddressLiteral& obj_addr, Register d) { ++inline void MacroAssembler::set_oop(const AddressLiteral& obj_addr, Register d) { + assert(obj_addr.rspec().type() == relocInfo::oop_type, "must be an oop reloc"); + set(obj_addr, d); + } +diff -r 13f94cc87253 -r 379b95785a1f src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp +--- openjdk.orig/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp Fri Aug 27 20:12:31 2010 +0100 +@@ -47,40 +47,56 @@ + // For Sun Studio - implementation is in solaris_x86_[32/64].il. + // For gcc - implementation is just below. + +-extern "C" jint _Atomic_add(jint add_value, volatile jint* dest, int mp); +-extern "C" jint _Atomic_xchg(jint exchange_value, volatile jint* dest); +-extern "C" jint _Atomic_cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value, int mp); +-extern "C" jlong _Atomic_cmpxchg_long(jlong exchange_value, volatile jlong* dest, jlong compare_value, int mp); ++// The lock prefix can be omitted for certain instructions on uniprocessors; to ++// facilitate this, os::is_MP() is passed as an additional argument. 64-bit ++// processors are assumed to be multi-threaded and/or multi-core, so the extra ++// argument is unnecessary. ++#ifndef _LP64 ++#define IS_MP_DECL() , int is_mp ++#define IS_MP_ARG() , (int) os::is_MP() ++#else ++#define IS_MP_DECL() ++#define IS_MP_ARG() ++#endif // _LP64 ++ ++extern "C" { ++ jint _Atomic_add(jint add_value, volatile jint* dest IS_MP_DECL()); ++ jint _Atomic_xchg(jint exchange_value, volatile jint* dest); ++ jint _Atomic_cmpxchg(jint exchange_value, volatile jint* dest, ++ jint compare_value IS_MP_DECL()); ++ jlong _Atomic_cmpxchg_long(jlong exchange_value, volatile jlong* dest, ++ jlong compare_value IS_MP_DECL()); ++} + + inline jint Atomic::add (jint add_value, volatile jint* dest) { +- return _Atomic_add(add_value, dest, (int) os::is_MP()); ++ return _Atomic_add(add_value, dest IS_MP_ARG()); ++} ++ ++inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) { ++ return _Atomic_xchg(exchange_value, dest); + } + + inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value) { +- return _Atomic_cmpxchg(exchange_value, dest, compare_value, (int) os::is_MP()); ++ return _Atomic_cmpxchg(exchange_value, dest, compare_value IS_MP_ARG()); + } + + inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value) { +- return _Atomic_cmpxchg_long(exchange_value, dest, compare_value, (int) os::is_MP()); ++ return _Atomic_cmpxchg_long(exchange_value, dest, compare_value IS_MP_ARG()); + } + + + #ifdef AMD64 + inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; } + inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; } +-extern "C" jlong _Atomic_add_long(jlong add_value, volatile jlong* dest, int mp); ++extern "C" jlong _Atomic_add_long(jlong add_value, volatile jlong* dest); + extern "C" jlong _Atomic_xchg_long(jlong exchange_value, volatile jlong* dest); + + inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) { +- return (intptr_t)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest, (int) os::is_MP()); ++ return (intptr_t)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest); + } + + inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) { +- return (void*)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest, (int) os::is_MP()); +-} +- +-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) { +- return _Atomic_xchg(exchange_value, dest); ++ return (void*)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest); + } + + inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) { +@@ -92,11 +108,11 @@ + } + + inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) { +- return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, (int) os::is_MP()); ++ return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value); + } + + inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value) { +- return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, (int) os::is_MP()); ++ return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value); + } + + inline jlong Atomic::load(volatile jlong* src) { return *src; } +@@ -111,13 +127,6 @@ + return (void*)add((jint)add_value, (volatile jint*)dest); + } + +-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) { +- // We noticed a CC5.5 bug (4894807), so keep calling the stub just to be safe. +- // Will use the inline template version after 4894807 is fixed. +- // return _Atomic_xchg(exchange_value, dest); +- return (*os::atomic_xchg_func)(exchange_value, dest); +-} +- + inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) { + return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest); + } +@@ -179,9 +188,6 @@ + #endif // AMD64 + + inline jint _Atomic_xchg(jint exchange_value, volatile jint* dest) { +- +- // 32bit version originally did nothing!! +- + __asm__ __volatile__ ("xchgl (%2),%0" + : "=r" (exchange_value) + : "0" (exchange_value), "r" (dest) +diff -r 13f94cc87253 -r 379b95785a1f src/os_cpu/solaris_x86/vm/solaris_x86_32.il +--- openjdk.orig/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il Fri Aug 27 20:12:31 2010 +0100 +@@ -50,10 +50,12 @@ + movl 4(%esp), %edx // dest + movl %eax, %ecx + cmpl $0, 8(%esp) // MP test +- je 1f +- lock +-1: xaddl %eax, (%edx) +- addl %ecx, %eax ++ jne 1f ++ xaddl %eax, (%edx) ++ jmp 2f ++1: lock ++ xaddl %eax, (%edx) ++2: addl %ecx, %eax + .end + + // Support for jint Atomic::xchg(jint exchange_value, volatile jint* dest). +@@ -72,9 +74,12 @@ + movl 0(%esp), %ecx // exchange_value + movl 4(%esp), %edx // dest + cmp $0, 12(%esp) // MP test +- je 1f +- lock +-1: cmpxchgl %ecx, (%edx) ++ jne 1f ++ cmpxchgl %ecx, (%edx) ++ jmp 2f ++1: lock ++ cmpxchgl %ecx, (%edx) ++2: + .end + + // Support for jlong Atomic::cmpxchg(jlong exchange_value, +@@ -90,10 +95,12 @@ + movl 8(%esp), %ebx // exchange_value (low) + movl 12(%esp), %ecx // exchange_high (high) + cmp $0, 28(%esp) // MP test +- je 1f +- lock +-1: cmpxchg8b (%edi) +- popl %edi ++ jne 1f ++ cmpxchg8b (%edi) ++ jmp 2f ++1: lock From ahughes at redhat.com Fri Aug 27 15:47:23 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Fri, 27 Aug 2010 23:47:23 +0100 Subject: [BRANCH APPROVAL] /hg/icedtea6: PR398: hotspot hs16 / 6b17 build failure on sparc Message-ID: <20100827224723.GD6429@bree.middle-earth.co.uk> This fixes PR398. Ok for 1.7, 1.8 & 1.9? ----- Forwarded message from andrew at icedtea.classpath.org ----- Date: Fri, 27 Aug 2010 22:40:06 +0000 From: andrew at icedtea.classpath.org To: distro-pkg-dev at openjdk.java.net Subject: /hg/icedtea6: PR398: hotspot hs16 / 6b17 build failure on sparc changeset 133ae13dda61 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=133ae13dda61 author: Andrew John Hughes date: Fri Aug 27 23:39:58 2010 +0100 PR398: hotspot hs16 / 6b17 build failure on sparc 2010-08-27 Andrew John Hughes PR398, S6951319: * Makefile.am: Add new patch. * patches/openjdk/6951319-sparc_build_fixes.patch: Backport of 6951319 to fix build issues on GNU/Linux+SPARC. * patches/systemtap.patch: Rerolled against 6951319. * NEWS: Updated. diffstat: 5 files changed, 672 insertions(+), 16 deletions(-) ChangeLog | 9 Makefile.am | 1 NEWS | 3 patches/openjdk/6951319-sparc_build_fixes.patch | 642 +++++++++++++++++++++++ patches/systemtap.patch | 33 - diffs (truncated from 796 to 500 lines): diff -r b1cf18e3cb6c -r 133ae13dda61 ChangeLog --- a/ChangeLog Fri Aug 27 23:59:00 2010 +0200 +++ b/ChangeLog Fri Aug 27 23:39:58 2010 +0100 @@ -1,3 +1,12 @@ 2010-08-27 Matthias Klose + + PR398, S6951319: + * Makefile.am: Add new patch. + * patches/openjdk/6951319-sparc_build_fixes.patch: + Backport of 6951319 to fix build issues on GNU/Linux+SPARC. + * patches/systemtap.patch: Rerolled against 6951319. + * NEWS: Updated. + 2010-08-27 Matthias Klose * patches/icedtea-too-many-args.diff: Fix build failure with diff -r b1cf18e3cb6c -r 133ae13dda61 Makefile.am --- a/Makefile.am Fri Aug 27 23:59:00 2010 +0200 +++ b/Makefile.am Fri Aug 27 23:39:58 2010 +0100 @@ -291,6 +291,7 @@ ICEDTEA_PATCHES = \ patches/openjdk/4356282-opentype.patch \ patches/openjdk/6954424-opentype_javadoc.patch \ patches/openjdk/6438179-systray_check.patch \ + patches/openjdk/6951319-sparc_build_fixes.patch \ patches/icedtea-too-many-args.diff if WITH_RHINO diff -r b1cf18e3cb6c -r 133ae13dda61 NEWS --- a/NEWS Fri Aug 27 23:59:00 2010 +0200 +++ b/NEWS Fri Aug 27 23:39:58 2010 +0100 @@ -13,7 +13,8 @@ New in release 1.10 (2010-XX-XX): - S4356282, RH525870: RFE: T2K should be used to rasterize CID/CFF fonts - S6954424: Support OpenType/CFF fonts in JDK 7 - S6438179: XToolkit.isTraySupported() result has nothing to do with the system tray -* Netx + - S6951319: enable solaris builds using Sun Studio 12 update 1 (fixes PR398) +* NetX - RH601281: Possible NullPointerException in splash screen code New in release 1.9 (2010-XX-XX): diff -r b1cf18e3cb6c -r 133ae13dda61 patches/openjdk/6951319-sparc_build_fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6951319-sparc_build_fixes.patch Fri Aug 27 23:39:58 2010 +0100 @@ -0,0 +1,642 @@ +# HG changeset patch +# User jcoomes +# Date 1282936351 -3600 +# Node ID 379b95785a1faacbe5261b7517159718e139e57b +# Parent 13f94cc872531ff5b81d1551edf7145f73864c74 +6951319: enable solaris builds using Sun Studio 12 update 1 +Reviewed-by: kamg, ysr, dholmes, johnc + +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/amd64.make +--- openjdk.orig/hotspot/make/solaris/makefiles/amd64.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/amd64.make Fri Aug 27 20:12:31 2010 +0100 +@@ -33,14 +33,8 @@ + # + ifeq ("${Platform_compiler}", "sparcWorks") + +-# Temporary until C++ compiler is fixed +- +-# _lwp_create_interpose must have a frame +-OPT_CFLAGS/os_solaris_x86_64.o = -xO1 +- + # Temporary until SS10 C++ compiler is fixed + OPT_CFLAGS/generateOptoStub.o = -xO2 +-OPT_CFLAGS/thread.o = -xO2 + + else + +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/fastdebug.make +--- openjdk.orig/hotspot/make/solaris/makefiles/fastdebug.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/fastdebug.make Fri Aug 27 20:12:31 2010 +0100 +@@ -36,15 +36,15 @@ + ifeq ("${Platform_compiler}", "sparcWorks") + OPT_CFLAGS/SLOWER = -xO2 + +-# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876) + ifeq ($(COMPILER_REV_NUMERIC), 509) +- # To avoid jvm98 crash +- OPT_CFLAGS/instanceKlass.o = $(OPT_CFLAGS/SLOWER) +- # Not clear this workaround could be skipped in some cases. +- OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) +- OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) +- OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) +-endif ++# To avoid jvm98 crash ++OPT_CFLAGS/instanceKlass.o = $(OPT_CFLAGS/SLOWER) ++endif # COMPILER_NUMERIC_REV == 509 ++ ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++# dtrace cannot handle tail call optimization (6672627, 6693876) ++OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) ++endif # COMPILER_NUMERIC_REV >= 509 + + ifeq ($(COMPILER_REV_NUMERIC), 505) + # CC 5.5 has bug 4908364 with -xO4 (Fixed in 5.6) +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/i486.make +--- openjdk.orig/hotspot/make/solaris/makefiles/i486.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/i486.make Fri Aug 27 20:12:31 2010 +0100 +@@ -33,25 +33,6 @@ + # Special case flags for compilers and compiler versions on i486. + # + ifeq ("${Platform_compiler}", "sparcWorks") +- +-# _lwp_create_interpose must have a frame +-OPT_CFLAGS/os_solaris_x86.o = -xO1 +-else +- +-ifeq ("${Platform_compiler}", "gcc") +-# gcc +-# _lwp_create_interpose must have a frame +-OPT_CFLAGS/os_solaris_x86.o = -fno-omit-frame-pointer +-# +-else +-# error +-_JUNK2_ := $(shell echo >&2 \ +- "*** ERROR: this compiler is not yet supported by this code base!") +- @exit 1 +-endif +-endif +- +-ifeq ("${Platform_compiler}", "sparcWorks") + # ILD is gone as of SS11 (5.8), not supported in SS10 (5.7) + ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \< 507), 1) + # +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/launcher.make +--- openjdk.orig/hotspot/make/solaris/makefiles/launcher.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/launcher.make Fri Aug 27 20:12:31 2010 +0100 +@@ -80,15 +80,12 @@ + } > $@ + + $(LAUNCHER): $(LAUNCHER.o) $(LIBJVM) $(LAUNCHER_MAPFILE) ++ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) ++ @echo Linking launcher... ++ $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK) + $(QUIETLY) \ +- case "$(CFLAGS_BROWSE)" in \ +- -sbfast|-xsbfast) \ +- ;; \ +- *) \ +- echo Linking launcher...; \ +- $(LINK_LAUNCHER/PRE_HOOK) \ +- $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(LAUNCHER.o) $(LIBS_LAUNCHER); \ +- $(LINK_LAUNCHER/POST_HOOK) \ +- [ -f $(LAUNCHER_G) ] || { ln -s $@ $(LAUNCHER_G); }; \ +- ;; \ +- esac ++ $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(LAUNCHER.o) $(LIBS_LAUNCHER) ++ $(QUIETLY) $(LINK_LAUNCHER/POST_HOOK) ++ [ -f $(LAUNCHER_G) ] || ln -s $@ $(LAUNCHER_G) ++endif # filter -sbfast -xsbfast ++ +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/optimized.make +--- openjdk.orig/hotspot/make/solaris/makefiles/optimized.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/optimized.make Fri Aug 27 20:12:31 2010 +0100 +@@ -32,13 +32,10 @@ + # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files) + ifeq ("${Platform_compiler}", "sparcWorks") + +-# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876) +-ifeq ($(COMPILER_REV_NUMERIC),509) +- # Not clear this workaround could be skipped in some cases. +- OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) -g +- OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) -g +- OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) -g +-endif ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++# dtrace cannot handle tail call optimization (6672627, 6693876) ++OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) ++endif # COMPILER_NUMERIC_REV >= 509 + + # Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12) + ifeq ($(COMPILER_REV_NUMERIC),508) +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/product.make +--- openjdk.orig/hotspot/make/solaris/makefiles/product.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/product.make Fri Aug 27 20:12:31 2010 +0100 +@@ -40,13 +40,10 @@ + # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files) + ifeq ("${Platform_compiler}", "sparcWorks") + +-# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876) +-ifeq ($(COMPILER_REV_NUMERIC),509) +- # Not clear this workaround could be skipped in some cases. +- OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) -g +- OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) -g +- OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) -g +-endif ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++# dtrace cannot handle tail call optimization (6672627, 6693876) ++OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) ++endif # COMPILER_NUMERIC_REV >= 509 + + # Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12) + ifeq ($(COMPILER_REV_NUMERIC),508) +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/sparcWorks.make +--- openjdk.orig/hotspot/make/solaris/makefiles/sparcWorks.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/sparcWorks.make Fri Aug 27 20:12:31 2010 +0100 +@@ -48,27 +48,33 @@ + # Pick which compiler is validated + ifeq ($(JRE_RELEASE_VER),1.6.0) + # Validated compiler for JDK6 is SS11 (5.8) +- VALIDATED_COMPILER_REV := 5.8 +- VALIDATED_C_COMPILER_REV := 5.8 ++ VALIDATED_COMPILER_REVS := 5.8 ++ VALIDATED_C_COMPILER_REVS := 5.8 + else +- # Validated compiler for JDK7 is SS12 (5.9) +- VALIDATED_COMPILER_REV := 5.9 +- VALIDATED_C_COMPILER_REV := 5.9 ++ # Validated compilers for JDK7 are SS12 (5.9) or SS12 update 1 (5.10) ++ VALIDATED_COMPILER_REVS := 5.9 5.10 ++ VALIDATED_C_COMPILER_REVS := 5.9 5.10 + endif + +-# Warning messages about not using the above validated version +-ENFORCE_COMPILER_REV${ENFORCE_COMPILER_REV} := ${VALIDATED_COMPILER_REV} +-ifneq (${COMPILER_REV},${ENFORCE_COMPILER_REV}) +-dummy_target_to_enforce_compiler_rev:=\ +-$(shell echo >&2 WARNING: You are using CC version ${COMPILER_REV} \ +-and should be using version ${ENFORCE_COMPILER_REV}. Set ENFORCE_COMPILER_REV=${COMPILER_REV} to avoid this warning.) ++# Warning messages about not using the above validated versions ++ENFORCE_COMPILER_REV${ENFORCE_COMPILER_REV} := $(strip ${VALIDATED_COMPILER_REVS}) ++ifeq ($(filter ${ENFORCE_COMPILER_REV},${COMPILER_REV}),) ++PRINTABLE_CC_REVS := $(subst $(shell echo ' '), or ,${ENFORCE_COMPILER_REV}) ++dummy_var_to_enforce_compiler_rev := $(shell \ ++ echo >&2 WARNING: You are using CC version ${COMPILER_REV} and \ ++ should be using version ${PRINTABLE_CC_REVS}.; \ ++ echo >&2 Set ENFORCE_COMPILER_REV=${COMPILER_REV} to avoid this \ ++ warning.) + endif + +-ENFORCE_C_COMPILER_REV${ENFORCE_C_COMPILER_REV} := ${VALIDATED_C_COMPILER_REV} +-ifneq (${C_COMPILER_REV},${ENFORCE_C_COMPILER_REV}) +-dummy_target_to_enforce_c_compiler_rev:=\ +-$(shell echo >&2 WARNING: You are using cc version ${C_COMPILER_REV} \ +-and should be using version ${ENFORCE_C_COMPILER_REV}. Set ENFORCE_C_COMPILER_REV=${C_COMPILER_REV} to avoid this warning.) ++ENFORCE_C_COMPILER_REV${ENFORCE_C_COMPILER_REV} := $(strip ${VALIDATED_C_COMPILER_REVS}) ++ifeq ($(filter ${ENFORCE_C_COMPILER_REV},${C_COMPILER_REV}),) ++PRINTABLE_C_REVS := $(subst $(shell echo ' '), or ,${ENFORCE_C_COMPILER_REV}) ++dummy_var_to_enforce_c_compiler_rev := $(shell \ ++ echo >&2 WARNING: You are using cc version ${C_COMPILER_REV} and \ ++ should be using version ${PRINTABLE_C_REVS}.; \ ++ echo >&2 Set ENFORCE_C_COMPILER_REV=${C_COMPILER_REV} to avoid this \ ++ warning.) + endif + + COMPILER_REV_NUMERIC := $(shell echo $(COMPILER_REV) | awk -F. '{ print $$1 * 100 + $$2 }') +@@ -139,6 +145,13 @@ + OPT_CFLAGS/O2=-xO2 + OPT_CFLAGS/NOOPT=-xO1 + ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++ifeq ($(Platform_arch), x86) ++OPT_CFLAGS/NO_TAIL_CALL_OPT = -Wu,-O~yz ++OPT_CCFLAGS/NO_TAIL_CALL_OPT = -Qoption ube -O~yz ++endif # Platform_arch == x86 ++endif # COMPILER_REV_NUMERIC >= 509 ++ + ################################################# + # Begin current (>=5.6) Forte compiler options # + ################################################# +@@ -181,10 +194,7 @@ + + ifeq ("${Platform_arch_model}", "x86_32") + +-OPT_CFLAGS=-xtarget=pentium $(EXTRA_OPT_CFLAGS) +- +-# UBE (CC 5.5) has bug 4923569 with -xO4 +-OPT_CFLAGS+=-xO3 ++OPT_CFLAGS=-xtarget=pentium -xO4 $(EXTRA_OPT_CFLAGS) + + endif # 32bit x86 + +@@ -461,7 +471,7 @@ + # The -g0 setting allows the C++ frontend to inline, which is a big win. + + # Special global options for SS12 +-ifeq ($(COMPILER_REV_NUMERIC),509) ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) + # There appears to be multiple issues with the new Dwarf2 debug format, so + # we tell the compiler to use the older 'stabs' debug format all the time. + # Note that this needs to be used in optimized compiles too to be 100%. +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/vm.make +--- openjdk.orig/hotspot/make/solaris/makefiles/vm.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/vm.make Fri Aug 27 20:12:31 2010 +0100 +@@ -174,19 +174,16 @@ + endif + # making the library: + $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) +- $(QUIETLY) \ +- case "$(CFLAGS_BROWSE)" in \ +- -sbfast|-xsbfast) \ +- ;; \ +- *) \ +- echo Linking vm...; \ +- $(LINK_LIB.CC/PRE_HOOK) \ +- $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ +- $(LINK_LIB.CC/POST_HOOK) \ +- rm -f $@.1; ln -s $@ $@.1; \ +- [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ +- ;; \ +- esac ++ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) ++ @echo Linking vm... ++ $(QUIETLY) $(LINK_LIB.CC/PRE_HOOK) ++ $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM) ++ $(QUIETLY) $(LINK_LIB.CC/POST_HOOK) ++ $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1 ++ $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G) ++ $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1 ++endif # filter -sbfast -xsbfast ++ + + DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) + +diff -r 13f94cc87253 -r 379b95785a1f src/cpu/sparc/vm/assembler_sparc.hpp +--- openjdk.orig/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp Fri Aug 27 20:12:31 2010 +0100 +@@ -2239,7 +2239,7 @@ + AddressLiteral constant_oop_address(jobject obj); // find_index + inline void set_oop (jobject obj, Register d); // uses allocate_oop_address + inline void set_oop_constant (jobject obj, Register d); // uses constant_oop_address +- inline void set_oop (AddressLiteral& obj_addr, Register d); // same as load_address ++ inline void set_oop (const AddressLiteral& obj_addr, Register d); // same as load_address + + void set_narrow_oop( jobject obj, Register d ); + +diff -r 13f94cc87253 -r 379b95785a1f src/cpu/sparc/vm/assembler_sparc.inline.hpp +--- openjdk.orig/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Fri Aug 27 20:12:31 2010 +0100 +@@ -707,7 +707,7 @@ + } + + +-inline void MacroAssembler::set_oop(AddressLiteral& obj_addr, Register d) { ++inline void MacroAssembler::set_oop(const AddressLiteral& obj_addr, Register d) { + assert(obj_addr.rspec().type() == relocInfo::oop_type, "must be an oop reloc"); + set(obj_addr, d); + } +diff -r 13f94cc87253 -r 379b95785a1f src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp +--- openjdk.orig/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp Fri Aug 27 20:12:31 2010 +0100 +@@ -47,40 +47,56 @@ + // For Sun Studio - implementation is in solaris_x86_[32/64].il. + // For gcc - implementation is just below. + +-extern "C" jint _Atomic_add(jint add_value, volatile jint* dest, int mp); +-extern "C" jint _Atomic_xchg(jint exchange_value, volatile jint* dest); +-extern "C" jint _Atomic_cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value, int mp); +-extern "C" jlong _Atomic_cmpxchg_long(jlong exchange_value, volatile jlong* dest, jlong compare_value, int mp); ++// The lock prefix can be omitted for certain instructions on uniprocessors; to ++// facilitate this, os::is_MP() is passed as an additional argument. 64-bit ++// processors are assumed to be multi-threaded and/or multi-core, so the extra ++// argument is unnecessary. ++#ifndef _LP64 ++#define IS_MP_DECL() , int is_mp ++#define IS_MP_ARG() , (int) os::is_MP() ++#else ++#define IS_MP_DECL() ++#define IS_MP_ARG() ++#endif // _LP64 ++ ++extern "C" { ++ jint _Atomic_add(jint add_value, volatile jint* dest IS_MP_DECL()); ++ jint _Atomic_xchg(jint exchange_value, volatile jint* dest); ++ jint _Atomic_cmpxchg(jint exchange_value, volatile jint* dest, ++ jint compare_value IS_MP_DECL()); ++ jlong _Atomic_cmpxchg_long(jlong exchange_value, volatile jlong* dest, ++ jlong compare_value IS_MP_DECL()); ++} + + inline jint Atomic::add (jint add_value, volatile jint* dest) { +- return _Atomic_add(add_value, dest, (int) os::is_MP()); ++ return _Atomic_add(add_value, dest IS_MP_ARG()); ++} ++ ++inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) { ++ return _Atomic_xchg(exchange_value, dest); + } + + inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value) { +- return _Atomic_cmpxchg(exchange_value, dest, compare_value, (int) os::is_MP()); ++ return _Atomic_cmpxchg(exchange_value, dest, compare_value IS_MP_ARG()); + } + + inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value) { +- return _Atomic_cmpxchg_long(exchange_value, dest, compare_value, (int) os::is_MP()); ++ return _Atomic_cmpxchg_long(exchange_value, dest, compare_value IS_MP_ARG()); + } + + + #ifdef AMD64 + inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; } + inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; } +-extern "C" jlong _Atomic_add_long(jlong add_value, volatile jlong* dest, int mp); ++extern "C" jlong _Atomic_add_long(jlong add_value, volatile jlong* dest); + extern "C" jlong _Atomic_xchg_long(jlong exchange_value, volatile jlong* dest); + + inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) { +- return (intptr_t)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest, (int) os::is_MP()); ++ return (intptr_t)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest); + } + + inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) { +- return (void*)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest, (int) os::is_MP()); +-} +- +-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) { +- return _Atomic_xchg(exchange_value, dest); ++ return (void*)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest); + } + + inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) { +@@ -92,11 +108,11 @@ + } + + inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) { +- return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, (int) os::is_MP()); ++ return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value); + } + + inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value) { +- return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, (int) os::is_MP()); ++ return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value); + } + + inline jlong Atomic::load(volatile jlong* src) { return *src; } +@@ -111,13 +127,6 @@ + return (void*)add((jint)add_value, (volatile jint*)dest); + } + +-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) { +- // We noticed a CC5.5 bug (4894807), so keep calling the stub just to be safe. +- // Will use the inline template version after 4894807 is fixed. +- // return _Atomic_xchg(exchange_value, dest); +- return (*os::atomic_xchg_func)(exchange_value, dest); +-} +- + inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) { + return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest); + } +@@ -179,9 +188,6 @@ + #endif // AMD64 + + inline jint _Atomic_xchg(jint exchange_value, volatile jint* dest) { +- +- // 32bit version originally did nothing!! +- + __asm__ __volatile__ ("xchgl (%2),%0" + : "=r" (exchange_value) + : "0" (exchange_value), "r" (dest) +diff -r 13f94cc87253 -r 379b95785a1f src/os_cpu/solaris_x86/vm/solaris_x86_32.il +--- openjdk.orig/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il Fri Aug 27 20:12:31 2010 +0100 +@@ -50,10 +50,12 @@ + movl 4(%esp), %edx // dest + movl %eax, %ecx + cmpl $0, 8(%esp) // MP test +- je 1f +- lock +-1: xaddl %eax, (%edx) +- addl %ecx, %eax ++ jne 1f ++ xaddl %eax, (%edx) ++ jmp 2f ++1: lock ++ xaddl %eax, (%edx) ++2: addl %ecx, %eax + .end + + // Support for jint Atomic::xchg(jint exchange_value, volatile jint* dest). +@@ -72,9 +74,12 @@ + movl 0(%esp), %ecx // exchange_value + movl 4(%esp), %edx // dest + cmp $0, 12(%esp) // MP test +- je 1f +- lock +-1: cmpxchgl %ecx, (%edx) ++ jne 1f ++ cmpxchgl %ecx, (%edx) ++ jmp 2f ++1: lock ++ cmpxchgl %ecx, (%edx) ++2: + .end + + // Support for jlong Atomic::cmpxchg(jlong exchange_value, +@@ -90,10 +95,12 @@ + movl 8(%esp), %ebx // exchange_value (low) + movl 12(%esp), %ecx // exchange_high (high) + cmp $0, 28(%esp) // MP test +- je 1f +- lock +-1: cmpxchg8b (%edi) +- popl %edi ++ jne 1f ++ cmpxchg8b (%edi) ++ jmp 2f ++1: lock ----- End forwarded message ----- -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From doko at ubuntu.com Fri Aug 27 15:57:23 2010 From: doko at ubuntu.com (Matthias Klose) Date: Sat, 28 Aug 2010 00:57:23 +0200 Subject: [BRANCH APPROVAL] /hg/icedtea6: PR398: hotspot hs16 / 6b17 build failure on sparc In-Reply-To: <20100827224723.GD6429@bree.middle-earth.co.uk> References: <20100827224723.GD6429@bree.middle-earth.co.uk> Message-ID: <4C7842D3.3000602@ubuntu.com> On 28.08.2010 00:47, Dr Andrew John Hughes wrote: > This fixes PR398. Ok for 1.7, 1.8& 1.9? I only can approve for 1.8, approved. you are release manager for 1.9 yourself, so please make the decision yourself. Matthias From doko at icedtea.classpath.org Sat Aug 28 03:58:52 2010 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Sat, 28 Aug 2010 10:58:52 +0000 Subject: /hg/icedtea6: Add missing file patches/icedtea-too-many-args.patch Message-ID: changeset 17e622c24432 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=17e622c24432 author: doko at ubuntu.com date: Sat Aug 28 12:58:17 2010 +0200 Add missing file patches/icedtea-too-many-args.patch diffstat: 2 files changed, 47 insertions(+), 1 deletion(-) Makefile.am | 2 - patches/icedtea-too-many-args.patch | 46 +++++++++++++++++++++++++++++++++++ diffs (62 lines): diff -r 133ae13dda61 -r 17e622c24432 Makefile.am --- a/Makefile.am Fri Aug 27 23:39:58 2010 +0100 +++ b/Makefile.am Sat Aug 28 12:58:17 2010 +0200 @@ -292,7 +292,7 @@ ICEDTEA_PATCHES = \ patches/openjdk/6954424-opentype_javadoc.patch \ patches/openjdk/6438179-systray_check.patch \ patches/openjdk/6951319-sparc_build_fixes.patch \ - patches/icedtea-too-many-args.diff + patches/icedtea-too-many-args.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r 133ae13dda61 -r 17e622c24432 patches/icedtea-too-many-args.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-too-many-args.patch Sat Aug 28 12:58:17 2010 +0200 @@ -0,0 +1,46 @@ +--- openjdk/hotspot/make/linux/makefiles/sa.make.orig 2010-06-21 23:12:13.000000000 +0200 ++++ openjdk/hotspot/make/linux/makefiles/sa.make 2010-06-28 01:11:27.022322578 +0200 +@@ -45,6 +45,9 @@ + AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) + AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) + ++AGENT_FILES1_LIST := $(TOPDIR)/../agent1.classes.list ++AGENT_FILES2_LIST := $(TOPDIR)/../agent2.classes.list ++ + SA_CLASSDIR = $(GENERATED)/saclasses + + SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)" +@@ -59,7 +62,7 @@ + $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ + fi + +-$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) ++$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) agent_files_preclean + $(QUIETLY) echo "Making $@" + $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ + echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ +@@ -74,8 +77,11 @@ + mkdir -p $(SA_CLASSDIR); \ + fi + +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1) +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2) ++ $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) ++ $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) ++ ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) + + $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer + $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) +@@ -92,6 +98,10 @@ + $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext + $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext + ++agent_files_preclean: ++ rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) ++ + clean: + rm -rf $(SA_CLASSDIR) + rm -rf $(GENERATED)/sa-jdi.jar ++ rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) From doko at icedtea.classpath.org Sat Aug 28 04:00:32 2010 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Sat, 28 Aug 2010 11:00:32 +0000 Subject: /hg/release/icedtea6-1.9: 2 new changesets Message-ID: changeset 84253abe090d in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=84253abe090d author: doko at ubuntu.com date: Sat Aug 28 00:03:59 2010 +0200 Fix hotspot build with small SC_ARG_MAX 2010-08-27 Matthias Klose * patches/icedtea-too-many-args.diff: Fix build failure with small SC_ARG_MAX. * Makefile.am (ICEDTEA_PATCHES): Apply the above. * patches/ecj/icedtea-hotspot.patch: Update. changeset 3714dbfe54a4 in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=3714dbfe54a4 author: doko at ubuntu.com date: Sat Aug 28 12:59:57 2010 +0200 Add missing file patches/icedtea-too-many-args.patch diffstat: 4 files changed, 76 insertions(+), 22 deletions(-) ChangeLog | 35 +++++++++++++++----------- Makefile.am | 3 +- patches/ecj/icedtea-hotspot.patch | 14 +++++----- patches/icedtea-too-many-args.patch | 46 +++++++++++++++++++++++++++++++++++ diffs (144 lines): diff -r f24a287fb69d -r 3714dbfe54a4 ChangeLog --- a/ChangeLog Fri Aug 27 23:46:48 2010 +0200 +++ b/ChangeLog Sat Aug 28 12:59:57 2010 +0200 @@ -1,3 +1,23 @@ 2010-08-26 Pavel Tisnovsky + + * patches/icedtea-too-many-args.diff: Fix build failure with + small SC_ARG_MAX. + * Makefile.am (ICEDTEA_PATCHES): Apply the above. + * patches/ecj/icedtea-hotspot.patch: Update. + +2010-08-27 Matthias Klose + + * Makefile.am: Bump cacao version to changeset including build + fixes for ARM and S390. + * patches/cacao/version-parsing.patch: Remove, applied upstream. + +2010-08-27 Deepak Bhole + + Fixes rhbz#560193 + * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java + (activateJars): Process nested jar only if size > 0 bytes. + * NEWS: Updated. + 2010-08-26 Pavel Tisnovsky * Makefile.am: @@ -15,7 +35,7 @@ 2010-08-24 Omair Majid - * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java + * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java (parse): Removed parsing for unknown tag. 2010-08-09 Deepak Bhole @@ -164,19 +184,6 @@ 2010-08-02 Andrew John Hughes - - * Makefile.am: Bump cacao version to changeset including build - fixes for ARM and S390. - * patches/cacao/version-parsing.patch: Remove, applied upstream. - -2010-08-27 Deepak Bhole - - Fixes rhbz#560193 - * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java - (activateJars): Process nested jar only if size > 0 bytes. - * NEWS: Updated. 2010-07-30 Andrew John Hughes diff -r f24a287fb69d -r 3714dbfe54a4 Makefile.am --- a/Makefile.am Fri Aug 27 23:46:48 2010 +0200 +++ b/Makefile.am Sat Aug 28 12:59:57 2010 +0200 @@ -289,7 +289,8 @@ ICEDTEA_PATCHES = \ patches/fonts-rhel.patch \ patches/fonts-gentoo.patch \ patches/ipv4-mapped-ipv6-addresses.patch \ - patches/openjdk/6795060-icu_crash.patch + patches/openjdk/6795060-icu_crash.patch \ + patches/icedtea-too-many-args.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r f24a287fb69d -r 3714dbfe54a4 patches/ecj/icedtea-hotspot.patch --- a/patches/ecj/icedtea-hotspot.patch Fri Aug 27 23:46:48 2010 +0200 +++ b/patches/ecj/icedtea-hotspot.patch Sat Aug 28 12:59:57 2010 +0200 @@ -1,14 +1,14 @@ diff -Nru openjdk-ecj.orig/hotspot/make/ diff -Nru openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make openjdk-ecj/hotspot/make/linux/makefiles/sa.make --- openjdk-ecj.orig/hotspot/make/linux/makefiles/sa.make 2010-03-29 21:34:15.000000000 +0100 +++ openjdk-ecj/hotspot/make/linux/makefiles/sa.make 2010-03-29 21:41:28.000000000 +0100 -@@ -74,8 +74,8 @@ - mkdir -p $(SA_CLASSDIR); \ - fi +@@ -80,8 +80,8 @@ + $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) + $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) -- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1) -- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2) -+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1) -+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2) +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) diff -r f24a287fb69d -r 3714dbfe54a4 patches/icedtea-too-many-args.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-too-many-args.patch Sat Aug 28 12:59:57 2010 +0200 @@ -0,0 +1,46 @@ +--- openjdk/hotspot/make/linux/makefiles/sa.make.orig 2010-06-21 23:12:13.000000000 +0200 ++++ openjdk/hotspot/make/linux/makefiles/sa.make 2010-06-28 01:11:27.022322578 +0200 +@@ -45,6 +45,9 @@ + AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) + AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) + ++AGENT_FILES1_LIST := $(TOPDIR)/../agent1.classes.list ++AGENT_FILES2_LIST := $(TOPDIR)/../agent2.classes.list ++ + SA_CLASSDIR = $(GENERATED)/saclasses + + SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)" +@@ -59,7 +62,7 @@ + $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ + fi + +-$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) ++$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) agent_files_preclean + $(QUIETLY) echo "Making $@" + $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ + echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ +@@ -74,8 +77,11 @@ + mkdir -p $(SA_CLASSDIR); \ + fi + +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1) +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2) ++ $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) ++ $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) ++ ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -target 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) + + $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer + $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) +@@ -92,6 +98,10 @@ + $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext + $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext + ++agent_files_preclean: ++ rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) ++ + clean: + rm -rf $(SA_CLASSDIR) + rm -rf $(GENERATED)/sa-jdi.jar ++ rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) From doko at icedtea.classpath.org Sat Aug 28 04:11:28 2010 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Sat, 28 Aug 2010 11:11:28 +0000 Subject: /hg/release/icedtea6-1.8: 2010-08-27 Matthias Klose changeset 9aa28151c299 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=9aa28151c299 author: doko at ubuntu.com date: Sat Aug 28 13:10:53 2010 +0200 2010-08-27 Matthias Klose * patches/icedtea-too-many-args.diff: Fix build failure with small SC_ARG_MAX. * Makefile.am (ICEDTEA_PATCHES): Apply the above. * patches/ecj/icedtea-hotspot.patch: Update. diffstat: 4 files changed, 60 insertions(+), 5 deletions(-) ChangeLog | 7 +++++ Makefile.am | 3 +- patches/ecj/icedtea-hotspot.patch | 8 ++--- patches/icedtea-too-many-args.patch | 47 +++++++++++++++++++++++++++++++++++ diffs (96 lines): diff -r 73442a614b23 -r 9aa28151c299 ChangeLog --- a/ChangeLog Fri Aug 27 14:50:02 2010 -0400 +++ b/ChangeLog Sat Aug 28 13:10:53 2010 +0200 @@ -1,3 +1,10 @@ 2010-08-27 Deepak Bhole + + * patches/icedtea-too-many-args.diff: Fix build failure with + small SC_ARG_MAX. + * Makefile.am (ICEDTEA_PATCHES): Apply the above. + * patches/ecj/icedtea-hotspot.patch: Update. + 2010-08-27 Deepak Bhole Fixes rhbz#560193 diff -r 73442a614b23 -r 9aa28151c299 Makefile.am --- a/Makefile.am Fri Aug 27 14:50:02 2010 -0400 +++ b/Makefile.am Sat Aug 28 13:10:53 2010 +0200 @@ -331,7 +331,8 @@ ICEDTEA_PATCHES = \ patches/icedtea-override-redirect-metacity.patch \ patches/openjdk/6678385.patch \ patches/fonts-gentoo.patch \ - patches/fonts-rhel.patch + patches/fonts-rhel.patch \ + patches/icedtea-too-many-args.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r 73442a614b23 -r 9aa28151c299 patches/ecj/icedtea-hotspot.patch --- a/patches/ecj/icedtea-hotspot.patch Fri Aug 27 14:50:02 2010 -0400 +++ b/patches/ecj/icedtea-hotspot.patch Sat Aug 28 13:10:53 2010 +0200 @@ -5,10 +5,10 @@ diff -Nru openjdk-ecj.orig/hotspot/make/ mkdir -p $(SA_CLASSDIR); \ fi -- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1) -- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2) -+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1) -+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2) +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH):$(BOOT_JAVA_HOME)/jre/lib/rt.jar -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) diff -r 73442a614b23 -r 9aa28151c299 patches/icedtea-too-many-args.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-too-many-args.patch Sat Aug 28 13:10:53 2010 +0200 @@ -0,0 +1,47 @@ +diff -ru openjdk_/hotspot/make/linux/makefiles/sa.make openjdk/hotspot/make/linux/makefiles/sa.make +--- openjdk_/hotspot/make/linux/makefiles/sa.make 2010-05-02 22:35:19.000000000 +0200 ++++ openjdk/hotspot/make/linux/makefiles/sa.make 2010-05-02 22:26:12.000000000 +0200 +@@ -45,6 +45,9 @@ + AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) + AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) + ++AGENT_FILES1_LIST := $(TOPDIR)/../agent1.classes.list ++AGENT_FILES2_LIST := $(TOPDIR)/../agent2.classes.list ++ + SA_CLASSDIR = $(GENERATED)/saclasses + + SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)" +@@ -59,7 +62,7 @@ + $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \ + fi + +-$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) ++$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2) agent_files_preclean + $(QUIETLY) echo "Making $@" + $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \ + echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \ +@@ -74,8 +77,11 @@ + mkdir -p $(SA_CLASSDIR); \ + fi + +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES1) +- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) $(AGENT_FILES2) ++ $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST))) ++ $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST))) ++ ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST) ++ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -source 1.4 -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -g -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST) + + $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer + $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES) +@@ -92,6 +98,10 @@ + $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext + $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext + ++agent_files_preclean: ++ rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) ++ + clean: + rm -rf $(SA_CLASSDIR) + rm -rf $(GENERATED)/sa-jdi.jar ++ rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST) From dj at lucasit.com Sat Aug 28 17:55:45 2010 From: dj at lucasit.com (DJ Lucas) Date: Sat, 28 Aug 2010 19:55:45 -0500 Subject: For users of --with-openjdk In-Reply-To: <20100825153429.GH26213@rivendell.middle-earth.co.uk> References: <20100810111600.GF27843@rivendell.middle-earth.co.uk> <4C6234EC.7020809@linuxfromscratch.org> <20100811181112.GL10867@rivendell.middle-earth.co.uk> <4C633B7F.3080101@linuxfromscratch.org> <4C6484B8.6090007@linuxfromscratch.org> <20100813004137.GP10867@rivendell.middle-earth.co.uk> <4C64A128.2010300@linuxfromscratch.org> <20100813195739.GX10867@rivendell.middle-earth.co.uk> <4C66DBB9.4070707@linuxfromscratch.org> <20100825153429.GH26213@rivendell.middle-earth.co.uk> Message-ID: <4C79B011.4020609@lucasit.com> On 08/25/2010 10:34 AM, Dr Andrew John Hughes wrote: > On 13:08 Sat 14 Aug , DJ Lucas wrote: >> On 08/13/2010 02:57 PM, Dr Andrew John Hughes wrote: > I think I found a simpler fix for this. At least, it works when bootstrapping > with both IcedTea6 1.8 and gcj 4.5.1. Basically, instead of trying to build > the whole of javax.swing.plaf.synth, we just build NimbusLookAndFeel which is > the class this is outdated in 1.8: > > http://icedtea.classpath.org/hg/icedtea6/rev/6f017e9047ab > >> Attached patch will have to be moved appropriately for 1.9 branch (if >> accepted) and could be done in the same location for 1.10 in FIND_JAVAC. >> > > These changes will just be in 1.10. I want them to have plenty of soak > time before being used generally. > I was referring only to the name of the patch, as I am planning on doing for 1.9 locally, but it doesn't matter now as you've already put in a smaller (better) fix in both 1.9 and 1.10 (as quoted above) which works great BTW. Sorry I hadn't replied on that yet, haven't had a chance to test with GCJ, but that was already done anyway. > > Pavel has been looking into the Xrender test breakages which also affect > OpenJDK7: > > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009988.html > > So it looks like Oracle made changes without fixing the tests. Pavel now has > a fix which should be committed shortly. > Pavel's fix and additionally creating a populated cacerts file (which Pavel was working on back in May) has reduced the number of failures considerably. On the second fix, I've written a bash script to account for both CADIR and CAFILE. AC check accounts for distros who's certs I know about. ATM that would be RedHat and Debian derivatives, and BLFS, but if you look at the check, it should easily extended. If you all would be interested in a single upstream solution that accounts for both certificates directory and a single bundle file, feel free (attached). I did the check for the files unconditionally, as I wasn't exactly sure how to (properly) do a conditional check based on another (where if --genertate-cacerts should be set yes by another switch). Additionally, the mkcacerts.sh script could be written much differently (and probably better/faster in perl rather than bash/sed/grep but it should in account for both variants from the command line). > On JDK, I don't think there's ever been a 100% pass, and some aren't even > stable tests. So you're looking more for regressions between builds. > > To my knowledge, the HotSpot and langtools suites should all pass (and > take a considerably shorter time to run). > Is there a central place to share and view previous test results, or just search the distro-pkg-dev and openjdk-dev lists? -- DJ Lucas -- This message has been scanned for viruses and dangerous content, and is believed to be clean. -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: icedtea6-1.9-generate_cacerts-1.patch Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100828/1853d6a5/icedtea6-1.9-generate_cacerts-1.patch From doko at icedtea.classpath.org Sun Aug 29 03:49:02 2010 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Sun, 29 Aug 2010 10:49:02 +0000 Subject: /hg/release/icedtea6-1.9: PR398: hotspot hs16 / 6b17 build failu... Message-ID: changeset 4e8cce62cabf in /hg/release/icedtea6-1.9 details: http://icedtea.classpath.org/hg/release/icedtea6-1.9?cmd=changeset;node=4e8cce62cabf author: doko at ubuntu.com date: Sun Aug 29 12:48:15 2010 +0200 PR398: hotspot hs16 / 6b17 build failure on sparc 2010-08-27 Andrew John Hughes PR398, S6951319: * Makefile.am: Add new patch. * patches/openjdk/6951319-sparc_build_fixes.patch: Backport of 6951319 to fix build issues on GNU/Linux+SPARC. * patches/systemtap.patch: Rerolled against 6951319. * NEWS: Updated. diffstat: 5 files changed, 671 insertions(+), 15 deletions(-) ChangeLog | 9 Makefile.am | 1 NEWS | 1 patches/openjdk/6951319-sparc_build_fixes.patch | 642 +++++++++++++++++++++++ patches/systemtap.patch | 33 - diffs (truncated from 794 to 500 lines): diff -r 3714dbfe54a4 -r 4e8cce62cabf ChangeLog --- a/ChangeLog Sat Aug 28 12:59:57 2010 +0200 +++ b/ChangeLog Sun Aug 29 12:48:15 2010 +0200 @@ -1,3 +1,12 @@ 2010-08-27 Matthias Klose + + PR398, S6951319: + * Makefile.am: Add new patch. + * patches/openjdk/6951319-sparc_build_fixes.patch: + Backport of 6951319 to fix build issues on GNU/Linux+SPARC. + * patches/systemtap.patch: Rerolled against 6951319. + * NEWS: Updated. + 2010-08-27 Matthias Klose * patches/icedtea-too-many-args.diff: Fix build failure with diff -r 3714dbfe54a4 -r 4e8cce62cabf Makefile.am --- a/Makefile.am Sat Aug 28 12:59:57 2010 +0200 +++ b/Makefile.am Sun Aug 29 12:48:15 2010 +0200 @@ -290,6 +290,7 @@ ICEDTEA_PATCHES = \ patches/fonts-gentoo.patch \ patches/ipv4-mapped-ipv6-addresses.patch \ patches/openjdk/6795060-icu_crash.patch \ + patches/openjdk/6951319-sparc_build_fixes.patch \ patches/icedtea-too-many-args.patch if WITH_RHINO diff -r 3714dbfe54a4 -r 4e8cce62cabf NEWS --- a/NEWS Sat Aug 28 12:59:57 2010 +0200 +++ b/NEWS Sun Aug 29 12:48:15 2010 +0200 @@ -715,6 +715,7 @@ New in release 1.9 (2010-XX-XX): - PR494: Shark fails to catch Exception using catch (Throwable e) - PR525: Shark made not entrant deopt sigsegv regression after bump to b20 and hs17. - LLVM 2.7 non-product fixes. + - S6951319: enable solaris builds using Sun Studio 12 update 1 (fixes PR398) * NetX - Do not use Look and Feel related methods for setting up security dialogs - Minor fixes to JNLPRandomAccessFile diff -r 3714dbfe54a4 -r 4e8cce62cabf patches/openjdk/6951319-sparc_build_fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/6951319-sparc_build_fixes.patch Sun Aug 29 12:48:15 2010 +0200 @@ -0,0 +1,642 @@ +# HG changeset patch +# User jcoomes +# Date 1282936351 -3600 +# Node ID 379b95785a1faacbe5261b7517159718e139e57b +# Parent 13f94cc872531ff5b81d1551edf7145f73864c74 +6951319: enable solaris builds using Sun Studio 12 update 1 +Reviewed-by: kamg, ysr, dholmes, johnc + +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/amd64.make +--- openjdk.orig/hotspot/make/solaris/makefiles/amd64.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/amd64.make Fri Aug 27 20:12:31 2010 +0100 +@@ -33,14 +33,8 @@ + # + ifeq ("${Platform_compiler}", "sparcWorks") + +-# Temporary until C++ compiler is fixed +- +-# _lwp_create_interpose must have a frame +-OPT_CFLAGS/os_solaris_x86_64.o = -xO1 +- + # Temporary until SS10 C++ compiler is fixed + OPT_CFLAGS/generateOptoStub.o = -xO2 +-OPT_CFLAGS/thread.o = -xO2 + + else + +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/fastdebug.make +--- openjdk.orig/hotspot/make/solaris/makefiles/fastdebug.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/fastdebug.make Fri Aug 27 20:12:31 2010 +0100 +@@ -36,15 +36,15 @@ + ifeq ("${Platform_compiler}", "sparcWorks") + OPT_CFLAGS/SLOWER = -xO2 + +-# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876) + ifeq ($(COMPILER_REV_NUMERIC), 509) +- # To avoid jvm98 crash +- OPT_CFLAGS/instanceKlass.o = $(OPT_CFLAGS/SLOWER) +- # Not clear this workaround could be skipped in some cases. +- OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) +- OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) +- OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) +-endif ++# To avoid jvm98 crash ++OPT_CFLAGS/instanceKlass.o = $(OPT_CFLAGS/SLOWER) ++endif # COMPILER_NUMERIC_REV == 509 ++ ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++# dtrace cannot handle tail call optimization (6672627, 6693876) ++OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) ++endif # COMPILER_NUMERIC_REV >= 509 + + ifeq ($(COMPILER_REV_NUMERIC), 505) + # CC 5.5 has bug 4908364 with -xO4 (Fixed in 5.6) +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/i486.make +--- openjdk.orig/hotspot/make/solaris/makefiles/i486.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/i486.make Fri Aug 27 20:12:31 2010 +0100 +@@ -33,25 +33,6 @@ + # Special case flags for compilers and compiler versions on i486. + # + ifeq ("${Platform_compiler}", "sparcWorks") +- +-# _lwp_create_interpose must have a frame +-OPT_CFLAGS/os_solaris_x86.o = -xO1 +-else +- +-ifeq ("${Platform_compiler}", "gcc") +-# gcc +-# _lwp_create_interpose must have a frame +-OPT_CFLAGS/os_solaris_x86.o = -fno-omit-frame-pointer +-# +-else +-# error +-_JUNK2_ := $(shell echo >&2 \ +- "*** ERROR: this compiler is not yet supported by this code base!") +- @exit 1 +-endif +-endif +- +-ifeq ("${Platform_compiler}", "sparcWorks") + # ILD is gone as of SS11 (5.8), not supported in SS10 (5.7) + ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \< 507), 1) + # +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/launcher.make +--- openjdk.orig/hotspot/make/solaris/makefiles/launcher.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/launcher.make Fri Aug 27 20:12:31 2010 +0100 +@@ -80,15 +80,12 @@ + } > $@ + + $(LAUNCHER): $(LAUNCHER.o) $(LIBJVM) $(LAUNCHER_MAPFILE) ++ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) ++ @echo Linking launcher... ++ $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK) + $(QUIETLY) \ +- case "$(CFLAGS_BROWSE)" in \ +- -sbfast|-xsbfast) \ +- ;; \ +- *) \ +- echo Linking launcher...; \ +- $(LINK_LAUNCHER/PRE_HOOK) \ +- $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(LAUNCHER.o) $(LIBS_LAUNCHER); \ +- $(LINK_LAUNCHER/POST_HOOK) \ +- [ -f $(LAUNCHER_G) ] || { ln -s $@ $(LAUNCHER_G); }; \ +- ;; \ +- esac ++ $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(LAUNCHER.o) $(LIBS_LAUNCHER) ++ $(QUIETLY) $(LINK_LAUNCHER/POST_HOOK) ++ [ -f $(LAUNCHER_G) ] || ln -s $@ $(LAUNCHER_G) ++endif # filter -sbfast -xsbfast ++ +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/optimized.make +--- openjdk.orig/hotspot/make/solaris/makefiles/optimized.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/optimized.make Fri Aug 27 20:12:31 2010 +0100 +@@ -32,13 +32,10 @@ + # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files) + ifeq ("${Platform_compiler}", "sparcWorks") + +-# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876) +-ifeq ($(COMPILER_REV_NUMERIC),509) +- # Not clear this workaround could be skipped in some cases. +- OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) -g +- OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) -g +- OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) -g +-endif ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++# dtrace cannot handle tail call optimization (6672627, 6693876) ++OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) ++endif # COMPILER_NUMERIC_REV >= 509 + + # Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12) + ifeq ($(COMPILER_REV_NUMERIC),508) +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/product.make +--- openjdk.orig/hotspot/make/solaris/makefiles/product.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/product.make Fri Aug 27 20:12:31 2010 +0100 +@@ -40,13 +40,10 @@ + # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files) + ifeq ("${Platform_compiler}", "sparcWorks") + +-# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876) +-ifeq ($(COMPILER_REV_NUMERIC),509) +- # Not clear this workaround could be skipped in some cases. +- OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) -g +- OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) -g +- OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) -g +-endif ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++# dtrace cannot handle tail call optimization (6672627, 6693876) ++OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) ++endif # COMPILER_NUMERIC_REV >= 509 + + # Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12) + ifeq ($(COMPILER_REV_NUMERIC),508) +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/sparcWorks.make +--- openjdk.orig/hotspot/make/solaris/makefiles/sparcWorks.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/sparcWorks.make Fri Aug 27 20:12:31 2010 +0100 +@@ -48,27 +48,33 @@ + # Pick which compiler is validated + ifeq ($(JRE_RELEASE_VER),1.6.0) + # Validated compiler for JDK6 is SS11 (5.8) +- VALIDATED_COMPILER_REV := 5.8 +- VALIDATED_C_COMPILER_REV := 5.8 ++ VALIDATED_COMPILER_REVS := 5.8 ++ VALIDATED_C_COMPILER_REVS := 5.8 + else +- # Validated compiler for JDK7 is SS12 (5.9) +- VALIDATED_COMPILER_REV := 5.9 +- VALIDATED_C_COMPILER_REV := 5.9 ++ # Validated compilers for JDK7 are SS12 (5.9) or SS12 update 1 (5.10) ++ VALIDATED_COMPILER_REVS := 5.9 5.10 ++ VALIDATED_C_COMPILER_REVS := 5.9 5.10 + endif + +-# Warning messages about not using the above validated version +-ENFORCE_COMPILER_REV${ENFORCE_COMPILER_REV} := ${VALIDATED_COMPILER_REV} +-ifneq (${COMPILER_REV},${ENFORCE_COMPILER_REV}) +-dummy_target_to_enforce_compiler_rev:=\ +-$(shell echo >&2 WARNING: You are using CC version ${COMPILER_REV} \ +-and should be using version ${ENFORCE_COMPILER_REV}. Set ENFORCE_COMPILER_REV=${COMPILER_REV} to avoid this warning.) ++# Warning messages about not using the above validated versions ++ENFORCE_COMPILER_REV${ENFORCE_COMPILER_REV} := $(strip ${VALIDATED_COMPILER_REVS}) ++ifeq ($(filter ${ENFORCE_COMPILER_REV},${COMPILER_REV}),) ++PRINTABLE_CC_REVS := $(subst $(shell echo ' '), or ,${ENFORCE_COMPILER_REV}) ++dummy_var_to_enforce_compiler_rev := $(shell \ ++ echo >&2 WARNING: You are using CC version ${COMPILER_REV} and \ ++ should be using version ${PRINTABLE_CC_REVS}.; \ ++ echo >&2 Set ENFORCE_COMPILER_REV=${COMPILER_REV} to avoid this \ ++ warning.) + endif + +-ENFORCE_C_COMPILER_REV${ENFORCE_C_COMPILER_REV} := ${VALIDATED_C_COMPILER_REV} +-ifneq (${C_COMPILER_REV},${ENFORCE_C_COMPILER_REV}) +-dummy_target_to_enforce_c_compiler_rev:=\ +-$(shell echo >&2 WARNING: You are using cc version ${C_COMPILER_REV} \ +-and should be using version ${ENFORCE_C_COMPILER_REV}. Set ENFORCE_C_COMPILER_REV=${C_COMPILER_REV} to avoid this warning.) ++ENFORCE_C_COMPILER_REV${ENFORCE_C_COMPILER_REV} := $(strip ${VALIDATED_C_COMPILER_REVS}) ++ifeq ($(filter ${ENFORCE_C_COMPILER_REV},${C_COMPILER_REV}),) ++PRINTABLE_C_REVS := $(subst $(shell echo ' '), or ,${ENFORCE_C_COMPILER_REV}) ++dummy_var_to_enforce_c_compiler_rev := $(shell \ ++ echo >&2 WARNING: You are using cc version ${C_COMPILER_REV} and \ ++ should be using version ${PRINTABLE_C_REVS}.; \ ++ echo >&2 Set ENFORCE_C_COMPILER_REV=${C_COMPILER_REV} to avoid this \ ++ warning.) + endif + + COMPILER_REV_NUMERIC := $(shell echo $(COMPILER_REV) | awk -F. '{ print $$1 * 100 + $$2 }') +@@ -139,6 +145,13 @@ + OPT_CFLAGS/O2=-xO2 + OPT_CFLAGS/NOOPT=-xO1 + ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++ifeq ($(Platform_arch), x86) ++OPT_CFLAGS/NO_TAIL_CALL_OPT = -Wu,-O~yz ++OPT_CCFLAGS/NO_TAIL_CALL_OPT = -Qoption ube -O~yz ++endif # Platform_arch == x86 ++endif # COMPILER_REV_NUMERIC >= 509 ++ + ################################################# + # Begin current (>=5.6) Forte compiler options # + ################################################# +@@ -181,10 +194,7 @@ + + ifeq ("${Platform_arch_model}", "x86_32") + +-OPT_CFLAGS=-xtarget=pentium $(EXTRA_OPT_CFLAGS) +- +-# UBE (CC 5.5) has bug 4923569 with -xO4 +-OPT_CFLAGS+=-xO3 ++OPT_CFLAGS=-xtarget=pentium -xO4 $(EXTRA_OPT_CFLAGS) + + endif # 32bit x86 + +@@ -461,7 +471,7 @@ + # The -g0 setting allows the C++ frontend to inline, which is a big win. + + # Special global options for SS12 +-ifeq ($(COMPILER_REV_NUMERIC),509) ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) + # There appears to be multiple issues with the new Dwarf2 debug format, so + # we tell the compiler to use the older 'stabs' debug format all the time. + # Note that this needs to be used in optimized compiles too to be 100%. +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/vm.make +--- openjdk.orig/hotspot/make/solaris/makefiles/vm.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/vm.make Fri Aug 27 20:12:31 2010 +0100 +@@ -174,19 +174,16 @@ + endif + # making the library: + $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) +- $(QUIETLY) \ +- case "$(CFLAGS_BROWSE)" in \ +- -sbfast|-xsbfast) \ +- ;; \ +- *) \ +- echo Linking vm...; \ +- $(LINK_LIB.CC/PRE_HOOK) \ +- $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ +- $(LINK_LIB.CC/POST_HOOK) \ +- rm -f $@.1; ln -s $@ $@.1; \ +- [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ +- ;; \ +- esac ++ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) ++ @echo Linking vm... ++ $(QUIETLY) $(LINK_LIB.CC/PRE_HOOK) ++ $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM) ++ $(QUIETLY) $(LINK_LIB.CC/POST_HOOK) ++ $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1 ++ $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G) ++ $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1 ++endif # filter -sbfast -xsbfast ++ + + DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) + +diff -r 13f94cc87253 -r 379b95785a1f src/cpu/sparc/vm/assembler_sparc.hpp +--- openjdk.orig/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp Fri Aug 27 20:12:31 2010 +0100 +@@ -2239,7 +2239,7 @@ + AddressLiteral constant_oop_address(jobject obj); // find_index + inline void set_oop (jobject obj, Register d); // uses allocate_oop_address + inline void set_oop_constant (jobject obj, Register d); // uses constant_oop_address +- inline void set_oop (AddressLiteral& obj_addr, Register d); // same as load_address ++ inline void set_oop (const AddressLiteral& obj_addr, Register d); // same as load_address + + void set_narrow_oop( jobject obj, Register d ); + +diff -r 13f94cc87253 -r 379b95785a1f src/cpu/sparc/vm/assembler_sparc.inline.hpp +--- openjdk.orig/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Fri Aug 27 20:12:31 2010 +0100 +@@ -707,7 +707,7 @@ + } + + +-inline void MacroAssembler::set_oop(AddressLiteral& obj_addr, Register d) { ++inline void MacroAssembler::set_oop(const AddressLiteral& obj_addr, Register d) { + assert(obj_addr.rspec().type() == relocInfo::oop_type, "must be an oop reloc"); + set(obj_addr, d); + } +diff -r 13f94cc87253 -r 379b95785a1f src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp +--- openjdk.orig/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp Fri Aug 27 20:12:31 2010 +0100 +@@ -47,40 +47,56 @@ + // For Sun Studio - implementation is in solaris_x86_[32/64].il. + // For gcc - implementation is just below. + +-extern "C" jint _Atomic_add(jint add_value, volatile jint* dest, int mp); +-extern "C" jint _Atomic_xchg(jint exchange_value, volatile jint* dest); +-extern "C" jint _Atomic_cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value, int mp); +-extern "C" jlong _Atomic_cmpxchg_long(jlong exchange_value, volatile jlong* dest, jlong compare_value, int mp); ++// The lock prefix can be omitted for certain instructions on uniprocessors; to ++// facilitate this, os::is_MP() is passed as an additional argument. 64-bit ++// processors are assumed to be multi-threaded and/or multi-core, so the extra ++// argument is unnecessary. ++#ifndef _LP64 ++#define IS_MP_DECL() , int is_mp ++#define IS_MP_ARG() , (int) os::is_MP() ++#else ++#define IS_MP_DECL() ++#define IS_MP_ARG() ++#endif // _LP64 ++ ++extern "C" { ++ jint _Atomic_add(jint add_value, volatile jint* dest IS_MP_DECL()); ++ jint _Atomic_xchg(jint exchange_value, volatile jint* dest); ++ jint _Atomic_cmpxchg(jint exchange_value, volatile jint* dest, ++ jint compare_value IS_MP_DECL()); ++ jlong _Atomic_cmpxchg_long(jlong exchange_value, volatile jlong* dest, ++ jlong compare_value IS_MP_DECL()); ++} + + inline jint Atomic::add (jint add_value, volatile jint* dest) { +- return _Atomic_add(add_value, dest, (int) os::is_MP()); ++ return _Atomic_add(add_value, dest IS_MP_ARG()); ++} ++ ++inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) { ++ return _Atomic_xchg(exchange_value, dest); + } + + inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value) { +- return _Atomic_cmpxchg(exchange_value, dest, compare_value, (int) os::is_MP()); ++ return _Atomic_cmpxchg(exchange_value, dest, compare_value IS_MP_ARG()); + } + + inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value) { +- return _Atomic_cmpxchg_long(exchange_value, dest, compare_value, (int) os::is_MP()); ++ return _Atomic_cmpxchg_long(exchange_value, dest, compare_value IS_MP_ARG()); + } + + + #ifdef AMD64 + inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; } + inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; } +-extern "C" jlong _Atomic_add_long(jlong add_value, volatile jlong* dest, int mp); ++extern "C" jlong _Atomic_add_long(jlong add_value, volatile jlong* dest); + extern "C" jlong _Atomic_xchg_long(jlong exchange_value, volatile jlong* dest); + + inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) { +- return (intptr_t)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest, (int) os::is_MP()); ++ return (intptr_t)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest); + } + + inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) { +- return (void*)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest, (int) os::is_MP()); +-} +- +-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) { +- return _Atomic_xchg(exchange_value, dest); ++ return (void*)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest); + } + + inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) { +@@ -92,11 +108,11 @@ + } + + inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) { +- return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, (int) os::is_MP()); ++ return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value); + } + + inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value) { +- return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, (int) os::is_MP()); ++ return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value); + } + + inline jlong Atomic::load(volatile jlong* src) { return *src; } +@@ -111,13 +127,6 @@ + return (void*)add((jint)add_value, (volatile jint*)dest); + } + +-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) { +- // We noticed a CC5.5 bug (4894807), so keep calling the stub just to be safe. +- // Will use the inline template version after 4894807 is fixed. +- // return _Atomic_xchg(exchange_value, dest); +- return (*os::atomic_xchg_func)(exchange_value, dest); +-} +- + inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) { + return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest); + } +@@ -179,9 +188,6 @@ + #endif // AMD64 + + inline jint _Atomic_xchg(jint exchange_value, volatile jint* dest) { +- +- // 32bit version originally did nothing!! +- + __asm__ __volatile__ ("xchgl (%2),%0" + : "=r" (exchange_value) + : "0" (exchange_value), "r" (dest) +diff -r 13f94cc87253 -r 379b95785a1f src/os_cpu/solaris_x86/vm/solaris_x86_32.il +--- openjdk.orig/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il Fri Aug 27 20:12:31 2010 +0100 +@@ -50,10 +50,12 @@ + movl 4(%esp), %edx // dest + movl %eax, %ecx + cmpl $0, 8(%esp) // MP test +- je 1f +- lock +-1: xaddl %eax, (%edx) +- addl %ecx, %eax ++ jne 1f ++ xaddl %eax, (%edx) ++ jmp 2f ++1: lock ++ xaddl %eax, (%edx) ++2: addl %ecx, %eax + .end + + // Support for jint Atomic::xchg(jint exchange_value, volatile jint* dest). +@@ -72,9 +74,12 @@ + movl 0(%esp), %ecx // exchange_value + movl 4(%esp), %edx // dest + cmp $0, 12(%esp) // MP test +- je 1f +- lock +-1: cmpxchgl %ecx, (%edx) ++ jne 1f ++ cmpxchgl %ecx, (%edx) ++ jmp 2f ++1: lock ++ cmpxchgl %ecx, (%edx) ++2: + .end + + // Support for jlong Atomic::cmpxchg(jlong exchange_value, +@@ -90,10 +95,12 @@ + movl 8(%esp), %ebx // exchange_value (low) + movl 12(%esp), %ecx // exchange_high (high) + cmp $0, 28(%esp) // MP test +- je 1f +- lock +-1: cmpxchg8b (%edi) +- popl %edi ++ jne 1f ++ cmpxchg8b (%edi) ++ jmp 2f ++1: lock ++ cmpxchg8b (%edi) ++2: popl %edi From doko at icedtea.classpath.org Sun Aug 29 03:54:46 2010 From: doko at icedtea.classpath.org (doko at icedtea.classpath.org) Date: Sun, 29 Aug 2010 10:54:46 +0000 Subject: /hg/release/icedtea6-1.8: 2010-08-27 Andrew John Hughes changeset 59c86078a676 in /hg/release/icedtea6-1.8 details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=59c86078a676 author: doko at ubuntu.com date: Sun Aug 29 12:54:00 2010 +0200 2010-08-27 Andrew John Hughes Matthias Klose PR398, S6951319: * Makefile.am: Add new patch. * patches/hotspot/hs16/6951319-sparc_build_fixes.patch: Backport of 6951319 to fix build issues on GNU/Linux+SPARC. * NEWS: Updated. diffstat: 4 files changed, 594 insertions(+), 1 deletion(-) ChangeLog | 9 Makefile.am | 3 NEWS | 1 patches/hotspot/hs16/6951319-sparc_build_fixes.patch | 582 ++++++++++++++++++ diffs (truncated from 626 to 500 lines): diff -r 9aa28151c299 -r 59c86078a676 ChangeLog --- a/ChangeLog Sat Aug 28 13:10:53 2010 +0200 +++ b/ChangeLog Sun Aug 29 12:54:00 2010 +0200 @@ -1,3 +1,12 @@ 2010-08-27 Matthias Klose + Matthias Klose + + PR398, S6951319: + * Makefile.am: Add new patch. + * patches/hotspot/hs16/6951319-sparc_build_fixes.patch: + Backport of 6951319 to fix build issues on GNU/Linux+SPARC. + * NEWS: Updated. + 2010-08-27 Matthias Klose * patches/icedtea-too-many-args.diff: Fix build failure with diff -r 9aa28151c299 -r 59c86078a676 Makefile.am --- a/Makefile.am Sat Aug 28 13:10:53 2010 +0200 +++ b/Makefile.am Sun Aug 29 12:54:00 2010 +0200 @@ -393,7 +393,8 @@ if WITH_ALT_HSBUILD if WITH_ALT_HSBUILD ICEDTEA_PATCHES += patches/hotspot/$(HSBUILD)/openjdk-6886353-ignore_deoptimizealot.patch \ patches/hotspot/$(HSBUILD)/zero.patch \ - patches/hotspot/$(HSBUILD)/shark.patch + patches/hotspot/$(HSBUILD)/shark.patch \ + patches/hotspot/$(HSBUILD)/6951319-sparc_build_fixes.patch else ICEDTEA_PATCHES += patches/hotspot/original/icedtea-6778662-lib64.patch \ patches/hotspot/original/icedtea-6778657-f2i-overflow.patch \ diff -r 9aa28151c299 -r 59c86078a676 NEWS --- a/NEWS Sat Aug 28 13:10:53 2010 +0200 +++ b/NEWS Sun Aug 29 12:54:00 2010 +0200 @@ -4,6 +4,7 @@ New in release 1.8.2 (XXXX-XX-XX): - G244901: Skip test_gamma on hardened (PaX-enabled) kernels - G266295: Provide font configuration for Gentoo. - Provide font configuration for RHEL 6. + - S6951319: enable solaris builds using Sun Studio 12 update 1 (fixes PR398) - NetX: - Fix browser command in BasicService.showDocument(URL) - Run programs that inherit main(String[]) in their main-class diff -r 9aa28151c299 -r 59c86078a676 patches/hotspot/hs16/6951319-sparc_build_fixes.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/hotspot/hs16/6951319-sparc_build_fixes.patch Sun Aug 29 12:54:00 2010 +0200 @@ -0,0 +1,582 @@ +# HG changeset patch +# User jcoomes +# Date 1282936351 -3600 +# Node ID 379b95785a1faacbe5261b7517159718e139e57b +# Parent 13f94cc872531ff5b81d1551edf7145f73864c74 +6951319: enable solaris builds using Sun Studio 12 update 1 +Reviewed-by: kamg, ysr, dholmes, johnc + +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/amd64.make +--- openjdk.orig/hotspot/make/solaris/makefiles/amd64.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/amd64.make Fri Aug 27 20:12:31 2010 +0100 +@@ -33,14 +33,8 @@ + # + ifeq ("${Platform_compiler}", "sparcWorks") + +-# Temporary until C++ compiler is fixed +- +-# _lwp_create_interpose must have a frame +-OPT_CFLAGS/os_solaris_x86_64.o = -xO1 +- + # Temporary until SS10 C++ compiler is fixed + OPT_CFLAGS/generateOptoStub.o = -xO2 +-OPT_CFLAGS/thread.o = -xO2 + + else + +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/fastdebug.make +--- openjdk.orig/hotspot/make/solaris/makefiles/fastdebug.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/fastdebug.make Fri Aug 27 20:12:31 2010 +0100 +@@ -36,15 +36,15 @@ + ifeq ("${Platform_compiler}", "sparcWorks") + OPT_CFLAGS/SLOWER = -xO2 + +-# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876) + ifeq ($(COMPILER_REV_NUMERIC), 509) +- # To avoid jvm98 crash +- OPT_CFLAGS/instanceKlass.o = $(OPT_CFLAGS/SLOWER) +- # Not clear this workaround could be skipped in some cases. +- OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) +- OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) +- OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) +-endif ++# To avoid jvm98 crash ++OPT_CFLAGS/instanceKlass.o = $(OPT_CFLAGS/SLOWER) ++endif # COMPILER_NUMERIC_REV == 509 ++ ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++# dtrace cannot handle tail call optimization (6672627, 6693876) ++OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) ++endif # COMPILER_NUMERIC_REV >= 509 + + ifeq ($(COMPILER_REV_NUMERIC), 505) + # CC 5.5 has bug 4908364 with -xO4 (Fixed in 5.6) +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/i486.make +--- openjdk.orig/hotspot/make/solaris/makefiles/i486.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/i486.make Fri Aug 27 20:12:31 2010 +0100 +@@ -33,25 +33,6 @@ + # Special case flags for compilers and compiler versions on i486. + # + ifeq ("${Platform_compiler}", "sparcWorks") +- +-# _lwp_create_interpose must have a frame +-OPT_CFLAGS/os_solaris_x86.o = -xO1 +-else +- +-ifeq ("${Platform_compiler}", "gcc") +-# gcc +-# _lwp_create_interpose must have a frame +-OPT_CFLAGS/os_solaris_x86.o = -fno-omit-frame-pointer +-# +-else +-# error +-_JUNK2_ := $(shell echo >&2 \ +- "*** ERROR: this compiler is not yet supported by this code base!") +- @exit 1 +-endif +-endif +- +-ifeq ("${Platform_compiler}", "sparcWorks") + # ILD is gone as of SS11 (5.8), not supported in SS10 (5.7) + ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \< 507), 1) + # +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/optimized.make +--- openjdk.orig/hotspot/make/solaris/makefiles/optimized.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/optimized.make Fri Aug 27 20:12:31 2010 +0100 +@@ -32,13 +32,10 @@ + # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files) + ifeq ("${Platform_compiler}", "sparcWorks") + +-# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876) +-ifeq ($(COMPILER_REV_NUMERIC),509) +- # Not clear this workaround could be skipped in some cases. +- OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) -g +- OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) -g +- OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) -g +-endif ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++# dtrace cannot handle tail call optimization (6672627, 6693876) ++OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) ++endif # COMPILER_NUMERIC_REV >= 509 + + # Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12) + ifeq ($(COMPILER_REV_NUMERIC),508) +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/product.make +--- openjdk.orig/hotspot/make/solaris/makefiles/product.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/product.make Fri Aug 27 20:12:31 2010 +0100 +@@ -40,13 +40,10 @@ + # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files) + ifeq ("${Platform_compiler}", "sparcWorks") + +-# Problem with SS12 compiler, dtrace doesn't like the .o files (bug 6693876) +-ifeq ($(COMPILER_REV_NUMERIC),509) +- # Not clear this workaround could be skipped in some cases. +- OPT_CFLAGS/vmGCOperations.o = $(OPT_CFLAGS/SLOWER) -g +- OPT_CFLAGS/java.o = $(OPT_CFLAGS/SLOWER) -g +- OPT_CFLAGS/jni.o = $(OPT_CFLAGS/SLOWER) -g +-endif ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++# dtrace cannot handle tail call optimization (6672627, 6693876) ++OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT) ++endif # COMPILER_NUMERIC_REV >= 509 + + # Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12) + ifeq ($(COMPILER_REV_NUMERIC),508) +diff -r 13f94cc87253 -r 379b95785a1f make/solaris/makefiles/sparcWorks.make +--- openjdk.orig/hotspot/make/solaris/makefiles/sparcWorks.make Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/make/solaris/makefiles/sparcWorks.make Fri Aug 27 20:12:31 2010 +0100 +@@ -48,27 +48,33 @@ + # Pick which compiler is validated + ifeq ($(JRE_RELEASE_VER),1.6.0) + # Validated compiler for JDK6 is SS11 (5.8) +- VALIDATED_COMPILER_REV := 5.8 +- VALIDATED_C_COMPILER_REV := 5.8 ++ VALIDATED_COMPILER_REVS := 5.8 ++ VALIDATED_C_COMPILER_REVS := 5.8 + else +- # Validated compiler for JDK7 is SS12 (5.9) +- VALIDATED_COMPILER_REV := 5.9 +- VALIDATED_C_COMPILER_REV := 5.9 ++ # Validated compilers for JDK7 are SS12 (5.9) or SS12 update 1 (5.10) ++ VALIDATED_COMPILER_REVS := 5.9 5.10 ++ VALIDATED_C_COMPILER_REVS := 5.9 5.10 + endif + +-# Warning messages about not using the above validated version +-ENFORCE_COMPILER_REV${ENFORCE_COMPILER_REV} := ${VALIDATED_COMPILER_REV} +-ifneq (${COMPILER_REV},${ENFORCE_COMPILER_REV}) +-dummy_target_to_enforce_compiler_rev:=\ +-$(shell echo >&2 WARNING: You are using CC version ${COMPILER_REV} \ +-and should be using version ${ENFORCE_COMPILER_REV}. Set ENFORCE_COMPILER_REV=${COMPILER_REV} to avoid this warning.) ++# Warning messages about not using the above validated versions ++ENFORCE_COMPILER_REV${ENFORCE_COMPILER_REV} := $(strip ${VALIDATED_COMPILER_REVS}) ++ifeq ($(filter ${ENFORCE_COMPILER_REV},${COMPILER_REV}),) ++PRINTABLE_CC_REVS := $(subst $(shell echo ' '), or ,${ENFORCE_COMPILER_REV}) ++dummy_var_to_enforce_compiler_rev := $(shell \ ++ echo >&2 WARNING: You are using CC version ${COMPILER_REV} and \ ++ should be using version ${PRINTABLE_CC_REVS}.; \ ++ echo >&2 Set ENFORCE_COMPILER_REV=${COMPILER_REV} to avoid this \ ++ warning.) + endif + +-ENFORCE_C_COMPILER_REV${ENFORCE_C_COMPILER_REV} := ${VALIDATED_C_COMPILER_REV} +-ifneq (${C_COMPILER_REV},${ENFORCE_C_COMPILER_REV}) +-dummy_target_to_enforce_c_compiler_rev:=\ +-$(shell echo >&2 WARNING: You are using cc version ${C_COMPILER_REV} \ +-and should be using version ${ENFORCE_C_COMPILER_REV}. Set ENFORCE_C_COMPILER_REV=${C_COMPILER_REV} to avoid this warning.) ++ENFORCE_C_COMPILER_REV${ENFORCE_C_COMPILER_REV} := $(strip ${VALIDATED_C_COMPILER_REVS}) ++ifeq ($(filter ${ENFORCE_C_COMPILER_REV},${C_COMPILER_REV}),) ++PRINTABLE_C_REVS := $(subst $(shell echo ' '), or ,${ENFORCE_C_COMPILER_REV}) ++dummy_var_to_enforce_c_compiler_rev := $(shell \ ++ echo >&2 WARNING: You are using cc version ${C_COMPILER_REV} and \ ++ should be using version ${PRINTABLE_C_REVS}.; \ ++ echo >&2 Set ENFORCE_C_COMPILER_REV=${C_COMPILER_REV} to avoid this \ ++ warning.) + endif + + COMPILER_REV_NUMERIC := $(shell echo $(COMPILER_REV) | awk -F. '{ print $$1 * 100 + $$2 }') +@@ -139,6 +145,13 @@ + OPT_CFLAGS/O2=-xO2 + OPT_CFLAGS/NOOPT=-xO1 + ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++ifeq ($(Platform_arch), x86) ++OPT_CFLAGS/NO_TAIL_CALL_OPT = -Wu,-O~yz ++OPT_CCFLAGS/NO_TAIL_CALL_OPT = -Qoption ube -O~yz ++endif # Platform_arch == x86 ++endif # COMPILER_REV_NUMERIC >= 509 ++ + ################################################# + # Begin current (>=5.6) Forte compiler options # + ################################################# +@@ -181,10 +194,7 @@ + + ifeq ("${Platform_arch_model}", "x86_32") + +-OPT_CFLAGS=-xtarget=pentium $(EXTRA_OPT_CFLAGS) +- +-# UBE (CC 5.5) has bug 4923569 with -xO4 +-OPT_CFLAGS+=-xO3 ++OPT_CFLAGS=-xtarget=pentium -xO4 $(EXTRA_OPT_CFLAGS) + + endif # 32bit x86 + +@@ -461,7 +471,7 @@ + # The -g0 setting allows the C++ frontend to inline, which is a big win. + + # Special global options for SS12 +-ifeq ($(COMPILER_REV_NUMERIC),509) ++ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) + # There appears to be multiple issues with the new Dwarf2 debug format, so + # we tell the compiler to use the older 'stabs' debug format all the time. + # Note that this needs to be used in optimized compiles too to be 100%. +diff -r 13f94cc87253 -r 379b95785a1f src/cpu/sparc/vm/assembler_sparc.hpp +--- openjdk.orig/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp Fri Aug 27 20:12:31 2010 +0100 +@@ -2239,7 +2239,7 @@ + AddressLiteral constant_oop_address(jobject obj); // find_index + inline void set_oop (jobject obj, Register d); // uses allocate_oop_address + inline void set_oop_constant (jobject obj, Register d); // uses constant_oop_address +- inline void set_oop (AddressLiteral& obj_addr, Register d); // same as load_address ++ inline void set_oop (const AddressLiteral& obj_addr, Register d); // same as load_address + + void set_narrow_oop( jobject obj, Register d ); + +diff -r 13f94cc87253 -r 379b95785a1f src/cpu/sparc/vm/assembler_sparc.inline.hpp +--- openjdk.orig/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp Fri Aug 27 20:12:31 2010 +0100 +@@ -707,7 +707,7 @@ + } + + +-inline void MacroAssembler::set_oop(AddressLiteral& obj_addr, Register d) { ++inline void MacroAssembler::set_oop(const AddressLiteral& obj_addr, Register d) { + assert(obj_addr.rspec().type() == relocInfo::oop_type, "must be an oop reloc"); + set(obj_addr, d); + } +diff -r 13f94cc87253 -r 379b95785a1f src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp +--- openjdk.orig/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp Fri Aug 27 20:12:31 2010 +0100 +@@ -47,40 +47,56 @@ + // For Sun Studio - implementation is in solaris_x86_[32/64].il. + // For gcc - implementation is just below. + +-extern "C" jint _Atomic_add(jint add_value, volatile jint* dest, int mp); +-extern "C" jint _Atomic_xchg(jint exchange_value, volatile jint* dest); +-extern "C" jint _Atomic_cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value, int mp); +-extern "C" jlong _Atomic_cmpxchg_long(jlong exchange_value, volatile jlong* dest, jlong compare_value, int mp); ++// The lock prefix can be omitted for certain instructions on uniprocessors; to ++// facilitate this, os::is_MP() is passed as an additional argument. 64-bit ++// processors are assumed to be multi-threaded and/or multi-core, so the extra ++// argument is unnecessary. ++#ifndef _LP64 ++#define IS_MP_DECL() , int is_mp ++#define IS_MP_ARG() , (int) os::is_MP() ++#else ++#define IS_MP_DECL() ++#define IS_MP_ARG() ++#endif // _LP64 ++ ++extern "C" { ++ jint _Atomic_add(jint add_value, volatile jint* dest IS_MP_DECL()); ++ jint _Atomic_xchg(jint exchange_value, volatile jint* dest); ++ jint _Atomic_cmpxchg(jint exchange_value, volatile jint* dest, ++ jint compare_value IS_MP_DECL()); ++ jlong _Atomic_cmpxchg_long(jlong exchange_value, volatile jlong* dest, ++ jlong compare_value IS_MP_DECL()); ++} + + inline jint Atomic::add (jint add_value, volatile jint* dest) { +- return _Atomic_add(add_value, dest, (int) os::is_MP()); ++ return _Atomic_add(add_value, dest IS_MP_ARG()); ++} ++ ++inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) { ++ return _Atomic_xchg(exchange_value, dest); + } + + inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value) { +- return _Atomic_cmpxchg(exchange_value, dest, compare_value, (int) os::is_MP()); ++ return _Atomic_cmpxchg(exchange_value, dest, compare_value IS_MP_ARG()); + } + + inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value) { +- return _Atomic_cmpxchg_long(exchange_value, dest, compare_value, (int) os::is_MP()); ++ return _Atomic_cmpxchg_long(exchange_value, dest, compare_value IS_MP_ARG()); + } + + + #ifdef AMD64 + inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; } + inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; } +-extern "C" jlong _Atomic_add_long(jlong add_value, volatile jlong* dest, int mp); ++extern "C" jlong _Atomic_add_long(jlong add_value, volatile jlong* dest); + extern "C" jlong _Atomic_xchg_long(jlong exchange_value, volatile jlong* dest); + + inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) { +- return (intptr_t)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest, (int) os::is_MP()); ++ return (intptr_t)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest); + } + + inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) { +- return (void*)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest, (int) os::is_MP()); +-} +- +-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) { +- return _Atomic_xchg(exchange_value, dest); ++ return (void*)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest); + } + + inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) { +@@ -92,11 +108,11 @@ + } + + inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) { +- return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, (int) os::is_MP()); ++ return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value); + } + + inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value) { +- return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, (int) os::is_MP()); ++ return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value); + } + + inline jlong Atomic::load(volatile jlong* src) { return *src; } +@@ -111,13 +127,6 @@ + return (void*)add((jint)add_value, (volatile jint*)dest); + } + +-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) { +- // We noticed a CC5.5 bug (4894807), so keep calling the stub just to be safe. +- // Will use the inline template version after 4894807 is fixed. +- // return _Atomic_xchg(exchange_value, dest); +- return (*os::atomic_xchg_func)(exchange_value, dest); +-} +- + inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) { + return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest); + } +@@ -179,9 +188,6 @@ + #endif // AMD64 + + inline jint _Atomic_xchg(jint exchange_value, volatile jint* dest) { +- +- // 32bit version originally did nothing!! +- + __asm__ __volatile__ ("xchgl (%2),%0" + : "=r" (exchange_value) + : "0" (exchange_value), "r" (dest) +diff -r 13f94cc87253 -r 379b95785a1f src/os_cpu/solaris_x86/vm/solaris_x86_32.il +--- openjdk.orig/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il Fri Aug 27 20:12:31 2010 +0100 +@@ -50,10 +50,12 @@ + movl 4(%esp), %edx // dest + movl %eax, %ecx + cmpl $0, 8(%esp) // MP test +- je 1f +- lock +-1: xaddl %eax, (%edx) +- addl %ecx, %eax ++ jne 1f ++ xaddl %eax, (%edx) ++ jmp 2f ++1: lock ++ xaddl %eax, (%edx) ++2: addl %ecx, %eax + .end + + // Support for jint Atomic::xchg(jint exchange_value, volatile jint* dest). +@@ -72,9 +74,12 @@ + movl 0(%esp), %ecx // exchange_value + movl 4(%esp), %edx // dest + cmp $0, 12(%esp) // MP test +- je 1f +- lock +-1: cmpxchgl %ecx, (%edx) ++ jne 1f ++ cmpxchgl %ecx, (%edx) ++ jmp 2f ++1: lock ++ cmpxchgl %ecx, (%edx) ++2: + .end + + // Support for jlong Atomic::cmpxchg(jlong exchange_value, +@@ -90,10 +95,12 @@ + movl 8(%esp), %ebx // exchange_value (low) + movl 12(%esp), %ecx // exchange_high (high) + cmp $0, 28(%esp) // MP test +- je 1f +- lock +-1: cmpxchg8b (%edi) +- popl %edi ++ jne 1f ++ cmpxchg8b (%edi) ++ jmp 2f ++1: lock ++ cmpxchg8b (%edi) ++2: popl %edi + popl %ebx + .end + +diff -r 13f94cc87253 -r 379b95785a1f src/os_cpu/solaris_x86/vm/solaris_x86_64.il +--- openjdk.orig/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.il Fri Jun 18 01:17:46 2010 -0700 +--- openjdk/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.il Fri Aug 27 20:12:31 2010 +0100 +@@ -37,24 +37,18 @@ + .end + + // Support for jint Atomic::add(jint add_value, volatile jint* dest) +- // An additional bool (os::is_MP()) is passed as the last argument. +- .inline _Atomic_add,3 ++ .inline _Atomic_add,2 + movl %edi, %eax // save add_value for return +- testl %edx, %edx // MP test +- je 1f + lock +-1: xaddl %edi, (%rsi) ++ xaddl %edi, (%rsi) + addl %edi, %eax + .end + + // Support for jlong Atomic::add(jlong add_value, volatile jlong* dest) +- // An additional bool (os::is_MP()) is passed as the last argument. +- .inline _Atomic_add_long,3 ++ .inline _Atomic_add_long,2 + movq %rdi, %rax // save add_value for return +- testq %rdx, %rdx // MP test +- je 1f + lock +-1: xaddq %rdi, (%rsi) ++ xaddq %rdi, (%rsi) + addq %rdi, %rax + .end + +@@ -73,25 +67,19 @@ + // Support for jint Atomic::cmpxchg(jint exchange_value, + // volatile jint *dest, + // jint compare_value) +- // An additional bool (os::is_MP()) is passed as the last argument. +- .inline _Atomic_cmpxchg,4 ++ .inline _Atomic_cmpxchg,3 + movl %edx, %eax // compare_value +- testl %ecx, %ecx // MP test +- je 1f + lock +-1: cmpxchgl %edi, (%rsi) ++ cmpxchgl %edi, (%rsi) + .end + + // Support for jlong Atomic::cmpxchg(jlong exchange_value, + // volatile jlong* dest, + // jlong compare_value) +- // An additional bool (os::is_MP()) is passed as the last argument. +- .inline _Atomic_cmpxchg_long,6 ++ .inline _Atomic_cmpxchg_long,3 + movq %rdx, %rax // compare_value +- testq %rcx, %rcx // MP test From doko at ubuntu.com Sun Aug 29 03:56:07 2010 From: doko at ubuntu.com (Matthias Klose) Date: Sun, 29 Aug 2010 12:56:07 +0200 Subject: [BRANCH APPROVAL] /hg/icedtea6: PR398: hotspot hs16 / 6b17 build failure on sparc In-Reply-To: <4C7842D3.3000602@ubuntu.com> References: <20100827224723.GD6429@bree.middle-earth.co.uk> <4C7842D3.3000602@ubuntu.com> Message-ID: <4C7A3CC7.5030501@ubuntu.com> On 28.08.2010 00:57, Matthias Klose wrote: > On 28.08.2010 00:47, Dr Andrew John Hughes wrote: >> This fixes PR398. Ok for 1.7, 1.8& 1.9? > > I only can approve for 1.8, approved. you are release manager for 1.9 yourself, > so please make the decision yourself. now checked in the unmodified patch on the 1.9 branch, and one which only applies for the alternate hotspot build on the 1.8 branch. Test results are attached. Matthias -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-summary-hotspot.log.1.8 Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100829/cb6cecaa/jtreg-summary-hotspot.log.1.8 -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: jtreg-summary-hotspot.log.1.9 Url: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100829/cb6cecaa/jtreg-summary-hotspot.log.1.9 From mark at klomp.org Sun Aug 29 05:41:51 2010 From: mark at klomp.org (Mark Wielaard) Date: Sun, 29 Aug 2010 14:41:51 +0200 Subject: Collecting test results (Was: For users of --with-openjdk) In-Reply-To: <4C79B011.4020609@lucasit.com> References: <20100810111600.GF27843@rivendell.middle-earth.co.uk> <4C6234EC.7020809@linuxfromscratch.org> <20100811181112.GL10867@rivendell.middle-earth.co.uk> <4C633B7F.3080101@linuxfromscratch.org> <4C6484B8.6090007@linuxfromscratch.org> <20100813004137.GP10867@rivendell.middle-earth.co.uk> <4C64A128.2010300@linuxfromscratch.org> <20100813195739.GX10867@rivendell.middle-earth.co.uk> <4C66DBB9.4070707@linuxfromscratch.org> <20100825153429.GH26213@rivendell.middle-earth.co.uk> <4C79B011.4020609@lucasit.com> Message-ID: <1283085711.2345.11.camel@hermans.wildebeest.org> On Sat, 2010-08-28 at 19:55 -0500, DJ Lucas wrote: > > On JDK, I don't think there's ever been a 100% pass, and some aren't even > > stable tests. So you're looking more for regressions between builds. > > > > To my knowledge, the HotSpot and langtools suites should all pass (and > > take a considerably shorter time to run). > > > Is there a central place to share and view previous test results, or > just search the distro-pkg-dev and openjdk-dev lists? We should probably setup a real buildbot so people can more easily share their results. For now there is one autobuilder that puts its results at: http://icedtea.classpath.org/builds/ It has build logs, test logs and the full test results, but only for the last (successful) build. See for example the full hotspot jtreg results for icedtea6: http://icedtea.classpath.org/builds/icedtea6/test/hotspot/JTreport/html/index.html Replace /icedtea6/ with /icedtea7/ if you are interested in the 7 branch, replace /hotspot/ with /langtools/ or /jdk/ if you are interested in these jtreg runs. If the autobuilder detects a change in test results or a build failure it will send email to every committer since the last run plus the icedtea-testresults mailinglist: http://icedtea.classpath.org/pipermail/testresults/ Red Hat also has an autobuilder (based on hudson) that sends its results to that list. I promised Pavel that I would make room on the autobuilder site to post full test results (really, almost there now, disk space is cheap, but time to move services around isn't...) Cheers, Mark From bugzilla-daemon at icedtea.classpath.org Sun Aug 29 10:45:57 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 29 Aug 2010 17:45:57 +0000 Subject: [Bug 534] New: zero doesn't work on sparc linux Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=534 Summary: zero doesn't work on sparc linux Product: IcedTea Version: 6-1.8.1 Platform: all OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Zero AssignedTo: unassigned at icedtea.classpath.org ReportedBy: doko at ubuntu.com seen with 20100829 from the icedtea6 trunk: touch stamps/bootstrap-directory.stamp mkdir -p bootstrap rm -f /home/packages/openjdk/zero/openjdk-6-6b20~pre2/build/bootstrap/jdk1.6.0 ln -sf /home/packages/openjdk/zero/openjdk-6-6b20~pre2/build/bootstrap/icedtea /home/packages/openjdk/zero/openjdk-6-6b20~pre2/build/bootstrap/jdk1.6.0; \ if ! /home/packages/openjdk/zero/openjdk-6-6b20~pre2/build/bootstrap/jdk1.6.0/bin/java -version ; \ then \ echo "/home/packages/openjdk/zero/openjdk-6-6b20~pre2/build/bootstrap/jdk1.6.0/bin/java" \ "cannot be found or is corrupted." ; \ exit 1; \ fi # # A fatal error has been detected by the Java Runtime Environment: # # Internal Error (os_linux_zero.cpp:236), pid=13355, tid=1888762736 # Error: caught unhandled signal 10 # # JRE version: 6.0_20-b20 # Java VM: OpenJDK Zero VM (17.0-b16 interpreted mode linux-sparc ) # Derivative: IcedTea6 1.9pre # Distribution: Debian GNU/Linux unstable (sid), package 6b20~pre2-0ubuntu3 # An error report file with more information is saved as: # /home/packages/openjdk/zero/openjdk-6-6b20~pre2/build/hs_err_pid13355.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # /bin/bash: line 6: 13355 Aborted /home/packages/openjdk/zero/openjdk-6-6b20~pre2/build/bootstrap/jdk1.6.0/bin/java -version /home/packages/openjdk/zero/openjdk-6-6b20~pre2/build/bootstrap/jdk1.6.0/bin/java cannot be found or is corrupted. make[1]: *** [stamps/bootstrap-directory-symlink.stamp] Error 1 build configured with --enable-zero. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sun Aug 29 10:46:56 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 29 Aug 2010 17:46:56 +0000 Subject: [Bug 534] zero doesn't work on sparc linux Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=534 ------- Comment #1 from doko at ubuntu.com 2010-08-29 17:46 ------- Created an attachment (id=405) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=405&action=view) hs log -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Sun Aug 29 13:36:14 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 29 Aug 2010 20:36:14 +0000 Subject: [Bug 534] zero doesn't work on sparc linux Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=534 ------- Comment #2 from xerxes at zafena.se 2010-08-29 20:36 ------- For what I have heard, Signal 10, SIGBUS on Sparc usually indicates an address mis-alignments during read/write. A quick fix are to look for some gcc option to allow mis-aligned data. http://gcc.gnu.org/onlinedocs/gcc/SPARC-Options.html Try compile zero with -munaligned-doubles on Ssparc. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Aug 30 07:27:32 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 Aug 2010 14:27:32 +0000 Subject: [Bug 536] New: DaCapo 9.12 eclipse triggers Error: guarantee(cont_offset != 0, "unhandled implicit exception in compiled code") Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=536 Summary: DaCapo 9.12 eclipse triggers Error: guarantee(cont_offset != 0,"unhandled implicit exception in compiled code") Product: IcedTea Version: 6-1.8.1 Platform: x86 OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: xerxes at zafena.se Testcase: wget http://sourceforge.net/projects/dacapobench/files/9.12-bach/dacapo-9.12-bach.jar/download java -jar dacapo-9.12-bach.jar -s large eclipse xerxes at xerxes-J464X:~/test$ java -jar dacapo-9.12-bach.jar -s large eclipse Unzip workspace ===== DaCapo 9.12 eclipse starting ===== Initialize workspace .............................................................. Index workspace # # A fatal error has been detected by the Java Runtime Environment: # # Internal Error (nmethod.cpp:1847), pid=31551, tid=2340420464 # Error: guarantee(cont_offset != 0,"unhandled implicit exception in compiled code") # # JRE version: 6.0_18-b18 # Java VM: OpenJDK Server VM (16.0-b13 mixed mode linux-x86 ) # Derivative: IcedTea6 1.8.1 # Distribution: Ubuntu 10.04 LTS, package 6b18-1.8.1-0ubuntu1 # An error report file with more information is saved as: # /home/xerxes/test/hs_err_pid31551.log # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # https://bugs.launchpad.net/ubuntu/+source/openjdk-6/ # Avbruten (SIGABRT) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Mon Aug 30 07:40:46 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 30 Aug 2010 14:40:46 +0000 Subject: [Bug 536] DaCapo 9.12 eclipse triggers Error: guarantee(cont_offset != 0, "unhandled implicit exception in compiled code") Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=536 ------- Comment #1 from xerxes at zafena.se 2010-08-30 14:40 ------- Created an attachment (id=406) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=406&action=view) hs_err_pid31551.log I have found this testcase to be quite weak and only reproduces the internal error bug on about 20% of the time. .. but if I attach some monitoring tool like jconsole then I get the impression that this bug hits more frequently to perhaps 40% of the time. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From ptisnovs at redhat.com Mon Aug 30 09:12:08 2010 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Mon, 30 Aug 2010 18:12:08 +0200 Subject: Patch that sort out OpenGL-related issue in IcedTea6 HEAD (was: Possible regression between IcedTea6-1.8 and IcedTea6-1.9) Message-ID: <4C7BD858.9060906@redhat.com> Hi all, can anybody please review simple patch which in the end ensures that method glGetString(GL_VENDOR) etc. is called only when rendering context is properly configured. When glGetString() is called for uninitialized rendering context, it is possible that application got SIGSEGV because OpenGL standard does not specify correct behaviour in this case. The patch is based on actual OpenJDK7 sources and it's behaviour can be tested by this simple test: import javax.swing.JFrame; public class Test extends JFrame { public Test() { System.out.println("Nothing happens"); } public static void main(String[] args) { Test t = new Test(); System.out.println("Test Passed."); } } (must be run with -Dsun.java2d.opengl=True option) Cheers Pavel PS: if anybody is interested whether his OpenGL implementation segfaulted (RHEL5 and its Mesa 6.5.1 case, for example), this C test can be useful: #include #include #include int main(void) { printf("%x\n", glXGetCurrentContext()); glGetString(GL_VENDOR); return 0; } (must be compiled with -lGL and -lX11 options) -------------- next part -------------- A non-text attachment was scrubbed... Name: opengl-xxx.patch Type: text/x-patch Size: 1081 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100830/58b3274e/opengl-xxx.patch From bugzilla-daemon at icedtea.classpath.org Mon Aug 30 21:19:44 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 Aug 2010 04:19:44 +0000 Subject: [Bug 537] New: I am open a tuxguitar and icedtea6 is crash Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=537 Summary: I am open a tuxguitar and icedtea6 is crash Product: IcedTea Version: 6-1.8.1 Platform: 32-bit OS/Version: Linux Status: NEW Severity: critical Priority: P2 Component: IcedTea6 AssignedTo: unassigned at icedtea.classpath.org ReportedBy: shtartora at ya.ru # # A fatal error has been detected by the Java Runtime Environment: # # SIGSEGV (0xb) at pc=0xb786547a, pid=18745, tid=3068738416 # # JRE version: 6.0_18-b18 # Java VM: OpenJDK Client VM (16.0-b13 mixed mode linux-x86 ) # Derivative: IcedTea6 1.8.1 # Distribution: Built on Gentoo Base System release 1.12.13 (Fri Jul 30 14:07:36 CEST 2010) # Problematic frame: # C [libc.so.6+0x15f47a] # # If you would like to submit a bug report, please include # instructions how to reproduce the bug and visit: # http://icedtea.classpath.org/bugzilla # The crash happened outside the Java Virtual Machine in native code. # See problematic frame for where to report the bug. # --------------- T H R E A D --------------- Current thread (0x0951e400): JavaThread "main" [_thread_in_native, id=18758, stack(0xb6e43000,0xb6e94000)] siginfo:si_signo=SIGSEGV: si_errno=0, si_code=1 (SEGV_MAPERR), si_addr=0x6e6f80f0 Registers: EAX=0xb78653f8, EBX=0xa778eff4, ECX=0xb7865408, EDX=0xb6e92d40 ESP=0xb6e92c4c, EBP=0xb6e92e58, ESI=0x0951e510, EDI=0xb6e92c80 EIP=0xb786547a, CR2=0x6e6f80f0, EFLAGS=0x00010282 Top of Stack: (sp=0xb6e92c4c) 0xb6e92c4c: a77769b8 b78653f8 b6e92d40 00000000 0xb6e92c5c: 00000000 a77a476a 09918768 a77a5ff4 0xb6e92c6c: a77a434c b78653f8 b6e92d40 a77a476a 0xb6e92c7c: a77a476a 00000000 00000000 00000000 0xb6e92c8c: 00000000 00000000 00000000 00000000 0xb6e92c9c: 00000000 00000000 00000000 00000000 0xb6e92cac: 00000000 00000000 00000000 00000000 0xb6e92cbc: 00000000 00000000 00000000 00000000 Instructions: (pc=0xb786547a) 0xb786546a: 86 b7 60 54 86 b7 68 54 86 b7 68 54 86 b7 70 54 0xb786547a: 86 b7 70 54 86 b7 78 54 86 b7 78 54 86 b7 80 54 Stack: [0xb6e43000,0xb6e94000], sp=0xb6e92c4c, free space=13fb6e925e4k Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) C [libc.so.6+0x15f47a] j org.herac.tuxguitar.player.impl.midiport.alsa.MidiSystem.findPorts(J)V+0 j org.herac.tuxguitar.player.impl.midiport.alsa.MidiSystem.findPorts()Ljava/util/List;+30 j org.herac.tuxguitar.player.impl.midiport.alsa.MidiOutputPortProviderImpl.listPorts()Ljava/util/List;+39 j org.herac.tuxguitar.player.base.MidiPlayer.addOutputPortProvider(Lorg/herac/tuxguitar/player/base/MidiOutputPortProvider;Z)V+13 j org.herac.tuxguitar.gui.system.plugins.base.TGMidiOutputPortProviderPlugin.addPlugin()V+23 j org.herac.tuxguitar.gui.system.plugins.base.TGMidiOutputPortProviderPlugin.setEnabled(Z)V+5 j org.herac.tuxguitar.gui.system.plugins.TGPluginManager.openPlugins()V+35 j org.herac.tuxguitar.gui.TuxGuitar.displayGUI([Ljava/lang/String;)V+101 j org.herac.tuxguitar.gui.TGMain.main([Ljava/lang/String;)V+4 v ~StubRoutines::call_stub V [libjvm.so+0x1e5a47] V [libjvm.so+0x2d59c9] V [libjvm.so+0x1e492f] V [libjvm.so+0x1ef87a] V [libjvm.so+0x1fb8aa] C [java+0x346f] JavaMain+0xeef C [libpthread.so.0+0x5eca] Java frames: (J=compiled Java code, j=interpreted, Vv=VM code) j org.herac.tuxguitar.player.impl.midiport.alsa.MidiSystem.findPorts(J)V+0 j org.herac.tuxguitar.player.impl.midiport.alsa.MidiSystem.findPorts()Ljava/util/List;+30 j org.herac.tuxguitar.player.impl.midiport.alsa.MidiOutputPortProviderImpl.listPorts()Ljava/util/List;+39 j org.herac.tuxguitar.player.base.MidiPlayer.addOutputPortProvider(Lorg/herac/tuxguitar/player/base/MidiOutputPortProvider;Z)V+13 j org.herac.tuxguitar.gui.system.plugins.base.TGMidiOutputPortProviderPlugin.addPlugin()V+23 j org.herac.tuxguitar.gui.system.plugins.base.TGMidiOutputPortProviderPlugin.setEnabled(Z)V+5 j org.herac.tuxguitar.gui.system.plugins.TGPluginManager.openPlugins()V+35 j org.herac.tuxguitar.gui.TuxGuitar.displayGUI([Ljava/lang/String;)V+101 j org.herac.tuxguitar.gui.TGMain.main([Ljava/lang/String;)V+4 v ~StubRoutines::call_stub --------------- P R O C E S S --------------- Java Threads: ( => current thread ) 0x09901800 JavaThread "Java Sound Event Dispatcher" daemon [_thread_blocked, id=18897, stack(0xa76aa000,0xa76fb000)] 0x0958b000 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=18764, stack(0xa8558000,0xa85a9000)] 0x09589400 JavaThread "CompilerThread0" daemon [_thread_blocked, id=18763, stack(0xa85a9000,0xa862a000)] 0x09587800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=18762, stack(0xa862a000,0xa867b000)] 0x09577000 JavaThread "Finalizer" daemon [_thread_blocked, id=18761, stack(0xa899b000,0xa89ec000)] 0x09572400 JavaThread "Reference Handler" daemon [_thread_blocked, id=18760, stack(0xa89ec000,0xa8a3d000)] =>0x0951e400 JavaThread "main" [_thread_in_native, id=18758, stack(0xb6e43000,0xb6e94000)] Other Threads: 0x0956f800 VMThread [stack: 0xa8a3d000,0xa8abe000] [id=18759] 0x0958d800 WatcherThread [stack: 0xa837f000,0xa8400000] [id=18765] VM state:not at safepoint (normal execution) VM Mutex/Monitor currently owned by a thread: None Heap def new generation total 39296K, used 20730K [0xa8d30000, 0xab7d0000, 0xab7d0000) eden space 34944K, 59% used [0xa8d30000, 0xaa16eb08, 0xaaf50000) from space 4352K, 0% used [0xaaf50000, 0xaaf50000, 0xab390000) to space 4352K, 0% used [0xab390000, 0xab390000, 0xab7d0000) tenured generation total 87424K, used 0K [0xab7d0000, 0xb0d30000, 0xb0d30000) the space 87424K, 0% used [0xab7d0000, 0xab7d0000, 0xab7d0200, 0xb0d30000) compacting perm gen total 12288K, used 8087K [0xb0d30000, 0xb1930000, 0xb4d30000) the space 12288K, 65% used [0xb0d30000, 0xb1515c68, 0xb1515e00, 0xb1930000) No shared spaces configured. Dynamic libraries: 08048000-08051000 r-xp 00000000 08:13 17287 /opt/icedtea6-bin-1.8.1/bin/java 08051000-08052000 r--p 00008000 08:13 17287 /opt/icedtea6-bin-1.8.1/bin/java 08052000-08053000 rw-p 00009000 08:13 17287 /opt/icedtea6-bin-1.8.1/bin/java 09518000-0992b000 rw-p 00000000 00:00 0 [heap] a76aa000-a76ad000 ---p 00000000 00:00 0 a76ad000-a76fb000 rw-p 00000000 00:00 0 a76fb000-a778c000 r-xp 00000000 fe:00 10772 /usr/lib/libasound.so.2.0.0 a778c000-a778f000 r--p 00090000 fe:00 10772 /usr/lib/libasound.so.2.0.0 a778f000-a7790000 rw-p 00093000 fe:00 10772 /usr/lib/libasound.so.2.0.0 a77a3000-a77a5000 r-xp 00000000 fe:00 571423 /usr/share/tuxguitar/lib/lib/libtuxguitar-alsa-jni.so a77a5000-a77a6000 r--p 00001000 fe:00 571423 /usr/share/tuxguitar/lib/lib/libtuxguitar-alsa-jni.so a77a6000-a77a7000 rw-p 00002000 fe:00 571423 /usr/share/tuxguitar/lib/lib/libtuxguitar-alsa-jni.so a77a7000-a77b4000 r-xp 00000000 08:13 17819 /opt/icedtea6-bin-1.8.1/jre/lib/i386/libjsoundalsa.so a77b4000-a77b5000 r--p 0000c000 08:13 17819 /opt/icedtea6-bin-1.8.1/jre/lib/i386/libjsoundalsa.so a77b5000-a77b6000 rw-p 0000d000 08:13 17819 /opt/icedtea6-bin-1.8.1/jre/lib/i386/libjsoundalsa.so a77b6000-a77b7000 r-xp 00000000 08:13 17835 /opt/icedtea6-bin-1.8.1/jre/lib/i386/libjsound.so a77b7000-a77b8000 r--p 00000000 08:13 17835 /opt/icedtea6-bin-1.8.1/jre/lib/i386/libjsound.so a77b8000-a77b9000 rw-p 00001000 08:13 17835 /opt/icedtea6-bin-1.8.1/jre/lib/i386/libjsound.so a77b9000-a77c0000 r--s 00101000 08:13 17879 /opt/icedtea6-bin-1.8.1/jre/lib/resources.jar a77c0000-a77cb000 r-xp 00000000 fe:00 571166 /usr/lib/libswt-cairo-gtk-3448.so a77cb000-a77cc000 r--p 0000a000 fe:00 571166 /usr/lib/libswt-cairo-gtk-3448.so a77cc000-a77cd000 rw-p 0000b000 fe:00 571166 /usr/lib/libswt-cairo-gtk-3448.so a77cd000-a77cf000 r--s 0000a000 fe:00 762789 /usr/share/tuxguitar/lib/share/plugins/tuxguitar-compat.jar a77cf000-a77d1000 r--s 0000e000 fe:00 762788 /usr/share/tuxguitar/lib/share/plugins/tuxguitar-gtp.jar a77d1000-a77d3000 r--s 00004000 fe:00 762787 /usr/share/tuxguitar/lib/share/plugins/tuxguitar-fluidsynth.jar a77d3000-a77d5000 r--s 00003000 fe:00 762786 /usr/share/tuxguitar/lib/share/plugins/tuxguitar-browser-ftp.jar a77d5000-a77d6000 r--s 00005000 fe:00 762785 /usr/share/tuxguitar/lib/share/plugins/tuxguitar-lilypond.jar a77d6000-a77d8000 r--s 00005000 fe:00 762784 /usr/share/tuxguitar/lib/share/plugins/tuxguitar-converter.jar a77d8000-a77d9000 r--s 00004000 fe:00 762783 /usr/share/tuxguitar/lib/share/plugins/tuxguitar-tef.jar a77d9000-a77da000 r--s 00001000 fe:00 762782 /usr/share/tuxguitar/lib/share/plugins/tuxguitar-alsa.jar a77da000-a77dc000 r--s 00006000 fe:00 762781 /usr/share/tuxguitar/lib/share/plugins/tuxguitar-tuner.jar a77dc000-a77dd000 r--s 00001000 fe:00 762780 /usr/share/tuxguitar/lib/share/plugins/tuxguitar-ascii.jar a77dd000-a77df000 r--s 00005000 fe:00 762779 /usr/share/tuxguitar/lib/share/plugins/tuxguitar-midi.jar a77df000-a77e1000 r--s 00005000 fe:00 762778 /usr/share/tuxguitar/lib/share/plugins/tuxguitar-ptb.jar a77e1000-a77e3000 r--s 00001000 fe:00 762777 /usr/share/tuxguitar/lib/share/plugins/tuxguitar-musicxml.jar a77e3000-a77e5000 r--s 00001000 fe:00 762776 /usr/share/tuxguitar/lib/share/plugins/tuxguitar-pdf.jar a77e5000-a77e7000 r--s 00008000 fe:00 762774 /usr/share/tuxguitar/lib/share/plugins/tuxguitar-jsa.jar a77e7000-a77ea000 r--s 0001b000 fe:00 571351 /usr/share/junit/lib/junit.jar a77ea000-a77f6000 r--s 00105000 fe:00 571393 /usr/share/itext/lib/iText.jar a77f6000-a77fd000 r--s 00069000 fe:00 571384 /usr/share/sun-javamail/lib/mail.jar a77fd000-a785d000 rw-s 00000000 00:04 19103745 /SYSV00000000 (deleted) a785d000-a7904000 r--p 00000000 fe:00 379108 /usr/share/fonts/dejavu/DejaVuSans.ttf a7904000-a7906000 r-xp 00000000 fe:00 1044 /usr/lib/pango/1.6.0/modules/pango-basic-fc.so a7906000-a7907000 r--p 00001000 fe:00 1044 /usr/lib/pango/1.6.0/modules/pango-basic-fc.so a7907000-a7908000 rw-p 00002000 fe:00 1044 /usr/lib/pango/1.6.0/modules/pango-basic-fc.so a7908000-a790e000 r--s 00000000 fe:01 769112 /var/cache/fontconfig/87f5e051180a7a75f16eb6fe7dbd3749-le32d4.cache-3 a790e000-a7914000 r--s 00000000 fe:01 510561 /var/cache/fontconfig/acc285bc1956c3c4bc7afb41d537a85a-le32d4.cache-3 a7914000-a7921000 r--s 00000000 fe:01 768366 /var/cache/fontconfig/8d4af663993b81a124ee82e610bb31f9-le32d4.cache-3 a7921000-a7924000 r--s 00000000 fe:01 768385 /var/cache/fontconfig/a595ca43be94766bbfe429f07fba82d0-le32d4.cache-3 a7924000-a792b000 r--s 00000000 fe:01 769121 /var/cache/fontconfig/12b26b760a24f8b4feb03ad48a333a72-le32d4.cache-3 a792b000-a7933000 r-xp 00000000 fe:00 329875 /usr/lib/libdrm.so.2.4.0 a7933000-a7934000 r--p 00007000 fe:00 329875 /usr/lib/libdrm.so.2.4.0 a7934000-a7935000 rw-p 00008000 fe:00 329875 /usr/lib/libdrm.so.2.4.0 a7935000-a7945000 r-xp 00000000 fe:00 10402 /usr/lib/libxcb-glx.so.0.0.0 a7945000-a7946000 r--p 00010000 fe:00 10402 /usr/lib/libxcb-glx.so.0.0.0 a7946000-a7947000 rw-p 00011000 fe:00 10402 /usr/lib/libxcb-glx.so.0.0.0 a7947000-a794b000 r-xp 00000000 fe:00 88287 /usr/lib/libXxf86vm.so.1.0.0 a794b000-a794c000 r--p 00003000 fe:00 88287 /usr/lib/libXxf86vm.so.1.0.0 a794c000-a794d000 rw-p 00004000 fe:00 88287 /usr/lib/libXxf86vm.so.1.0.0 a794d000-a795e000 r-xp 00000000 08:13 17128 /lib/libresolv-2.12.1.so a795e000-a795f000 r--p 00010000 08:13 17128 /lib/libresolv-2.12.1.so a795f000-a7960000 rw-p 00011000 08:13 17128 /lib/libresolv-2.12.1.so a7960000-a7962000 rw-p 00000000 00:00 0 a7962000-a797f000 r-xp 00000000 fe:00 90840 /usr/lib/libexpat.so.1.5.2 a797f000-a7981000 r--p 0001c000 fe:00 90840 /usr/lib/libexpat.so.1.5.2 a7981000-a7982000 rw-p 0001e000 fe:00 90840 /usr/lib/libexpat.so.1.5.2 a7982000-a79ed000 r-xp 00000000 fe:00 1334 /usr/lib/libfreetype.so.6.6.0 a79ed000-a79f0000 r--p 0006b000 fe:00 1334 /usr/lib/libfreetype.so.6.6.0 a79f0000-a79f1000 rw-p 0006e000 fe:00 1334 /usr/lib/libfreetype.so.6.6.0 a79f1000-a79f5000 r-xp 00000000 fe:00 330111 /usr/lib/libXdmcp.so.6.0.0 a79f5000-a79f6000 r--p 00003000 fe:00 330111 /usr/lib/libXdmcp.so.6.0.0 a79f6000-a79f7000 rw-p 00004000 fe:00 330111 /usr/lib/libXdmcp.so.6.0.0 a79f7000-a79f9000 r-xp 00000000 fe:00 330115 /usr/lib/libXau.so.6.0.0 a79f9000-a79fa000 r--p 00001000 fe:00 330115 /usr/lib/libXau.so.6.0.0 a79fa000-a79fb000 rw-p 00002000 fe:00 330115 /usr/lib/libXau.so.6.0.0 a79fb000-a7a12000 r-xp 00000000 fe:00 126520 /usr/lib/libxcb.so.1.1.0 a7a12000-a7a13000 r--p 00016000 fe:00 126520 /usr/lib/libxcb.so.1.1.0 a7a13000-a7a14000 rw-p 00017000 fe:00 126520 /usr/lib/libxcb.so.1.1.0 a7a14000-a7a1a000 r-xp 00000000 fe:00 33494 /usr/lib/libxcb-render.so.0.0.0 a7a1a000-a7a1b000 r--p 00006000 fe:00 33494 /usr/lib/libxcb-render.so.0.0.0 a7a1b000-a7a1c000 rw-p 00007000 fe:00 33494 /usr/lib/libxcb-render.so.0.0.0 a7a1c000-a7a1e000 r-xp 00000000 fe:00 34019 /usr/lib/libxcb-render-util.so.0.0.0 a7a1e000-a7a1f000 r--p 00002000 fe:00 34019 /usr/lib/libxcb-render-util.so.0.0.0 a7a1f000-a7a20000 rw-p 00003000 fe:00 34019 /usr/lib/libxcb-render-util.so.0.0.0 a7a20000-a7a3d000 r-xp 00000000 fe:00 333977 /usr/lib/libpng14.so.14.3.0 a7a3d000-a7a3e000 r--p 0001c000 fe:00 333977 /usr/lib/libpng14.so.14.3.0 a7a3e000-a7a3f000 rw-p 0001d000 fe:00 333977 /usr/lib/libpng14.so.14.3.0 a7a3f000-a7a61000 r-xp 00000000 fe:00 4059 /usr/lib/libglitz.so.1.0.0 a7a61000-a7a62000 r--p 00021000 fe:00 4059 /usr/lib/libglitz.so.1.0.0 a7a62000-a7a63000 rw-p 00022000 fe:00 4059 /usr/lib/libglitz.so.1.0.0 a7a63000-a7aa8000 r-xp 00000000 fe:00 16692 /usr/lib/opengl/xorg-x11/lib/libGL.so.1.2 a7aa8000-a7aad000 r--p 00044000 fe:00 16692 /usr/lib/opengl/xorg-x11/lib/libGL.so.1.2 a7aad000-a7ab2000 rwxp 00049000 fe:00 16692 /usr/lib/opengl/xorg-x11/lib/libGL.so.1.2 a7ab2000-a7ab4000 rwxp 00000000 00:00 0 a7ab4000-a7ab8000 r-xp 00000000 fe:00 107635 /usr/lib/libglitz-glx.so.1.0.0 a7ab8000-a7ab9000 r--p 00004000 fe:00 107635 /usr/lib/libglitz-glx.so.1.0.0 a7ab9000-a7aba000 rw-p 00005000 fe:00 107635 /usr/lib/libglitz-glx.so.1.0.0 a7aba000-a7b05000 r-xp 00000000 fe:00 120053 /usr/lib/libpixman-1.so.0.18.4 a7b05000-a7b08000 r--p 0004b000 fe:00 120053 /usr/lib/libpixman-1.so.0.18.4 a7b08000-a7b09000 rw-p 0004e000 fe:00 120053 /usr/lib/libpixman-1.so.0.18.4 a7b09000-a7b10000 r-xp 00000000 fe:00 332579 /usr/lib/libXrender.so.1.3.0 a7b10000-a7b11000 r--p 00006000 fe:00 332579 /usr/lib/libXrender.so.1.3.0 a7b11000-a7b12000 rw-p 00007000 fe:00 332579 /usr/lib/libXrender.so.1.3.0 a7b12000-a7b14000 r-xp 00000000 fe:00 330222 /usr/lib/libXdamage.so.1.1.0 a7b14000-a7b15000 r--p 00001000 fe:00 330222 /usr/lib/libXdamage.so.1.1.0 a7b15000-a7b16000 rw-p 00002000 fe:00 330222 /usr/lib/libXdamage.so.1.1.0 a7b16000-a7b18000 r-xp 00000000 fe:00 1360 /usr/lib/libXcomposite.so.1.0.0 a7b18000-a7b19000 r--p 00001000 fe:00 1360 /usr/lib/libXcomposite.so.1.0.0 a7b19000-a7b1a000 rw-p 00002000 fe:00 1360 /usr/lib/libXcomposite.so.1.0.0 a7b1a000-a7b21000 r-xp 00000000 fe:00 330220 /usr/lib/libXcursor.so.1.0.2 a7b21000-a7b22000 r--p 00006000 fe:00 330220 /usr/lib/libXcursor.so.1.0.2 a7b22000-a7b23000 rw-p 00007000 fe:00 330220 /usr/lib/libXcursor.so.1.0.2 a7b23000-a7b29000 r-xp 00000000 fe:00 330078 /usr/lib/libXrandr.so.2.2.0 a7b29000-a7b2a000 r--p 00005000 fe:00 330078 /usr/lib/libXrandr.so.2.2.0 a7b2a000-a7b2b000 rw-p 00006000 fe:00 330078 /usr/lib/libXrandr.so.2.2.0 a7b2b000-a7b36000 r-xp 00000000 fe:00 99275 /usr/lib/libXi.so.6.1.0 a7b36000-a7b37000 r--p 0000a000 fe:00 99275 /usr/lib/libXi.so.6.1.0 a7b37000-a7b38000 rw-p 0000b000 fe:00 99275 /usr/lib/libXi.so.6.1.0 a7b38000-a7b44000 r-xp 00000000 fe:00 87635 /usr/lib/libXext.so.6.4.0 a7b44000-a7b45000 r--p 0000b000 fe:00 87635 /usr/lib/libXext.so.6.4.0 a7b45000-a7b46000 rw-p 0000c000 fe:00 87635 /usr/lib/libXext.so.6.4.0 a7b46000-a7c08000 r-xp 00000000 fe:00 16403 /usr/lib/libglib-2.0.so.0.2400.1 a7c08000-a7c09000 r--p 000c1000 fe:00 16403 /usr/lib/libglib-2.0.so.0.2400.1 a7c09000-a7c0a000 rw-p 000c2000 fe:00 16403 /usr/lib/libglib-2.0.so.0.2400.1 a7c0a000-a7c0c000 r-xp 00000000 fe:00 1124 /usr/lib/libgmodule-2.0.so.0.2400.1 a7c0c000-a7c0d000 r--p 00001000 fe:00 1124 /usr/lib/libgmodule-2.0.so.0.2400.1 a7c0d000-a7c0e000 rw-p 00002000 fe:00 1124 /usr/lib/libgmodule-2.0.so.0.2400.1 a7c0e000-a7c3b000 r-xp 00000000 fe:00 356767 /usr/lib/libgobject-2.0.so.0.2400.1 a7c3b000-a7c3c000 r--p 0002c000 fe:00 356767 /usr/lib/libgobject-2.0.so.0.2400.1 a7c3c000-a7c3d000 rw-p 0002d000 fe:00 356767 /usr/lib/libgobject-2.0.so.0.2400.1 a7c3d000-a7c64000 r-xp 00000000 fe:00 631 /usr/lib/libfontconfig.so.1.4.4 a7c64000-a7c65000 r--p 00027000 fe:00 631 /usr/lib/libfontconfig.so.1.4.4 a7c65000-a7c66000 rw-p 00028000 fe:00 631 /usr/lib/libfontconfig.so.1.4.4 a7c66000-a7c9f000 r-xp 00000000 fe:00 32834 /usr/lib/libpango-1.0.so.0.2800.1 a7c9f000-a7ca0000 r--p 00039000 fe:00 32834 /usr/lib/libpango-1.0.so.0.2800.1 a7ca0000-a7ca1000 rw-p 0003a000 fe:00 32834 /usr/lib/libpango-1.0.so.0.2800.1 a7ca1000-a7cbf000 r-xp 00000000 fe:00 16391 /usr/lib/libpangoft2-1.0.so.0.2800.1 a7cbf000-a7cc0000 r--p 0001d000 fe:00 16391 /usr/lib/libpangoft2-1.0.so.0.2800.1 a7cc0000-a7cc1000 rw-p 0001e000 fe:00 16391 /usr/lib/libpangoft2-1.0.so.0.2800.1 a7cc1000-a7d3d000 r-xp 00000000 fe:00 445 /usr/lib/libgio-2.0.so.0.2400.1 a7d3d000-a7d3e000 r--p 0007c000 fe:00 445 /usr/lib/libgio-2.0.so.0.2400.1 a7d3e000-a7d3f000 rw-p 0007d000 fe:00 445 /usr/lib/libgio-2.0.so.0.2400.1 a7d3f000-a7d40000 rw-p 00000000 00:00 0 a7d40000-a7e3a000 r-xp 00000000 fe:00 91019 /usr/lib/libX11.so.6.3.0 a7e3a000-a7e3b000 r--p 000f9000 fe:00 91019 /usr/lib/libX11.so.6.3.0 a7e3b000-a7e3e000 rw-p 000fa000 fe:00 91019 /usr/lib/libX11.so.6.3.0 a7e3e000-a7e9f000 r-xp 00000000 fe:00 16587 /usr/lib/libcairo.so.2.10800.10 a7e9f000-a7ea1000 r--p 00060000 fe:00 16587 /usr/lib/libcairo.so.2.10800.10 a7ea1000-a7ea2000 rw-p 00062000 fe:00 16587 /usr/lib/libcairo.so.2.10800.10 a7ea2000-a7eb9000 r-xp 00000000 fe:00 330146 /usr/lib/libatk-1.0.so.0.3009.1 a7eb9000-a7eba000 r--p 00016000 fe:00 330146 /usr/lib/libatk-1.0.so.0.3009.1 a7eba000-a7ebb000 rw-p 00017000 fe:00 330146 /usr/lib/libatk-1.0.so.0.3009.1 a7ebb000-a7ebf000 r-xp 00000000 fe:00 96357 /usr/lib/libXfixes.so.3.1.0 a7ebf000-a7ec0000 r--p 00003000 fe:00 96357 /usr/lib/libXfixes.so.3.1.0 a7ec0000-a7ec1000 rw-p 00004000 fe:00 96357 /usr/lib/libXfixes.so.3.1.0 a7ec1000-a7eca000 r-xp 00000000 fe:00 107105 /usr/lib/libpangocairo-1.0.so.0.2800.1 a7eca000-a7ecb000 r--p 00009000 fe:00 107105 /usr/lib/libpangocairo-1.0.so.0.2800.1 a7ecb000-a7ecc000 rw-p 0000a000 fe:00 107105 /usr/lib/libpangocairo-1.0.so.0.2800.1 a7ecc000-a7ee5000 r-xp 00000000 fe:00 16411 /usr/lib/libgdk_pixbuf-2.0.so.0.2000.1 a7ee5000-a7ee6000 r--p 00018000 fe:00 16411 /usr/lib/libgdk_pixbuf-2.0.so.0.2000.1 a7ee6000-a7ee7000 rw-p 00019000 fe:00 16411 /usr/lib/libgdk_pixbuf-2.0.so.0.2000.1 a7ee7000-a7f73000 r-xp 00000000 fe:00 16478 /usr/lib/libgdk-x11-2.0.so.0.2000.1 a7f73000-a7f74000 ---p 0008c000 fe:00 16478 /usr/lib/libgdk-x11-2.0.so.0.2000.1 a7f74000-a7f76000 r--p 0008c000 fe:00 16478 /usr/lib/libgdk-x11-2.0.so.0.2000.1 a7f76000-a7f77000 rw-p 0008e000 fe:00 16478 /usr/lib/libgdk-x11-2.0.so.0.2000.1 a7f77000-a8308000 r-xp 00000000 fe:00 17210 /usr/lib/libgtk-x11-2.0.so.0.2000.1 a8308000-a830c000 r--p 00390000 fe:00 17210 /usr/lib/libgtk-x11-2.0.so.0.2000.1 a830c000-a830e000 rw-p 00394000 fe:00 17210 /usr/lib/libgtk-x11-2.0.so.0.2000.1 a830e000-a8310000 rw-p 00000000 00:00 0 a8310000-a8323000 r--s 00000000 fe:01 769109 /var/cache/fontconfig/4b5cf4386f1cde02a336ba961b4ac82d-le32d4.cache-3 a8323000-a8327000 rwxp 00000000 00:00 0 a8327000-a837c000 r-xp 00000000 fe:00 571191 /usr/lib/libswt-pi-gtk-3448.so a837c000-a837d000 r--p 00054000 fe:00 571191 /usr/lib/libswt-pi-gtk-3448.so a837d000-a837e000 rw-p 00055000 fe:00 571191 /usr/lib/libswt-pi-gtk-3448.so a837e000-a837f000 rw-p 00000000 00:00 0 a837f000-a8380000 ---p 00000000 00:00 0 a8380000-a8400000 rw-p 00000000 00:00 0 a8400000-a8478000 rw-p 00000000 00:00 0 a8478000-a8500000 ---p 00000000 00:00 0 a8501000-a8505000 r-xp 00000000 fe:00 334044 /usr/lib/libXtst.so.6.1.0 a8505000-a8506000 r--p 00003000 fe:00 334044 /usr/lib/libXtst.so.6.1.0 a8506000-a8507000 rw-p 00004000 fe:00 334044 /usr/lib/libXtst.so.6.1.0 a8507000-a8519000 r--s 00100000 fe:00 571203 /usr/share/swt-3.4/lib/swt.jar a8519000-a8534000 r--s 000f5000 fe:00 762792 /usr/share/tuxguitar/lib/tuxguitar.jar a8534000-a8558000 r--s 00191000 fe:00 571021 /usr/share/bcprov/lib/bcprov.jar a8558000-a855b000 ---p 00000000 00:00 0 a855b000-a85a9000 rw-p 00000000 00:00 0 a85a9000-a85ac000 ---p 00000000 00:00 0 a85ac000-a862a000 rw-p 00000000 00:00 0 a862a000-a862d000 ---p 00000000 00:00 0 a862d000-a867b000 rw-p 00000000 00:00 0 a867b000-a879b000 r--p 00176000 fe:00 537419 /usr/lib/locale/locale-archive a879b000-a899b000 r--p 00000000 fe:00 537419 /usr/lib/locale/locale-archive a899b000-a899e000 ---p 00000000 00:00 0 a899e000-a89ec000 rw-p 00000000 00:00 0 a89ec000-a89ef000 ---p 00000000 00:00 0 a89ef000-a8a3d000 rw-p 00000000 00:00 0 a8a3d000-a8a3e000 ---p 00000000 00:00 0 a8a3e000-a8af1000 rw-p 00000000 00:00 0 a8af1000-a8c83000 r--s 03911000 08:13 17880 /opt/icedtea6-bin-1.8.1/jre/lib/rt.jar a8c83000-a8c8a000 rw-p 00000000 00:00 0 a8c8a000-a8ca4000 rw-p 00000000 00:00 0 a8ca4000-a8d15000 rw-p 00000000 00:00 0 a8d15000-a8d2f000 rw-p 00000000 00:00 0 a8d2f000-b1930000 rw-p 00000000 00:00 0 b1930000-b4d30000 rw-p 00000000 00:00 0 b4d30000-b4d32000 r--s 0000f000 fe:00 571027 /usr/share/sun-jaf/lib/activation.jar b4d32000-b4d35000 r-xp 00000000 fe:00 347690 /usr/lib/libgthread-2.0.so.0.2400.1 b4d35000-b4d36000 r--p 00002000 fe:00 347690 /usr/lib/libgthread-2.0.so.0.2400.1 b4d36000-b4d37000 rw-p 00003000 fe:00 347690 /usr/lib/libgthread-2.0.so.0.2400.1 b4d37000-b4d3b000 rw-p 00000000 00:00 0 b4d3b000-b4db7000 rw-p 00000000 00:00 0 b4db7000-b4e9f000 rwxp 00000000 00:00 0 b4e9f000-b6db7000 rw-p 00000000 00:00 0 b6db7000-b6dc1000 r-xp 00000000 08:13 17175 /lib/libnss_files-2.12.1.so b6dc1000-b6dc2000 r--p 00009000 08:13 17175 /lib/libnss_files-2.12.1.so b6dc2000-b6dc3000 rw-p 0000a000 08:13 17175 /lib/libnss_files-2.12.1.so b6dc3000-b6dcc000 r-xp 00000000 08:13 17198 /lib/libnss_nis-2.12.1.so b6dcc000-b6dcd000 r--p 00008000 08:13 17198 /lib/libnss_nis-2.12.1.so b6dcd000-b6dce000 rw-p 00009000 08:13 17198 /lib/libnss_nis-2.12.1.so b6dce000-b6dd1000 r-xp 00000000 fe:00 571164 /usr/lib/libswt-gtk-3448.so b6dd1000-b6dd2000 r--p 00002000 fe:00 571164 /usr/lib/libswt-gtk-3448.so b6dd2000-b6dd3000 rw-p 00003000 fe:00 571164 /usr/lib/libswt-gtk-3448.so b6dd3000-b6dd4000 rw-p 00000000 00:00 0 b6dd4000-b6ddb000 r-xp 00000000 08:13 17815 /opt/icedtea6-bin-1.8.1/jre/lib/i386/libzip.so b6ddb000-b6ddc000 r--p 00006000 08:13 17815 /opt/icedtea6-bin-1.8.1/jre/lib/i386/libzip.so b6ddc000-b6ddd000 rw-p 00007000 08:13 17815 /opt/icedtea6-bin-1.8.1/jre/lib/i386/libzip.so b6ddd000-b6de5000 rw-s 00000000 08:13 6028 /tmp/hsperfdata_pimiento/18745 b6de5000-b6df8000 r-xp 00000000 08:13 5724 /lib/libnsl-2.12.1.so b6df8000-b6df9000 r--p 00012000 08:13 5724 /lib/libnsl-2.12.1.so b6df9000-b6dfa000 rw-p 00013000 08:13 5724 /lib/libnsl-2.12.1.so b6dfa000-b6dfc000 rw-p 00000000 00:00 0 b6dfc000-b6dfd000 r-xp 00000000 fe:00 32584 /usr/lib/libX11-xcb.so.1.0.0 b6dfd000-b6dfe000 r--p 00000000 fe:00 32584 /usr/lib/libX11-xcb.so.1.0.0 b6dfe000-b6dff000 rw-p 00001000 fe:00 32584 /usr/lib/libX11-xcb.so.1.0.0 b6dff000-b6e02000 r--s 0007a000 08:13 17902 /opt/icedtea6-bin-1.8.1/jre/lib/jsse.jar b6e02000-b6e08000 r-xp 00000000 08:13 17196 /lib/libnss_compat-2.12.1.so b6e08000-b6e09000 r--p 00006000 08:13 17196 /lib/libnss_compat-2.12.1.so b6e09000-b6e0a000 rw-p 00007000 08:13 17196 /lib/libnss_compat-2.12.1.so b6e0a000-b6e11000 r-xp 00000000 08:13 17823 /opt/icedtea6-bin-1.8.1/jre/lib/i386/native_threads/libhpi.so b6e11000-b6e12000 r--p 00006000 08:13 17823 /opt/icedtea6-bin-1.8.1/jre/lib/i386/native_threads/libhpi.so b6e12000-b6e13000 rw-p 00007000 08:13 17823 /opt/icedtea6-bin-1.8.1/jre/lib/i386/native_threads/libhpi.so b6e13000-b6e37000 r-xp 00000000 08:13 17836 /opt/icedtea6-bin-1.8.1/jre/lib/i386/libjava.so b6e37000-b6e38000 r--p 00023000 08:13 17836 /opt/icedtea6-bin-1.8.1/jre/lib/i386/libjava.so b6e38000-b6e3a000 rw-p 00024000 08:13 17836 /opt/icedtea6-bin-1.8.1/jre/lib/i386/libjava.so b6e3a000-b6e41000 r-xp 00000000 08:13 17253 /lib/librt-2.12.1.so b6e41000-b6e42000 r--p 00006000 08:13 17253 /lib/librt-2.12.1.so b6e42000-b6e43000 rw-p 00007000 08:13 17253 /lib/librt-2.12.1.so b6e43000-b6e46000 ---p 00000000 00:00 0 b6e46000-b6e94000 rw-p 00000000 00:00 0 b6e94000-b6eb7000 r-xp 00000000 08:13 17259 /lib/libm-2.12.1.so b6eb7000-b6eb8000 r--p 00022000 08:13 17259 /lib/libm-2.12.1.so b6eb8000-b6eb9000 rw-p 00023000 08:13 17259 /lib/libm-2.12.1.so b6eb9000-b72c6000 r-xp 00000000 08:13 17828 /opt/icedtea6-bin-1.8.1/jre/lib/i386/client/libjvm.so b72c6000-b72dd000 r--p 0040c000 08:13 17828 /opt/icedtea6-bin-1.8.1/jre/lib/i386/client/libjvm.so b72dd000-b72ea000 rw-p 00423000 08:13 17828 /opt/icedtea6-bin-1.8.1/jre/lib/i386/client/libjvm.so b72ea000-b7706000 rw-p 00000000 00:00 0 b7706000-b7862000 r-xp 00000000 08:13 17251 /lib/libc-2.12.1.so b7862000-b7864000 r--p 0015b000 08:13 17251 /lib/libc-2.12.1.so b7864000-b7865000 rw-p 0015d000 08:13 17251 /lib/libc-2.12.1.so b7865000-b7868000 rw-p 00000000 00:00 0 b7868000-b786a000 r-xp 00000000 08:13 17257 /lib/libdl-2.12.1.so b786a000-b786b000 r--p 00001000 08:13 17257 /lib/libdl-2.12.1.so b786b000-b786c000 rw-p 00002000 08:13 17257 /lib/libdl-2.12.1.so b786c000-b786d000 rw-p 00000000 00:00 0 b786d000-b7871000 r-xp 00000000 08:13 17811 /opt/icedtea6-bin-1.8.1/jre/lib/i386/jli/libjli.so b7871000-b7872000 r--p 00003000 08:13 17811 /opt/icedtea6-bin-1.8.1/jre/lib/i386/jli/libjli.so b7872000-b7873000 rw-p 00004000 08:13 17811 /opt/icedtea6-bin-1.8.1/jre/lib/i386/jli/libjli.so b7873000-b7889000 r-xp 00000000 08:13 17252 /lib/libpthread-2.12.1.so b7889000-b788a000 r--p 00015000 08:13 17252 /lib/libpthread-2.12.1.so b788a000-b788b000 rw-p 00016000 08:13 17252 /lib/libpthread-2.12.1.so b788b000-b788d000 rw-p 00000000 00:00 0 b788d000-b789d000 r-xp 00000000 08:13 5363 /lib/libz.so.1.2.5 b789d000-b789e000 r--p 0000f000 08:13 5363 /lib/libz.so.1.2.5 b789e000-b789f000 rw-p 00010000 08:13 5363 /lib/libz.so.1.2.5 b789f000-b78a0000 r--s 00001000 fe:00 762775 /usr/share/tuxguitar/lib/share/plugins/tuxguitar-tray.jar b78a0000-b78a6000 r--s 00056000 fe:00 571389 /usr/share/bcmail/lib/bcmail.jar b78a6000-b78a7000 rw-p 00000000 00:00 0 b78a7000-b78a8000 r--p 00000000 00:00 0 b78a8000-b78b4000 r-xp 00000000 08:13 17847 /opt/icedtea6-bin-1.8.1/jre/lib/i386/libverify.so b78b4000-b78b5000 r--p 0000c000 08:13 17847 /opt/icedtea6-bin-1.8.1/jre/lib/i386/libverify.so b78b5000-b78b6000 rw-p 0000d000 08:13 17847 /opt/icedtea6-bin-1.8.1/jre/lib/i386/libverify.so b78b6000-b78b7000 rw-p 00000000 00:00 0 b78b7000-b78b8000 r-xp 00000000 00:00 0 [vdso] b78b8000-b78d4000 r-xp 00000000 08:13 17161 /lib/ld-2.12.1.so b78d4000-b78d5000 r--p 0001b000 08:13 17161 /lib/ld-2.12.1.so b78d5000-b78d6000 rw-p 0001c000 08:13 17161 /lib/ld-2.12.1.so bfaf9000-bfb1a000 rw-p 00000000 00:00 0 [stack] VM Arguments: jvm_args: -Djava.library.path=/usr/lib:/usr/share/tuxguitar/lib/lib:/lib:/usr/lib -Xms128m -Xmx128m -Dtuxguitar.share.path=/usr/share/tuxguitar/lib/share java_command: org.herac.tuxguitar.gui.TGMain Launcher Type: SUN_STANDARD Environment Variables: JAVA_HOME=/opt/icedtea6-bin-1.8.1 PATH=/opt/icedtea6-bin-1.8.1/bin:/opt/icedtea6-bin-1.8.1/jre/bin LD_LIBRARY_PATH=/opt/icedtea6-bin-1.8.1/jre/lib/i386/client:/opt/icedtea6-bin-1.8.1/jre/lib/i386:/opt/icedtea6-bin-1.8.1/jre/../lib/i386 SHELL=/bin/bash DISPLAY=:0.0 Signal Handlers: SIGSEGV: [libjvm.so+0x3aa0d0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGBUS: [libjvm.so+0x3aa0d0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGFPE: [libjvm.so+0x2d85a0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGPIPE: SIG_IGN, sa_mask[0]=0x00001000, sa_flags=0x10000000 SIGXFSZ: [libjvm.so+0x2d85a0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGILL: [libjvm.so+0x2d85a0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000 SIGUSR2: [libjvm.so+0x2d7d10], sa_mask[0]=0x00000000, sa_flags=0x10000004 SIGHUP: [libjvm.so+0x2da150], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGINT: [libjvm.so+0x2da150], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGTERM: [libjvm.so+0x2da150], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 SIGQUIT: [libjvm.so+0x2da150], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004 --------------- S Y S T E M --------------- OS:Gentoo Base System release 2.0.1 uname:Linux 2.6.35-gentoo-r1 #1 SMP Fri Aug 13 09:36:05 YEKST 2010 i686 libc:glibc 2.12.1 NPTL 2.12.1 rlimit: STACK 8192k, CORE 0k, NPROC 7049, NOFILE 1024, AS infinity load average:1.40 1.44 1.81 CPU:total 2 (1 cores per cpu, 2 threads per core) family 15 model 6 stepping 5, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ht Memory: 4k page, physical 902684k(65304k free), swap 136548k(113432k free) vm_info: OpenJDK Client VM (16.0-b13) for linux-x86 JRE (1.6.0_18-b18), built on Jul 30 2010 14:14:00 by "root" with gcc 4.3.4 time: Tue Aug 31 10:04:52 2010 elapsed time: 3 seconds -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From dj at lucasit.com Mon Aug 30 23:34:10 2010 From: dj at lucasit.com (DJ Lucas) Date: Tue, 31 Aug 2010 01:34:10 -0500 Subject: [PATCH] --enable-cacerts (Was: Re: For users of --with-openjdk) Message-ID: <4C7CA262.60500@lucasit.com> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I had previously sent an erroneous patch to the list (incorrect version). Rather than send another large (possibly unwanted) patch to list, a revised patch, with correct conditionals, and default no, is available for review at: http://www.linuxfromscratch.org/~dj/icedtea6/icedtea6-enable-cacerts.patch I'm currently using it on 1.9 but should be good with possibly some offsets in 1.10. Tested only on BLFS, however, I've added the correct search directories and files for what I believe to be correct for RedHat and Debian (and derivatives) and one or two others that seem likely. Also, though it works with sh->bash for the interpreter, I haven't fed the script through ash/dash yet, so watch for bashisms if sh isn't bash (or zsh). Thanks. - -- DJ Lucas -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) iQIcBAEBAgAGBQJMfKJgAAoJEEuKOnIORKixKQEQAIna6uQAliNy8+zV7y+Z1ZB8 As8nMzsoXwCpLEjs2n8ZoJxDXcA9CPUFPi8Dkvw5OBgQFxQptP8kHP5gWnMHtAth i6FKTBpNxVnLh2t4xv9FmO6O+KG6RCVoyFbmjbFlb2ldATkmDwN9DiI4Xr6j2Qdj bOuIUagP/+PbiNxhgIJtfF4fbUtzNgXLDPvNcIJU0DBT9BeHc90As6xJFXsmfI7Y AlKgI/3CgOj9VMvGsXJu4HgMUAj06aNn+KQUFL7BlyZwCcW2zkDmgZOfAKWHnv+1 EX+wHSOn4x9nOKFndF+gRLnC3r6uESTMfNP7jhnmAG0/cxe7OuiRD+TR8lih2Ojd o9HgnPvLuYw0TEWtqKJZVXH5QFcOvqM7Lh5E8tX++iAZU2ddHMIr0ZGllc/b7I+h kxamwADfXxiUJi+gJ0kxQnxgCZ5b08aFZXNTvkYe/0/meyGY0GWudv8oMlexeHFK cqymVGlvsCMUsEOQZoF9Ts4uVWhi73F56u6c8GGFaO9MCG3Uys4TpyezLqEqLBAA Vyec4TbLZEuzrEsPb9o+dHp8RiU009BFMO3+MB+IO6xmsFXIV2Gbek/N6ZYEyPVA Q46D/7bnJhhKeirmwaOcSEeEskTtyYfRGX62JJm0BouuMesoIMLdf4z2vh7ORu5G a0AKtScxTayz5oip2zyG =sNTh -----END PGP SIGNATURE----- -- This message has been scanned for viruses and dangerous content, and is believed to be clean. From dj at lucasit.com Tue Aug 31 00:02:59 2010 From: dj at lucasit.com (DJ Lucas) Date: Tue, 31 Aug 2010 02:02:59 -0500 Subject: Collecting test results (Was: For users of --with-openjdk) In-Reply-To: <1283085711.2345.11.camel@hermans.wildebeest.org> References: <20100810111600.GF27843@rivendell.middle-earth.co.uk> <4C6234EC.7020809@linuxfromscratch.org> <20100811181112.GL10867@rivendell.middle-earth.co.uk> <4C633B7F.3080101@linuxfromscratch.org> <4C6484B8.6090007@linuxfromscratch.org> <20100813004137.GP10867@rivendell.middle-earth.co.uk> <4C64A128.2010300@linuxfromscratch.org> <20100813195739.GX10867@rivendell.middle-earth.co.uk> <4C66DBB9.4070707@linuxfromscratch.org> <20100825153429.GH26213@rivendell.middle-earth.co.uk> <4C79B011.4020609@lucasit.com> <1283085711.2345.11.camel@hermans.wildebeest.org> Message-ID: <4C7CA923.2020607@lucasit.com> On 08/29/2010 07:41 AM, Mark Wielaard wrote: > > We should probably setup a real buildbot so people can more easily share > their results. > > For now there is one autobuilder that puts its results at: > http://icedtea.classpath.org/builds/ > It has build logs, test logs and the full test results, but only for the > last (successful) build. > > See for example the full hotspot jtreg results for icedtea6: > http://icedtea.classpath.org/builds/icedtea6/test/hotspot/JTreport/html/index.html > Replace /icedtea6/ with /icedtea7/ if you are interested in the 7 > branch, replace /hotspot/ with /langtools/ or /jdk/ if you are > interested in these jtreg runs. > > If the autobuilder detects a change in test results or a build failure > it will send email to every committer since the last run plus the > icedtea-testresults mailinglist: > http://icedtea.classpath.org/pipermail/testresults/ > Actually, those three sites are more than enough to go on for my purposes. Thanks. -- DJ Lucas -- This message has been scanned for viruses and dangerous content, and is believed to be clean. From bugzilla-daemon at icedtea.classpath.org Tue Aug 31 02:22:56 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 Aug 2010 09:22:56 +0000 Subject: [Bug 534] zero doesn't work on sparc linux Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=534 gbenson at redhat.com changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #405|text/x-log |text/plain mime type| | -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Aug 31 02:37:55 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 Aug 2010 09:37:55 +0000 Subject: [Bug 534] zero doesn't work on sparc linux Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=534 ------- Comment #3 from gbenson at redhat.com 2010-08-31 09:37 ------- Can you do "jcf-dump -c /path/to/java/lang/ref/ReferenceQueue.class" and attach the result to this bug please? -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From ahughes at redhat.com Tue Aug 31 07:34:15 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 31 Aug 2010 15:34:15 +0100 Subject: For users of --with-openjdk In-Reply-To: <4C79B011.4020609@lucasit.com> References: <4C6234EC.7020809@linuxfromscratch.org> <20100811181112.GL10867@rivendell.middle-earth.co.uk> <4C633B7F.3080101@linuxfromscratch.org> <4C6484B8.6090007@linuxfromscratch.org> <20100813004137.GP10867@rivendell.middle-earth.co.uk> <4C64A128.2010300@linuxfromscratch.org> <20100813195739.GX10867@rivendell.middle-earth.co.uk> <4C66DBB9.4070707@linuxfromscratch.org> <20100825153429.GH26213@rivendell.middle-earth.co.uk> <4C79B011.4020609@lucasit.com> Message-ID: <20100831143415.GA18421@rivendell.middle-earth.co.uk> On 19:55 Sat 28 Aug , DJ Lucas wrote: > On 08/25/2010 10:34 AM, Dr Andrew John Hughes wrote: > > On 13:08 Sat 14 Aug , DJ Lucas wrote: > >> On 08/13/2010 02:57 PM, Dr Andrew John Hughes wrote: > > > > > I think I found a simpler fix for this. At least, it works when bootstrapping > > with both IcedTea6 1.8 and gcj 4.5.1. Basically, instead of trying to build > > the whole of javax.swing.plaf.synth, we just build NimbusLookAndFeel which is > > the class this is outdated in 1.8: > > > > http://icedtea.classpath.org/hg/icedtea6/rev/6f017e9047ab > > > > > >> Attached patch will have to be moved appropriately for 1.9 branch (if > >> accepted) and could be done in the same location for 1.10 in FIND_JAVAC. > >> > > > > These changes will just be in 1.10. I want them to have plenty of soak > > time before being used generally. > > > > I was referring only to the name of the patch, as I am planning on doing > for 1.9 locally, but it doesn't matter now as you've already put in a > smaller (better) fix in both 1.9 and 1.10 (as quoted above) which works > great BTW. Sorry I hadn't replied on that yet, haven't had a chance to > test with GCJ, but that was already done anyway. > Well, I've put the fix in HEAD which will become 1.10. I'm not applying any of this to 1.9, as I've mentioned before. > > > > Pavel has been looking into the Xrender test breakages which also affect > > OpenJDK7: > > > > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009988.html > > > > So it looks like Oracle made changes without fixing the tests. Pavel now has > > a fix which should be committed shortly. > > > > Pavel's fix and additionally creating a populated cacerts file (which > Pavel was working on back in May) has reduced the number of failures > considerably. On the second fix, I've written a bash script to account > for both CADIR and CAFILE. AC check accounts for distros who's certs I > know about. ATM that would be RedHat and Debian derivatives, and BLFS, > but if you look at the check, it should easily extended. If you all > would be interested in a single upstream solution that accounts for both > certificates directory and a single bundle file, feel free (attached). > I did the check for the files unconditionally, as I wasn't exactly sure > how to (properly) do a conditional check based on another (where if > --genertate-cacerts should be set yes by another switch). Additionally, > the mkcacerts.sh script could be written much differently (and probably > better/faster in perl rather than bash/sed/grep but it should in account > for both variants from the command line). > Thanks. I'll take a look at the patch. I don't know what's happened to Pavel's work on this. It's been three months. > > On JDK, I don't think there's ever been a 100% pass, and some aren't even > > stable tests. So you're looking more for regressions between builds. > > > > To my knowledge, the HotSpot and langtools suites should all pass (and > > take a considerably shorter time to run). > > > > Is there a central place to share and view previous test results, or > just search the distro-pkg-dev and openjdk-dev lists? > See Mark's e-mail; I was going to include the link myself but couldn't find a reference to it and Mark wasn't online. > -- DJ Lucas > > -- > This message has been scanned for viruses and > dangerous content, and is believed to be clean. > > diff -Naurp icedtea6-1-9-d59cbcab0fe4-orig/acinclude.m4 icedtea6-1-9-d59cbcab0fe4-new/acinclude.m4 > --- icedtea6-1-9-d59cbcab0fe4-orig/acinclude.m4 2010-08-26 00:25:14.000000000 -0500 > +++ icedtea6-1-9-d59cbcab0fe4-new/acinclude.m4 2010-08-28 19:09:44.000000000 -0500 > @@ -316,6 +316,66 @@ AC_DEFUN_ONCE([IT_CAN_HARDLINK_TO_SOURCE > AM_CONDITIONAL([SRC_DIR_HARDLINKABLE], test x"${it_cv_hardlink_src}" = "xyes") > ]) > > +AC_DEFUN([IT_CHECK_GENERATE_CACERTS], > +[ > + AC_MSG_CHECKING([for a local x509 certificate directory]) > + AC_ARG_WITH([ca-dir], > + [AS_HELP_STRING(--with-ca-dir=DIR, specify a top-level local x509 certificate directory)], > + [ > + if test -d "${withval}"; then > + CADIR="${withval}" > + fi > + ], > + [ > + CADIR= > + ]) > + if test -z "${CADIR}"; then > + for dir in /etc/pki/tls/certs \ > + /usr/share/ca-certificates \ > + /etc/ssl/certs \ > + /etc/certs ; do > + if test -d "${dir}"; then > + CADIR="${dir}" > + break > + fi > + done > + if test -z "${CADIR}"; then > + CADIR=no > + fi > + fi > + AC_MSG_RESULT(${CADIR}) > + AC_SUBST(CADIR) > + > + AC_MSG_CHECKING([for a local x509 certificate file]) > + AC_ARG_WITH([ca-file], > + [AS_HELP_STRING(--with-ca-file=FILE, specify a local x509 certificate file)], > + [ > + if test -f "${withval}"; then > + CAFILE="${withval}" > + fi > + ], > + [ > + CAFILE= > + ]) > + if test -z "${CAFILE}"; then > + for file in /etc/pki/tls/certs/ca-bundle.crt \ > + /etc/ssl/certs/ca-bundle.crt \ > + /etc/ssl/ca-bundle.crt \ > + /etc/ca-bundle.crt ; do > + if test -e "${file}"; then > + CAFILE=$file > + break > + fi > + done > + if test -z "${CAFILE}"; then > + CAFILE=no > + fi > + fi > + AC_MSG_RESULT(${CAFILE}) > + AC_SUBST(CAFILE) > + AM_CONDITIONAL(GENERATE_CACERTS, test "${CADIR}x" != "nox" -a "${CAFILE}x" != "nox") > +]) > + > AC_DEFUN([FIND_ECJ_JAR], > [ > AC_MSG_CHECKING([for an ecj JAR file]) > diff -Naurp icedtea6-1-9-d59cbcab0fe4-orig/configure.ac icedtea6-1-9-d59cbcab0fe4-new/configure.ac > --- icedtea6-1-9-d59cbcab0fe4-orig/configure.ac 2010-08-26 00:25:14.000000000 -0500 > +++ icedtea6-1-9-d59cbcab0fe4-new/configure.ac 2010-08-28 19:10:33.000000000 -0500 > @@ -135,6 +135,8 @@ else > AC_MSG_RESULT([disabled by default (edit java.security to enable)]) > fi > > +IT_CHECK_GENERATE_CACERTS > + > IT_GET_PKGVERSION > IT_GET_LSB_DATA > > diff -Naurp icedtea6-1-9-d59cbcab0fe4-orig/Makefile.am icedtea6-1-9-d59cbcab0fe4-new/Makefile.am > --- icedtea6-1-9-d59cbcab0fe4-orig/Makefile.am 2010-08-26 01:07:58.000000000 -0500 > +++ icedtea6-1-9-d59cbcab0fe4-new/Makefile.am 2010-08-28 19:13:15.000000000 -0500 > @@ -1273,6 +1273,19 @@ if WITH_TZDATA_DIR > cp $(abs_top_builddir)/tz.properties \ > $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; > endif > + > +if GENERATE_CACERTS > + if test -n "${CADIR}"; then > + sh scripts/mkcacerts.sh -d "${CADIR}" \ > + -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \ > + -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts > + else > + sh scripts/mkcacerts.sh -f "${CAFILE}" \ > + -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \ > + -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts > + fi > +endif > + > @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR) > mkdir -p stamps > touch stamps/icedtea.stamp > @@ -1337,6 +1350,19 @@ if WITH_TZDATA_DIR > cp $(abs_top_builddir)/tz.properties \ > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; > endif > + > +if GENERATE_CACERTS > + if test -n "${CADIR}"; then > + sh scripts/mkcacerts.sh -d "${CADIR}" \ > + -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \ > + -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts > + else > + sh scripts/mkcacerts.sh -f "${CAFILE}" \ > + -k $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/keytool \ > + -o $(BUILD_OUTPUT_DIR)/j2re-image/lib/security/cacerts > + fi > +endif > + > @echo "IcedTea (debug build) is served:" \ > $(DEBUG_BUILD_OUTPUT_DIR) > mkdir -p stamps > diff -Naurp icedtea6-1-9-d59cbcab0fe4-orig/scripts/mkcacerts.sh icedtea6-1-9-d59cbcab0fe4-new/scripts/mkcacerts.sh > --- icedtea6-1-9-d59cbcab0fe4-orig/scripts/mkcacerts.sh 1969-12-31 18:00:00.000000000 -0600 > +++ icedtea6-1-9-d59cbcab0fe4-new/scripts/mkcacerts.sh 2010-08-28 19:07:09.000000000 -0500 > @@ -0,0 +1,154 @@ > +#!/bin/sh > +# Simple script to extract individual pem-files from a bundle and create > +# JRE cacerts file. > + > +get_args() > + { > + if test -z "${@}" ; then > + showhelp > + exit 1 > + fi > + > + while test -n "$1" ; do > + case "${1}" in > + -f | --cafile) > + check_arg $1 $2 > + CAFILE="${2}" > + shift 2 > + ;; > + -d | --cadir) > + check_arg $1 $2 > + CADIR="${2}" > + shift 2 > + ;; > + -o | --outfile) > + check_arg $1 $2 > + OUTFILE="${2}" > + shift 2 > + ;; > + -k | --keytool) > + check_arg $1 $2 > + KEYTOOL="${2}" > + shift 2 > + ;; > + -h | --help) > + showhelp > + exit 0 > + ;; > + *) > + showhelp > + exit 1 > + ;; > + esac > + done > + } > + > +check_arg() > + { > + echo "${2}" | grep -v "^-" > /dev/null > + if [ -z "$?" -o ! -n "$2" ]; then > + echo "Error: $1 requires a valid argument." > + exit 1 > + fi > + } > + > + > +showhelp() > + { > + echo "`basename ${0}` creates a valid cacerts file for use with IcedTea." > + echo "" > + echo " -f --cafile The path to a file containing PEM formated CA" > + echo " certificates. May not be used with -d/--cadir." > + echo " -d --cadir The path to a diectory of PEM formatted CA" > + echo " certificates. May not be used with -f/--cafile." > + echo " -o --outfile The path to the output file." > + echo "" > + echo " -k --keytool The path to the java keytool utility." > + echo "" > + echo " -h --help Show this help message and exit." > + echo "" > + echo "" > + } > + > +# Initialize empty variables so that the shell does not polute the script > +CAFILE="" > +CADIR="" > +OUTFILE="" > +KEYTOOL="" > + > +# Process command line arguments > +get_args ${@} > + > +# Handle common errors > +if test "${CAFILE}x" == "x" -a "${CADIR}x" == "x" ; then > + echo "ERROR! You must provide an x509 certificate store!" > + echo "\'$(basename ${0}) --help\' for more info." > + echo "" > + exit 1 > +fi > + > +if test "${CAFILE}x" != "x" -a "${CADIR}x" != "x" ; then > + echo "ERROR! You cannot provide two x509 certificate stores!" > + echo "\'$(basename ${0}) --help\' for more info." > + echo "" > + exit 1 > +fi > + > +if test "${KEYTOOL}x" == "x" ; then > + echo "ERROR! You must provide a valid keytool program!" > + echo "\'$(basename ${0}) --help\' for more info." > + echo "" > + exit 1 > +fi > + > +if test "${OUTFILE}x" == "x" ; then > + echo "ERROR! You must provide a valid output file!" > + echo "\'$(basename ${0}) --help\' for more info." > + echo "" > + exit 1 > +fi > + > +# Get on with the work > + > +# If using a CAFILE, split it into individual files in a temp directory > +if test "${CAFILE}x" != "x" ; then > + TEMPDIR=`mktemp -d` > + CADIR="${TEMPDIR}" > + > + # Get a list of staring lines for each cert > + CERTLIST=`grep -n "^-----BEGIN" "${CAFILE}" | cut -d ":" -f 1` > + > + # Get a list of ending lines for each cert > + ENDCERTLIST=`grep -n "^-----END" "${CAFILE}" | cut -d ":" -f 1` > + > + # Start a loop > + for certbegin in `echo "${CERTLIST}"` ; do > + for certend in `echo "${ENDCERTLIST}"` ; do > + if test "${certend}" -gt "${certbegin}"; then > + break > + fi > + done > + sed -n "${certbegin},${certend}p" "${CAFILE}" > "${CADIR}/${certbegin}" > + keyhash=`openssl x509 -noout -in "${CADIR}/${certbegin}" -hash` > + echo "Generated PEM file with hash: ${keyhash}." > + mv "${CADIR}/${certbegin}" "${CADIR}/${keyhash}.pem" > + done > +fi > + > +# Write the output file > +for cert in `find "${CADIR}" -type f -name "*.pem" -name "*.crt"` > +do > + tempfile=`mktemp` > + certbegin=`grep -n "^-----BEGIN" "${cert}" | cut -d ":" -f 1` > + certend=`grep -n "^-----END" "${cert}" | cut -d ":" -f 1` > + sed -n "${certbegin},${certend}p" "${cert}" > "${tempfile}" > + echo yes | "${KEYTOOL}" -import -alias `basename "${cert}"` -keystore \ > + "${OUTFILE}" -storepass 'changeit' -file "${tempfile}" > + rm "${tempfile}" > +done > + > +if test "${TEMPDIR}x" != "x" ; then > + rm -rf "${TEMPDIR}" > +fi > +exit 0 > + -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Aug 31 07:47:41 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 31 Aug 2010 15:47:41 +0100 Subject: Collecting test results (Was: For users of --with-openjdk) In-Reply-To: <1283085711.2345.11.camel@hermans.wildebeest.org> References: <20100811181112.GL10867@rivendell.middle-earth.co.uk> <4C633B7F.3080101@linuxfromscratch.org> <4C6484B8.6090007@linuxfromscratch.org> <20100813004137.GP10867@rivendell.middle-earth.co.uk> <4C64A128.2010300@linuxfromscratch.org> <20100813195739.GX10867@rivendell.middle-earth.co.uk> <4C66DBB9.4070707@linuxfromscratch.org> <20100825153429.GH26213@rivendell.middle-earth.co.uk> <4C79B011.4020609@lucasit.com> <1283085711.2345.11.camel@hermans.wildebeest.org> Message-ID: <20100831144741.GB18421@rivendell.middle-earth.co.uk> On 14:41 Sun 29 Aug , Mark Wielaard wrote: > On Sat, 2010-08-28 at 19:55 -0500, DJ Lucas wrote: > > > On JDK, I don't think there's ever been a 100% pass, and some aren't even > > > stable tests. So you're looking more for regressions between builds. > > > > > > To my knowledge, the HotSpot and langtools suites should all pass (and > > > take a considerably shorter time to run). > > > > > Is there a central place to share and view previous test results, or > > just search the distro-pkg-dev and openjdk-dev lists? > > We should probably setup a real buildbot so people can more easily share > their results. > > For now there is one autobuilder that puts its results at: > http://icedtea.classpath.org/builds/ > It has build logs, test logs and the full test results, but only for the > last (successful) build. > > See for example the full hotspot jtreg results for icedtea6: > http://icedtea.classpath.org/builds/icedtea6/test/hotspot/JTreport/html/index.html > Replace /icedtea6/ with /icedtea7/ if you are interested in the 7 > branch, replace /hotspot/ with /langtools/ or /jdk/ if you are > interested in these jtreg runs. > > If the autobuilder detects a change in test results or a build failure > it will send email to every committer since the last run plus the > icedtea-testresults mailinglist: > http://icedtea.classpath.org/pipermail/testresults/ > Is there a page that lists the available IcedTea mailing lists? I was looking for this to give DJ the link, but couldn't find anything on our wiki. > Red Hat also has an autobuilder (based on hudson) that sends its results > to that list. I promised Pavel that I would make room on the autobuilder > site to post full test results (really, almost there now, disk space is > cheap, but time to move services around isn't...) > > Cheers, > > Mark > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Aug 31 08:00:03 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 31 Aug 2010 16:00:03 +0100 Subject: [BRANCH APPROVAL] /hg/icedtea6: PR398: hotspot hs16 / 6b17 build failure on sparc In-Reply-To: <4C7A3CC7.5030501@ubuntu.com> References: <20100827224723.GD6429@bree.middle-earth.co.uk> <4C7842D3.3000602@ubuntu.com> <4C7A3CC7.5030501@ubuntu.com> Message-ID: <20100831150003.GC18421@rivendell.middle-earth.co.uk> On 12:56 Sun 29 Aug , Matthias Klose wrote: > On 28.08.2010 00:57, Matthias Klose wrote: > > On 28.08.2010 00:47, Dr Andrew John Hughes wrote: > >> This fixes PR398. Ok for 1.7, 1.8& 1.9? > > > > I only can approve for 1.8, approved. you are release manager for 1.9 yourself, > > so please make the decision yourself. > My plan with 1.9 (and 1.7 now as well) was to have a requirement of having each patch approved by another developer (see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009934.html), rather than the previous rather unfair practice of me approving all patches and being able to commit what I want. As with patches to any tree, anyone can still veto a patch with good reason. > now checked in the unmodified patch on the 1.9 branch, and one which only > applies for the alternate hotspot build on the 1.8 branch. Thanks. Was there a particular reason you didn't do 1.7? > Test results are > attached. What version & arch are these from? How do they compare with the last working build? > > Matthias > --------------- jtreg console summary for hotspot --------------- > FAILED: compiler/6865031/Test.java > Test results: passed: 61; failed: 1 > --------------- jtreg console summary for langtools --------------- > Test results: passed: 1,355 > --------------- jtreg console summary for jdk --------------- > FAILED: com/sun/crypto/provider/KeyFactory/TestProviderLeak.java > FAILED: com/sun/net/httpserver/bugs/B6361557.java > FAILED: java/awt/Frame/DynamicLayout/DynamicLayout.java > FAILED: java/awt/print/PrinterJob/ExceptionTest.java > FAILED: java/beans/XMLEncoder/javax_swing_tree_TreePath.java > FAILED: java/net/URL/TestHttps.java > FAILED: java/nio/channels/FileChannel/TransferToChannel.java > Error: java/nio/channels/SocketChannel/Connect.java > FAILED: java/security/KeyPairGenerator/Failover.java > FAILED: java/util/Random/NextBytes.java > FAILED: java/util/Random/NextIntPowerOfTwoMod.java > FAILED: sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java > FAILED: sun/java2d/cmm/ColorConvertOp/ColConvDCMTest.java > FAILED: sun/java2d/cmm/ColorConvertOp/MTColConvTest.java > Error: sun/java2d/cmm/ColorConvertOp/MTSafetyTest.java > FAILED: sun/rmi/transport/proxy/EagerHttpFallback.java > FAILED: sun/security/pkcs11/ec/ReadCertificates.java > FAILED: sun/security/pkcs11/ec/ReadPKCS12.java > FAILED: sun/security/pkcs11/ec/TestCurves.java > FAILED: sun/security/pkcs11/ec/TestECDH.java > FAILED: sun/security/pkcs11/ec/TestECDSA.java > FAILED: sun/security/pkcs11/ec/TestECGenSpec.java > FAILED: sun/security/pkcs11/ec/TestKeyFactory.java > FAILED: sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java > FAILED: sun/security/pkcs11/tls/TestPRF.java > FAILED: sun/security/provider/MessageDigest/DigestKAT.java > FAILED: sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/TestAllSuites.java > Error: sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java > FAILED: sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java > FAILED: sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java > Error: tools/pack200/Pack200Simple.sh > Test results: passed: 3,371; failed: 27; error: 4 > --------------- jtreg console summary for hotspot --------------- > Error: compiler/6901572/Test.java > Test results: passed: 85; error: 1 > --------------- jtreg console summary for langtools --------------- > Error: tools/javac/processing/6499119/ClassProcessor.java > Test results: passed: 1,378; error: 1 > --------------- jtreg console summary for jdk --------------- > Error: com/sun/jdi/ExceptionEvents.java > FAILED: com/sun/net/httpserver/bugs/B6361557.java > FAILED: java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html > FAILED: java/awt/Frame/DynamicLayout/DynamicLayout.java > FAILED: java/awt/Graphics2D/DrawString/RotTransText.java > FAILED: java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html > FAILED: java/awt/print/PrinterJob/ExceptionTest.java > FAILED: java/beans/XMLEncoder/javax_swing_tree_TreePath.java > FAILED: java/net/Socket/Bindv6Only.java > FAILED: java/net/URL/TestHttps.java > FAILED: java/nio/channels/FileChannel/TransferToChannel.java > Error: java/nio/channels/SocketChannel/Connect.java > FAILED: java/nio/charset/Charset/NIOCharsetAvailabilityTest.java > FAILED: java/security/KeyPairGenerator/Failover.java > FAILED: java/util/Random/NextBytes.java > FAILED: java/util/Random/NextIntPowerOfTwoMod.java > FAILED: javax/swing/plaf/synth/Test6933784.java > FAILED: sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java > FAILED: sun/java2d/cmm/ColorConvertOp/ColConvDCMTest.java > FAILED: sun/java2d/cmm/ColorConvertOp/MTColConvTest.java > Error: sun/java2d/cmm/ColorConvertOp/MTSafetyTest.java > FAILED: sun/nio/cs/Test4200310.sh > FAILED: sun/nio/cs/TestSJIS0213.java > FAILED: sun/rmi/transport/proxy/EagerHttpFallback.java > FAILED: sun/security/pkcs11/ec/ReadCertificates.java > FAILED: sun/security/pkcs11/ec/ReadPKCS12.java > FAILED: sun/security/pkcs11/ec/TestCurves.java > FAILED: sun/security/pkcs11/ec/TestECDH.java > FAILED: sun/security/pkcs11/ec/TestECDSA.java > FAILED: sun/security/pkcs11/ec/TestECGenSpec.java > FAILED: sun/security/pkcs11/ec/TestKeyFactory.java > FAILED: sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java > FAILED: sun/security/pkcs11/tls/TestPRF.java > FAILED: sun/security/provider/MessageDigest/DigestKAT.java > FAILED: sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/TestAllSuites.java > Error: sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java > FAILED: sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java > FAILED: sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java > FAILED: sun/security/validator/CertReplace.java > Error: tools/launcher/MultipleJRE.sh > Error: tools/pack200/Pack200Simple.sh > Test results: passed: 3,283; failed: 35; error: 6 -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Aug 31 08:15:08 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 31 Aug 2010 16:15:08 +0100 Subject: Patch that sort out OpenGL-related issue in IcedTea6 HEAD (was: Possible regression between IcedTea6-1.8 and IcedTea6-1.9) In-Reply-To: <4C7BD858.9060906@redhat.com> References: <4C7BD858.9060906@redhat.com> Message-ID: <20100831151508.GD18421@rivendell.middle-earth.co.uk> On 18:12 Mon 30 Aug , Pavel Tisnovsky wrote: > Hi all, > > can anybody please review simple patch which in the end ensures that > method glGetString(GL_VENDOR) etc. is called only when rendering context > is properly configured. When glGetString() is called for uninitialized > rendering context, it is possible that application got SIGSEGV because > OpenGL standard does not specify correct behaviour in this case. > As this patch is a backport of: 6755274: 6u10b33 2d tests fails on sles10x64 with jvm crash Reviewed-by: campbell http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/452c58b2f53 can you use a hg export of this changeset rather than a fresh patch, and include it as patches/openjdk/6755274-glgetstring-crash.patch? We're then also covered for Windows, should anyone ever build IcedTea there ;-) Please commit to HEAD and 1.9 with these changes. > The patch is based on actual OpenJDK7 sources and it's behaviour can be > tested by this simple test: > > import javax.swing.JFrame; > > public class Test extends JFrame { > public Test() { > System.out.println("Nothing happens"); > } > > public static void main(String[] args) > { > Test t = new Test(); > System.out.println("Test Passed."); > } > } > > (must be run with -Dsun.java2d.opengl=True option) > Can you include this as JTreg test in a separate patch? > > Cheers > Pavel > > PS: if anybody is interested whether his OpenGL implementation > segfaulted (RHEL5 and its Mesa 6.5.1 case, for example), this C test can > be useful: > > #include > #include > #include > > int main(void) > { > printf("%x\n", glXGetCurrentContext()); > glGetString(GL_VENDOR); > return 0; > } > > (must be compiled with -lGL and -lX11 options) > --- openjdk/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java.old 2010-08-30 11:47:11.000000000 +0200 > --- openjdk/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java 2010-08-30 11:47:11.000000000 +0200 > @@ -120,12 +120,15 @@ > new GLXGetConfigInfo(device.getScreen(), visualnum); > rq.flushAndInvokeNow(action); > cfginfo = action.getConfigInfo(); > - OGLContext.setScratchSurface(cfginfo); > - rq.flushAndInvokeNow(new Runnable() { > - public void run() { > - ids[0] = OGLContext.getOGLIdString(); > - } > - }); > + // System.out.println("GLXGetConfigInfo: " + cfginfo); > + if (cfginfo != 0L) { > + OGLContext.setScratchSurface(cfginfo); > + rq.flushAndInvokeNow(new Runnable() { > + public void run() { > + ids[0] = OGLContext.getOGLIdString(); > + } > + }); > + } > } finally { > rq.unlock(); > } Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From bugzilla-daemon at icedtea.classpath.org Tue Aug 31 08:32:54 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 Aug 2010 15:32:54 +0000 Subject: [Bug 537] I am open a tuxguitar and icedtea6 is crash Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=537 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Severity|critical |normal Platform|32-bit |x86 -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Aug 31 08:33:24 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 Aug 2010 15:33:24 +0000 Subject: [Bug 537] I am open a tuxguitar and icedtea6 is crash Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=537 ------- Comment #1 from gnu_andrew at member.fsf.org 2010-08-31 15:33 ------- I'm not sure this is an OpenJDK bug. It's crashing in glibc as a result of a call from the TuxGuitar code. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From bugzilla-daemon at icedtea.classpath.org Tue Aug 31 08:39:40 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 Aug 2010 15:39:40 +0000 Subject: [Bug 534] zero doesn't work on sparc linux Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=534 ------- Comment #4 from gnu_andrew at member.fsf.org 2010-08-31 15:39 ------- I can see why it would be nice to have zero working everywhere, but I don't think there's any other reason to build zero on sparc. -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From ahughes at redhat.com Tue Aug 31 09:07:56 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 31 Aug 2010 17:07:56 +0100 Subject: Patch that sort out OpenGL-related issue in IcedTea6 HEAD (was: Possible regression between IcedTea6-1.8 and IcedTea6-1.9) In-Reply-To: <20100831151508.GD18421@rivendell.middle-earth.co.uk> References: <4C7BD858.9060906@redhat.com> <20100831151508.GD18421@rivendell.middle-earth.co.uk> Message-ID: <20100831160756.GF18421@rivendell.middle-earth.co.uk> On 16:15 Tue 31 Aug , Dr Andrew John Hughes wrote: > On 18:12 Mon 30 Aug , Pavel Tisnovsky wrote: > > Hi all, > > > > can anybody please review simple patch which in the end ensures that > > method glGetString(GL_VENDOR) etc. is called only when rendering context > > is properly configured. When glGetString() is called for uninitialized > > rendering context, it is possible that application got SIGSEGV because > > OpenGL standard does not specify correct behaviour in this case. > > > > As this patch is a backport of: > > 6755274: 6u10b33 2d tests fails on sles10x64 with jvm crash > Reviewed-by: campbell > http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/452c58b2f53 > > can you use a hg export of this changeset rather than a fresh patch, > and include it as patches/openjdk/6755274-glgetstring-crash.patch? > > We're then also covered for Windows, should anyone ever build IcedTea there ;-) > > Please commit to HEAD and 1.9 with these changes. > > > The patch is based on actual OpenJDK7 sources and it's behaviour can be > > tested by this simple test: > > > > import javax.swing.JFrame; > > > > public class Test extends JFrame { > > public Test() { > > System.out.println("Nothing happens"); > > } > > > > public static void main(String[] args) > > { > > Test t = new Test(); > > System.out.println("Test Passed."); > > } > > } > > > > (must be run with -Dsun.java2d.opengl=True option) > > > > Can you include this as JTreg test in a separate patch? > > > > > Cheers > > Pavel > > > > PS: if anybody is interested whether his OpenGL implementation > > segfaulted (RHEL5 and its Mesa 6.5.1 case, for example), this C test can > > be useful: > > > > #include > > #include > > #include > > > > int main(void) > > { > > printf("%x\n", glXGetCurrentContext()); > > glGetString(GL_VENDOR); > > return 0; > > } > > > > (must be compiled with -lGL and -lX11 options) > > > > --- openjdk/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java.old 2010-08-30 11:47:11.000000000 +0200 > > --- openjdk/jdk/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java 2010-08-30 11:47:11.000000000 +0200 > > @@ -120,12 +120,15 @@ > > new GLXGetConfigInfo(device.getScreen(), visualnum); > > rq.flushAndInvokeNow(action); > > cfginfo = action.getConfigInfo(); > > - OGLContext.setScratchSurface(cfginfo); > > - rq.flushAndInvokeNow(new Runnable() { > > - public void run() { > > - ids[0] = OGLContext.getOGLIdString(); > > - } > > - }); > > + // System.out.println("GLXGetConfigInfo: " + cfginfo); > > + if (cfginfo != 0L) { > > + OGLContext.setScratchSurface(cfginfo); > > + rq.flushAndInvokeNow(new Runnable() { > > + public void run() { > > + ids[0] = OGLContext.getOGLIdString(); > > + } > > + }); > > + } > > } finally { > > rq.unlock(); > > } > > Thanks, > -- > Andrew :) > > Free Java Software Engineer > Red Hat, Inc. (http://www.redhat.com) > > Support Free Java! > Contribute to GNU Classpath and the OpenJDK > http://www.gnu.org/software/classpath > http://openjdk.java.net > PGP Key: 94EFD9D8 (http://subkeys.pgp.net) > Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 Likewise, changeset: 995:0c856354b669 user: tdv date: Thu Feb 26 13:38:38 2009 -0800 summary: 6791612: OGLBat tests are failed in jdk 7 b42 http://hg.openjdk.java.net/jdk7/jdk7/jdk/rev/0c856354b669 should be exported and replace opengl-jni-fix.patch with patches/openjdk/6791612-opengl-jni-fix.patch -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From ahughes at redhat.com Tue Aug 31 09:45:06 2010 From: ahughes at redhat.com (Dr Andrew John Hughes) Date: Tue, 31 Aug 2010 17:45:06 +0100 Subject: IcedTea6 1.9 Message-ID: <20100831164506.GG18421@rivendell.middle-earth.co.uk> Now that http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=398 is fixed, I'd like to release 1.9 next Tuesday (7th of September) after Matthias returns from his conference. Please contact the list ASAP if there are any blocking issues. Thanks, -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) Support Free Java! Contribute to GNU Classpath and the OpenJDK http://www.gnu.org/software/classpath http://openjdk.java.net PGP Key: 94EFD9D8 (http://subkeys.pgp.net) Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8 From bugzilla-daemon at icedtea.classpath.org Tue Aug 31 10:28:16 2010 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 31 Aug 2010 17:28:16 +0000 Subject: [Bug 534] zero doesn't work on sparc linux Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=534 ------- Comment #5 from gbenson at redhat.com 2010-08-31 17:28 ------- Sure, but I'm happy to look into it (at least a little bit!) -- Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee. From doko at ubuntu.com Tue Aug 31 22:05:28 2010 From: doko at ubuntu.com (Matthias Klose) Date: Wed, 01 Sep 2010 07:05:28 +0200 Subject: [BRANCH APPROVAL] /hg/icedtea6: PR398: hotspot hs16 / 6b17 build failure on sparc In-Reply-To: <20100831150003.GC18421@rivendell.middle-earth.co.uk> References: <20100827224723.GD6429@bree.middle-earth.co.uk> <4C7842D3.3000602@ubuntu.com> <4C7A3CC7.5030501@ubuntu.com> <20100831150003.GC18421@rivendell.middle-earth.co.uk> Message-ID: <4C7DDF18.2030105@ubuntu.com> On 31.08.2010 17:00, Dr Andrew John Hughes wrote: > On 12:56 Sun 29 Aug , Matthias Klose wrote: >> On 28.08.2010 00:57, Matthias Klose wrote: >>> On 28.08.2010 00:47, Dr Andrew John Hughes wrote: >>>> This fixes PR398. Ok for 1.7, 1.8& 1.9? >>> >>> I only can approve for 1.8, approved. you are release manager for 1.9 yourself, >>> so please make the decision yourself. >> > > My plan with 1.9 (and 1.7 now as well) was to have a requirement of > having each patch approved by another developer (see > http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-August/009934.html), > rather than the previous rather unfair practice of me approving all > patches and being able to commit what I want. As with patches to any > tree, anyone can still veto a patch with good reason. > >> now checked in the unmodified patch on the 1.9 branch, and one which only >> applies for the alternate hotspot build on the 1.8 branch. > > Thanks. Was there a particular reason you didn't do 1.7? they don't apply with the hotspot included in 1.7. >> Test results are >> attached. > > What version& arch are these from? current 1.8 and 1.9 branches, sparc. > How do they compare with the last working build? jtreg doesn't crash anymore while running the tests.