From mark at klomp.org Sun Jun 1 08:57:59 2008 From: mark at klomp.org (Mark Wielaard) Date: Sun, 01 Jun 2008 17:57:59 +0200 Subject: changeset in /hg/icedtea: Merge with IcedTea tip. In-Reply-To: References: Message-ID: <1212335879.3133.13.camel@dijkstra.wildebeest.org> Hi Andrew, On Fri, 2008-05-30 at 14:53 +0000, gnu_andrew at member.fsf.org wrote: > changeset 7975ee6908a5 in /hg/icedtea > details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7975ee6908a5 > description: > Merge with IcedTea tip. Sometimes these merges are confusing. I thought I had already merged this in this changeset: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e9fff1dcf5a3 Which strangely is also one of the parents of your changeset. > diff -r df0892463d09 -r 7975ee6908a5 patches/icedtea-ecj.patch > --- a/patches/icedtea-ecj.patch Fri May 30 15:50:34 2008 +0100 > +++ b/patches/icedtea-ecj.patch Fri May 30 15:52:51 2008 +0100 > @@ -661,15 +661,14 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm > @@ -649,10 +649,11 @@ > $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST) > $(prep-target) > - $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@ > -$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE) > +$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE) This part is wrong. That SED line should not be removed. It corrupts the patch file so that it cannot be applied anymore. The following patch reinstates it: 2008-06-01 Mark Wielaard * patches/icedtea-ecj.patch: Correct patch by reinstating accidentally removed line. Cheers, Mark diff -r f1c821e52996 patches/icedtea-ecj.patch --- a/patches/icedtea-ecj.patch Fri May 30 11:09:57 2008 -0400 +++ b/patches/icedtea-ecj.patch Sun Jun 01 17:56:34 2008 +0200 @@ -661,6 +661,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm @@ -649,10 +649,11 @@ $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST) $(prep-target) + $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@ -$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE) +$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE) $(prep-target) From mark at klomp.org Sun Jun 1 08:58:40 2008 From: mark at klomp.org (Mark Wielaard) Date: Sun, 01 Jun 2008 15:58:40 +0000 Subject: changeset in /hg/icedtea: Put accidentially removed line back in... Message-ID: changeset 6a6228a27e7f in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=6a6228a27e7f description: Put accidentially removed line back in patches/icedtea-ecj.patch. 2008-06-01 Mark Wielaard * patches/icedtea-ecj.patch: Correct patch by reinstating accidentally removed line. diffstat: 2 files changed, 6 insertions(+) ChangeLog | 5 +++++ patches/icedtea-ecj.patch | 1 + diffs (23 lines): diff -r f1c821e52996 -r 6a6228a27e7f ChangeLog --- a/ChangeLog Fri May 30 11:09:57 2008 -0400 +++ b/ChangeLog Sun Jun 01 17:57:21 2008 +0200 @@ -1,3 +1,8 @@ 2008-05-30 Lillian Angel + + * patches/icedtea-ecj.patch: Correct patch by reinstating + accidentally removed line. + 2008-05-30 Lillian Angel * Makefile.am: Fixed dist to not include full path to ports, and diff -r f1c821e52996 -r 6a6228a27e7f patches/icedtea-ecj.patch --- a/patches/icedtea-ecj.patch Fri May 30 11:09:57 2008 -0400 +++ b/patches/icedtea-ecj.patch Sun Jun 01 17:57:21 2008 +0200 @@ -661,6 +661,7 @@ diff -Nru openjdk-ecj.orig/jdk/make/comm @@ -649,10 +649,11 @@ $(RES_JAR_ARGLIST): $(RES_JAR_FILELIST) $(prep-target) + $(SED) -e "s@^@-C $(CLASSBINDIR) @" $< > $@ -$(RESOURCES_JAR): $(RES_JAR_ARGLIST) $(JAR_MANIFEST_FILE) +$(RESOURCES_JAR): $(RES_JAR_FILELIST) $(JAR_MANIFEST_FILE) $(prep-target) From gnu_andrew at member.fsf.org Sun Jun 1 09:45:35 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Sun, 1 Jun 2008 17:45:35 +0100 Subject: [patch] Use jar `cat file-list` not gjar -@ stdin extension In-Reply-To: <1212180666.619.61.camel@dijkstra.wildebeest.org> References: <1212156783.619.47.camel@dijkstra.wildebeest.org> <1ccfd1c10805301139l1e27119cvfb19a0a322bd205c@mail.gmail.com> <1212180666.619.61.camel@dijkstra.wildebeest.org> Message-ID: <17c6771e0806010945h3fa73aa5kb394a631302f0b53@mail.gmail.com> On 30/05/2008, Mark Wielaard wrote: > Hi Martin, > > > On Fri, 2008-05-30 at 11:39 -0700, Martin Buchholz wrote: > > On Fri, May 30, 2008 at 7:13 AM, Mark Wielaard wrote: > > > There was some concern that the command line would have some limit that > > > might overflow. But this doesn't seem an issue on modern GNU/Linux (or > > > OpenSolaris) systems. > > > > I share that concern. Although very recent Linux > > kernels might have no command line length limit, > > today essentially every OS has such a limit, > > and I consider it a bug to depend on its magnitude. > > > Yeah, I agree it isn't the most beautiful thing to do. But there doesn't > seem to be another way given that the different jar utility > implementations being used for bootstrapping icedtea don't all currently > support the same set of options. > > I see I forgot to add the link to the patch that should go into gjar to > support the @file arguments like the openjdk jar implementation does: > http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-4.3/debian/patches/libjava-jar.dpatch?view=markup > > When that goes in and we can kind of rely on systems shipping it by > default we could reverse this and depend on @file everywhere I hope. > > Cheers, > > > Mark > > I think there's a better way of patching this bug than implementing parsing the @file from scratch as the linked patch does. I'd rather we reused the existing stdin support by generalising it to read from a list of files in addition to stdin. I'll look into rolling a patch for this. -- Andrew :-) 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 mark at klomp.org Sun Jun 1 15:37:05 2008 From: mark at klomp.org (Mark Wielaard) Date: Mon, 02 Jun 2008 00:37:05 +0200 Subject: OpenJDK 6 b10 source posted In-Reply-To: <4840AC46.8030409@sun.com> References: <4840AC46.8030409@sun.com> Message-ID: <1212359825.3133.84.camel@dijkstra.wildebeest.org> Hi Joe, On Fri, 2008-05-30 at 18:39 -0700, Joseph D. Darcy wrote: > The OpenJDK 6 b10 source is now available at > > http://download.java.net/openjdk/jdk6/ Thanks for releasing this. I have updated icedtea6 to include it. Are you planning to support a mercurial repo for openjdk6? Although your release notes below helped a lot, it is still hard work to review all the changes for integration if all you got is just the diff between two full versions. For those interested I posted the b09-b10 diff here: http://icedtea.classpath.org/~mjw/b09-b10.diff.gz (Excluding the new/deleted (gervill) files) Posting individual changes and/or having a public repo might also help understanding smaller things that you don't explicitly mention in your release notes like the changes to java.c, MetaData.java or ChunkedInputStream/test.txt (also removed from the diff since it is essentially a binary blob). > A few fixes in the 2D area: > > 6604044: java crashes talking to second X screen > 6636469: Java Fullscreen Exclusive Mode not working with Xorg server > 1.3.0 and above Removed icedtea-xinerama.patch from icedtea6 which did the same thing. > 6523403: OSS CMM: Need to provide lcms library with PYCC and > LINEAR_RGB OS ICC profiles > > The last fix was contributed by Andrew Haley and Keith Seitz of Red Hat > and fixes color management related regression and JCK failures. Thanks, I removed the icedtea-color-profiles.patch and the overlay. > The encumbered sound engine has been replaced with Gervill: > > 6702956 OpenJDK: replace encumbered code (software synthesizer) Very nice. We had good experience with this code in IcedTea. It wasn't clear precisely which upstream version of Gervill you are including. It does look like you are missing some fixes Karl and I made since it got integrated into icedtea. For example you miss the sample rate conversion support. But it is somewhat hard to see because all the files got completely reformatted from the upstream sources. You should be able to find all the changes we made on the mailinglist (sound-dev, distro-pkg-dev and audio-engine-dev) and of course in Gervill CVS https://gervill.dev.java.net/source/browse/gervill/ (or icedtea6 mercurial under overlays). Could you make the changes you made to the upstream sources available separate from the changes you made to the indention of the sources for easy comparison? For now I kept the current upstream/icedtea version. > Some progress has been made on addressing the copyright/licensing > concerns raised by Debian > (http://mail.openjdk.java.net/pipermail/jdk6-dev/2008-April/000044.html): > > 6695553: Cleanup GPLv2+SPL legal notices in hat sources > 6703931 Remove jaxws doc-files from the jdk > > Work will continue in this area until all the issues are addressed. Very nice. I removed the patches/icedtea-hat-spl-gpl.patch. And this also closes: - http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=142 And I saw soundbank.gm was also removed, which closes: - http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=149 The general tracking bug for hopefully all these issues is: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 > Mark Wielaard recently proposed publishing regression test results for > OpenJDK 6 > (http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2008-May/001921.html). > > > I'll publish results for b10 later. That would be cool. I am also happy to note that Lillian and Tom added jtregcheck to the Fedora rpm builds in addition to running the Mauve tests. The test results output (just the jtreg -v1 output for now, not yet the full JTreport and JTwork output) are then included in the src subpackage rpm and in the build logs. Which is great because it also allows us to easily monitor the (zero) ports that Fedora ships like ppc and ppc64. For an example see: http://koji.fedoraproject.org/koji/buildinfo?buildID=51083 Click on the build logs (build.log) and search for "JTREG TESTING". The results still have a bit too many failures because it doesn't currently provide a Xvfb wrapper like it does for Mauve. But that is in the works. Cheers, Mark 2008-06-01 Mark Wielaard * Makefile.am (OPENJDK_DATE): Updated to 30_may_2008. (OPENJDK_MD5SUM): Updated. (OPENJDK_VERSION): Updated to b10. (OPENJDK_SRC_ZIP): Adjusted to new underscore convention between version and date in b10. (ICEDTEA_PATCHES): Removed icedtea-xinerama.patch, icedtea-color-profiles.patch and icedtea-hat-spl-gpl.patch. * Makefile.in: Regenerated. * patches/icedtea-copy-plugs.patch: Adjusted to remove sound references in b10. * patches/icedtea-gervill.patch: Adjusted to new sound service files in b10. * overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: Removed. * overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Removed. * overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Removed. * patches/icedtea-color-profiles.patch: Removed. * patches/icedtea-hat-spl-gpl.patch: Removed. * patches/icedtea-xinerama.patch: Removed. -------------- next part -------------- A non-text attachment was scrubbed... Name: icedtea6-b10.patch Type: text/x-patch Size: 7653 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20080602/8b225606/attachment.bin From mark at klomp.org Sun Jun 1 15:44:02 2008 From: mark at klomp.org (Mark Wielaard) Date: Sun, 01 Jun 2008 22:44:02 +0000 Subject: changeset in /hg/icedtea6: Integrate b10. Message-ID: changeset 37c853f39fe3 in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=37c853f39fe3 description: Integrate b10. 2008-06-01 Mark Wielaard * Makefile.am (OPENJDK_DATE): Updated to 30_may_2008. (OPENJDK_MD5SUM): Updated. (OPENJDK_VERSION): Updated to b10. (OPENJDK_SRC_ZIP): Adjusted to new underscore convention between version and date in b10. (ICEDTEA_PATCHES): Removed icedtea-xinerama.patch, icedtea-color-profiles.patch and icedtea-hat-spl-gpl.patch. * Makefile.in: Regenerated. * patches/icedtea-copy-plugs.patch: Adjusted to remove sound references in b10. * patches/icedtea-gervill.patch: Adjusted to new sound service files in b10. * overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: Removed. * overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Removed. * overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Removed. * patches/icedtea-color-profiles.patch: Removed. * patches/icedtea-hat-spl-gpl.patch: Removed. * patches/icedtea-xinerama.patch: Removed. diffstat: 8 files changed, 49 insertions(+), 2311 deletions(-) ChangeLog | 21 Makefile.am | 11 Makefile.in | 13 patches/icedtea-color-profiles.patch | 29 patches/icedtea-copy-plugs.patch | 41 patches/icedtea-gervill.patch | 28 patches/icedtea-hat-spl-gpl.patch | 2133 ---------------------------------- patches/icedtea-xinerama.patch | 84 - diffs (truncated from 2509 to 500 lines): diff -r cebc828cf765 -r 37c853f39fe3 ChangeLog --- a/ChangeLog Fri May 30 15:39:55 2008 +0200 +++ b/ChangeLog Mon Jun 02 00:35:24 2008 +0200 @@ -1,3 +1,24 @@ 2008-05-30 Mark Wielaard + + * Makefile.am (OPENJDK_DATE): Updated to 30_may_2008. + (OPENJDK_MD5SUM): Updated. + (OPENJDK_VERSION): Updated to b10. + (OPENJDK_SRC_ZIP): Adjusted to new underscore convention between + version and date in b10. + (ICEDTEA_PATCHES): Removed icedtea-xinerama.patch, + icedtea-color-profiles.patch and icedtea-hat-spl-gpl.patch. + * Makefile.in: Regenerated. + * patches/icedtea-copy-plugs.patch: Adjusted to remove sound + references in b10. + * patches/icedtea-gervill.patch: Adjusted to new sound service + files in b10. + * overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: Removed. + * overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Removed. + * overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Removed. + * patches/icedtea-color-profiles.patch: Removed. + * patches/icedtea-hat-spl-gpl.patch: Removed. + * patches/icedtea-xinerama.patch: Removed. + 2008-05-30 Mark Wielaard * patches/icedtea-ecj.patch: Use `cat file-list` not gjar -@ stdin. diff -r cebc828cf765 -r 37c853f39fe3 Makefile.am --- a/Makefile.am Fri May 30 15:39:55 2008 +0200 +++ b/Makefile.am Mon Jun 02 00:35:24 2008 +0200 @@ -1,6 +1,6 @@ OPENJDK_DATE = 11_apr_2008 -OPENJDK_DATE = 11_apr_2008 -OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c -OPENJDK_VERSION = b09 +OPENJDK_DATE = 30_may_2008 +OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f +OPENJDK_VERSION = b10 if NETX_PLUGIN NETX_PATCH = patches/icedtea-netx-plugin.patch @@ -200,7 +200,7 @@ if USE_ALT_OPENJDK_SRC_ZIP if USE_ALT_OPENJDK_SRC_ZIP OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP) else - OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz + OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)_$(OPENJDK_DATE).tar.gz endif stamps/download.stamp: @@ -303,16 +303,13 @@ ICEDTEA_PATCHES = \ patches/icedtea-zero-build.patch \ patches/icedtea-print-lsb-release.patch \ patches/icedtea-jpegclasses.patch \ - patches/icedtea-xinerama.patch \ patches/icedtea-arm-uname.patch \ patches/icedtea-ia64-fdlibm.patch \ patches/icedtea-LCMS-setTagData.patch \ patches/icedtea-color-createcontext.patch \ - patches/icedtea-color-profiles.patch \ patches/icedtea-fonts.patch \ patches/icedtea-gervill.patch \ patches/icedtea-directaudio-close-trick.patch \ - patches/icedtea-hat-spl-gpl.patch \ patches/icedtea-sparc.patch \ patches/icedtea-override-redirect-metacity.patch \ $(GCC_PATCH) \ diff -r cebc828cf765 -r 37c853f39fe3 Makefile.in --- a/Makefile.in Fri May 30 15:39:55 2008 +0200 +++ b/Makefile.in Mon Jun 02 00:35:24 2008 +0200 @@ -249,9 +249,9 @@ target_alias = @target_alias@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -OPENJDK_DATE = 11_apr_2008 -OPENJDK_MD5SUM = 9ef5b6e83ec0c7a32bffd1a4de50fe5c -OPENJDK_VERSION = b09 +OPENJDK_DATE = 30_may_2008 +OPENJDK_MD5SUM = 98e9eb16615605f76056135b0eb0b39f +OPENJDK_VERSION = b10 @NETX_PLUGIN_FALSE at NETX_PATCH = @NETX_PLUGIN_TRUE at NETX_PATCH = patches/icedtea-netx-plugin.patch EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \ @@ -360,7 +360,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$ # Download OpenJDK sources. OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/ - at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)-$(OPENJDK_DATE).tar.gz + at USE_ALT_OPENJDK_SRC_ZIP_FALSE@OPENJDK_SRC_ZIP = openjdk-6-src-$(OPENJDK_VERSION)_$(OPENJDK_DATE).tar.gz @USE_ALT_OPENJDK_SRC_ZIP_TRUE at OPENJDK_SRC_ZIP = $(ALT_OPENJDK_SRC_ZIP) @GCC_OLD_FALSE at GCC_PATCH = patches/icedtea-gcc-4.3.patch @@ -409,14 +409,13 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \ patches/icedtea-zero-build.patch \ patches/icedtea-print-lsb-release.patch \ patches/icedtea-jpegclasses.patch \ - patches/icedtea-xinerama.patch patches/icedtea-arm-uname.patch \ + patches/icedtea-arm-uname.patch \ patches/icedtea-ia64-fdlibm.patch \ patches/icedtea-LCMS-setTagData.patch \ patches/icedtea-color-createcontext.patch \ - patches/icedtea-color-profiles.patch \ patches/icedtea-fonts.patch patches/icedtea-gervill.patch \ patches/icedtea-directaudio-close-trick.patch \ - patches/icedtea-hat-spl-gpl.patch patches/icedtea-sparc.patch \ + patches/icedtea-sparc.patch \ patches/icedtea-override-redirect-metacity.patch $(GCC_PATCH) \ $(DISTRIBUTION_PATCHES) $(am__append_7) diff -r cebc828cf765 -r 37c853f39fe3 overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf has changed diff -r cebc828cf765 -r 37c853f39fe3 overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf has changed diff -r cebc828cf765 -r 37c853f39fe3 overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf Binary file overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf has changed diff -r cebc828cf765 -r 37c853f39fe3 patches/icedtea-color-profiles.patch --- a/patches/icedtea-color-profiles.patch Fri May 30 15:39:55 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -# Changeset: 804b0757d801 -# Author: prr -# Date: 2008-04-24 11:58 -0700 -# URL: http://hg.openjdk.java.net/jdk7/2d/jdk/rev/804b0757d801 -# -# 6523403: Need to provide lcms library with PYCC and LINEAR_RGB OS ICC profiles -# Summary: Add two contributed profiles and a fix to GRAY.pf, all from Redhat, keiths at redhat.com contributed the GRAY.pf fix. -# Reviewed-by: jgodinez, avu, prr -# Contributed-by: aph at redhat.com -# -# .pf files can be found under overlays/openjdk/jdk/src/share/lib/cmm/lcms/ - ---- openjdk/jdk/make/sun/cmm/Makefile.orig 2008-04-27 23:59:37.000000000 +0200 -+++ openjdk/jdk/make/sun/cmm/Makefile 2008-04-27 23:59:45.000000000 +0200 -@@ -41,12 +41,8 @@ - ICCPROFILE_DEST_DIR = $(LIBDIR)/cmm - - iccprofiles: $(ICCPROFILE_DEST_DIR)/sRGB.pf $(ICCPROFILE_DEST_DIR)/GRAY.pf \ -- $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf -- --ifndef OPENJDK --iccprofiles: $(ICCPROFILE_DEST_DIR)/PYCC.pf \ -- $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf --endif -+ $(ICCPROFILE_DEST_DIR)/CIEXYZ.pf $(ICCPROFILE_DEST_DIR)/PYCC.pf \ -+ $(ICCPROFILE_DEST_DIR)/LINEAR_RGB.pf - - $(ICCPROFILE_DEST_DIR)/sRGB.pf: $(ICCPROFILE_SRC_DIR)/sRGB.pf - $(RM) $(ICCPROFILE_DEST_DIR)/sRGB.pf diff -r cebc828cf765 -r 37c853f39fe3 patches/icedtea-copy-plugs.patch --- a/patches/icedtea-copy-plugs.patch Fri May 30 15:39:55 2008 +0200 +++ b/patches/icedtea-copy-plugs.patch Mon Jun 02 00:35:24 2008 +0200 @@ -33,9 +33,9 @@ diff -urN openjdk.orig/jdk/src/share/cla Type[] paramTypes = constr.getGenericParameterTypes(); if (paramTypes.length != propertyNames.length) { ---- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk 2008-02-28 04:39:40.000000000 -0500 -+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2008-02-29 14:28:47.000000000 -0500 -@@ -51,28 +51,19 @@ +--- openjdk/jdk/make/common/internal/BinaryPlugs.gmk.orig 2008-05-30 09:50:36.000000000 +0200 ++++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk 2008-06-01 23:18:11.000000000 +0200 +@@ -49,33 +49,30 @@ com/sun/jmx/snmp/SnmpDataTypeEnums.class \ com/sun/jmx/snmp/SnmpDefinitions.class \ com/sun/jmx/snmp/SnmpOid.class \ @@ -64,10 +64,6 @@ diff -urN openjdk.orig/jdk/src/share/cla -com/sun/jmx/snmp/daemon/WaitQ.class +com/sun/jmx/snmp/daemon/SnmpSession.class - PLUG_SOUND_CLASS_NAMES = \ - com/sun/media/sound/AbstractPlayer.class \ -@@ -128,8 +119,14 @@ - # Class list temp files (used by both import and export of plugs) +PLUG_GNU_CLASS_NAMES = gnu @@ -77,14 +73,14 @@ diff -urN openjdk.orig/jdk/src/share/cla +PLUG_NETX_CLASS_NAMES = net + PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs --PLUG_CLASS_AREAS = jmf sound -+PLUG_CLASS_AREAS = jmf sound gnu javax netx +-PLUG_CLASS_AREAS = jmf ++PLUG_CLASS_AREAS = jmf gnu javax netx PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist) # Create jargs file command -@@ -152,6 +149,21 @@ - @for i in $(PLUG_SOUND_CLASS_NAMES) ; do \ - $(ECHO) "$$i" >> $@ ; \ +@@ -93,11 +90,32 @@ + @for i in $(PLUG_JMF_CLASS_NAMES) ; do \ + $(ECHO) "$$i" >> $@; \ done +$(PLUG_TEMPDIR)/gnu.clist: + @$(prep-target) @@ -104,9 +100,7 @@ diff -urN openjdk.orig/jdk/src/share/cla $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS) @$(prep-target) $(CAT) $(PLUG_CLISTS) > $@ -@@ -159,6 +171,12 @@ - $(plug-create-jargs) - $(PLUG_TEMPDIR)/sound.jargs: $(PLUG_TEMPDIR)/sound.clist + $(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist $(plug-create-jargs) +$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist + $(plug-create-jargs) @@ -117,7 +111,7 @@ diff -urN openjdk.orig/jdk/src/share/cla $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist $(plug-create-jargs) -@@ -188,9 +206,9 @@ +@@ -125,9 +143,9 @@ # Import classes command define import-binary-plug-classes @@ -129,10 +123,10 @@ diff -urN openjdk.orig/jdk/src/share/cla endef # import-binary-plug-classes else # IMPORT_BINARY_PLUGS -@@ -220,12 +238,21 @@ +@@ -153,11 +171,20 @@ + + import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/jmf.clist $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist) - import-binary-plug-sound-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/sound.clist - $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/sound.clist) +import-binary-plug-gnu-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/gnu.clist + $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/gnu.clist) +import-binary-plug-javax-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/javax.clist @@ -143,12 +137,11 @@ diff -urN openjdk.orig/jdk/src/share/cla # Import all classes from the jar file import-binary-plug-jar: \ - import-binary-plug-jmf-classes \ -- import-binary-plug-sound-classes -+ import-binary-plug-sound-classes \ +- import-binary-plug-jmf-classes ++ import-binary-plug-jmf-classes \ + import-binary-plug-gnu-classes \ + import-binary-plug-javax-classes \ -+ import-binary-plug-netx-classes \ ++ import-binary-plug-netx-classes - # Import native libraries + # Binary plug start/complete messages diff -r cebc828cf765 -r 37c853f39fe3 patches/icedtea-gervill.patch --- a/patches/icedtea-gervill.patch Fri May 30 15:39:55 2008 +0200 +++ b/patches/icedtea-gervill.patch Mon Jun 02 00:35:24 2008 +0200 @@ -1,33 +1,7 @@ # Adds the provides defined by gervill (and removes non-existing ones). # Gervill can be found in the overlays under # openjdk/jdk/src/share/classes/com/sun/media/sound ---- openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider.orig 2008-04-30 16:12:37.000000000 +0200 -+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider 2008-04-30 16:06:18.000000000 +0200 -@@ -1,5 +1,5 @@ - # Providers for midi devices --com.sun.media.sound.MixerSynthProvider - com.sun.media.sound.RealTimeSequencerProvider - com.sun.media.sound.MidiOutDeviceProvider - com.sun.media.sound.MidiInDeviceProvider -+com.sun.media.sound.SoftProvider ---- openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader.orig 2008-04-30 16:13:18.000000000 +0200 -+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader 2008-04-30 16:07:16.000000000 +0200 -@@ -1,2 +1,6 @@ - # Providers for Soundbanks --com.sun.media.sound.HsbParser -+com.sun.media.sound.PATSoundbankReader -+com.sun.media.sound.DLSSoundbankReader -+com.sun.media.sound.JARSoundbankReader -+com.sun.media.sound.AudioFileSoundbankReader -+com.sun.media.sound.SF2SoundbankReader ---- openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader.orig 2008-04-30 16:13:58.000000000 +0200 -+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader 2008-04-30 16:01:27.000000000 +0200 -@@ -2,3 +2,5 @@ - com.sun.media.sound.AuFileReader - com.sun.media.sound.AiffFileReader - com.sun.media.sound.WaveFileReader -+com.sun.media.sound.WaveFloatFileReader -+com.sun.media.sound.SoftMidiAudioFileReader +# (This currently overrides the one from b10 because we track Gervill CVS) --- /home/mark/src/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider 2008-04-13 01:05:30.000000000 +0200 +++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider 2008-05-09 02:54:26.000000000 +0200 @@ -2,3 +2,4 @@ diff -r cebc828cf765 -r 37c853f39fe3 patches/icedtea-hat-spl-gpl.patch --- a/patches/icedtea-hat-spl-gpl.patch Fri May 30 15:39:55 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2133 +0,0 @@ -Changeset: d70a63c92b49 -Author: ohair -Date: 2008-04-30 17:34 -0700 -URL: http://hg.openjdk.java.net/jdk7/build/jdk/rev/d70a63c92b49 - -6695553: Cleanup GPLv2+SPL legal notices in hat sources -Summary: Just correcting the legal notices on the HAT sources. -Reviewed-by: alanb - ---- openjdk/jdk/src/share/classes/com/sun/tools/hat/Main.java Fri Apr 18 16:40:32 2008 -0700 -+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/Main.java Wed Apr 30 17:34:41 2008 -0700 -@@ -23,18 +23,10 @@ - * have any questions. - */ - -- - /* -- * The contents of this file are subject to the Sun Public License -- * Version 1.0 (the "License"); you may not use this file except in -- * compliance with the License. A copy of the License is available at -- * http://www.sun.com/, and in the file LICENSE.html in the -- * doc directory. -- * - * The Original Code is HAT. The Initial Developer of the - * Original Code is Bill Foote, with contributions from others -- * at JavaSoft/Sun. Portions created by Bill Foote and others -- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved. -+ * at JavaSoft/Sun. - */ - - package com.sun.tools.hat; ---- openjdk/jdk/src/share/classes/com/sun/tools/hat/build.xml Fri Apr 18 16:40:32 2008 -0700 -+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/build.xml Wed Apr 30 17:34:41 2008 -0700 -@@ -27,19 +27,9 @@ - - - ---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java Fri Apr 18 16:40:32 2008 -0700 -+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java Wed Apr 30 17:34:41 2008 -0700 -@@ -1,5 +1,5 @@ - /* -- * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. -+ * Copyright 1997-2005 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 -@@ -25,20 +25,9 @@ - - - /* -- * The contents of this file are subject to the Sun Public License -- * Version 1.0 (the "License"); you may not use this file except in -- * compliance with the License. A copy of the License is available at -- * http://www.sun.com/, and in the file LICENSE.html in the -- * doc directory. -- * - * The Original Code is HAT. The Initial Developer of the - * Original Code is Bill Foote, with contributions from others -- * at JavaSoft/Sun. Portions created by Bill Foote and others -- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved. -- * -- * In addition to the formal license, I ask that you don't -- * change the history or donations files without permission. -- * -+ * at JavaSoft/Sun. - */ - - package com.sun.tools.hat.internal.model; ---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/ArrayTypeCodes.java Fri Apr 18 16:40:32 2008 -0700 -+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/ArrayTypeCodes.java Wed Apr 30 17:34:41 2008 -0700 -@@ -1,5 +1,5 @@ - /* -- * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. -+ * Copyright 1997-2005 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 -@@ -25,20 +25,9 @@ - - - /* -- * The contents of this file are subject to the Sun Public License -- * Version 1.0 (the "License"); you may not use this file except in -- * compliance with the License. A copy of the License is available at -- * http://www.sun.com/, and in the file LICENSE.html in the -- * doc directory. -- * - * The Original Code is HAT. The Initial Developer of the - * Original Code is Bill Foote, with contributions from others -- * at JavaSoft/Sun. Portions created by Bill Foote and others -- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved. -- * -- * In addition to the formal license, I ask that you don't -- * change the history or donations files without permission. -- * -+ * at JavaSoft/Sun. - */ - - package com.sun.tools.hat.internal.model; ---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java Fri Apr 18 16:40:32 2008 -0700 -+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java Wed Apr 30 17:34:41 2008 -0700 -@@ -1,5 +1,5 @@ - /* -- * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. -+ * Copyright 1997-2005 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 -@@ -25,20 +25,9 @@ - - - /* -- * The contents of this file are subject to the Sun Public License -- * Version 1.0 (the "License"); you may not use this file except in -- * compliance with the License. A copy of the License is available at -- * http://www.sun.com/, and in the file LICENSE.html in the -- * doc directory. -- * - * The Original Code is HAT. The Initial Developer of the - * Original Code is Bill Foote, with contributions from others -- * at JavaSoft/Sun. Portions created by Bill Foote and others -- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved. -- * -- * In addition to the formal license, I ask that you don't -- * change the history or donations files without permission. -- * -+ * at JavaSoft/Sun. - */ - - package com.sun.tools.hat.internal.model; ---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java Fri Apr 18 16:40:32 2008 -0700 -+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java Wed Apr 30 17:34:41 2008 -0700 -@@ -1,5 +1,5 @@ - /* -- * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. -+ * Copyright 1997-2005 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 -@@ -25,20 +25,9 @@ - - - /* -- * The contents of this file are subject to the Sun Public License -- * Version 1.0 (the "License"); you may not use this file except in -- * compliance with the License. A copy of the License is available at -- * http://www.sun.com/, and in the file LICENSE.html in the -- * doc directory. -- * - * The Original Code is HAT. The Initial Developer of the - * Original Code is Bill Foote, with contributions from others -- * at JavaSoft/Sun. Portions created by Bill Foote and others -- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved. -- * -- * In addition to the formal license, I ask that you don't -- * change the history or donations files without permission. -- * -+ * at JavaSoft/Sun. - */ - - package com.sun.tools.hat.internal.model; ---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaByte.java Fri Apr 18 16:40:32 2008 -0700 -+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaByte.java Wed Apr 30 17:34:41 2008 -0700 -@@ -1,5 +1,5 @@ - /* -- * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved. -+ * Copyright 1997-2005 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 -@@ -25,20 +25,9 @@ - - - /* -- * The contents of this file are subject to the Sun Public License -- * Version 1.0 (the "License"); you may not use this file except in -- * compliance with the License. A copy of the License is available at -- * http://www.sun.com/, and in the file LICENSE.html in the -- * doc directory. -- * - * The Original Code is HAT. The Initial Developer of the - * Original Code is Bill Foote, with contributions from others -- * at JavaSoft/Sun. Portions created by Bill Foote and others -- * at Javasoft/Sun are Copyright (C) 1997-2004. All Rights Reserved. -- * -- * In addition to the formal license, I ask that you don't -- * change the history or donations files without permission. -- * -+ * at JavaSoft/Sun. - */ - - package com.sun.tools.hat.internal.model; ---- openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaChar.java Fri Apr 18 16:40:32 2008 -0700 -+++ openjdk/jdk/src/share/classes/com/sun/tools/hat/internal/model/JavaChar.java Wed Apr 30 17:34:41 2008 -0700 -@@ -1,5 +1,5 @@ From bugzilla-daemon at icedtea.classpath.org Sun Jun 1 15:59:19 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 01 Jun 2008 22:59:19 +0000 Subject: [Bug 142] corrupt and/or files which cannot be built from the source files Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=142 mark at klomp.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Comment #2 from mark at klomp.org 2008-06-01 22:59 ------- These got removed in b10 which was integrated into icedtea6 (rev 37c853f39fe3) -- 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 Jun 1 15:59:20 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 01 Jun 2008 22:59:20 +0000 Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 Bug 138 depends on bug 142, which changed state. Bug 142 Summary: corrupt and/or files which cannot be built from the source files http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=142 What |Old Value |New Value ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED -- 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 Jun 1 15:59:54 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 01 Jun 2008 22:59:54 +0000 Subject: [Bug 149] soundbank.gm binary file included in sources Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=149 mark at klomp.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED ------- Comment #2 from mark at klomp.org 2008-06-01 22:59 ------- This file got removed from b10 which was integrated into icedtea6 (rev 37c853f39fe3). -- 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 Jun 1 15:59:55 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Sun, 01 Jun 2008 22:59:55 +0000 Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented copyrights and licenses Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 Bug 138 depends on bug 149, which changed state. Bug 149 Summary: soundbank.gm binary file included in sources http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=149 What |Old Value |New Value ---------------------------------------------------------------------------- Status|NEW |RESOLVED Resolution| |FIXED -- 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 gnu_andrew at member.fsf.org Sun Jun 1 20:11:46 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 2 Jun 2008 04:11:46 +0100 Subject: FYI: Final changes to IcedTea(7) prior to release Message-ID: <20080602031146.GA7662@rivendell.middle-earth.co.uk> This patch bumps the version number and corrects a few issues I found running make dist and make distcheck for the release, namely: * The existence of both a ports target and a ports directory causes the OpenJDK to be downloaded. I've renamed the ports target to hotspot-ports, which seems the least intrusive fix. * icedtea-ecj.patch should be referred to as $(srcdir)/icedtea-ecj.patch for out-of-dir builds (which includes make distcheck). Lillian reverted this with her last patch, because abs_top_srcdir doesn't work with dist. srcdir thankfully still works with dist and allows out-of-dir builds to complete (srcdir being stripped by the distdir target). Release announcement and tarball to appear shortly... :) ChangeLog: 2008-06-02 Andrew John Hughes * Makefile.am: Fix location of icedtea-ecj.patch for out-of-dir and make distcheck builds, and rename ports target to hotspot-ports to stop make dist downloading the JDK. * Makefile.in: Regenerated. * NEWS: Add release news. * configure: Regenerated. * configure.ac: Bump version number to 1.7. -- Andrew :) 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 6a6228a27e7f Makefile.am --- a/Makefile.am Sun Jun 01 17:57:21 2008 +0200 +++ b/Makefile.am Mon Jun 02 04:04:19 2008 +0100 @@ -455,7 +455,7 @@ stamps/ports-ecj.stamp: stamps/clone-ecj touch stamps/ports-ecj.stamp # Patch OpenJDK for plug replacements and ecj. -ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch +ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch stamps/patch-ecj.stamp: stamps/clone-ecj.stamp echo Checking $(ICEDTEA_ECJ_PATCH) ; \ @@ -1056,9 +1056,9 @@ tools: stamps/tools.stamp tools-class-files: stamps/tools-class-files.stamp -ports: stamps/ports.stamp +hotspot-ports: stamps/ports.stamp -ports-ecj: stamps/ports-ecj.stamp +hotspot-ports-ecj: stamps/ports-ecj.stamp clean: distclean-local diff -r 6a6228a27e7f Makefile.in --- a/Makefile.in Sun Jun 01 17:57:21 2008 +0200 +++ b/Makefile.in Mon Jun 02 04:04:19 2008 +0100 @@ -426,7 +426,7 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p $(am__append_7) # Patch OpenJDK for plug replacements and ecj. -ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch +ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch @WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp @WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = @WITH_OPENJDK_TRUE at BOOTSTRAP_DIRECTORY_STAMP = @@ -1496,9 +1496,9 @@ tools: stamps/tools.stamp tools-class-files: stamps/tools-class-files.stamp -ports: stamps/ports.stamp +hotspot-ports: stamps/ports.stamp -ports-ecj: stamps/ports-ecj.stamp +hotspot-ports-ecj: stamps/ports-ecj.stamp clean: distclean-local diff -r 6a6228a27e7f NEWS --- a/NEWS Sun Jun 01 17:57:21 2008 +0200 +++ b/NEWS Mon Jun 02 04:04:19 2008 +0100 @@ -1,36 +1,98 @@ New in release 1.2 (2008-05-28) -New in release 1.2 (2008-05-28) +New in release 1.7 (2008-06-02) -- Updated to b09 build. -- Added the the lcms library with PYCC and LINEAR_RGB ICC - profiles. -- Integrated Gervill to provide midi support. -- JTreg integrated. -- javaws/NetX fixes: - -improved security, namely catching Socket permissions during - runtime - -implemented the remaining JNLP services api (PrintService, - JNLPRandomAccessFile) - -applet focusing bug fixed -- sparc/sparc64 port -- Desktop file integration. -- Various zero fixes. -- Sound fixes. -- Font fixes. -- Several other bug fixes. + IcedTea is based on the hard work of a lot of people that contributed to + IcedTea6 and OpenJDK. The following noteworthy changes were added in + this release: -New in release 1.1 (2008-04-04) + - Paul Hohensee published a GNU/Linux hotspot Sparc port and Matthias + Klose integrated it into IcedTea. + - Keith Seiths and Andrew Haley made fixes to the awt color package so + that it now provides the lcms library with PYCC and LINEAR_RGB ICC + profiles, fixing several applications that did complex color + transformations. + - Karl Helgason wrote a midi software synthesizer called Gervill that + is now integrated in IcedTea so that javax.sound.midi support works + now. Mark Wielaard integrated it and made some fixes so that it works + better with javax.sound.sampled. + - Jonathan Gibbons released a free version of jtreg, which was imported + into IcedTea by Mark Wielaard so that a make check now runs all the + functional unit tests integrated into OpenJDK. + - Joshua Sumali made lots of fixes to the javaws/netx support. Including + improved security, namely catching Socket permissions during runtime, + implementing the remaining JNLP services api (PrintService and + JNLPRandomAccessFile), and applet focusing bug fixes, so now netx + plays nice with gcjwebplugin. + - Kelly O'Hair resolved the license issues with the (j)hat tool which is + now integrated. + - Lillian Angel and Tom Fitzsimmons added several .desktop files for + the various tools included for better GNU/Linux desktop integration. + - Thomas Fitzsimmons rewrote the cacert support to resolve issues with + applications like Glashfish and Eclipse which access the keystore + directly. + - Lillian Angel made lots of bug fixes to the packaging and integration + support, include improving the font support. + - IcedTea6 1.2 and IcedTea[7] 1.7 are completely synced up again thanks + to Andrew John Hughes. + - Andrew also did all the work to make sure IcedTea[7] is now based on + OpenJDK7 b26 as released by Xiomara Jayasena. + - Thomas Fitzsimmons rewrote the certificate keystore support. + - Christian Thalinger made various cacao integration fixes. -- Zero builds on any architecture. -- New features added to NetX: - - Certificate fingerprints now show as part - of certificate details. - - gcjwebplugin can now run applets through NetX, - taking advantage of NetX's sandboxing and application security. - - User trusted certificates can be managed by passing the -viewer - option to NetX. -- Updated to b08. +New in release 1.6 (2008-02-13) + +- Zero-assembler implemented. +- Netx support added. Still a work-in-progress. +- Updated to build with gcc 4.3. +- Many bug fixes. + +New in release 1.5 (2008-01-03) + +- ppc/ppc64 support. +- ecj bootstrapping re-implemented. +- Updated to OpenJDK b24 build (now uses mercurial). +- System libraries (libpng, libjpeg, zlib, giflib) are used +instead of OpenJDK's implementations. - Several bug fixes. -New in release 1.0 (2008-02-15) +New in release 1.4 (2007-10-12) -- Initial release +* Updated to OpenJDK b21 build (README and INSTALL updated accordingly). +* Now using SSL/Crypto support included in b21, OpenSSL certs +still read directly. +* TZdata fix: uses System's timezone data. +* Memory issue fix: maximum PermGen space set to 128M and MaxHeap +to 512M. +* Xinerama fix: uses system installed library instead. +* DebugInfo fix: generates full debuginfo, regardless of +optimization. +* Fixed JConsole crash. +* Several other bug fixes. + +New in release 1.3 (2007-08-29) + +* Updated to OpenJDK b18 build. +* Web browser plugin support using gcjwebplugin. +* Now using Font supported included in b18. +* Graphics fixes. +* SSL/Crypto fixes. +* Refactored build process. + +New in release 1.2 (2007-08-01) + +* Updated to OpenJDK b16 build. +* Freetype font support fully replacing the encumbered libt2k. +* Path widening imported from GNU Classpath. +* Window decorations on x86_64 fixed. +* Bug fixes in various graphics classes. +* Anti-aliasing support explicitly disabled (instead of crashing). +* OpenSSL certs read directly +* Various crypto bug fixes. + +New in release 1.1 (2007-07-12) + +* Color management and raster fixes for compatibility with LittleCMS. +* Debuginfo is always generated. +* Initial work to satisfy libt2k requirement with Freetype. +* The GNU Crypto security providers have been imported from GNU + Classpath. +* IcedTls security provider. diff -r 6a6228a27e7f configure --- a/configure Sun Jun 01 17:57:21 2008 +0200 +++ b/configure Mon Jun 02 04:04:19 2008 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for icedtea 1.6. +# Generated by GNU Autoconf 2.61 for icedtea 1.7. # # Report bugs to . # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='icedtea' PACKAGE_TARNAME='icedtea' -PACKAGE_VERSION='1.6' -PACKAGE_STRING='icedtea 1.6' +PACKAGE_VERSION='1.7' +PACKAGE_STRING='icedtea 1.7' PACKAGE_BUGREPORT='fitzsim at redhat.com' ac_default_prefix=bootstrap @@ -1344,7 +1344,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures icedtea 1.6 to adapt to many kinds of systems. +\`configure' configures icedtea 1.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1414,7 +1414,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of icedtea 1.6:";; + short | recursive ) echo "Configuration of icedtea 1.7:";; esac cat <<\_ACEOF @@ -1572,7 +1572,7 @@ test -n "$ac_init_help" && exit $ac_stat test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -icedtea configure 1.6 +icedtea configure 1.7 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1586,7 +1586,7 @@ This file contains any messages produced This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by icedtea $as_me 1.6, which was +It was created by icedtea $as_me 1.7, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2276,7 +2276,7 @@ fi # Define the identity of the package. PACKAGE='icedtea' - VERSION='1.6' + VERSION='1.7' cat >>confdefs.h <<_ACEOF @@ -12709,7 +12709,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by icedtea $as_me 1.6, which was +This file was extended by icedtea $as_me 1.7, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12756,7 +12756,7 @@ _ACEOF _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -icedtea config.status 1.6 +icedtea config.status 1.7 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -r 6a6228a27e7f configure.ac --- a/configure.ac Sun Jun 01 17:57:21 2008 +0200 +++ b/configure.ac Mon Jun 02 04:04:19 2008 +0100 @@ -1,5 +1,5 @@ AC_PREREQ([2.61]) AC_PREREQ([2.61]) -AC_INIT([icedtea], [1.6], [fitzsim at redhat.com]) +AC_INIT([icedtea], [1.7], [fitzsim at redhat.com]) AM_INIT_AUTOMAKE([tar-pax]) AC_CONFIG_FILES([Makefile]) AC_CANONICAL_HOST From gnu_andrew at member.fsf.org Sun Jun 1 20:13:11 2008 From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org) Date: Mon, 02 Jun 2008 03:13:11 +0000 Subject: changeset in /hg/icedtea: Bump to 1.7 and fix make dist and out-... Message-ID: changeset 8bbc4ffe2c7c in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8bbc4ffe2c7c description: Bump to 1.7 and fix make dist and out-of-dir builds. diffstat: 6 files changed, 122 insertions(+), 49 deletions(-) ChangeLog | 11 +++++ Makefile.am | 8 +-- Makefile.in | 8 +-- NEWS | 122 +++++++++++++++++++++++++++++++++++++++++++--------------- configure | 20 ++++----- configure.ac | 2 diffs (295 lines): diff -r 6a6228a27e7f -r 8bbc4ffe2c7c ChangeLog --- a/ChangeLog Sun Jun 01 17:57:21 2008 +0200 +++ b/ChangeLog Mon Jun 02 04:13:01 2008 +0100 @@ -1,3 +1,14 @@ 2008-06-01 Mark Wielaard + + * Makefile.am: + Fix location of icedtea-ecj.patch for out-of-dir + and make distcheck builds, and rename ports target to + hotspot-ports to stop make dist downloading the JDK. + * Makefile.in: Regenerated. + * NEWS: Add release news. + * configure: Regenerated. + * configure.ac: Bump version number to 1.7. + 2008-06-01 Mark Wielaard * patches/icedtea-ecj.patch: Correct patch by reinstating diff -r 6a6228a27e7f -r 8bbc4ffe2c7c Makefile.am --- a/Makefile.am Sun Jun 01 17:57:21 2008 +0200 +++ b/Makefile.am Mon Jun 02 04:13:01 2008 +0100 @@ -455,7 +455,7 @@ stamps/ports-ecj.stamp: stamps/clone-ecj touch stamps/ports-ecj.stamp # Patch OpenJDK for plug replacements and ecj. -ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch +ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch stamps/patch-ecj.stamp: stamps/clone-ecj.stamp echo Checking $(ICEDTEA_ECJ_PATCH) ; \ @@ -1056,9 +1056,9 @@ tools: stamps/tools.stamp tools-class-files: stamps/tools-class-files.stamp -ports: stamps/ports.stamp - -ports-ecj: stamps/ports-ecj.stamp +hotspot-ports: stamps/ports.stamp + +hotspot-ports-ecj: stamps/ports-ecj.stamp clean: distclean-local diff -r 6a6228a27e7f -r 8bbc4ffe2c7c Makefile.in --- a/Makefile.in Sun Jun 01 17:57:21 2008 +0200 +++ b/Makefile.in Mon Jun 02 04:13:01 2008 +0100 @@ -426,7 +426,7 @@ ICEDTEA_PATCHES = patches/icedtea-copy-p $(am__append_7) # Patch OpenJDK for plug replacements and ecj. -ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch +ICEDTEA_ECJ_PATCH = $(srcdir)/patches/icedtea-ecj.patch @WITH_ICEDTEA_FALSE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp @WITH_ICEDTEA_TRUE@@WITH_OPENJDK_FALSE at BOOTSTRAP_DIRECTORY_STAMP = @WITH_OPENJDK_TRUE at BOOTSTRAP_DIRECTORY_STAMP = @@ -1496,9 +1496,9 @@ tools: stamps/tools.stamp tools-class-files: stamps/tools-class-files.stamp -ports: stamps/ports.stamp - -ports-ecj: stamps/ports-ecj.stamp +hotspot-ports: stamps/ports.stamp + +hotspot-ports-ecj: stamps/ports-ecj.stamp clean: distclean-local diff -r 6a6228a27e7f -r 8bbc4ffe2c7c NEWS --- a/NEWS Sun Jun 01 17:57:21 2008 +0200 +++ b/NEWS Mon Jun 02 04:13:01 2008 +0100 @@ -1,36 +1,98 @@ New in release 1.2 (2008-05-28) -New in release 1.2 (2008-05-28) +New in release 1.7 (2008-06-02) -- Updated to b09 build. -- Added the the lcms library with PYCC and LINEAR_RGB ICC - profiles. -- Integrated Gervill to provide midi support. -- JTreg integrated. -- javaws/NetX fixes: - -improved security, namely catching Socket permissions during - runtime - -implemented the remaining JNLP services api (PrintService, - JNLPRandomAccessFile) - -applet focusing bug fixed -- sparc/sparc64 port -- Desktop file integration. -- Various zero fixes. -- Sound fixes. -- Font fixes. -- Several other bug fixes. + IcedTea is based on the hard work of a lot of people that contributed to + IcedTea6 and OpenJDK. The following noteworthy changes were added in + this release: -New in release 1.1 (2008-04-04) + - Paul Hohensee published a GNU/Linux hotspot Sparc port and Matthias + Klose integrated it into IcedTea. + - Keith Seiths and Andrew Haley made fixes to the awt color package so + that it now provides the lcms library with PYCC and LINEAR_RGB ICC + profiles, fixing several applications that did complex color + transformations. + - Karl Helgason wrote a midi software synthesizer called Gervill that + is now integrated in IcedTea so that javax.sound.midi support works + now. Mark Wielaard integrated it and made some fixes so that it works + better with javax.sound.sampled. + - Jonathan Gibbons released a free version of jtreg, which was imported + into IcedTea by Mark Wielaard so that a make check now runs all the + functional unit tests integrated into OpenJDK. + - Joshua Sumali made lots of fixes to the javaws/netx support. Including + improved security, namely catching Socket permissions during runtime, + implementing the remaining JNLP services api (PrintService and + JNLPRandomAccessFile), and applet focusing bug fixes, so now netx + plays nice with gcjwebplugin. + - Kelly O'Hair resolved the license issues with the (j)hat tool which is + now integrated. + - Lillian Angel and Tom Fitzsimmons added several .desktop files for + the various tools included for better GNU/Linux desktop integration. + - Thomas Fitzsimmons rewrote the cacert support to resolve issues with + applications like Glashfish and Eclipse which access the keystore + directly. + - Lillian Angel made lots of bug fixes to the packaging and integration + support, include improving the font support. + - IcedTea6 1.2 and IcedTea[7] 1.7 are completely synced up again thanks + to Andrew John Hughes. + - Andrew also did all the work to make sure IcedTea[7] is now based on + OpenJDK7 b26 as released by Xiomara Jayasena. + - Thomas Fitzsimmons rewrote the certificate keystore support. + - Christian Thalinger made various cacao integration fixes. -- Zero builds on any architecture. -- New features added to NetX: - - Certificate fingerprints now show as part - of certificate details. - - gcjwebplugin can now run applets through NetX, - taking advantage of NetX's sandboxing and application security. - - User trusted certificates can be managed by passing the -viewer - option to NetX. -- Updated to b08. +New in release 1.6 (2008-02-13) + +- Zero-assembler implemented. +- Netx support added. Still a work-in-progress. +- Updated to build with gcc 4.3. +- Many bug fixes. + +New in release 1.5 (2008-01-03) + +- ppc/ppc64 support. +- ecj bootstrapping re-implemented. +- Updated to OpenJDK b24 build (now uses mercurial). +- System libraries (libpng, libjpeg, zlib, giflib) are used +instead of OpenJDK's implementations. - Several bug fixes. -New in release 1.0 (2008-02-15) +New in release 1.4 (2007-10-12) -- Initial release +* Updated to OpenJDK b21 build (README and INSTALL updated accordingly). +* Now using SSL/Crypto support included in b21, OpenSSL certs +still read directly. +* TZdata fix: uses System's timezone data. +* Memory issue fix: maximum PermGen space set to 128M and MaxHeap +to 512M. +* Xinerama fix: uses system installed library instead. +* DebugInfo fix: generates full debuginfo, regardless of +optimization. +* Fixed JConsole crash. +* Several other bug fixes. + +New in release 1.3 (2007-08-29) + +* Updated to OpenJDK b18 build. +* Web browser plugin support using gcjwebplugin. +* Now using Font supported included in b18. +* Graphics fixes. +* SSL/Crypto fixes. +* Refactored build process. + +New in release 1.2 (2007-08-01) + +* Updated to OpenJDK b16 build. +* Freetype font support fully replacing the encumbered libt2k. +* Path widening imported from GNU Classpath. +* Window decorations on x86_64 fixed. +* Bug fixes in various graphics classes. +* Anti-aliasing support explicitly disabled (instead of crashing). +* OpenSSL certs read directly +* Various crypto bug fixes. + +New in release 1.1 (2007-07-12) + +* Color management and raster fixes for compatibility with LittleCMS. +* Debuginfo is always generated. +* Initial work to satisfy libt2k requirement with Freetype. +* The GNU Crypto security providers have been imported from GNU + Classpath. +* IcedTls security provider. diff -r 6a6228a27e7f -r 8bbc4ffe2c7c configure --- a/configure Sun Jun 01 17:57:21 2008 +0200 +++ b/configure Mon Jun 02 04:13:01 2008 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for icedtea 1.6. +# Generated by GNU Autoconf 2.61 for icedtea 1.7. # # Report bugs to . # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='icedtea' PACKAGE_TARNAME='icedtea' -PACKAGE_VERSION='1.6' -PACKAGE_STRING='icedtea 1.6' +PACKAGE_VERSION='1.7' +PACKAGE_STRING='icedtea 1.7' PACKAGE_BUGREPORT='fitzsim at redhat.com' ac_default_prefix=bootstrap @@ -1344,7 +1344,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures icedtea 1.6 to adapt to many kinds of systems. +\`configure' configures icedtea 1.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1414,7 +1414,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of icedtea 1.6:";; + short | recursive ) echo "Configuration of icedtea 1.7:";; esac cat <<\_ACEOF @@ -1572,7 +1572,7 @@ test -n "$ac_init_help" && exit $ac_stat test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -icedtea configure 1.6 +icedtea configure 1.7 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1586,7 +1586,7 @@ This file contains any messages produced This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by icedtea $as_me 1.6, which was +It was created by icedtea $as_me 1.7, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2276,7 +2276,7 @@ fi # Define the identity of the package. PACKAGE='icedtea' - VERSION='1.6' + VERSION='1.7' cat >>confdefs.h <<_ACEOF @@ -12709,7 +12709,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by icedtea $as_me 1.6, which was +This file was extended by icedtea $as_me 1.7, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12756,7 +12756,7 @@ _ACEOF _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -icedtea config.status 1.6 +icedtea config.status 1.7 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -r 6a6228a27e7f -r 8bbc4ffe2c7c configure.ac --- a/configure.ac Sun Jun 01 17:57:21 2008 +0200 +++ b/configure.ac Mon Jun 02 04:13:01 2008 +0100 @@ -1,5 +1,5 @@ AC_PREREQ([2.61]) AC_PREREQ([2.61]) -AC_INIT([icedtea], [1.6], [fitzsim at redhat.com]) +AC_INIT([icedtea], [1.7], [fitzsim at redhat.com]) AM_INIT_AUTOMAKE([tar-pax]) AC_CONFIG_FILES([Makefile]) AC_CANONICAL_HOST From gnu_andrew at member.fsf.org Sun Jun 1 20:22:26 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 2 Jun 2008 04:22:26 +0100 Subject: IcedTea 1.7 released! Message-ID: <17c6771e0806012022n6f84a07bxaa7ac90bdb7a358@mail.gmail.com> We are proud to announce the release of IcedTea 1.7. The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools and provides replacements libraries for the binary plugs with code from the GNU Classpath project. More information on IcedTea can be found at http://icedtea.classpath.org What's New? ----------------- IcedTea is based on the hard work of a lot of people that contributed to IcedTea6 (see the recent announcement of 1.2) and OpenJDK. The following noteworthy changes are included in this release (summarised by Mark Wielaard): - Paul Hohensee published a GNU/Linux hotspot Sparc port and Matthias Klose integrated it into IcedTea. - Keith Seiths and Andrew Haley made fixes to the awt color package so that it now provides the lcms library with PYCC and LINEAR_RGB ICC profiles, fixing several applications that did complex color transformations. - Karl Helgason wrote a midi software synthesizer called Gervill that is now integrated in IcedTea so that javax.sound.midi support works now. Mark Wielaard integrated it and made some fixes so that it works better with javax.sound.sampled. - Jonathan Gibbons released a free version of jtreg, which was imported into IcedTea by Mark Wielaard so that a make check now runs all the functional unit tests integrated into OpenJDK. - Joshua Sumali made lots of fixes to the javaws/netx support. Including improved security, namely catching Socket permissions during runtime, implementing the remaining JNLP services api (PrintService and JNLPRandomAccessFile), and applet focusing bug fixes, so now netx plays nice with gcjwebplugin. - Kelly O'Hair resolved the license issues with the (j)hat tool which is now integrated. - Lillian Angel and Tom Fitzsimmons added several .desktop files for the various tools included for better GNU/Linux desktop integration. - Thomas Fitzsimmons rewrote the cacert support to resolve issues with applications like Glashfish and Eclipse which access the keystore directly. - Lillian Angel made lots of bug fixes to the packaging and integration support, include improving the font support. - IcedTea6 1.2 and IcedTea[7] 1.7 are completely synced up again thanks to Andrew John Hughes. - Andrew also did all the work to make sure IcedTea[7] is now based on OpenJDK7 b26 as released by Xiomara Jayasena. - Thomas Fitzsimmons rewrote the certificate keystore support. - Christian Thalinger made various cacao integration fixes. ----------------- The tarball can be downloaded here: http://icedtea.classpath.org/download/source/icedtea-1.7.tar.gz The following people helped with this release: Lillian Angel, Gary Benson, Thomas Fitzsimmons, Andrew Haley, Andrew John Hughes, Matthias Klose, Dan Munckton, Parag Nemade, Keith Seitz, Joshua Sumali, Christian Thalinger, Mark Wielaard, Yi Zhan We would also like to thank the bug reporters and testers! Full build requirements and instructions can be found in the INSTALL file in the top-level directory of the release. However, $ ./configure $ make should be a good start. Thanks, -- Andrew :-) 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 gnu_andrew at member.fsf.org Sun Jun 1 20:31:23 2008 From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org) Date: Mon, 02 Jun 2008 03:31:23 +0000 Subject: changeset in /hg/icedtea: Added tag icedtea-1.7 for changeset 8b... Message-ID: changeset 79a70e3a3d61 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=79a70e3a3d61 description: Added tag icedtea-1.7 for changeset 8bbc4ffe2c7c diffstat: 1 file changed, 1 insertion(+) .hgtags | 1 + diffs (8 lines): diff -r 8bbc4ffe2c7c -r 79a70e3a3d61 .hgtags --- a/.hgtags Mon Jun 02 04:13:01 2008 +0100 +++ b/.hgtags Mon Jun 02 04:30:31 2008 +0100 @@ -8,3 +8,4 @@ 38e6eb354632588f5ac8dbcd69229ebd031f57cb 38e6eb354632588f5ac8dbcd69229ebd031f57cb icedtea6-1.0 a5c32475a2e87f0f3bd7af28e632e6bd4f724b04 icedtea6-1.1 871b70407a139c6bd42c200762ee1d302b31168f icedtea6-1.2 +8bbc4ffe2c7c542f9aa7d26f823e50f0dd036ce9 icedtea-1.7 From gnu_andrew at member.fsf.org Sun Jun 1 20:35:00 2008 From: gnu_andrew at member.fsf.org (Andrew John Hughes) Date: Mon, 2 Jun 2008 04:35:00 +0100 Subject: FYI: Bump version to 1.8-pre for next release. Message-ID: <20080602033500.GA10112@rivendell.middle-earth.co.uk> This bumps IcedTea's version number to 1.8-pre so we can prepare for the next release. ChangeLog: 2008-06-02 Andrew John Hughes * NEWS: Add news stub for next release. * configure: Regenerated. * configure.ac: Bump version number to 1.8-pre. -- Andrew :) 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 79a70e3a3d61 NEWS --- a/NEWS Mon Jun 02 04:30:31 2008 +0100 +++ b/NEWS Mon Jun 02 04:33:00 2008 +0100 @@ -1,3 +1,5 @@ New in release 1.7 (2008-06-02) +New in release 1.8 (XXXX-XX-XX) + New in release 1.7 (2008-06-02) IcedTea is based on the hard work of a lot of people that contributed to diff -r 79a70e3a3d61 configure --- a/configure Mon Jun 02 04:30:31 2008 +0100 +++ b/configure Mon Jun 02 04:33:00 2008 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for icedtea 1.7. +# Generated by GNU Autoconf 2.61 for icedtea 1.8-pre. # # Report bugs to . # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='icedtea' PACKAGE_TARNAME='icedtea' -PACKAGE_VERSION='1.7' -PACKAGE_STRING='icedtea 1.7' +PACKAGE_VERSION='1.8-pre' +PACKAGE_STRING='icedtea 1.8-pre' PACKAGE_BUGREPORT='fitzsim at redhat.com' ac_default_prefix=bootstrap @@ -1344,7 +1344,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures icedtea 1.7 to adapt to many kinds of systems. +\`configure' configures icedtea 1.8-pre to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1414,7 +1414,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of icedtea 1.7:";; + short | recursive ) echo "Configuration of icedtea 1.8-pre:";; esac cat <<\_ACEOF @@ -1572,7 +1572,7 @@ test -n "$ac_init_help" && exit $ac_stat test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -icedtea configure 1.7 +icedtea configure 1.8-pre generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1586,7 +1586,7 @@ This file contains any messages produced This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by icedtea $as_me 1.7, which was +It was created by icedtea $as_me 1.8-pre, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2276,7 +2276,7 @@ fi # Define the identity of the package. PACKAGE='icedtea' - VERSION='1.7' + VERSION='1.8-pre' cat >>confdefs.h <<_ACEOF @@ -12709,7 +12709,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by icedtea $as_me 1.7, which was +This file was extended by icedtea $as_me 1.8-pre, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12756,7 +12756,7 @@ _ACEOF _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -icedtea config.status 1.7 +icedtea config.status 1.8-pre configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -r 79a70e3a3d61 configure.ac --- a/configure.ac Mon Jun 02 04:30:31 2008 +0100 +++ b/configure.ac Mon Jun 02 04:33:00 2008 +0100 @@ -1,5 +1,5 @@ AC_PREREQ([2.61]) AC_PREREQ([2.61]) -AC_INIT([icedtea], [1.7], [fitzsim at redhat.com]) +AC_INIT([icedtea], [1.8-pre], [fitzsim at redhat.com]) AM_INIT_AUTOMAKE([tar-pax]) AC_CONFIG_FILES([Makefile]) AC_CANONICAL_HOST From gnu_andrew at member.fsf.org Sun Jun 1 20:35:09 2008 From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org) Date: Mon, 02 Jun 2008 03:35:09 +0000 Subject: changeset in /hg/icedtea: Bump version to 1.8-pre. Message-ID: changeset d097426f525a in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d097426f525a description: Bump version to 1.8-pre. diffstat: 3 files changed, 13 insertions(+), 11 deletions(-) NEWS | 2 ++ configure | 20 ++++++++++---------- configure.ac | 2 +- diffs (104 lines): diff -r 79a70e3a3d61 -r d097426f525a NEWS --- a/NEWS Mon Jun 02 04:30:31 2008 +0100 +++ b/NEWS Mon Jun 02 04:33:20 2008 +0100 @@ -1,3 +1,5 @@ New in release 1.7 (2008-06-02) +New in release 1.8 (XXXX-XX-XX) + New in release 1.7 (2008-06-02) IcedTea is based on the hard work of a lot of people that contributed to diff -r 79a70e3a3d61 -r d097426f525a configure --- a/configure Mon Jun 02 04:30:31 2008 +0100 +++ b/configure Mon Jun 02 04:33:20 2008 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for icedtea 1.7. +# Generated by GNU Autoconf 2.61 for icedtea 1.8-pre. # # Report bugs to . # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='icedtea' PACKAGE_TARNAME='icedtea' -PACKAGE_VERSION='1.7' -PACKAGE_STRING='icedtea 1.7' +PACKAGE_VERSION='1.8-pre' +PACKAGE_STRING='icedtea 1.8-pre' PACKAGE_BUGREPORT='fitzsim at redhat.com' ac_default_prefix=bootstrap @@ -1344,7 +1344,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures icedtea 1.7 to adapt to many kinds of systems. +\`configure' configures icedtea 1.8-pre to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1414,7 +1414,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of icedtea 1.7:";; + short | recursive ) echo "Configuration of icedtea 1.8-pre:";; esac cat <<\_ACEOF @@ -1572,7 +1572,7 @@ test -n "$ac_init_help" && exit $ac_stat test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -icedtea configure 1.7 +icedtea configure 1.8-pre generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1586,7 +1586,7 @@ This file contains any messages produced This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by icedtea $as_me 1.7, which was +It was created by icedtea $as_me 1.8-pre, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2276,7 +2276,7 @@ fi # Define the identity of the package. PACKAGE='icedtea' - VERSION='1.7' + VERSION='1.8-pre' cat >>confdefs.h <<_ACEOF @@ -12709,7 +12709,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by icedtea $as_me 1.7, which was +This file was extended by icedtea $as_me 1.8-pre, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12756,7 +12756,7 @@ _ACEOF _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -icedtea config.status 1.7 +icedtea config.status 1.8-pre configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -r 79a70e3a3d61 -r d097426f525a configure.ac --- a/configure.ac Mon Jun 02 04:30:31 2008 +0100 +++ b/configure.ac Mon Jun 02 04:33:20 2008 +0100 @@ -1,5 +1,5 @@ AC_PREREQ([2.61]) AC_PREREQ([2.61]) -AC_INIT([icedtea], [1.7], [fitzsim at redhat.com]) +AC_INIT([icedtea], [1.8-pre], [fitzsim at redhat.com]) AM_INIT_AUTOMAKE([tar-pax]) AC_CONFIG_FILES([Makefile]) AC_CANONICAL_HOST From gnu_andrew at member.fsf.org Sun Jun 1 20:35:10 2008 From: gnu_andrew at member.fsf.org (gnu_andrew at member.fsf.org) Date: Mon, 02 Jun 2008 03:35:10 +0000 Subject: changeset in /hg/icedtea: Add ChangeLog for previous commit. Message-ID: changeset 910a55ae501d in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=910a55ae501d description: Add ChangeLog for previous commit. diffstat: 1 file changed, 6 insertions(+) ChangeLog | 6 ++++++ diffs (13 lines): diff -r d097426f525a -r 910a55ae501d ChangeLog --- a/ChangeLog Mon Jun 02 04:33:20 2008 +0100 +++ b/ChangeLog Mon Jun 02 04:34:01 2008 +0100 @@ -1,3 +1,9 @@ 2008-06-02 Andrew John Hughes + + * NEWS: Add news stub for next release. + * configure: Regenerated. + * configure.ac: Bump version number to 1.8-pre. + 2008-06-02 Andrew John Hughes * Makefile.am: From bugzilla-daemon at icedtea.classpath.org Mon Jun 2 03:52:08 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 02 Jun 2008 10:52:08 +0000 Subject: [Bug 140] no source included for jscheme*jar Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=140 ------- Comment #4 from doko at ubuntu.com 2008-06-02 10:52 ------- while jscheme-5.0.0 does have a conforming license, it doesn't build from source with openjdk6: jlib/Swing.java:5765: cannot find symbol symbol : class Dialog$ModalityType location: package java.awt (args.nth(1) instanceof java.awt.Dialog$ModalityType))) ^ jlib/Swing.java:5782: cannot find symbol symbol : class Dialog$ModalityType location: package java.awt (args.nth(2) instanceof java.awt.Dialog$ModalityType))) ^ jlib/Swing.java:5791: cannot find symbol symbol : class Dialog$ModalityType location: package java.awt (args.nth(2) instanceof java.awt.Dialog$ModalityType) && ^ jlib/Swing.java:5838: cannot find symbol symbol : class Dialog$ModalityType location: package java.awt (java.awt.Dialog$ModalityType) args.nth(1) ); ^ jlib/Swing.java:5845: cannot find symbol symbol : class Dialog$ModalityType location: package java.awt (java.awt.Dialog$ModalityType) args.nth(2) ); ^ jlib/Swing.java:5849: cannot find symbol symbol : class Dialog$ModalityType location: package java.awt (java.awt.Dialog$ModalityType) args.nth(2), ^ Note: Some input files use or override a deprecated API. Note: Recompile with -Xlint:deprecation for details. Note: Some input files use unchecked or unsafe operations. Note: Recompile with -Xlint:unchecked for details. 6 errors -- 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 Jun 2 04:19:08 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 02 Jun 2008 11:19:08 +0000 Subject: [Bug 140] no source included for jscheme*jar Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=140 ------- Comment #5 from aph at redhat.com 2008-06-02 11:19 ------- Shouldn't these be java.awt.Dialog.ModalityType ? The spec says ststic class Dialog.ModalityType Modal dialogs block all input to some top-level windows. -- 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 Jun 2 04:54:17 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 02 Jun 2008 11:54:17 +0000 Subject: [Bug 153] New: Class library tests should be less specific and ensure correctness Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=153 Summary: Class library tests should be less specific and ensure correctness Product: IcedTea Version: unspecified Platform: Other OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: gnu_andrew at member.fsf.org At present we test for a class library to use for the build with: --with-libgcj-jar specify location of the libgcj 4.3.0 jar This will actually now pick up both 4.3.0 and 4.1.2. The latter is Fedora-specific. The upstream 4.1.2 is not capable of being used (lacking 1.5 features) and the test generates false positives on Debian stable and Gentoo. The titling of the option is also too specific. glibj.zip from GNU Classpath is also capable of fulfilling this dependency. Indeed, libgcj.jar is largely composed of GNU Classpath classes. I'd suggest an option like --with-classlib-jar followed by a test to ensure that the required classes are actually present. A 1.5 test already exists in GNU Classpath and could be altered to suit this purpose. -- 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 Jun 2 04:57:18 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 02 Jun 2008 11:57:18 +0000 Subject: [Bug 154] New: Hidden GCJ HOME dependency misleading Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=154 Summary: Hidden GCJ HOME dependency misleading Product: IcedTea Version: unspecified Platform: Other OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: gnu_andrew at member.fsf.org The build relies on an option called --with-gcj-home to provide libjvm. This is not included in the output of configure. Thus, the first time it may be found to be wrong is in make: /usr/lib/jvm/java-gcj cannot be found. Try reconfiguring with --with-gcj-home=/path/to/java-gcj-devel The option is also misleading. The required structure is not a GCC/GCJ install but an installation of gcj-java-compat. What this option is really looking for is a JDK-like structure. As a result, it could also be used for javac and the class library, but isn't. -- 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 Joe.Darcy at Sun.COM Mon Jun 2 10:19:44 2008 From: Joe.Darcy at Sun.COM (Joseph D. Darcy) Date: Mon, 02 Jun 2008 10:19:44 -0700 Subject: OpenJDK 6 b10 source posted In-Reply-To: <1212359825.3133.84.camel@dijkstra.wildebeest.org> References: <4840AC46.8030409@sun.com> <1212359825.3133.84.camel@dijkstra.wildebeest.org> Message-ID: <48442BB0.90802@sun.com> Mark Wielaard wrote: > Hi Joe, > > On Fri, 2008-05-30 at 18:39 -0700, Joseph D. Darcy wrote: >> The OpenJDK 6 b10 source is now available at >> >> http://download.java.net/openjdk/jdk6/ > > Thanks for releasing this. I have updated icedtea6 to include it. > > Are you planning to support a mercurial repo for openjdk6? Yes, a mercurial repo for OpenJDK 6 should be up and running withing a month or two. > Although your > release notes below helped a lot, it is still hard work to review all > the changes for integration if all you got is just the diff between two > full versions. Agreed. > For those interested I posted the b09-b10 diff here: > http://icedtea.classpath.org/~mjw/b09-b10.diff.gz > (Excluding the new/deleted (gervill) files) > > Posting individual changes and/or having a public repo might also help > understanding smaller things that you don't explicitly mention in your > release notes like the changes to java.c, MetaData.java or > ChunkedInputStream/test.txt (also removed from the diff since it is > essentially a binary blob). > >> A few fixes in the 2D area: >> >> 6604044: java crashes talking to second X screen >> 6636469: Java Fullscreen Exclusive Mode not working with Xorg server >> 1.3.0 and above > > Removed icedtea-xinerama.patch from icedtea6 which did the same thing. > >> 6523403: OSS CMM: Need to provide lcms library with PYCC and >> LINEAR_RGB OS ICC profiles >> >> The last fix was contributed by Andrew Haley and Keith Seitz of Red Hat >> and fixes color management related regression and JCK failures. > > Thanks, I removed the icedtea-color-profiles.patch and the overlay. > >> The encumbered sound engine has been replaced with Gervill: >> >> 6702956 OpenJDK: replace encumbered code (software synthesizer) > > Very nice. We had good experience with this code in IcedTea. > > It wasn't clear precisely which upstream version of Gervill you are > including. It does look like you are missing some fixes Karl and I made > since it got integrated into icedtea. For example you miss the sample > rate conversion support. But it is somewhat hard to see because all the > files got completely reformatted from the upstream sources. > > You should be able to find all the changes we made on the mailinglist > (sound-dev, distro-pkg-dev and audio-engine-dev) and of course in > Gervill CVS https://gervill.dev.java.net/source/browse/gervill/ (or > icedtea6 mercurial under overlays). > > Could you make the changes you made to the upstream sources available > separate from the changes you made to the indention of the sources for > easy comparison? I'll forward this request to the engineer who did the Gervill integration. > For now I kept the current upstream/icedtea version. > >> Some progress has been made on addressing the copyright/licensing >> concerns raised by Debian >> (http://mail.openjdk.java.net/pipermail/jdk6-dev/2008-April/000044.html): >> >> 6695553: Cleanup GPLv2+SPL legal notices in hat sources >> 6703931 Remove jaxws doc-files from the jdk >> >> Work will continue in this area until all the issues are addressed. > > Very nice. I removed the patches/icedtea-hat-spl-gpl.patch. > And this also closes: > - http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=142 > > And I saw soundbank.gm was also removed, which closes: > - http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=149 > > The general tracking bug for hopefully all these issues is: > http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138 > >> Mark Wielaard recently proposed publishing regression test results for >> OpenJDK 6 >> (http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2008-May/001921.html). >> Thanks for the update on incorporating the changes in b10. >> I'll publish results for b10 later. > > That would be cool. Yes; however, my own work on OpenJDK 6 will be delayed for a while since I am out of the office for a death in the family. Regards, -Joe > I am also happy to note that Lillian and Tom added jtregcheck to the > Fedora rpm builds in addition to running the Mauve tests. The test > results output (just the jtreg -v1 output for now, not yet the full > JTreport and JTwork output) are then included in the src subpackage rpm > and in the build logs. > > Which is great because it also allows us to easily monitor the (zero) > ports that Fedora ships like ppc and ppc64. For an example see: > http://koji.fedoraproject.org/koji/buildinfo?buildID=51083 > Click on the build logs (build.log) and search for "JTREG TESTING". > The results still have a bit too many failures because it doesn't > currently provide a Xvfb wrapper like it does for Mauve. But that is in > the works. > > Cheers, > > Mark > > > 2008-06-01 Mark Wielaard > > * Makefile.am (OPENJDK_DATE): Updated to 30_may_2008. > (OPENJDK_MD5SUM): Updated. > (OPENJDK_VERSION): Updated to b10. > (OPENJDK_SRC_ZIP): Adjusted to new underscore convention between > version and date in b10. > (ICEDTEA_PATCHES): Removed icedtea-xinerama.patch, > icedtea-color-profiles.patch and icedtea-hat-spl-gpl.patch. > * Makefile.in: Regenerated. > * patches/icedtea-copy-plugs.patch: Adjusted to remove sound > references in b10. > * patches/icedtea-gervill.patch: Adjusted to new sound service > files in b10. > * overlays/openjdk/jdk/src/share/lib/cmm/lcms/GRAY.pf: Removed. > * overlays/openjdk/jdk/src/share/lib/cmm/lcms/LINEAR_RGB.pf: Removed. > * overlays/openjdk/jdk/src/share/lib/cmm/lcms/PYCC.pf: Removed. > * patches/icedtea-color-profiles.patch: Removed. > * patches/icedtea-hat-spl-gpl.patch: Removed. > * patches/icedtea-xinerama.patch: Removed. > > From psj at familyjenner.co.uk Mon Jun 2 12:01:37 2008 From: psj at familyjenner.co.uk (Paul Jenner) Date: Mon, 02 Jun 2008 20:01:37 +0100 Subject: OpenJDK 6 b10 source posted In-Reply-To: <1212359825.3133.84.camel@dijkstra.wildebeest.org> References: <4840AC46.8030409@sun.com> <1212359825.3133.84.camel@dijkstra.wildebeest.org> Message-ID: <1212433297.7582.4.camel@localhost.localdomain> Hi Mark. On Mon, 2008-06-02 at 00:37 +0200, Mark Wielaard wrote: > > The encumbered sound engine has been replaced with Gervill: > > > > 6702956 OpenJDK: replace encumbered code (software synthesizer) > > Very nice. We had good experience with this code in IcedTea. Does that mean the libjsoundhs.so library target can go from Makefile.am? Presumably if/when the OpenJDK6 Gervill is imported to Icedtea, the files under rt/com/sun/media/sound/ could also go? I think that would only leave the SNMP stuff and the libdcpr.so library target (is this used since the replacement of Ductus?) from the original binary plugs replacements - way to go! Paul -- Paul Jenner From bugzilla-daemon at icedtea.classpath.org Mon Jun 2 13:26:56 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 02 Jun 2008 20:26:56 +0000 Subject: [Bug 140] no source included for jscheme*jar Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=140 ------- Comment #6 from doko at ubuntu.com 2008-06-02 20:26 ------- > Shouldn't these be java.awt.Dialog.ModalityType ? probably yes, but this .java file is generated. -- 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 mark at klomp.org Mon Jun 2 13:29:22 2008 From: mark at klomp.org (Mark Wielaard) Date: Mon, 02 Jun 2008 22:29:22 +0200 Subject: OpenJDK 6 b10 source posted In-Reply-To: <1212433297.7582.4.camel@localhost.localdomain> References: <4840AC46.8030409@sun.com> <1212359825.3133.84.camel@dijkstra.wildebeest.org> <1212433297.7582.4.camel@localhost.localdomain> Message-ID: <1212438562.3187.6.camel@hermans.wildebeest.org> Hi Paul, On Mon, 2008-06-02 at 20:01 +0100, Paul Jenner wrote: > On Mon, 2008-06-02 at 00:37 +0200, Mark Wielaard wrote: > > > The encumbered sound engine has been replaced with Gervill: > > > > > > 6702956 OpenJDK: replace encumbered code (software synthesizer) > > > > Very nice. We had good experience with this code in IcedTea. > > Does that mean the libjsoundhs.so library target can go from > Makefile.am? Yes, support for jsoundhs has been removed. > Presumably if/when the OpenJDK6 Gervill is imported to Icedtea, the > files under rt/com/sun/media/sound/ could also go? I believe they (and other classes there) already can, I have been lazy/hesitant to remove them to not accidentally break anybodies bootstrap. But none of these classes are used, the code under overlays/ from the Gervill project is used in its place. > I think that would only leave the SNMP stuff Yes :) > and the libdcpr.so library > target (is this used since the replacement of Ductus?) from the original > binary plugs replacements - way to go! dcpr should never be used, that is all replaced by pisces. I guess we really should do some spring cleaning :) Cheers, Mark From bugzilla-daemon at icedtea.classpath.org Mon Jun 2 14:22:49 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Mon, 02 Jun 2008 21:22:49 +0000 Subject: [Bug 140] no source included for jscheme*jar Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=140 ------- Comment #7 from gnu_andrew at member.fsf.org 2008-06-02 21:22 ------- I've looked over the one scheme file which seems to be the problem. It seems simple enough to port over to pure Java and I'm happy to do this. -- 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 Jun 3 03:14:43 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 03 Jun 2008 10:14:43 +0000 Subject: [Bug 155] New: Eclipse crashes in [libxul.so+0x9c753c] Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=155 Summary: Eclipse crashes in [libxul.so+0x9c753c] Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: mcepl at redhat.com Using RSSOwl I got the attached log, which instructs me to file a bug here. This is Fedora Rawhide. [matej at hubmaier ~]$ java -version java version "1.6.0" OpenJDK Runtime Environment (build 1.6.0-b09) OpenJDK 64-Bit Server VM (build 1.6.0-b09, mixed mode) [matej at hubmaier ~]$ rpm -qf $(readlink -f $(which java)) java-1.6.0-openjdk-1.6.0.0-0.14.b09.fc10.x86_64 [matej at hubmaier ~]$ rpm -qf $(readlink -f $(which eclipse)) eclipse-platform-3.3.2-12.fc9.x86_64 [matej at hubmaier ~]$ RSSOwl is 2.0.0alpha via Update Manager -- 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 Jun 3 03:16:12 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 03 Jun 2008 10:16:12 +0000 Subject: [Bug 155] Eclipse crashes in [libxul.so+0x9c753c] Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=155 ------- Comment #1 from mcepl at redhat.com 2008-06-03 10:16 ------- Created an attachment (id=73) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=73&action=view) error log from Eclipse -- 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 Jun 3 03:42:01 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 03 Jun 2008 10:42:01 +0000 Subject: [Bug 155] Eclipse crashes in [libxul.so+0x9c753c] Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=155 ------- Comment #2 from aph at redhat.com 2008-06-03 10:42 ------- Looks very similar to http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=152 -- 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 Jun 3 05:13:09 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 03 Jun 2008 12:13:09 +0000 Subject: [Bug 156] New: Eclipse crashes in [libglib-2.0.so.0+0x54f39] g_slice_alloc+0x139 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=156 Summary: Eclipse crashes in [libglib-2.0.so.0+0x54f39] g_slice_alloc+0x139 Product: IcedTea Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: IcedTea AssignedTo: unassigned at icedtea.classpath.org ReportedBy: mcepl at redhat.com (continuation of bug 155 -- I got two logs out of two runnings of RSSOwl). The all packages and everything is the same as in bug 155, but the log is different. -- 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 Jun 3 05:13:43 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Tue, 03 Jun 2008 12:13:43 +0000 Subject: [Bug 156] Eclipse crashes in [libglib-2.0.so.0+0x54f39] g_slice_alloc+0x139 Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=156 ------- Comment #1 from mcepl at redhat.com 2008-06-03 12:13 ------- Created an attachment (id=74) --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=74&action=view) 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 mark at klomp.org Wed Jun 4 02:25:24 2008 From: mark at klomp.org (Mark Wielaard) Date: Wed, 04 Jun 2008 11:25:24 +0200 Subject: OpenJDK 6 b10 source posted In-Reply-To: <36EC82E93EB0AD40A4301DAD654323868CA4FB2AE1@mail.midverk.is> References: <36EC82E93EB0AD40A4301DAD654323868CA4FB2AE1@mail.midverk.is> Message-ID: <1212571525.3172.11.camel@dijkstra.wildebeest.org> Hi Karl, On Wed, 2008-06-04 at 01:09 +0000, Karl Helgason wrote: > Mark Wielaard wrote: > > It wasn't clear precisely which upstream version of Gervill you are > > including. It does look like you are missing some fixes Karl and I made > > since it got integrated into icedtea. For example you miss the sample > > rate conversion support. But it is somewhat hard to see because all the > > files got completely reformatted from the upstream sources. > > They are using Gervill 0.9 source dump with these fixes (which are also in current cvs): > - Fix: Default tempo in SoftMidiFileReader was supposed to be 500000 mpq or 120 bpm > - Fix: Change type of info variable in SoftSynthesize into MidiDevice.Info > - Fix: Fix instanceof check of p1 variable in ModelInstrumentComparator > - Fix: Remove redundant constant variable in ModelByteBufferWaveTable Thanks for checking. These are all in the icedtea gervill overlay also. I'll make sure to upgrade to the latest CVS version in which I see you fixed some of the other issues I reported. > The code was also slightly reformatted: > a) lines "* @version %I%, %E%" was removed (such lines was removed from all JDK > sources); > b) line indention (to make lines no longer than 80 symbols); > c) tabs to spaces conversion; > > I will look into to reformat newest Gervill CVS code the same way. That would be great. Since 0.9 there have been lots of changes and fixes (which is why icedtea tracks your CVS tree and didn't use the old 0.9 code). Would it be a good idea to do a new version upgrade after syncing the sources and reformatting to celebrate the inclusion? Cheers, Mark From bugzilla-daemon at icedtea.classpath.org Wed Jun 4 14:13:19 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Jun 2008 21:13:19 +0000 Subject: [Bug 139] no source included for maf-1_0.jar, jlfgr-1_0.jar Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=139 ------- Comment #4 from kelly.ohair at sun.com 2008-06-04 21:13 ------- Filed Sun bug 6710791 on this issue -- 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 Jun 4 14:16:00 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Wed, 04 Jun 2008 21:16:00 +0000 Subject: [Bug 144] jvmtiLib.xsl and archDesc.cpp generate files with SUN PROPRIETARY/CONFIDENTIAL notices (openjdk6 only) Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=144 ------- Comment #1 from kelly.ohair at sun.com 2008-06-04 21:16 ------- Created Sun bug 6601377 on this issue -- 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 kalli at midverk.is Wed Jun 4 18:56:18 2008 From: kalli at midverk.is (Karl Helgason) Date: Thu, 5 Jun 2008 01:56:18 +0000 Subject: SV: OpenJDK 6 b10 source posted In-Reply-To: <1212571525.3172.11.camel@dijkstra.wildebeest.org> References: <36EC82E93EB0AD40A4301DAD654323868CA4FB2AE1@mail.midverk.is>, <1212571525.3172.11.camel@dijkstra.wildebeest.org> Message-ID: <36EC82E93EB0AD40A4301DAD654323868CA4FB2AE2@mail.midverk.is> Hi Mark, I have reformatted the Gervill CVS code. It should be possible now to make diffs between them easily. cheers, Karl ________________________________________ Fr?: Mark Wielaard [mark at klomp.org] Sent: 4. j?n? 2008 09:25 Vi?takandi: Karl Helgason Afrit: jdk6-dev at openjdk.java.net; distro-pkg-dev at openjdk.java.net Efni: Re: OpenJDK 6 b10 source posted Hi Karl, On Wed, 2008-06-04 at 01:09 +0000, Karl Helgason wrote: > Mark Wielaard wrote: > > It wasn't clear precisely which upstream version of Gervill you are > > including. It does look like you are missing some fixes Karl and I made > > since it got integrated into icedtea. For example you miss the sample > > rate conversion support. But it is somewhat hard to see because all the > > files got completely reformatted from the upstream sources. > > They are using Gervill 0.9 source dump with these fixes (which are also in current cvs): > - Fix: Default tempo in SoftMidiFileReader was supposed to be 500000 mpq or 120 bpm > - Fix: Change type of info variable in SoftSynthesize into MidiDevice.Info > - Fix: Fix instanceof check of p1 variable in ModelInstrumentComparator > - Fix: Remove redundant constant variable in ModelByteBufferWaveTable Thanks for checking. These are all in the icedtea gervill overlay also. I'll make sure to upgrade to the latest CVS version in which I see you fixed some of the other issues I reported. > The code was also slightly reformatted: > a) lines "* @version %I%, %E%" was removed (such lines was removed from all JDK > sources); > b) line indention (to make lines no longer than 80 symbols); > c) tabs to spaces conversion; > > I will look into to reformat newest Gervill CVS code the same way. That would be great. Since 0.9 there have been lots of changes and fixes (which is why icedtea tracks your CVS tree and didn't use the old 0.9 code). Would it be a good idea to do a new version upgrade after syncing the sources and reformatting to celebrate the inclusion? Cheers, Mark No virus found in this incoming message. Checked by AVG. Version: 7.5.524 / Virus Database: 269.24.6/1480 - Release Date: 3.6.2008 07:00 From bugzilla-daemon at icedtea.classpath.org Thu Jun 5 18:53:35 2008 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 06 Jun 2008 01:53:35 +0000 Subject: [Bug 140] no source included for jscheme*jar Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=140 gnu_andrew at member.fsf.org changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED ------- Comment #8 from gnu_andrew at member.fsf.org 2008-06-06 01:53 ------- Replacement started here: http://fuseyism.com/hg/jscheme/ It can already generate the first ten or so lines of the class file. Should hopefully be finished tomorrow. -- 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 mark at klomp.org Sun Jun 8 15:02:47 2008 From: mark at klomp.org (Mark Wielaard) Date: Sun, 08 Jun 2008 22:02:47 +0000 Subject: changeset in /hg/icedtea6: Import Gervill CVS fixes. Message-ID: changeset 94f0c8f3a4aa in /hg/icedtea6 details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=94f0c8f3a4aa description: Import Gervill CVS fixes. 2008-08-08 Mark Wielaard * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound: Import Gervill fixes from CVS. See CHANGES.txt. * overlays/openjdk/jdk/test/com/sun/media/sound: Likewise. - Cleanup: Make inner classes static AudioFloatFormatConverter.AudioFloatFormatConverterInputStream AudioFloatFormatConverter.AudioFloatInputStreamChannelMixer AudioFloatFormatConverter.AudioFloatInputStreamResampler SimpleInstrument.SimpleInstrumentPart SoftChorus.VariableDelay SoftChorus.LFODelay SoftMixingDataLine.AudioFloatInputStreamResampler SoftMixingSourceDataLine.NonBlockingFloatInputStream SoftReverb.AllPass SoftReverb.Comb SoftReverb.Delay - Cleanup: Remove unused fields in: SoftSincResampler.din, SoftLanczosResampler.din, SoftMainMixer.finetuning, SoftMainMixer.coarsetuning SoftJitterCorrector.JitterStream.nullbuff, SoftAbstractResampler.ModelAbstractResampler.loopread SoftAbstractResampler.ModelAbstractResampler.streammarked - Cleanup: Remove dead code from FFT. - Cleanup: Make constant fields in SoftFilter final. - Cleanup: Let SoftSynthesizer.info be final. - Cleanup: Let SoftProvider.info be final. - Fix: Unnecessary call to sourceDataLine.drain() in SoftSynthesizer causes random hangs in SoftSynthesizer.open jtreg test. This happens when the synthesizer is opened and right after closed. This will not happen if there is a delay between open and close call. - Fix: ModelByteBufferAudioFileSoundbankReader, SoftAudioPusher, SoftJitterCorrector don't ignore stream.read return value. - Fix: NullPointerException in SoftSynthesizer.unloadInstrument if instrument = null - Fix: SoftJitterCorrector.getSoundbank(URL) may fail to close stream. - Fix: Futile attempts to guard buffers variable in SoftJitterCorrector. - Fix: RiffReader/SF2SoundbankReader/DLSSoundbank should use readfully instead of read when reading from stream. JTreg tests where created to test for this. diffstat: 49 files changed, 844 insertions(+), 203 deletions(-) ChangeLog | 6 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java | 80 +++--- overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java | 2 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java | 12 - overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt | 37 +++ overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java | 60 ++--- overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java | 2 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/FFT.java | 1 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java | 32 +- overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBuffer.java | 9 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java | 1 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelIdentifier.java | 6 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/README.txt | 3 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFReader.java | 49 +++- overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Soundbank.java | 8 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleInstrument.java | 2 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java | 5 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java | 10 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java | 4 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java | 26 +- overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftInstrument.java | 6 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java | 21 + overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java | 2 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java | 4 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java | 2 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixer.java | 2 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java | 6 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java | 6 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProvider.java | 2 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReverb.java | 6 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSincResampler.java | 2 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java | 13 - overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankFile.java | 52 ++++ overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream.java | 63 +++++ overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankInputStream2.java | 119 ++++++++++ overlays/openjdk/jdk/test/com/sun/media/sound/DLSSoundbankReader/TestGetSoundbankUrl.java | 54 ++++ overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankFile.java | 52 ++++ overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream.java | 63 +++++ overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankInputStream2.java | 119 ++++++++++ overlays/openjdk/jdk/test/com/sun/media/sound/SF2SoundbankReader/TestGetSoundbankUrl.java | 54 ++++ overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix.java | 3 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono.java | 3 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java | 3 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_mix_overdrive.java | 3 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal.java | 3 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_normal_mono.java | 3 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive.java | 3 overlays/openjdk/jdk/test/com/sun/media/sound/SoftLimiter/ProcessAudio_replace_overdrive_mono.java | 3 overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/TestRender1.java | 20 + diffs (truncated from 1938 to 500 lines): diff -r e4b644655e78 -r 94f0c8f3a4aa ChangeLog --- a/ChangeLog Sun Jun 08 18:51:47 2008 +0200 +++ b/ChangeLog Sun Jun 08 21:21:14 2008 +0200 @@ -1,3 +1,9 @@ 2008-06-08 Mark Wielaard + + * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound: + Import Gervill fixes from CVS. See CHANGES.txt. + * overlays/openjdk/jdk/test/com/sun/media/sound: Likewise. + 2008-06-08 Mark Wielaard * Makefile.am (ZERO_PATCHES): Add diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java Sun Jun 08 18:51:47 2008 +0200 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java Sun Jun 08 21:21:14 2008 +0200 @@ -26,6 +26,7 @@ package com.sun.media.sound; package com.sun.media.sound; import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -41,7 +42,7 @@ import javax.sound.sampled.UnsupportedAu /** * Soundbank reader that uses audio files as soundbanks. * - * @version %I%, %E% + * @version %I%, %E% * @author Karl Helgason * */ @@ -81,34 +82,32 @@ public class AudioFileSoundbankReader ex throws InvalidMidiDataException, IOException { try { - try { - byte[] buffer; - if (ais.getFrameLength() == -1) { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - byte[] buff = new byte[1024 - (1024 % ais.getFormat().getFrameSize())]; - int ret; - while ((ret = ais.read(buff)) != -1) - baos.write(buff, 0, ret); - ais.close(); - buffer = baos.toByteArray(); - } else { - buffer = new byte[(int) (ais.getFrameLength() * ais - .getFormat().getFrameSize())]; - ais.read(buffer); - } - ModelByteBufferWavetable osc = new ModelByteBufferWavetable( - new ModelByteBuffer(buffer), ais.getFormat(), -4800); - ModelPerformer performer = new ModelPerformer(); - ; - performer.getOscillators().add(osc); + byte[] buffer; + if (ais.getFrameLength() == -1) { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + byte[] buff = new byte[1024 - (1024 % ais.getFormat() + .getFrameSize())]; + int ret; + while ((ret = ais.read(buff)) != -1) + baos.write(buff, 0, ret); + ais.close(); + buffer = baos.toByteArray(); + } else { + buffer = new byte[(int) (ais.getFrameLength() * ais.getFormat() + .getFrameSize())]; + new DataInputStream(ais).readFully(buffer); + } + ModelByteBufferWavetable osc = new ModelByteBufferWavetable( + new ModelByteBuffer(buffer), ais.getFormat(), -4800); + ModelPerformer performer = new ModelPerformer(); + ; + performer.getOscillators().add(osc); - SimpleSoundbank sbk = new SimpleSoundbank(); - SimpleInstrument ins = new SimpleInstrument(); - ins.add(performer); - sbk.addInstrument(ins); - return sbk; - } finally { - } + SimpleSoundbank sbk = new SimpleSoundbank(); + SimpleInstrument ins = new SimpleInstrument(); + ins.add(performer); + sbk.addInstrument(ins); + return sbk; } catch (Exception e) { return null; } @@ -117,18 +116,18 @@ public class AudioFileSoundbankReader ex public Soundbank getSoundbank(File file) throws InvalidMidiDataException, IOException { - try { - AudioInputStream ais = AudioSystem.getAudioInputStream(file); - ais.close(); - ModelByteBufferWavetable osc = new ModelByteBufferWavetable( + try { + AudioInputStream ais = AudioSystem.getAudioInputStream(file); + ais.close(); + ModelByteBufferWavetable osc = new ModelByteBufferWavetable( new ModelByteBuffer(file, 0, file.length()), -4800); - ModelPerformer performer = new ModelPerformer(); - performer.getOscillators().add(osc); - SimpleSoundbank sbk = new SimpleSoundbank(); - SimpleInstrument ins = new SimpleInstrument(); - ins.add(performer); - sbk.addInstrument(ins); - return sbk; + ModelPerformer performer = new ModelPerformer(); + performer.getOscillators().add(osc); + SimpleSoundbank sbk = new SimpleSoundbank(); + SimpleInstrument ins = new SimpleInstrument(); + ins.add(performer); + sbk.addInstrument(ins); + return sbk; } catch (UnsupportedAudioFileException e1) { return null; } catch (IOException e) { @@ -136,6 +135,5 @@ public class AudioFileSoundbankReader ex } } - - + } diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java Sun Jun 08 18:51:47 2008 +0200 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java Sun Jun 08 21:21:14 2008 +0200 @@ -923,7 +923,7 @@ public abstract class AudioFloatConverte if (format.getSampleSizeInBits() <= 8) conv = new AudioFloatConversion8S(); else if (format.getSampleSizeInBits() > 8 - & format.getSampleSizeInBits() <= 16) + && format.getSampleSizeInBits() <= 16) conv = new AudioFloatConversion16SL(); else if (format.getSampleSizeInBits() > 16 && format.getSampleSizeInBits() <= 24) diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java Sun Jun 08 18:51:47 2008 +0200 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java Sun Jun 08 21:21:14 2008 +0200 @@ -47,7 +47,7 @@ import javax.sound.sampled.spi.FormatCon public class AudioFloatFormatConverter extends FormatConversionProvider { - private class AudioFloatFormatConverterInputStream extends InputStream + private static class AudioFloatFormatConverterInputStream extends InputStream { private AudioFloatConverter converter; private AudioFloatInputStream stream; @@ -109,7 +109,7 @@ public class AudioFloatFormatConverter e } - private class AudioFloatInputStreamChannelMixer extends AudioFloatInputStream + private static class AudioFloatInputStreamChannelMixer extends AudioFloatInputStream { private int targetChannels; @@ -217,7 +217,7 @@ public class AudioFloatFormatConverter e } - private class AudioFloatInputStreamResampler extends AudioFloatInputStream + private static class AudioFloatInputStreamResampler extends AudioFloatInputStream { private AudioFloatInputStream ais; @@ -476,16 +476,16 @@ public class AudioFloatFormatConverter e } public Encoding[] getSourceEncodings() { - return formats; + return new Encoding[] {Encoding.PCM_SIGNED, Encoding.PCM_UNSIGNED, AudioFloatConverter.PCM_FLOAT}; } public Encoding[] getTargetEncodings() { - return formats; + return new Encoding[] {Encoding.PCM_SIGNED, Encoding.PCM_UNSIGNED, AudioFloatConverter.PCM_FLOAT}; } public Encoding[] getTargetEncodings(AudioFormat sourceFormat) { if(AudioFloatConverter.getConverter(sourceFormat) == null) return new Encoding[0]; - return formats; + return new Encoding[] {Encoding.PCM_SIGNED, Encoding.PCM_UNSIGNED, AudioFloatConverter.PCM_FLOAT}; } public AudioFormat[] getTargetFormats(Encoding targetEncoding, AudioFormat sourceFormat) { diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt Sun Jun 08 18:51:47 2008 +0200 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt Sun Jun 08 21:21:14 2008 +0200 @@ -1,3 +1,39 @@ + - Cleanup: Make inner classes static + AudioFloatFormatConverter.AudioFloatFormatConverterInputStream + AudioFloatFormatConverter.AudioFloatInputStreamChannelMixer + AudioFloatFormatConverter.AudioFloatInputStreamResampler + SimpleInstrument.SimpleInstrumentPart + SoftChorus.VariableDelay + SoftChorus.LFODelay + SoftMixingDataLine.AudioFloatInputStreamResampler + SoftMixingSourceDataLine.NonBlockingFloatInputStream + SoftReverb.AllPass + SoftReverb.Comb + SoftReverb.Delay + - Cleanup: Remove unused fields in: + SoftSincResampler.din, SoftLanczosResampler.din, + SoftMainMixer.finetuning, SoftMainMixer.coarsetuning + SoftJitterCorrector.JitterStream.nullbuff, + SoftAbstractResampler.ModelAbstractResampler.loopread + SoftAbstractResampler.ModelAbstractResampler.streammarked + - Cleanup: Remove dead code from FFT. + - Cleanup: Make constant fields in SoftFilter final. + - Cleanup: Let SoftSynthesizer.info be final. + - Cleanup: Let SoftProvider.info be final. + - Fix: Unnecessary call to sourceDataLine.drain() in SoftSynthesizer + causes random hangs in SoftSynthesizer.open jtreg test. + This happens when the synthesizer is opened and right after closed. + This will not happen if there is a delay between open and close call. + - Fix: ModelByteBufferAudioFileSoundbankReader, + SoftAudioPusher, SoftJitterCorrector + don't ignore stream.read return value. + - Fix: NullPointerException in + SoftSynthesizer.unloadInstrument if instrument = null + - Fix: SoftJitterCorrector.getSoundbank(URL) may fail to close stream. + - Fix: Futile attempts to guard buffers variable in SoftJitterCorrector. + - Fix: RiffReader/SF2SoundbankReader/DLSSoundbank should use readfully instead of read + when reading from stream. + JTreg tests where created to test for this. - Added: Software Mixing Mixer - Removed: PATSoundBankReader removed because no format license is available. It is also undocumented format. @@ -22,6 +58,7 @@ If illegal notenumber was used in NoteOn/NoteOff a ArrayOutOfIndex exception was thrown. +Version 1.0 (released in OpenJDK 6 b10) - Fix: Default tempo in SoftMidiFileReader was supposed to be 500000 mpq or 120 bpm - Fix: Change type of info variable in SoftSynthesize into MidiDevice.Info - Fix: Fix instanceof check of p1 variable in ModelInstrumentComparator diff -r e4b644655e78 -r 94f0c8f3a4aa overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java --- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java Sun Jun 08 18:51:47 2008 +0200 +++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java Sun Jun 08 21:21:14 2008 +0200 @@ -111,6 +111,10 @@ public class DLSSoundbank implements Sou return d; } + public int hashCode() { + return (int)i1; + } + public boolean equals(Object obj) { if(!(obj instanceof DLSID)) return false; DLSID t = (DLSID)obj; @@ -230,15 +234,15 @@ public class DLSSoundbank implements Sou if(!readCdlChunk(chunk)) throw new RIFFInvalidFormatException("DLS file isn't supported!"); } - if (chunk.getFormat().equals("colh")) { + //if (chunk.getFormat().equals("colh")) { // - skipped because we will load the entire bank into memory // long instrumentcount = chunk.readUnsignedInt(); // System.out.println("instrumentcount = "+ instrumentcount); - } - if (chunk.getFormat().equals("ptbl")) { + //} + //if (chunk.getFormat().equals("ptbl")) { // Pool Table Chunk // - skipped because we will load the entire bank into memory - } + //} if (chunk.getFormat().equals("vers")) { major = chunk.readUnsignedInt(); minor = chunk.readUnsignedInt(); @@ -300,80 +304,80 @@ public class DLSSoundbank implements Sou case DLS_CDL_AND: x = stack.pop(); y = stack.pop(); - stack.push(new Long( ((x!=0) & (y!=0)) ?1:0)); + stack.push(Long.valueOf( ((x!=0) && (y!=0)) ?1:0)); break; case DLS_CDL_OR: x = stack.pop(); y = stack.pop(); - stack.push(new Long( ((x!=0) | (y!=0)) ?1:0)); + stack.push(Long.valueOf( ((x!=0) || (y!=0)) ?1:0)); break; case DLS_CDL_XOR: x = stack.pop(); y = stack.pop(); - stack.push(new Long( ((x!=0) ^ (y!=0)) ?1:0)); + stack.push(Long.valueOf( ((x!=0) ^ (y!=0)) ?1:0)); break; case DLS_CDL_ADD: x = stack.pop(); y = stack.pop(); - stack.push(new Long( x+y )); + stack.push(Long.valueOf( x+y )); break; case DLS_CDL_SUBTRACT: x = stack.pop(); y = stack.pop(); - stack.push(new Long( x-y )); + stack.push(Long.valueOf( x-y )); break; case DLS_CDL_MULTIPLY: x = stack.pop(); y = stack.pop(); - stack.push(new Long( x*y )); + stack.push(Long.valueOf( x*y )); break; case DLS_CDL_DIVIDE: x = stack.pop(); y = stack.pop(); - stack.push(new Long( x/y )); + stack.push(Long.valueOf( x/y )); break; case DLS_CDL_LOGICAL_AND: x = stack.pop(); y = stack.pop(); - stack.push(new Long( ((x!=0) & (y!=0)) ?1:0)); + stack.push(Long.valueOf( ((x!=0) && (y!=0)) ?1:0)); break; case DLS_CDL_LOGICAL_OR: x = stack.pop(); y = stack.pop(); - stack.push(new Long( ((x!=0) | (y!=0)) ?1:0)); + stack.push(Long.valueOf( ((x!=0) || (y!=0)) ?1:0)); break; case DLS_CDL_LT: x = stack.pop(); y = stack.pop(); - stack.push(new Long( (x < y) ?1:0)); + stack.push(Long.valueOf( (x < y) ?1:0)); break; case DLS_CDL_LE: x = stack.pop(); y = stack.pop(); - stack.push(new Long( (x <= y) ?1:0)); + stack.push(Long.valueOf( (x <= y) ?1:0)); break; case DLS_CDL_GT: x = stack.pop(); y = stack.pop(); - stack.push(new Long( (x > y) ?1:0)); + stack.push(Long.valueOf( (x > y) ?1:0)); break; case DLS_CDL_GE: x = stack.pop(); y = stack.pop(); - stack.push(new Long( (x >= y) ?1:0)); + stack.push(Long.valueOf( (x >= y) ?1:0)); break; case DLS_CDL_EQ: x = stack.pop(); y = stack.pop(); - stack.push(new Long( (x == y) ?1:0)); + stack.push(Long.valueOf( (x == y) ?1:0)); break; case DLS_CDL_NOT: x = stack.pop(); y = stack.pop(); - stack.push(new Long((x==0)?1:0)); + stack.push(Long.valueOf((x==0)?1:0)); break; case DLS_CDL_CONST: - stack.push(new Long(riff.readUnsignedInt())); + stack.push(Long.valueOf(riff.readUnsignedInt())); break; case DLS_CDL_QUERY: uuid = DLSID.read(riff); @@ -381,7 +385,7 @@ public class DLSSoundbank implements Sou break; case DLS_CDL_QUERYSUPPORTED: uuid = DLSID.read(riff); - stack.push(new Long(cdlIsQuerySupported(uuid)?1:0)); + stack.push(Long.valueOf(cdlIsQuerySupported(uuid)?1:0)); break; default: break; @@ -527,7 +531,7 @@ public class DLSSoundbank implements Sou if(format.equals("dlid")) { instrument.guid = new byte[16]; - chunk.read(instrument.guid); + chunk.readFully(instrument.guid); } if(format.equals("insh")) { @@ -559,7 +563,7 @@ public class DLSSoundbank implements Sou long size = riff.readUnsignedInt(); long count = riff.readUnsignedInt(); - if(size - 8 != 0) riff.skip(size - 8); + if(size - 8 != 0) riff.skipBytes(size - 8); for (int i = 0; i < count; i++) { @@ -579,7 +583,7 @@ public class DLSSoundbank implements Sou long size = riff.readUnsignedInt(); long count = riff.readUnsignedInt(); - if(size - 8 != 0) riff.skip(size - 8); + if(size - 8 != 0) riff.skipBytes(size - 8); for (int i = 0; i < count; i++) { @@ -686,7 +690,7 @@ public class DLSSoundbank implements Sou if(size > 20) { - riff.skip(size - 20); + riff.skipBytes(size - 20); } for (int i = 0; i < loops; i++) { @@ -698,7 +702,7 @@ public class DLSSoundbank implements Sou sampleOptions.lo