From devel.sjanki at gmail.com Tue Sep 4 06:13:10 2007 From: devel.sjanki at gmail.com (Sunil Amitkumar Janki) Date: Tue, 04 Sep 2007 15:13:10 +0200 Subject: JDK GNU/Linux SPARC and MIPS In-Reply-To: <1188250373.3823.44.camel@localhost.localdomain> References: <46CC326D.1030101@gmail.com> <1188250373.3823.44.camel@localhost.localdomain> Message-ID: <46DD59E6.3080900@gmail.com> Christian Thalinger wrote: > On Wed, 2007-08-22 at 14:56 +0200, Sunil Amitkumar Janki wrote: > >> I have GNU/Linux running on x86, MIPS and SPARC but only >> x86 has an up to date JDK. For MIPS I have JDK 1.5.0 and >> for SPARC Blackdown's JDK 1.4.1. >> >> I would like to see support for both architectures integrated >> into the JDK sources alongside x86, x86_64 and Solaris SPARC >> so all systems can benefit from up to date Java installations. >> >> Could someone point out to me what I'd have to do to get >> the latest JDK up and running and support for it integrated >> into mainline sources? >> > > Well, you could port HotSpot or join us, in whatever way, in the IcedTea > project where we try to get OpenJDK running on non-HotSpot platforms. > > - twisti I think it's a better use of my time to get OpenJDK running on MIPS and SPARC than porting an older HotSpot JVM. I hope there are provisions for other architectures in the build system or at least that it's flexible enough to accommodate for those. What parts of IcedTea would have to be ported or rewritten in order to support MIPS and SPARC? I will checkout from the repository and see what the IcedTea source code looks like later today. Sunil From langel at redhat.com Tue Sep 4 11:40:44 2007 From: langel at redhat.com (Lillian Angel) Date: Tue, 04 Sep 2007 14:40:44 -0400 Subject: b19 IcedTea Message-ID: <46DDA6AC.4000905@redhat.com> http://iced-tea.org/hg/icedtea is now at Release b19. Please let me know if I broke anything. Lillian. 2007-09-04 Lillian Angel * .hgignore: Updated to ignore tools/ * Makefile.am: Updated to b19. A version of tools.jar is now generated at the beginning of the build. It is now required to build other hotspot sources. rt.jar has been renamed to rt-closed.jar, and ALT_CLOSED_JDK_IMPORT_PATH has been replaced with ALT_BINARY_PLUGS_PATH, as per b19 changes. * Makefile.in: Regenerated. * patches/icedtea-tools.patch: New patch to fix the build. jvmti.h fails generate properly without this patch. * tools-copy-files.txt: List of files used to create tools.jar. * generated/sun/awt/DebugHelper.java: Removed. This file has been removed from the OpenJDK sources as well. From neugens at limasoftware.net Wed Sep 5 07:09:53 2007 From: neugens at limasoftware.net (Mario Torre) Date: Wed, 05 Sep 2007 16:09:53 +0200 Subject: replacing included 3rd party libraries with system libraries In-Reply-To: <46D5E0D1.60206@sun.com> References: <46D58BA4.8000501@ubuntu.com> <46D5AF10.2020009@sun.com> <1188412918.3823.6.camel@dijkstra.wildebeest.org> <46D5E0D1.60206@sun.com> Message-ID: <1189001393.3918.20.camel@nirvana.limasoftware.net> Il giorno mer, 29/08/2007 alle 14.10 -0700, David Herron ha scritto: > > > I agree right now it's a little hard to follow - but what if there was > lots of traffic all in one list? At least the way it is now someone > who's specifically interested in X will only receive email on X. Hi! Just an idea, so sorry for stealing the thread. Is viable to have another mailing list with all the post from every other mailing list, maybe as a sort of summary from the other ml (like a digest). This is like going through the archives, but you could get them once per day. I suspect that few of us would be interested in such behaviour. Google did something similar for the GSoC mailing list, they send a digest of all the mailing list once a day, with a nice header for each thread with links to the discussion (exactly like a digest, but with a nice interface easy to follow). I guess this should be straightforward to implement, and would make us happy :) Mario -- Lima Software - http://www.limasoftware.net/ GNU Classpath Developer - http://www.classpath.org/ Fedora Ambassador - http://fedoraproject.org/wiki/MarioTorre Jabber: neugens at jabber.org pgp key: http://subkeys.pgp.net/ PGP Key ID: 80F240CF Fingerprint: BA39 9666 94EC 8B73 27FA FC7C 4086 63E3 80F2 40CF Please, support open standards: http://opendocumentfellowship.org/petition/ http://www.nosoftwarepatents.com/ From twisti at complang.tuwien.ac.at Wed Sep 5 07:21:03 2007 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Wed, 05 Sep 2007 16:21:03 +0200 Subject: RFC: icedtea-cacao branch vs. clone Message-ID: <1189002063.23103.21.camel@c1.complang.tuwien.ac.at> Hi! We're planing to set up a IcedTea repository that has all necessary patches to run with CACAO as VM. These patches include one or two patches for the OpenJDK build system and a patch we need for the binary wrappers from OpenJDK because of a problem with Boehm-GC. We should now decide what is better to use, a named branch or a seperate clone. I'm, personally, in favor for a named branch, as merging with the default branch is very easy and we have a full history of all changes ever done in one single repository. Other opinions? - twisti From matthew.flaschen at gatech.edu Wed Sep 5 08:16:06 2007 From: matthew.flaschen at gatech.edu (Matthew Flaschen) Date: Wed, 05 Sep 2007 11:16:06 -0400 Subject: replacing included 3rd party libraries with system libraries In-Reply-To: <1189001393.3918.20.camel@nirvana.limasoftware.net> References: <46D58BA4.8000501@ubuntu.com> <46D5AF10.2020009@sun.com> <1188412918.3823.6.camel@dijkstra.wildebeest.org> <46D5E0D1.60206@sun.com> <1189001393.3918.20.camel@nirvana.limasoftware.net> Message-ID: <46DEC836.3000507@gatech.edu> Mario Torre wrote: > Is viable to have another mailing list with all the post from every other mailing list, > maybe as a sort of summary from the other ml (like a digest). It's not that much work to sign up for every mailing list you're interested in. But such a merger list is certainly possible. Matt Flaschen From mark at klomp.org Wed Sep 5 12:38:38 2007 From: mark at klomp.org (Mark Wielaard) Date: Wed, 05 Sep 2007 21:38:38 +0200 Subject: replacing included 3rd party libraries with system libraries In-Reply-To: <1189001393.3918.20.camel@nirvana.limasoftware.net> References: <46D58BA4.8000501@ubuntu.com> <46D5AF10.2020009@sun.com> <1188412918.3823.6.camel@dijkstra.wildebeest.org> <46D5E0D1.60206@sun.com> <1189001393.3918.20.camel@nirvana.limasoftware.net> Message-ID: <1189021118.3813.44.camel@dijkstra.wildebeest.org> On Wed, 2007-09-05 at 16:09 +0200, Mario Torre wrote: > Il giorno mer, 29/08/2007 alle 14.10 -0700, David Herron ha scritto: > > > > > I agree right now it's a little hard to follow - but what if there was > > lots of traffic all in one list? At least the way it is now someone > > who's specifically interested in X will only receive email on X. > > Just an idea, so sorry for stealing the thread. Is viable to have > another mailing list with all the post from every other mailing list, > maybe as a sort of summary from the other ml (like a digest). This is > like going through the archives, but you could get them once per day. I > suspect that few of us would be interested in such behaviour. Google did > something similar for the GSoC mailing list, they send a digest of all > the mailing list once a day, with a nice header for each thread with > links to the discussion (exactly like a digest, but with a nice > interface easy to follow). > > I guess this should be straightforward to implement, and would make us > happy :) I think that is a nice idea and I would subscribe to such a list! Cheers, Mark -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 189 bytes Desc: This is a digitally signed message part Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20070905/799b9733/attachment.bin From mark at klomp.org Thu Sep 6 04:34:41 2007 From: mark at klomp.org (Mark Wielaard) Date: Thu, 06 Sep 2007 13:34:41 +0200 Subject: RFC: icedtea-cacao branch vs. clone In-Reply-To: <1189002063.23103.21.camel@c1.complang.tuwien.ac.at> References: <1189002063.23103.21.camel@c1.complang.tuwien.ac.at> Message-ID: <1189078481.3730.14.camel@dijkstra.wildebeest.org> Hi Christian, On Wed, 2007-09-05 at 16:21 +0200, Christian Thalinger wrote: > We're planing to set up a IcedTea repository that has all necessary > patches to run with CACAO as VM. These patches include one or two > patches for the OpenJDK build system and a patch we need for the binary > wrappers from OpenJDK because of a problem with Boehm-GC. > > We should now decide what is better to use, a named branch or a seperate > clone. I'm, personally, in favor for a named branch, as merging with > the default branch is very easy and we have a full history of all > changes ever done in one single repository. > > Other opinions? We are still learning how to most effectively use mercurial as a group. Personally I would have expected more people to just make clones of icedtea and publish their own repos. But clearly people seem to like the one shared repo approach even though technically that isn't really necessary. Since we are using a shared published repo at the time I think it makes sense to go for a named branch in that one IF the intent is to merge that branch eventually with the default one. Is the idea that icedtea-cacao eventually just becomes a configure option for icedtea proper? Cheers, Mark P.S. I actually had to read up on named branches. The Mercurial manual has a nice overview of "Managing releases and branchy development": http://hgbook.red-bean.com/hgbookch8.html And I thought the following Guided Tour of Mercurial focusing on working together with branches and merging was nice: http://blog.medallia.com/2007/02/a_guided_tour_of_mercurial.html From doko at ubuntu.com Thu Sep 6 07:01:08 2007 From: doko at ubuntu.com (Matthias Klose) Date: Thu, 06 Sep 2007 16:01:08 +0200 Subject: b19 IcedTea In-Reply-To: <46DDA6AC.4000905@redhat.com> References: <46DDA6AC.4000905@redhat.com> Message-ID: <46E00824.8090208@ubuntu.com> Lillian Angel schrieb: > http://iced-tea.org/hg/icedtea is now at Release b19. > > Please let me know if I broke anything. Nothing broken, but the patches I sent for b18 are not yet integrated. - The amd64 build succeds when built with g++ 4.2.1, when built with current g++ 4.1.3 svn, the vm crashes for every ui app. - You have to turn off -Werror when building with 4.2 (upstream problem) - Building on x86 with 4.2 fails. Updated packages for gutsy (installable on sid as well) are available here: deb http://people.ubuntu.com/~doko/ubuntu/ gutsy/ deb-src http://people.ubuntu.com/~doko/ubuntu/ gutsy/ Matthias From langel at redhat.com Thu Sep 6 07:14:10 2007 From: langel at redhat.com (Lillian Angel) Date: Thu, 06 Sep 2007 10:14:10 -0400 Subject: b19 IcedTea In-Reply-To: <46E00824.8090208@ubuntu.com> References: <46DDA6AC.4000905@redhat.com> <46E00824.8090208@ubuntu.com> Message-ID: <46E00B32.20204@redhat.com> Hi, Matthias Klose wrote: > Lillian Angel schrieb: >> http://iced-tea.org/hg/icedtea is now at Release b19. >> >> Please let me know if I broke anything. > > Nothing broken, but the patches I sent for b18 are not yet integrated. > > - The amd64 build succeds when built with g++ 4.2.1, when built with > current g++ 4.1.3 svn, the vm crashes for every ui app. I am using "g++ (GCC) 4.1.2 20070502 (Red Hat 4.1.2-12)" as per the build requirements for IcedTea. > > - You have to turn off -Werror when building with 4.2 (upstream problem) I have not seen this problem. Can you elaborate? > > - Building on x86 with 4.2 fails. As of now, the build requirements state that "GNU libgcj 4.1.2 - Red Hat branch (with generics)" should be installed. I have not tried with 4.2 either, but this will need to be fixed eventually. > > Updated packages for gutsy (installable on sid as well) are available here: > > deb http://people.ubuntu.com/~doko/ubuntu/ gutsy/ > deb-src http://people.ubuntu.com/~doko/ubuntu/ gutsy/ Lillian From doko at ubuntu.com Thu Sep 6 07:46:35 2007 From: doko at ubuntu.com (Matthias Klose) Date: Thu, 06 Sep 2007 16:46:35 +0200 Subject: b19 IcedTea In-Reply-To: <46E00B32.20204@redhat.com> References: <46DDA6AC.4000905@redhat.com> <46E00824.8090208@ubuntu.com> <46E00B32.20204@redhat.com> Message-ID: <46E012CB.9090901@ubuntu.com> Lillian Angel schrieb: >> - You have to turn off -Werror when building with 4.2 (upstream problem) > > I have not seen this problem. Can you elaborate? attached, the first two ones are problematic. > As of now, the build requirements state that "GNU libgcj 4.1.2 - Red Hat > branch (with generics)" should be installed. which seems to be hard to meet on other distros ;p Matthias From doko at ubuntu.com Thu Sep 6 07:53:04 2007 From: doko at ubuntu.com (Matthias Klose) Date: Thu, 06 Sep 2007 16:53:04 +0200 Subject: b19 IcedTea In-Reply-To: <46E012CB.9090901@ubuntu.com> References: <46DDA6AC.4000905@redhat.com> <46E00824.8090208@ubuntu.com> <46E00B32.20204@redhat.com> <46E012CB.9090901@ubuntu.com> Message-ID: <46E01450.5090400@ubuntu.com> Matthias Klose schrieb: > Lillian Angel schrieb: >>> - You have to turn off -Werror when building with 4.2 (upstream problem) >> I have not seen this problem. Can you elaborate? > > attached, the first two ones are problematic. -------------- next part -------------- A non-text attachment was scrubbed... Name: log.build.gz Type: application/x-gzip Size: 3388 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20070906/46ccfded/attachment.bin From langel at redhat.com Fri Sep 7 07:15:53 2007 From: langel at redhat.com (Lillian Angel) Date: Fri, 07 Sep 2007 10:15:53 -0400 Subject: RFC: icedtea-cacao branch vs. clone In-Reply-To: <1189078481.3730.14.camel@dijkstra.wildebeest.org> References: <1189002063.23103.21.camel@c1.complang.tuwien.ac.at> <1189078481.3730.14.camel@dijkstra.wildebeest.org> Message-ID: <46E15D19.9040506@redhat.com> Mark Wielaard wrote: > Hi Christian, > > On Wed, 2007-09-05 at 16:21 +0200, Christian Thalinger wrote: >> We're planing to set up a IcedTea repository that has all necessary >> patches to run with CACAO as VM. These patches include one or two >> patches for the OpenJDK build system and a patch we need for the binary >> wrappers from OpenJDK because of a problem with Boehm-GC. >> >> We should now decide what is better to use, a named branch or a seperate >> clone. I'm, personally, in favor for a named branch, as merging with >> the default branch is very easy and we have a full history of all >> changes ever done in one single repository. >> >> Other opinions? > > We are still learning how to most effectively use mercurial as a group. > Personally I would have expected more people to just make clones of > icedtea and publish their own repos. But clearly people seem to like the > one shared repo approach even though technically that isn't really > necessary. > > Since we are using a shared published repo at the time I think it makes > sense to go for a named branch in that one IF the intent is to merge > that branch eventually with the default one. Is the idea that > icedtea-cacao eventually just becomes a configure option for icedtea > proper? Yes, this is the idea. I think it would be best to have a named branch. Lillian From langel at redhat.com Fri Sep 7 07:55:46 2007 From: langel at redhat.com (Lillian Angel) Date: Fri, 07 Sep 2007 10:55:46 -0400 Subject: RFC: icedtea-cacao branch vs. clone In-Reply-To: <46E15D19.9040506@redhat.com> References: <1189002063.23103.21.camel@c1.complang.tuwien.ac.at> <1189078481.3730.14.camel@dijkstra.wildebeest.org> <46E15D19.9040506@redhat.com> Message-ID: <46E16672.2090806@redhat.com> Lillian Angel wrote: > > > Mark Wielaard wrote: >> Hi Christian, >> >> On Wed, 2007-09-05 at 16:21 +0200, Christian Thalinger wrote: >>> We're planing to set up a IcedTea repository that has all necessary >>> patches to run with CACAO as VM. These patches include one or two >>> patches for the OpenJDK build system and a patch we need for the binary >>> wrappers from OpenJDK because of a problem with Boehm-GC. >>> >>> We should now decide what is better to use, a named branch or a seperate >>> clone. I'm, personally, in favor for a named branch, as merging with >>> the default branch is very easy and we have a full history of all >>> changes ever done in one single repository. >>> >>> Other opinions? >> >> We are still learning how to most effectively use mercurial as a group. >> Personally I would have expected more people to just make clones of >> icedtea and publish their own repos. But clearly people seem to like the >> one shared repo approach even though technically that isn't really >> necessary. >> >> Since we are using a shared published repo at the time I think it makes >> sense to go for a named branch in that one IF the intent is to merge >> that branch eventually with the default one. Is the idea that >> icedtea-cacao eventually just becomes a configure option for icedtea >> proper? > > Yes, this is the idea. I think it would be best to have a named branch. A named branch (cacao) has been created in the repo. "hg up cacao" will switch from the default branch to the cacao branch. Lillian From twisti at complang.tuwien.ac.at Fri Sep 7 09:18:53 2007 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Fri, 07 Sep 2007 18:18:53 +0200 Subject: RFC: icedtea-cacao branch vs. clone In-Reply-To: <1189078481.3730.14.camel@dijkstra.wildebeest.org> References: <1189002063.23103.21.camel@c1.complang.tuwien.ac.at> <1189078481.3730.14.camel@dijkstra.wildebeest.org> Message-ID: <1189181934.4521.4.camel@localhost.localdomain> On Thu, 2007-09-06 at 13:34 +0200, Mark Wielaard wrote: > We are still learning how to most effectively use mercurial as a group. > Personally I would have expected more people to just make clones of > icedtea and publish their own repos. But clearly people seem to like the > one shared repo approach even though technically that isn't really > necessary. > > Since we are using a shared published repo at the time I think it makes > sense to go for a named branch in that one IF the intent is to merge > that branch eventually with the default one. Is the idea that > icedtea-cacao eventually just becomes a configure option for icedtea > proper? Hi! Yes, I think that should be the way to go, doing at some point a merge (maybe when things are working) to the default branch and use a configure option for IcedTea. What I want to do: * add the required patches * add a configure option (e.g. --with-cacao) * a make should pull the CACAO sources from HG/tarball (not sure yet) and build CACAO Are people OK with that? - twisti From matthew.flaschen at gatech.edu Sat Sep 8 03:53:45 2007 From: matthew.flaschen at gatech.edu (Matthew Flaschen) Date: Sat, 08 Sep 2007 06:53:45 -0400 Subject: Build fails with "ERROR: Your JAVA_HOME environment variable is set" Message-ID: <46E27F39.4050600@gatech.edu> A build of latest hg fails with: ERROR: Your JAVA_HOME environment variable is set. This will most likely cause the build to fail. Please unset it and start your build again. Exiting because of the above error(s). Should this need to be unset? I think I've always built with it set in the past. Matt Flaschen From aph at redhat.com Sat Sep 8 06:10:28 2007 From: aph at redhat.com (Andrew Haley) Date: Sat, 8 Sep 2007 14:10:28 +0100 Subject: Build fails with "ERROR: Your JAVA_HOME environment variable is set" In-Reply-To: <46E27F39.4050600@gatech.edu> References: <46E27F39.4050600@gatech.edu> Message-ID: <18146.40772.602332.611079@zebedee.pink> Matthew Flaschen writes: > A build of latest hg fails with: > > ERROR: Your JAVA_HOME environment variable is set. This will > most likely cause the build to fail. Please unset it > and start your build again. > > Exiting because of the above error(s). > > Should this need to be unset? I think I've always built with it set in > the past. Yes, it must be unset. The IcsedTea makefile unsets it, I think. Andrew. -- Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, UK Registered in England and Wales No. 3798903 From matthew.flaschen at gatech.edu Sat Sep 8 09:39:32 2007 From: matthew.flaschen at gatech.edu (Matthew Flaschen) Date: Sat, 08 Sep 2007 12:39:32 -0400 Subject: Build fails with "ERROR: Your JAVA_HOME environment variable is set" In-Reply-To: <18146.40772.602332.611079@zebedee.pink> References: <46E27F39.4050600@gatech.edu> <18146.40772.602332.611079@zebedee.pink> Message-ID: <46E2D044.5000909@gatech.edu> Andrew Haley wrote: > Matthew Flaschen writes: > > A build of latest hg fails with: > > > > ERROR: Your JAVA_HOME environment variable is set. This will > > most likely cause the build to fail. Please unset it > > and start your build again. > > > > Exiting because of the above error(s). > > > > Should this need to be unset? I think I've always built with it set in > > the past. > > Yes, it must be unset. The IcsedTea makefile unsets it, I think. I didn't modify the makefile, so this is apparently a bug. Matt Flaschen From mark at klomp.org Sun Sep 9 11:23:07 2007 From: mark at klomp.org (Mark Wielaard) Date: Sun, 09 Sep 2007 18:23:07 +0000 Subject: changeset in /hg/icedtea: * README: Add references to home page,... Message-ID: changeset a6883ba15bfb in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a6883ba15bfb description: * README: Add references to home page, bugzilla, faq, mailing list and mercurial repo. diffstat: 2 files changed, 22 insertions(+) ChangeLog | 5 +++++ README | 17 +++++++++++++++++ diffs (39 lines): diff -r f23640f520cf -r a6883ba15bfb ChangeLog --- a/ChangeLog Fri Sep 07 15:39:23 2007 -0400 +++ b/ChangeLog Sun Sep 09 20:22:32 2007 +0200 @@ -1,3 +1,8 @@ 2007-09-07 Thomas Fitzsimmons + + * README: Add references to home page, bugzilla, faq, mailing list + and mercurial repo. + 2007-09-07 Thomas Fitzsimmons * Makefile.am (EXTRA_DIST): Add tools-copy-files.txt. diff -r f23640f520cf -r a6883ba15bfb README --- a/README Fri Sep 07 15:39:23 2007 -0400 +++ b/README Sun Sep 09 20:22:32 2007 +0200 @@ -25,6 +25,23 @@ with IcedTea itself. with IcedTea itself. See INSTALL for build instructions. + +Homepage (wiki): + http://icedtea.classpath.org/ + +Bugs (bugzilla): + http://icedtea.classpath.org/bugzilla + +Mailing List: + distro-pkg-dev at openjdk.java.net + http://mail.openjdk.java.net/mailman/listinfo/distro-pkg-dev + +FAQ: + http://icedtea.classpath.org/wiki/FrequentlyAskedQuestions + +Anonymous Mercurial checkout: + hg clone http://icedtea.classpath.org/hg/icedtea + How the Stub Replacements were Produced --------------------------------------- From mark at klomp.org Sun Sep 9 12:27:27 2007 From: mark at klomp.org (Mark Wielaard) Date: Sun, 09 Sep 2007 21:27:27 +0200 Subject: Email notification of changesets in icedtea hg repositories Message-ID: <1189366047.5039.12.camel@hermans.wildebeest.org> Hi, I added email notification to the icedtea hg repositories. For every change pushed to the central server an email is send to this list, including up to 500 lines of diff. Except for the testrepo which doesn't send any email and the openjdk mirror repo which only send an notification of new code, but no diff. Currently all email goes to this list. If the notification emails get too much and people want we can setup a separate list. Attached is the global /etc/mercurial/hgrc used on the server. Cheers, Mark -------------- next part -------------- # system-wide mercurial configuration file # See hgrc(5) for more information [hooks] incoming.notify = python:hgext.notify.hook [notify] sources = serve push pull bundle test = False maxdiff = 500 [usersubs] ## key is subscriber email, value is comma-separated list of glob patterns # We don't want notification of /hg/testrepo, so not included. openjdk # overrides maxdiff to not send any diffs. The others use the default above. distro-pkg-dev at openjdk.java.net = /hg/fedora,/hg/icedtea,/hg/openjdk [smtp] host = localhost [web] style = gitweb allow_archive = bz2 gz contact = distro-pkg-dev at openjdk.java.net baseurl = http://icedtea.classpath.org [trusted] groups = icedtea From jsumali at redhat.com Tue Sep 11 09:52:22 2007 From: jsumali at redhat.com (Joshua Sumali) Date: Tue, 11 Sep 2007 16:52:22 +0000 Subject: changeset in /hg/icedtea: 2007-09-11 Joshua Sumali changeset 8c4bbe11b002 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8c4bbe11b002 description: 2007-09-11 Joshua Sumali * patches/icedtea-demos.patch: New File. Patches the sample jvmti makefiles. * configure.ac: Added a check for chmod. * configure: Regenerated. * Makefile.am: Added line to add write permissions to the sample makefiles to be patched. * Makefile.in: Regenerated. diffstat: 6 files changed, 458 insertions(+), 2 deletions(-) ChangeLog | 10 + Makefile.am | 5 Makefile.in | 6 configure | 115 +++++++++++++++ configure.ac | 1 patches/icedtea-demos.patch | 323 +++++++++++++++++++++++++++++++++++++++++++ diffs (truncated from 576 to 500 lines): diff -r a6883ba15bfb -r 8c4bbe11b002 ChangeLog --- a/ChangeLog Sun Sep 09 20:22:32 2007 +0200 +++ b/ChangeLog Tue Sep 11 10:46:22 2007 -0400 @@ -1,3 +1,13 @@ 2007-09-09 Mark Wielaard + + * patches/icedtea-demos.patch: New File. Patches the sample + jvmti makefiles. + * configure.ac: Added a check for chmod. + * configure: Regenerated. + * Makefile.am: Added line to add write + permissions to the sample makefiles to be patched. + * Makefile.in: Regenerated. + 2007-09-09 Mark Wielaard * README: Add references to home page, bugzilla, faq, mailing list diff -r a6883ba15bfb -r 8c4bbe11b002 Makefile.am --- a/Makefile.am Sun Sep 09 20:22:32 2007 +0200 +++ b/Makefile.am Tue Sep 11 10:46:22 2007 -0400 @@ -134,6 +134,8 @@ stamps/extract.stamp: stamps/download.st if ! test -d openjdk ; \ then \ $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \ + chmod ug+w `find openjdk/j2se/src/share/demo/jvmti \ + -name sample.makefile.txt` ; \ fi mkdir -p stamps touch stamps/extract.stamp @@ -167,6 +169,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-lesstif_amd64.patch \ patches/icedtea-tools.patch \ patches/icedtea-certbundle.patch \ + patches/icedtea-demos.patch \ $(FAST_BUILD_PATCH) stamps/patch.stamp: stamps/extract.stamp @@ -205,6 +208,8 @@ stamps/extract-ecj.stamp: stamps/downloa $(UNZIP) -q -d tmp-ecj $(OPENJDK_SRC_ZIP) ; \ mv tmp-ecj/openjdk openjdk-ecj ; \ rmdir tmp-ecj ; \ + chmod ug+w `find openjdk-ecj/j2se/share/demo/jvmti \ + -name sample.makefile.txt` ; \ fi mkdir -p stamps touch stamps/extract-ecj.stamp diff -r a6883ba15bfb -r 8c4bbe11b002 Makefile.in --- a/Makefile.in Sun Sep 09 20:22:32 2007 +0200 +++ b/Makefile.in Tue Sep 11 10:46:22 2007 -0400 @@ -69,6 +69,7 @@ CC = @CC@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CHMOD = @CHMOD@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -287,6 +288,7 @@ ICEDTEA_PATCHES = \ patches/icedtea-lesstif_amd64.patch \ patches/icedtea-tools.patch \ patches/icedtea-certbundle.patch \ + patches/icedtea-demos.patch \ $(FAST_BUILD_PATCH) @@ -667,6 +669,8 @@ stamps/extract.stamp: stamps/download.st if ! test -d openjdk ; \ then \ $(UNZIP) -q $(OPENJDK_SRC_ZIP) ; \ + chmod ug+w `find openjdk/j2se/src/share/demo/jvmti \ + -name sample.makefile.txt` ; \ fi mkdir -p stamps touch stamps/extract.stamp @@ -711,6 +715,8 @@ stamps/extract-ecj.stamp: stamps/downloa $(UNZIP) -q -d tmp-ecj $(OPENJDK_SRC_ZIP) ; \ mv tmp-ecj/openjdk openjdk-ecj ; \ rmdir tmp-ecj ; \ + chmod ug+w `find openjdk-ecj/j2se/share/demo/jvmti \ + -name sample.makefile.txt` ; \ fi mkdir -p stamps touch stamps/extract-ecj.stamp diff -r a6883ba15bfb -r 8c4bbe11b002 configure --- a/configure Sun Sep 09 20:22:32 2007 +0200 +++ b/configure Tue Sep 11 10:46:22 2007 -0400 @@ -709,6 +709,7 @@ PATCH PATCH UNZIP WGET +CHMOD GAWK SYSTEM_ICEDTEA_DIR WITH_ICEDTEA_TRUE @@ -4579,6 +4580,115 @@ fi if test x"$WGET" = x ; then { { echo "$as_me:$LINENO: error: wget program not found in PATH" >&5 echo "$as_me: error: wget program not found in PATH" >&2;} + { (exit 1); exit 1; }; } + fi + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}chmod", so it can be a program name with args. +set dummy ${ac_tool_prefix}chmod; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_CHMOD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $CHMOD in + [\\/]* | ?:[\\/]*) + ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +CHMOD=$ac_cv_path_CHMOD +if test -n "$CHMOD"; then + { echo "$as_me:$LINENO: result: $CHMOD" >&5 +echo "${ECHO_T}$CHMOD" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_CHMOD"; then + ac_pt_CHMOD=$CHMOD + # Extract the first word of "chmod", so it can be a program name with args. +set dummy chmod; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_ac_pt_CHMOD+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $ac_pt_CHMOD in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_CHMOD="$ac_pt_CHMOD" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_CHMOD="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_CHMOD=$ac_cv_path_ac_pt_CHMOD +if test -n "$ac_pt_CHMOD"; then + { echo "$as_me:$LINENO: result: $ac_pt_CHMOD" >&5 +echo "${ECHO_T}$ac_pt_CHMOD" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_pt_CHMOD" = x; then + CHMOD="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CHMOD=$ac_pt_CHMOD + fi +else + CHMOD="$ac_cv_path_CHMOD" +fi + + if test x"$CHMOD" = x ; then + { { echo "$as_me:$LINENO: error: chmod program not found in PATH" >&5 +echo "$as_me: error: chmod program not found in PATH" >&2;} { (exit 1); exit 1; }; } fi @@ -10065,9 +10175,9 @@ PATCH!$PATCH$ac_delim PATCH!$PATCH$ac_delim UNZIP!$UNZIP$ac_delim WGET!$WGET$ac_delim +CHMOD!$CHMOD$ac_delim GAWK!$GAWK$ac_delim SYSTEM_ICEDTEA_DIR!$SYSTEM_ICEDTEA_DIR$ac_delim -WITH_ICEDTEA_TRUE!$WITH_ICEDTEA_TRUE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -10109,6 +10219,7 @@ ac_delim='%!_!# ' ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +WITH_ICEDTEA_TRUE!$WITH_ICEDTEA_TRUE$ac_delim WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$ac_delim BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim @@ -10146,7 +10257,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -r a6883ba15bfb -r 8c4bbe11b002 configure.ac --- a/configure.ac Sun Sep 09 20:22:32 2007 +0200 +++ b/configure.ac Tue Sep 11 10:46:22 2007 -0400 @@ -14,6 +14,7 @@ FIND_TOOL([PATCH], [patch]) FIND_TOOL([PATCH], [patch]) FIND_TOOL([UNZIP], [unzip]) FIND_TOOL([WGET], [wget]) +FIND_TOOL([CHMOD], [chmod]) dnl OpenJDK's README-builds.html lists gawk as a build dependency so we dnl check for it explicitly rather than using AC_PROG_AWK. FIND_TOOL([GAWK], [gawk]) diff -r a6883ba15bfb -r 8c4bbe11b002 patches/icedtea-demos.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-demos.patch Tue Sep 11 10:46:22 2007 -0400 @@ -0,0 +1,323 @@ +--- openjdkb18/j2se/src/share/demo/jvmti/gctest/sample.makefile.txt 2007-08-16 03:33:19.000000000 -0400 ++++ openjdk/j2se/src/share/demo/jvmti/gctest/sample.makefile.txt 2007-08-23 16:12:59.000000000 -0400 +@@ -43,7 +43,7 @@ + + # Source lists + LIBNAME=gctest +-SOURCES=gctest.c ../agent_util/agent_util.c ++SOURCES=gctest.c ../../agent_util/src/agent_util.c + + # Solaris Sun C Compiler Version 5.5 + ifeq ($(OSNAME), solaris) +@@ -89,7 +89,7 @@ + # Object files needed to create library + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it +- LIBRARY=lib$(LIBNAME).so ++ LIBRARY=../lib/lib$(LIBNAME).so + LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text + # Libraries we are dependent on + LIBRARIES=-lc +@@ -122,7 +122,7 @@ + + # Common -I options + CFLAGS += -I. +-CFLAGS += -I../agent_util ++CFLAGS += -I../../agent_util/src + CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME) + + # Default rule +--- openjdkb18/j2se/src/share/demo/jvmti/heapTracker/sample.makefile.txt 2007-08-16 03:33:20.000000000 -0400 ++++ openjdk/j2se/src/share/demo/jvmti/heapTracker/sample.makefile.txt 2007-08-24 15:15:40.000000000 -0400 +@@ -41,13 +41,15 @@ + # + ######################################################################## + ++JAVA_CRW_DEMO=../../java_crw_demo/src/libjava_crw_demo.so ++ + # Source lists + LIBNAME=heapTracker +-SOURCES=heapTracker.c ../agent_util/agent_util.c ++SOURCES=heapTracker.c ../../agent_util/src/agent_util.c + JAVA_SOURCES=HeapTracker.java + + # Name of jar file that needs to be created +-JARFILE=heapTracker.jar ++JARFILE=../heapTracker.jar + + # Solaris Sun C Compiler Version 5.5 + ifeq ($(OSNAME), solaris) +@@ -93,10 +95,10 @@ + # Object files needed to create library + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it +- LIBRARY=lib$(LIBNAME).so ++ LIBRARY=../lib/lib$(LIBNAME).so + LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text + # Libraries we are dependent on +- LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc ++ LIBRARIES=-L../../java_crw_demo/src/ -ljava_crw_demo -lc + # Building a shared library + LINK_SHARED=$(LINK.c) -shared -o $@ + endif +@@ -128,15 +130,18 @@ + + # Common -I options + CFLAGS += -I. +-CFLAGS += -I../agent_util +-CFLAGS += -I../java_crw_demo ++CFLAGS += -I../../agent_util/src ++CFLAGS += -I../../java_crw_demo/src + CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME) + + # Default rule (build both native library and jar file) + all: $(LIBRARY) $(JARFILE) + ++$(JAVA_CRW_DEMO): ++ make JDK=$(JDK) OSNAME=$(OSNAME) -C ../../java_crw_demo/src -f sample.makefile.txt ++ + # Build native library +-$(LIBRARY): $(OBJECTS) ++$(LIBRARY): $(OBJECTS) $(JAVA_CRW_DEMO) + $(LINK_SHARED) $(OBJECTS) $(LIBRARIES) + + # Build jar file +--- openjdkb18/j2se/src/share/demo/jvmti/heapViewer/sample.makefile.txt 2007-08-16 03:33:20.000000000 -0400 ++++ openjdk/j2se/src/share/demo/jvmti/heapViewer/sample.makefile.txt 2007-08-23 16:13:00.000000000 -0400 +@@ -43,7 +43,7 @@ + + # Source lists + LIBNAME=heapViewer +-SOURCES=heapViewer.c ../agent_util/agent_util.c ++SOURCES=heapViewer.c ../../agent_util/src/agent_util.c + + # Solaris Sun C Compiler Version 5.5 + ifeq ($(OSNAME), solaris) +@@ -89,7 +89,7 @@ + # Object files needed to create library + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it +- LIBRARY=lib$(LIBNAME).so ++ LIBRARY=../lib/lib$(LIBNAME).so + LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text + # Libraries we are dependent on + LIBRARIES=-lc +@@ -123,6 +123,7 @@ + # Common -I options + CFLAGS += -I. + CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME) ++CFLAGS += -I../../agent_util/src + + # Default rule + all: $(LIBRARY) +--- openjdkb18/j2se/src/share/demo/jvmti/hprof/sample.makefile.txt 2007-08-16 03:33:21.000000000 -0400 ++++ openjdk/j2se/src/share/demo/jvmti/hprof/sample.makefile.txt 2007-08-23 16:12:58.000000000 -0400 +@@ -73,7 +73,7 @@ + JAVA_SOURCES=Tracker.java + + # Name of jar file that needs to be created +-#JARFILE=hprof.jar ++JARFILE=../hprof.jar + + # Solaris Sun C Compiler Version 5.5 + ifeq ($(OSNAME), solaris) +@@ -110,7 +110,7 @@ + # Linux GNU C Compiler + ifeq ($(OSNAME), linux) + # GNU Compiler options needed to build it +- COMMON_FLAGS=-fno-strict-aliasing -fPIC -fno-omit-frame-pointer ++ COMMON_FLAGS=-fno-strict-aliasing -fPIC -fno-omit-frame-pointer -DSKIP_NPT + # Options that help find errors + COMMON_FLAGS+= -W -Wall -Wno-unused -Wno-parentheses + # To allow access to dladdr() +@@ -166,7 +166,7 @@ + + # Common -I options + CFLAGS += -I. +-CFLAGS += -I../java_crw_demo ++CFLAGS += -I../../java_crw_demo/src + CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME) + + # Default rule (build both native library and jar file) +--- openjdkb18/j2se/src/share/demo/jvmti/minst/sample.makefile.txt 2007-08-16 03:33:21.000000000 -0400 ++++ openjdk/j2se/src/share/demo/jvmti/minst/sample.makefile.txt 2007-08-24 15:16:17.000000000 -0400 +@@ -41,13 +41,15 @@ + # + ######################################################################## + ++JAVA_CRW_DEMO=../../java_crw_demo/src/libjava_crw_demo.so ++ + # Source lists + LIBNAME=minst +-SOURCES=minst.c ../agent_util/agent_util.c ++SOURCES=minst.c ../../agent_util/src/agent_util.c + JAVA_SOURCES=Minst.java + + # Name of jar file that needs to be created +-JARFILE=minst.jar ++JARFILE=../minst.jar + + # Solaris Sun C Compiler Version 5.5 + ifeq ($(OSNAME), solaris) +@@ -93,10 +95,10 @@ + # Object files needed to create library + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it +- LIBRARY=lib$(LIBNAME).so ++ LIBRARY=../lib/lib$(LIBNAME).so + LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text + # Libraries we are dependent on +- LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc ++ LIBRARIES=-L../../java_crw_demo/src/ -ljava_crw_demo -lc + # Building a shared library + LINK_SHARED=$(LINK.c) -shared -o $@ + endif +@@ -128,15 +130,18 @@ + + # Common -I options + CFLAGS += -I. +-CFLAGS += -I../agent_util +-CFLAGS += -I../java_crw_demo ++CFLAGS += -I../../agent_util/src ++CFLAGS += -I../../java_crw_demo/src + CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME) + + # Default rule (build both native library and jar file) + all: $(LIBRARY) $(JARFILE) + ++$(JAVA_CRW_DEMO): ++ make JDK=$(JDK) OSNAME=$(OSNAME) -C ../../java_crw_demo/src -f sample.makefile.txt ++ + # Build native library +-$(LIBRARY): $(OBJECTS) ++$(LIBRARY): $(OBJECTS) $(JAVA_CRW_DEMO) + $(LINK_SHARED) $(OBJECTS) $(LIBRARIES) + + # Build jar file +--- openjdkb18/j2se/src/share/demo/jvmti/mtrace/sample.makefile.txt 2007-08-16 03:33:21.000000000 -0400 ++++ openjdk/j2se/src/share/demo/jvmti/mtrace/sample.makefile.txt 2007-08-24 15:16:01.000000000 -0400 +@@ -41,13 +41,15 @@ + # + ######################################################################## + ++JAVA_CRW_DEMO=../../java_crw_demo/src/libjava_crw_demo.so ++ + # Source lists + LIBNAME=mtrace +-SOURCES=mtrace.c ../agent_util/agent_util.c ++SOURCES=mtrace.c ../../agent_util/src/agent_util.c + JAVA_SOURCES=Mtrace.java + + # Name of jar file that needs to be created +-JARFILE=mtrace.jar ++JARFILE=../mtrace.jar + + # Solaris Sun C Compiler Version 5.5 + ifeq ($(OSNAME), solaris) +@@ -93,10 +95,11 @@ + # Object files needed to create library + OBJECTS=$(SOURCES:%.c=%.o) + # Library name and options needed to build it +- LIBRARY=lib$(LIBNAME).so ++ LIBRARY=../lib/lib$(LIBNAME).so + LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text + # Libraries we are dependent on +- LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc ++ LIBRARIES=-L../../java_crw_demo/src -ljava_crw_demo -lc ++ + # Building a shared library + LINK_SHARED=$(LINK.c) -shared -o $@ + endif +@@ -128,15 +131,18 @@ + + # Common -I options + CFLAGS += -I. +-CFLAGS += -I../agent_util +-CFLAGS += -I../java_crw_demo ++CFLAGS += -I../../agent_util/src ++CFLAGS += -I../../java_crw_demo/src + CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME) + + # Default rule (build both native library and jar file) + all: $(LIBRARY) $(JARFILE) + ++$(JAVA_CRW_DEMO): ++ make JDK=$(JDK) OSNAME=$(OSNAME) -C ../../java_crw_demo/src -f sample.makefile.txt ++ + # Build native library From twisti at complang.tuwien.ac.at Wed Sep 12 01:12:34 2007 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Wed, 12 Sep 2007 08:12:34 +0000 Subject: changeset in /hg/icedtea: * configure: Match powerpc-*-* to ppc ... Message-ID: changeset 094da98b9aa7 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=094da98b9aa7 description: * configure: Match powerpc-*-* to ppc and powerpc64-*-* to ppc64. diffstat: 1 file changed, 5 insertions(+), 1 deletion(-) configure | 6 +++++- diffs (18 lines): diff -r 8c4bbe11b002 -r 094da98b9aa7 configure --- a/configure Tue Sep 11 10:46:22 2007 -0400 +++ b/configure Wed Sep 12 10:12:27 2007 +0200 @@ -4858,9 +4858,13 @@ fi BUILD_ARCH_DIR=i586 INSTALL_ARCH_DIR=i386 ;; - powerpc*-*-*) + powerpc-*-*) BUILD_ARCH_DIR=ppc INSTALL_ARCH_DIR=ppc + ;; + powerpc64-*-*) + BUILD_ARCH_DIR=ppc64 + INSTALL_ARCH_DIR=ppc64 ;; s390*-*-*) BUILD_ARCH_DIR=s390 From twisti at complang.tuwien.ac.at Wed Sep 12 01:30:56 2007 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Wed, 12 Sep 2007 08:30:56 +0000 Subject: changeset in /hg/icedtea: * acinclude.m4: Match powerpc-*-* to p... Message-ID: changeset f10fc5307c27 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f10fc5307c27 description: * acinclude.m4: Match powerpc-*-* to ppc and powerpc64-*-* to ppc64 (missed in last commit). diffstat: 1 file changed, 5 insertions(+), 1 deletion(-) acinclude.m4 | 6 +++++- diffs (18 lines): diff -r 094da98b9aa7 -r f10fc5307c27 acinclude.m4 --- a/acinclude.m4 Wed Sep 12 10:12:27 2007 +0200 +++ b/acinclude.m4 Wed Sep 12 10:30:41 2007 +0200 @@ -9,9 +9,13 @@ AC_DEFUN([SET_ARCH_DIRS], BUILD_ARCH_DIR=i586 INSTALL_ARCH_DIR=i386 ;; - powerpc*-*-*) + powerpc-*-*) BUILD_ARCH_DIR=ppc INSTALL_ARCH_DIR=ppc + ;; + powerpc64-*-*) + BUILD_ARCH_DIR=ppc64 + INSTALL_ARCH_DIR=ppc64 ;; s390*-*-*) BUILD_ARCH_DIR=s390 From aph at redhat.com Wed Sep 12 07:46:03 2007 From: aph at redhat.com (Andrew Haley) Date: Wed, 12 Sep 2007 15:46:03 +0100 Subject: IcedTea trunk is broken Message-ID: <18151.64427.51123.88294@zebedee.pink> I did this: rm -rf icedtea/ hg pull http://iced-tea.org/hg/icedtea hg clone http://iced-tea.org/hg/icedtea cd icedtea/ ./configure make ... touch stamps/plugs.stamp if ! test -d openjdk-ecj ; \ then \ mkdir tmp-ecj ; \ /usr/bin/unzip -q -d tmp-ecj openjdk-7-ea-src-b19-30_aug_2007.zip ; \ mv tmp-ecj/openjdk openjdk-ecj ; \ rmdir tmp-ecj ; \ chmod ug+w `find openjdk-ecj/j2se/share/demo/jvmti \ -name sample.makefile.txt` ; \ fi find: openjdk-ecj/j2se/share/demo: No such file or directory chmod: missing operand after `ug+w' Try `chmod --help' for more information. make: *** [stamps/extract-ecj.stamp] Error 1 Should openjdk-ecj/j2se/share/demo/jvmti be openjdk-ecj/j2se/src/share/demo/jvmti ? Andrew. -- Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, UK Registered in England and Wales No. 3798903 From jsumali at redhat.com Wed Sep 12 08:07:19 2007 From: jsumali at redhat.com (Joshua Sumali) Date: Wed, 12 Sep 2007 11:07:19 -0400 Subject: IcedTea trunk is broken In-Reply-To: <18151.64427.51123.88294@zebedee.pink> References: <18151.64427.51123.88294@zebedee.pink> Message-ID: <46E800A7.6010601@redhat.com> Andrew Haley wrote: > I did this: > > rm -rf icedtea/ > hg pull http://iced-tea.org/hg/icedtea > hg clone http://iced-tea.org/hg/icedtea > cd icedtea/ > ./configure > make > > ... > > touch stamps/plugs.stamp > if ! test -d openjdk-ecj ; \ > then \ > mkdir tmp-ecj ; \ > /usr/bin/unzip -q -d tmp-ecj openjdk-7-ea-src-b19-30_aug_2007.zip ; \ > mv tmp-ecj/openjdk openjdk-ecj ; \ > rmdir tmp-ecj ; \ > chmod ug+w `find openjdk-ecj/j2se/share/demo/jvmti \ > -name sample.makefile.txt` ; \ > fi > find: openjdk-ecj/j2se/share/demo: No such file or directory > chmod: missing operand after `ug+w' > Try `chmod --help' for more information. > make: *** [stamps/extract-ecj.stamp] Error 1 > > Should openjdk-ecj/j2se/share/demo/jvmti be > openjdk-ecj/j2se/src/share/demo/jvmti ? > > Andrew. > > Hi, Sorry, this is my fault for not noticing that. Testing build now, so it should be fixed and committed in a few hours. Josh From aph at redhat.com Wed Sep 12 08:08:52 2007 From: aph at redhat.com (Andrew Haley) Date: Wed, 12 Sep 2007 16:08:52 +0100 Subject: IcedTea trunk is broken In-Reply-To: <18151.64427.51123.88294@zebedee.pink> References: <18151.64427.51123.88294@zebedee.pink> Message-ID: <18152.260.951569.768678@zebedee.pink> We seem to have more problems with the icedtea-debug target: diff -r f10fc5307c27 Makefile.am --- a/Makefile.am Wed Sep 12 10:30:41 2007 +0200 +++ b/Makefile.am Wed Sep 12 17:05:17 2007 +0100 @@ -357,9 +357,9 @@ icedtea-debug: stamps/tools.stamp stamps -C openjdk/control/make \ debug_build cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + openjdk/control/build/$(LINUX_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) @echo "Debug-flavoured IcedTea is served:" \ openjdk/control/build/$(LINUX_DIR)-debug -- Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, UK Registered in England and Wales No. 3798903 From langel at redhat.com Wed Sep 12 08:14:12 2007 From: langel at redhat.com (Lillian Angel) Date: Wed, 12 Sep 2007 11:14:12 -0400 Subject: Build fails with "ERROR: Your JAVA_HOME environment variable is set" In-Reply-To: <46E2D044.5000909@gatech.edu> References: <46E27F39.4050600@gatech.edu> <18146.40772.602332.611079@zebedee.pink> <46E2D044.5000909@gatech.edu> Message-ID: <46E80244.7080204@redhat.com> Matthew Flaschen wrote: > Andrew Haley wrote: >> Matthew Flaschen writes: >> > A build of latest hg fails with: >> > >> > ERROR: Your JAVA_HOME environment variable is set. This will >> > most likely cause the build to fail. Please unset it >> > and start your build again. >> > >> > Exiting because of the above error(s). >> > >> > Should this need to be unset? I think I've always built with it set in >> > the past. >> >> Yes, it must be unset. The IcsedTea makefile unsets it, I think. > > I didn't modify the makefile, so this is apparently a bug. Line 63 in Makefile.am: @echo 'unset JAVA_HOME' Lillian From langel at redhat.com Wed Sep 12 09:42:15 2007 From: langel at redhat.com (Lillian Angel) Date: Wed, 12 Sep 2007 12:42:15 -0400 Subject: Build fails with "ERROR: Your JAVA_HOME environment variable is set" In-Reply-To: <46E2D044.5000909@gatech.edu> References: <46E27F39.4050600@gatech.edu> <18146.40772.602332.611079@zebedee.pink> <46E2D044.5000909@gatech.edu> Message-ID: <46E816E7.3040207@redhat.com> Matthew Flaschen wrote: > Andrew Haley wrote: >> Matthew Flaschen writes: >> > A build of latest hg fails with: >> > >> > ERROR: Your JAVA_HOME environment variable is set. This will >> > most likely cause the build to fail. Please unset it >> > and start your build again. >> > >> > Exiting because of the above error(s). >> > >> > Should this need to be unset? I think I've always built with it set in >> > the past. >> >> Yes, it must be unset. The IcsedTea makefile unsets it, I think. > > I didn't modify the makefile, so this is apparently a bug. Actually, I spoke to Tom Fitzsimmons and he said that IcedTea does not modify the environment it just prints the shell commands that will setup the in environment when OpenJDK's make is run. You will need to manually unset JAVA_HOME. Previously, we were setting JAVA_HOME to "" in the Makefile, and this was incorrect. Lillian From jsumali at redhat.com Wed Sep 12 09:47:15 2007 From: jsumali at redhat.com (Joshua Sumali) Date: Wed, 12 Sep 2007 16:47:15 +0000 Subject: changeset in /hg/icedtea: 2007-09-12 Joshua Sumali changeset e3cfac23dca1 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e3cfac23dca1 description: 2007-09-12 Joshua Sumali * Makefile.am: Fixed error that broke the build. * Makefile.in: Regenerated diffstat: 3 files changed, 7 insertions(+), 2 deletions(-) ChangeLog | 5 +++++ Makefile.am | 2 +- Makefile.in | 2 +- diffs (36 lines): diff -r f10fc5307c27 -r e3cfac23dca1 ChangeLog --- a/ChangeLog Wed Sep 12 10:30:41 2007 +0200 +++ b/ChangeLog Wed Sep 12 11:07:58 2007 -0400 @@ -1,3 +1,8 @@ 2007-09-11 Joshua Sumali + + * Makefile.am: Fixed error that broke the build. + * Makefile.in: Regenerated + 2007-09-11 Joshua Sumali * patches/icedtea-demos.patch: New File. Patches the sample diff -r f10fc5307c27 -r e3cfac23dca1 Makefile.am --- a/Makefile.am Wed Sep 12 10:30:41 2007 +0200 +++ b/Makefile.am Wed Sep 12 11:07:58 2007 -0400 @@ -208,7 +208,7 @@ stamps/extract-ecj.stamp: stamps/downloa $(UNZIP) -q -d tmp-ecj $(OPENJDK_SRC_ZIP) ; \ mv tmp-ecj/openjdk openjdk-ecj ; \ rmdir tmp-ecj ; \ - chmod ug+w `find openjdk-ecj/j2se/share/demo/jvmti \ + chmod ug+w `find openjdk-ecj/j2se/src/share/demo/jvmti \ -name sample.makefile.txt` ; \ fi mkdir -p stamps diff -r f10fc5307c27 -r e3cfac23dca1 Makefile.in --- a/Makefile.in Wed Sep 12 10:30:41 2007 +0200 +++ b/Makefile.in Wed Sep 12 11:07:58 2007 -0400 @@ -715,7 +715,7 @@ stamps/extract-ecj.stamp: stamps/downloa $(UNZIP) -q -d tmp-ecj $(OPENJDK_SRC_ZIP) ; \ mv tmp-ecj/openjdk openjdk-ecj ; \ rmdir tmp-ecj ; \ - chmod ug+w `find openjdk-ecj/j2se/share/demo/jvmti \ + chmod ug+w `find openjdk-ecj/j2se/src/share/demo/jvmti \ -name sample.makefile.txt` ; \ fi mkdir -p stamps From jsumali at redhat.com Wed Sep 12 09:55:42 2007 From: jsumali at redhat.com (Joshua Sumali) Date: Wed, 12 Sep 2007 12:55:42 -0400 Subject: IcedTea trunk is broken In-Reply-To: <18151.64427.51123.88294@zebedee.pink> References: <18151.64427.51123.88294@zebedee.pink> Message-ID: <46E81A0E.4020705@redhat.com> Andrew Haley wrote: > I did this: > > rm -rf icedtea/ > hg pull http://iced-tea.org/hg/icedtea > hg clone http://iced-tea.org/hg/icedtea > cd icedtea/ > ./configure > make > > ... > > touch stamps/plugs.stamp > if ! test -d openjdk-ecj ; \ > then \ > mkdir tmp-ecj ; \ > /usr/bin/unzip -q -d tmp-ecj openjdk-7-ea-src-b19-30_aug_2007.zip ; \ > mv tmp-ecj/openjdk openjdk-ecj ; \ > rmdir tmp-ecj ; \ > chmod ug+w `find openjdk-ecj/j2se/share/demo/jvmti \ > -name sample.makefile.txt` ; \ > fi > find: openjdk-ecj/j2se/share/demo: No such file or directory > chmod: missing operand after `ug+w' > Try `chmod --help' for more information. > make: *** [stamps/extract-ecj.stamp] Error 1 > > Should openjdk-ecj/j2se/share/demo/jvmti be > openjdk-ecj/j2se/src/share/demo/jvmti ? > > Andrew. > > Hi, Problem fixed and build tested successfully. Sorry for the inconvenience. Josh From langel at redhat.com Wed Sep 12 10:26:03 2007 From: langel at redhat.com (Lillian Angel) Date: Wed, 12 Sep 2007 17:26:03 +0000 Subject: changeset in /hg/icedtea: 2007-09-12 Lillian Angel changeset 2022a192d00f in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2022a192d00f description: 2007-09-12 Lillian Angel * Makefile.am: Added BUILD_NUMBER to environment. This should be updated with each bXX release. Also, added dependency for icedtea-debug target. * Makefile.in: Regenerated. diffstat: 3 files changed, 15 insertions(+), 2 deletions(-) ChangeLog | 7 +++++++ Makefile.am | 5 ++++- Makefile.in | 5 ++++- diffs (72 lines): diff -r e3cfac23dca1 -r 2022a192d00f ChangeLog --- a/ChangeLog Wed Sep 12 11:07:58 2007 -0400 +++ b/ChangeLog Wed Sep 12 13:25:58 2007 -0400 @@ -1,3 +1,10 @@ 2007-09-12 Joshua Sumali + + * Makefile.am: Added BUILD_NUMBER to environment. This should be + updated with each bXX release. Also, added dependency for + icedtea-debug target. + * Makefile.in: Regenerated. + 2007-09-12 Joshua Sumali * Makefile.am: Fixed error that broke the build. diff -r e3cfac23dca1 -r 2022a192d00f Makefile.am --- a/Makefile.am Wed Sep 12 11:07:58 2007 -0400 +++ b/Makefile.am Wed Sep 12 13:25:58 2007 -0400 @@ -44,6 +44,7 @@ ICEDTEA_ENDORSED_DIR = \ ICEDTEA_ENDORSED_DIR = \ $(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed ICEDTEA_ENV = \ + "BUILD_NUMBER=b19" \ "LANG=C" \ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ @@ -71,6 +72,7 @@ ICEDTEA_CLS_DIR_ECJ = \ ICEDTEA_CLS_DIR_ECJ = \ $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes ICEDTEA_ENV_ECJ = \ + "BUILD_NUMBER=b19" \ "LANG=C" \ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ @@ -350,7 +352,8 @@ icedtea: stamps/tools.stamp stamps/plugs openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) @echo "IcedTea is served:" openjdk/control/build/$(LINUX_DIR) -icedtea-debug: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \ +icedtea-debug: stamps/bootstrap-directory-symlink-ecj.stamp stamps/tools.stamp \ + stamps/plugs.stamp stamps/extract.stamp \ stamps/patch.stamp gcjwebplugin.so $(MAKE) \ $(ICEDTEA_ENV) \ diff -r e3cfac23dca1 -r 2022a192d00f Makefile.in --- a/Makefile.in Wed Sep 12 11:07:58 2007 -0400 +++ b/Makefile.in Wed Sep 12 13:25:58 2007 -0400 @@ -210,6 +210,7 @@ ICEDTEA_ENDORSED_DIR = \ $(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed ICEDTEA_ENV = \ + "BUILD_NUMBER=b19" \ "LANG=C" \ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ @@ -237,6 +238,7 @@ ICEDTEA_CLS_DIR_ECJ = \ $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes ICEDTEA_ENV_ECJ = \ + "BUILD_NUMBER=b19" \ "LANG=C" \ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ @@ -836,7 +838,8 @@ icedtea: stamps/tools.stamp stamps/plugs openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) @echo "IcedTea is served:" openjdk/control/build/$(LINUX_DIR) -icedtea-debug: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \ +icedtea-debug: stamps/bootstrap-directory-symlink-ecj.stamp stamps/tools.stamp \ + stamps/plugs.stamp stamps/extract.stamp \ stamps/patch.stamp gcjwebplugin.so $(MAKE) \ $(ICEDTEA_ENV) \ From twisti at complang.tuwien.ac.at Wed Sep 12 10:43:59 2007 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Wed, 12 Sep 2007 17:43:59 +0000 Subject: changeset in /hg/icedtea: * Makefile.am (stamps/extract-ecj.stam... Message-ID: changeset 19a9c530d8e2 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=19a9c530d8e2 description: * Makefile.am (stamps/extract-ecj.stamp): Fixed typo. (clean-bootstrap-directory-ecj): Likewise. * Makefile.in: Likewise. diffstat: 2 files changed, 4 insertions(+), 4 deletions(-) Makefile.am | 4 ++-- Makefile.in | 4 ++-- diffs (42 lines): diff -r 094da98b9aa7 -r 19a9c530d8e2 Makefile.am --- a/Makefile.am Wed Sep 12 10:12:27 2007 +0200 +++ b/Makefile.am Wed Sep 12 19:42:05 2007 +0200 @@ -208,7 +208,7 @@ stamps/extract-ecj.stamp: stamps/downloa $(UNZIP) -q -d tmp-ecj $(OPENJDK_SRC_ZIP) ; \ mv tmp-ecj/openjdk openjdk-ecj ; \ rmdir tmp-ecj ; \ - chmod ug+w `find openjdk-ecj/j2se/share/demo/jvmti \ + chmod ug+w `find openjdk-ecj/j2se/src/share/demo/jvmti \ -name sample.makefile.txt` ; \ fi mkdir -p stamps @@ -314,7 +314,7 @@ stamps/bootstrap-directory-ecj.stamp: touch stamps/bootstrap-directory-ecj.stamp clean-bootstrap-directory-ecj: - rm -f stamps/ootstrap-directory-ecj.stamp + rm -f stamps/bootstrap-directory-ecj.stamp rm -rf bootstrap/ecj # bootstrap/jdk1.6.0 to bootstrap/ecj symlink. diff -r 094da98b9aa7 -r 19a9c530d8e2 Makefile.in --- a/Makefile.in Wed Sep 12 10:12:27 2007 +0200 +++ b/Makefile.in Wed Sep 12 19:42:05 2007 +0200 @@ -715,7 +715,7 @@ stamps/extract-ecj.stamp: stamps/downloa $(UNZIP) -q -d tmp-ecj $(OPENJDK_SRC_ZIP) ; \ mv tmp-ecj/openjdk openjdk-ecj ; \ rmdir tmp-ecj ; \ - chmod ug+w `find openjdk-ecj/j2se/share/demo/jvmti \ + chmod ug+w `find openjdk-ecj/j2se/src/share/demo/jvmti \ -name sample.makefile.txt` ; \ fi mkdir -p stamps @@ -810,7 +810,7 @@ stamps/bootstrap-directory-ecj.stamp: touch stamps/bootstrap-directory-ecj.stamp clean-bootstrap-directory-ecj: - rm -f stamps/ootstrap-directory-ecj.stamp + rm -f stamps/bootstrap-directory-ecj.stamp rm -rf bootstrap/ecj # bootstrap/jdk1.6.0 to bootstrap/ecj symlink. From twisti at complang.tuwien.ac.at Wed Sep 12 10:43:59 2007 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Wed, 12 Sep 2007 17:43:59 +0000 Subject: changeset in /hg/icedtea: * Merged. Message-ID: changeset c74818f04a5e in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c74818f04a5e description: * Merged. diffstat: 4 files changed, 25 insertions(+), 3 deletions(-) ChangeLog | 12 ++++++++++++ Makefile.am | 5 ++++- Makefile.in | 5 ++++- acinclude.m4 | 6 +++++- diffs (95 lines): diff -r 19a9c530d8e2 -r c74818f04a5e ChangeLog --- a/ChangeLog Wed Sep 12 19:42:05 2007 +0200 +++ b/ChangeLog Wed Sep 12 19:43:43 2007 +0200 @@ -1,3 +1,15 @@ 2007-09-11 Joshua Sumali + + * Makefile.am: Added BUILD_NUMBER to environment. This should be + updated with each bXX release. Also, added dependency for + icedtea-debug target. + * Makefile.in: Regenerated. + +2007-09-12 Joshua Sumali + + * Makefile.am: Fixed error that broke the build. + * Makefile.in: Regenerated + 2007-09-11 Joshua Sumali * patches/icedtea-demos.patch: New File. Patches the sample diff -r 19a9c530d8e2 -r c74818f04a5e Makefile.am --- a/Makefile.am Wed Sep 12 19:42:05 2007 +0200 +++ b/Makefile.am Wed Sep 12 19:43:43 2007 +0200 @@ -44,6 +44,7 @@ ICEDTEA_ENDORSED_DIR = \ ICEDTEA_ENDORSED_DIR = \ $(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed ICEDTEA_ENV = \ + "BUILD_NUMBER=b19" \ "LANG=C" \ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ @@ -71,6 +72,7 @@ ICEDTEA_CLS_DIR_ECJ = \ ICEDTEA_CLS_DIR_ECJ = \ $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes ICEDTEA_ENV_ECJ = \ + "BUILD_NUMBER=b19" \ "LANG=C" \ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ @@ -350,7 +352,8 @@ icedtea: stamps/tools.stamp stamps/plugs openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) @echo "IcedTea is served:" openjdk/control/build/$(LINUX_DIR) -icedtea-debug: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \ +icedtea-debug: stamps/bootstrap-directory-symlink-ecj.stamp stamps/tools.stamp \ + stamps/plugs.stamp stamps/extract.stamp \ stamps/patch.stamp gcjwebplugin.so $(MAKE) \ $(ICEDTEA_ENV) \ diff -r 19a9c530d8e2 -r c74818f04a5e Makefile.in --- a/Makefile.in Wed Sep 12 19:42:05 2007 +0200 +++ b/Makefile.in Wed Sep 12 19:43:43 2007 +0200 @@ -210,6 +210,7 @@ ICEDTEA_ENDORSED_DIR = \ $(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed ICEDTEA_ENV = \ + "BUILD_NUMBER=b19" \ "LANG=C" \ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ @@ -237,6 +238,7 @@ ICEDTEA_CLS_DIR_ECJ = \ $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes ICEDTEA_ENV_ECJ = \ + "BUILD_NUMBER=b19" \ "LANG=C" \ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ @@ -836,7 +838,8 @@ icedtea: stamps/tools.stamp stamps/plugs openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) @echo "IcedTea is served:" openjdk/control/build/$(LINUX_DIR) -icedtea-debug: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \ +icedtea-debug: stamps/bootstrap-directory-symlink-ecj.stamp stamps/tools.stamp \ + stamps/plugs.stamp stamps/extract.stamp \ stamps/patch.stamp gcjwebplugin.so $(MAKE) \ $(ICEDTEA_ENV) \ diff -r 19a9c530d8e2 -r c74818f04a5e acinclude.m4 --- a/acinclude.m4 Wed Sep 12 19:42:05 2007 +0200 +++ b/acinclude.m4 Wed Sep 12 19:43:43 2007 +0200 @@ -9,9 +9,13 @@ AC_DEFUN([SET_ARCH_DIRS], BUILD_ARCH_DIR=i586 INSTALL_ARCH_DIR=i386 ;; - powerpc*-*-*) + powerpc-*-*) BUILD_ARCH_DIR=ppc INSTALL_ARCH_DIR=ppc + ;; + powerpc64-*-*) + BUILD_ARCH_DIR=ppc64 + INSTALL_ARCH_DIR=ppc64 ;; s390*-*-*) BUILD_ARCH_DIR=s390 From langel at redhat.com Wed Sep 12 11:32:29 2007 From: langel at redhat.com (Lillian Angel) Date: Wed, 12 Sep 2007 18:32:29 +0000 Subject: changeset in /hg/icedtea: 2007-09-12 Lillian Angel changeset 7b9167e3d1ff in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7b9167e3d1ff description: 2007-09-12 Lillian Angel * AUTHORS: Added Christian Thalinger. diffstat: 2 files changed, 5 insertions(+) AUTHORS | 1 + ChangeLog | 4 ++++ diffs (22 lines): diff -r c74818f04a5e -r 7b9167e3d1ff AUTHORS --- a/AUTHORS Wed Sep 12 19:43:43 2007 +0200 +++ b/AUTHORS Wed Sep 12 14:32:24 2007 -0400 @@ -11,6 +11,7 @@ Casey Marshall Casey Marshall Raif Naffah Joshua Sumali +Christian Thalinger Mark Wielaard This project also includes code from the following projects: diff -r c74818f04a5e -r 7b9167e3d1ff ChangeLog --- a/ChangeLog Wed Sep 12 19:43:43 2007 +0200 +++ b/ChangeLog Wed Sep 12 14:32:24 2007 -0400 @@ -1,3 +1,7 @@ 2007-09-12 Lillian Angel + + * AUTHORS: Added Christian Thalinger. + 2007-09-12 Lillian Angel * Makefile.am: Added BUILD_NUMBER to environment. This should be From twisti at complang.tuwien.ac.at Wed Sep 12 11:41:26 2007 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Wed, 12 Sep 2007 18:41:26 +0000 Subject: changeset in /hg/icedtea: 2007-09-12 Christan Thalinger changeset 1d24d15ad821 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1d24d15ad821 description: 2007-09-12 Christan Thalinger * .hgignore: Added *~. diffstat: 2 files changed, 8 insertions(+) .hgignore | 4 ++++ ChangeLog | 4 ++++ diffs (22 lines): diff -r 7b9167e3d1ff -r 1d24d15ad821 .hgignore --- a/.hgignore Wed Sep 12 14:32:24 2007 -0400 +++ b/.hgignore Wed Sep 12 20:41:19 2007 +0200 @@ -1,3 +1,7 @@ autom4te.cache +syntax: glob +*~ + +syntax: regexp autom4te.cache openjdk bootstrap diff -r 7b9167e3d1ff -r 1d24d15ad821 ChangeLog --- a/ChangeLog Wed Sep 12 14:32:24 2007 -0400 +++ b/ChangeLog Wed Sep 12 20:41:19 2007 +0200 @@ -1,3 +1,7 @@ 2007-09-12 Lillian Angel + + * .hgignore: Added *~. + 2007-09-12 Lillian Angel * AUTHORS: Added Christian Thalinger. From matthew.flaschen at gatech.edu Wed Sep 12 12:22:21 2007 From: matthew.flaschen at gatech.edu (Matthew Flaschen) Date: Wed, 12 Sep 2007 15:22:21 -0400 Subject: Build fails with "ERROR: Your JAVA_HOME environment variable is set" In-Reply-To: <46E80244.7080204@redhat.com> References: <46E27F39.4050600@gatech.edu> <18146.40772.602332.611079@zebedee.pink> <46E2D044.5000909@gatech.edu> <46E80244.7080204@redhat.com> Message-ID: <46E83C6D.7070707@gatech.edu> Lillian Angel wrote: >> I didn't modify the makefile, so this is apparently a bug. > > Line 63 in Makefile.am: @echo 'unset JAVA_HOME' Okay, I see that. But I am still getting the error. So, perhaps the unset needs to be done in an earlier (or additional) script? Matt Flaschen From matthew.flaschen at gatech.edu Wed Sep 12 12:29:46 2007 From: matthew.flaschen at gatech.edu (Matthew Flaschen) Date: Wed, 12 Sep 2007 15:29:46 -0400 Subject: Build fails with "ERROR: Your JAVA_HOME environment variable is set" In-Reply-To: <46E816E7.3040207@redhat.com> References: <46E27F39.4050600@gatech.edu> <18146.40772.602332.611079@zebedee.pink> <46E2D044.5000909@gatech.edu> <46E816E7.3040207@redhat.com> Message-ID: <46E83E2A.3000008@gatech.edu> Lillian Angel wrote: > You will need to manually unset JAVA_HOME. Previously, we were setting > JAVA_HOME to "" in the Makefile, and this was incorrect. Okay, if that's the policy I'll just unset it manually. Matt Flaschen From twisti at complang.tuwien.ac.at Wed Sep 12 13:54:37 2007 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Wed, 12 Sep 2007 22:54:37 +0200 Subject: IcedTea trunk is broken In-Reply-To: <18152.260.951569.768678@zebedee.pink> References: <18151.64427.51123.88294@zebedee.pink> <18152.260.951569.768678@zebedee.pink> Message-ID: <1189630477.1431.4.camel@localhost.localdomain> On Wed, 2007-09-12 at 16:08 +0100, Andrew Haley wrote: > We seem to have more problems with the icedtea-debug target: > > diff -r f10fc5307c27 Makefile.am > --- a/Makefile.am Wed Sep 12 10:30:41 2007 +0200 > +++ b/Makefile.am Wed Sep 12 17:05:17 2007 +0100 > @@ -357,9 +357,9 @@ icedtea-debug: stamps/tools.stamp stamps > -C openjdk/control/make \ > debug_build > cp -af gcjwebplugin.so \ > - openjdk/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > + openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) > cp -af gcjwebplugin.so \ > - openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) > + openjdk/control/build/$(LINUX_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) > @echo "Debug-flavoured IcedTea is served:" \ > openjdk/control/build/$(LINUX_DIR)-debug > Commited. - twisti From twisti at complang.tuwien.ac.at Wed Sep 12 15:18:39 2007 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Thu, 13 Sep 2007 00:18:39 +0200 Subject: FYI: cacao branch Message-ID: <1189635519.1431.15.camel@localhost.localdomain> Hi! Today I finally started the cacao branch in the IcedTea repository. We had some smaller problems (Lillian accidentally merged the branches right after I created them). Tom stripped of this merge changeset from the upstream repository, so everything is fine. But probably one was pulling in this small time frame. The stripped revision was a4f10f91a707. If you think you have a broken clone, please clone again! OK, now some words to be branch itself. In order to switch to the branch just do: $ hg update -C cacao But be aware that -C does a cleanup! Also see: $ hg help update I added all patches required and a new configure option --with-cacao. Currently you need a CACAO built for OpenJDK (--with-classpath=sun) installed somewhere and point IcedTea to that location, e.g.: ./configure --with-cacao=/foo/bar/cacao-sun The default location for --with-cacao is /usr/local/cacao. Please tell me if it works for you or not (I/we know of a bug in CACAO that probably hangs the build, I try to fix that). - twisti From langel at redhat.com Wed Sep 12 13:55:18 2007 From: langel at redhat.com (Lillian Angel) Date: Wed, 12 Sep 2007 20:55:18 +0000 Subject: changeset in /hg/icedtea: Merged heads Message-ID: changeset a4f10f91a707 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a4f10f91a707 description: Merged heads diffstat: 1 file changed, 6 insertions(+) ChangeLog | 6 ++++++ diffs (16 lines): diff -r 3ce5b4fff04b -r a4f10f91a707 ChangeLog --- a/ChangeLog Wed Sep 12 16:44:45 2007 -0400 +++ b/ChangeLog Wed Sep 12 16:55:12 2007 -0400 @@ -1,6 +1,12 @@ 2007-09-12 Christan Thalinger * README.cacao: New file. + +2007-09-12 Christan Thalinger + + * Makefile.am (icedtea-debug): Added -debug to target directory, + as found today by Andrew Haley. + * Makefile.in: Likewise. 2007-09-12 Christan Thalinger From twisti at complang.tuwien.ac.at Wed Sep 12 14:13:57 2007 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Wed, 12 Sep 2007 21:13:57 +0000 Subject: changeset in /hg/icedtea: 2007-09-12 Christan Thalinger changeset 8b0be2eafb18 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8b0be2eafb18 description: 2007-09-12 Christan Thalinger * Makefile.am: Added WITH_CACAO stuff. * Makefile.in: Regenerated. * acinclude.m4 (AC_CHECK_WITH_CACAO): New function. * configure.ac (AC_CHECK_WITH_CACAO): Added. * configure: Regenerated. * patches/icedtea-cacao-Compiler-gcc-gmk.patch, patches/icedtea-cacao-Defs-linux-gmk.patch, patches/icedtea-cacao-Platform-gmk.patch, patches/icedtea-cacao-Program-gmk.patch, patches/icedtea-cacao-java-c.patch, patches/icedtea-cacao-jvm-cfg.patch: New file. diffstat: 12 files changed, 310 insertions(+), 36 deletions(-) ChangeLog | 14 +++++ Makefile.am | 25 ++++++++-- Makefile.in | 63 +++++++++++++------------- acinclude.m4 | 28 +++++++++++ configure | 54 +++++++++++++++++++++- configure.ac | 1 patches/icedtea-cacao-Compiler-gcc-gmk.patch | 46 ++++++++++++++++++ patches/icedtea-cacao-Defs-linux-gmk.patch | 13 +++++ patches/icedtea-cacao-Platform-gmk.patch | 32 +++++++++++++ patches/icedtea-cacao-Program-gmk.patch | 13 +++++ patches/icedtea-cacao-java-c.patch | 14 +++++ patches/icedtea-cacao-jvm-cfg.patch | 43 +++++++++++++++++ diffs (truncated from 551 to 500 lines): diff -r 3ce5b4fff04b -r 8b0be2eafb18 ChangeLog --- a/ChangeLog Wed Sep 12 16:44:45 2007 -0400 +++ b/ChangeLog Wed Sep 12 23:13:50 2007 +0200 @@ -1,3 +1,17 @@ 2007-09-12 Christan Thalinger + + * Makefile.am: Added WITH_CACAO stuff. + * Makefile.in: Regenerated. + * acinclude.m4 (AC_CHECK_WITH_CACAO): New function. + * configure.ac (AC_CHECK_WITH_CACAO): Added. + * configure: Regenerated. + * patches/icedtea-cacao-Compiler-gcc-gmk.patch, + patches/icedtea-cacao-Defs-linux-gmk.patch, + patches/icedtea-cacao-Platform-gmk.patch, + patches/icedtea-cacao-Program-gmk.patch, + patches/icedtea-cacao-java-c.patch, + patches/icedtea-cacao-jvm-cfg.patch: New file. + 2007-09-12 Christan Thalinger * README.cacao: New file. diff -r 3ce5b4fff04b -r 8b0be2eafb18 Makefile.am --- a/Makefile.am Wed Sep 12 16:44:45 2007 -0400 +++ b/Makefile.am Wed Sep 12 23:13:50 2007 +0200 @@ -93,6 +93,12 @@ ICEDTEA_ENV_ECJ = \ "LD_LIBRARY_PATH=" \ "FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" +if WITH_CACAO +ICEDTEA_ENV_ECJ += \ + "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)" \ + "ALT_JDK_IMPORT_PATH=$(CACAO)" +endif + env-ecj: @echo 'unset JAVA_HOME' @echo 'export $(ICEDTEA_ENV_ECJ)' @@ -174,6 +180,17 @@ ICEDTEA_PATCHES = \ patches/icedtea-demos.patch \ $(FAST_BUILD_PATCH) +if WITH_CACAO +ICEDTEA_PATCHES += \ + patches/icedtea-cacao-Compiler-gcc-gmk.patch \ + patches/icedtea-cacao-Defs-linux-gmk.patch \ + patches/icedtea-cacao-Platform-gmk.patch \ + patches/icedtea-cacao-Program-gmk.patch \ + patches/icedtea-cacao-instrument-Makefile.patch \ + patches/icedtea-cacao-java-c.patch \ + patches/icedtea-cacao-jvm-cfg.patch +endif + stamps/patch.stamp: stamps/extract.stamp for p in $(ICEDTEA_PATCHES) ; \ do \ @@ -345,7 +362,7 @@ icedtea: stamps/tools.stamp stamps/plugs stamps/patch.stamp gcjwebplugin.so $(MAKE) \ $(ICEDTEA_ENV) \ - -C openjdk/control/make + -C openjdk/control/make j2se_only cp -af gcjwebplugin.so \ openjdk/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ @@ -358,7 +375,7 @@ icedtea-debug: stamps/bootstrap-director $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/control/make \ - debug_build + j2se_fastdebug_only cp -af gcjwebplugin.so \ openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ @@ -382,7 +399,7 @@ stamps/icedtea-ecj.stamp: stamps/tools.s stamps/extract-ecj.stamp stamps/patch-ecj.stamp $(MAKE) \ $(ICEDTEA_ENV_ECJ) \ - -C openjdk-ecj/control/make + -C openjdk-ecj/control/make j2se_only @echo "ecj-poured IcedTea is served:" \ openjdk-ecj/control/build/$(LINUX_DIR) mkdir -p stamps @@ -531,7 +548,7 @@ bootstrap/ecj/lib/tools.jar: stamps/tool mkdir -p bootstrap/ecj/lib $(JAR) cf $@ -C lib/tools com -C lib/tools sun \ -C lib/tools org - + # rt-closed.jar class files. rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp find rt -name '*.java' | sort > $@ diff -r 3ce5b4fff04b -r 8b0be2eafb18 Makefile.in --- a/Makefile.in Wed Sep 12 16:44:45 2007 -0400 +++ b/Makefile.in Wed Sep 12 23:13:50 2007 +0200 @@ -31,6 +31,19 @@ POST_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ + at WITH_CACAO_TRUE@am__append_1 = \ + at WITH_CACAO_TRUE@ "ALT_HOTSPOT_IMPORT_PATH=$(CACAO)" \ + at WITH_CACAO_TRUE@ "ALT_JDK_IMPORT_PATH=$(CACAO)" + + at WITH_CACAO_TRUE@am__append_2 = \ + at WITH_CACAO_TRUE@ patches/icedtea-cacao-Compiler-gcc-gmk.patch \ + at WITH_CACAO_TRUE@ patches/icedtea-cacao-Defs-linux-gmk.patch \ + at WITH_CACAO_TRUE@ patches/icedtea-cacao-Platform-gmk.patch \ + at WITH_CACAO_TRUE@ patches/icedtea-cacao-Program-gmk.patch \ + at WITH_CACAO_TRUE@ patches/icedtea-cacao-instrument-Makefile.patch \ + at WITH_CACAO_TRUE@ patches/icedtea-cacao-java-c.patch \ + at WITH_CACAO_TRUE@ patches/icedtea-cacao-jvm-cfg.patch + subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/javac.in $(srcdir)/javap.in \ @@ -66,6 +79,7 @@ AUTOMAKE = @AUTOMAKE@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ BUILD_ARCH_DIR = @BUILD_ARCH_DIR@ +CACAO = @CACAO@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -237,28 +251,22 @@ ICEDTEA_CLS_DIR_ECJ = \ ICEDTEA_CLS_DIR_ECJ = \ $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes -ICEDTEA_ENV_ECJ = \ - "BUILD_NUMBER=b19" \ - "LANG=C" \ +ICEDTEA_ENV_ECJ = "BUILD_NUMBER=b19" "LANG=C" \ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ "ALT_BINARY_PLUGS_PATH=$(abs_top_srcdir)/bootstrap/jdk1.7.0" \ - "BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \ - "LIBGCJ_JAR=$(LIBGCJ_JAR)" \ - "ICEDTEA_JCE=$(ICEDTEA_JCE_ECJ)" \ - "ICEDTEA_RT=$(ICEDTEA_RT)" \ + "BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" "LIBGCJ_JAR=$(LIBGCJ_JAR)" \ + "ICEDTEA_JCE=$(ICEDTEA_JCE_ECJ)" "ICEDTEA_RT=$(ICEDTEA_RT)" \ "ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \ "ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR_ECJ)" \ "ICEDTEA_ENDORSED_DIR=$(ICEDTEA_ENDORSED_DIR)" \ "ENDORSED=-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \ "BOOTCLASSPATH_CLS_RT=-bootclasspath \ - $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \ + $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \ "BOOTCLASSPATH_CLS=-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \ - "BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath $(ICEDTEA_RT):$(LIBGCJ_JAR)" \ - "CLASSPATH=" \ - "LD_LIBRARY_PATH=" \ - "FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" - + "BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath \ + $(ICEDTEA_RT):$(LIBGCJ_JAR)" "CLASSPATH=" "LD_LIBRARY_PATH=" \ + "FREETYPE2_INC_DIR=$(FREETYPE2_INC_DIR)" $(am__append_1) # OpenJDK Source Preparation Targets # ================================== @@ -272,27 +280,20 @@ OPENJDK_SRC_ZIP_BASE = openjdk-7-ea-src- # Patch OpenJDK sources for plug replacements. @FAST_BUILD_TRUE at FAST_BUILD_PATCH = patches/icedtea-speed.patch -ICEDTEA_PATCHES = \ - patches/icedtea-copy-plugs.patch \ +ICEDTEA_PATCHES = patches/icedtea-copy-plugs.patch \ patches/icedtea-version.patch \ patches/icedtea-text-relocations.patch \ - patches/icedtea-graphics.patch \ - patches/icedtea-antialias.patch \ - patches/icedtea-paths.patch \ - patches/icedtea-debuginfo.patch \ - patches/icedtea-java.security.patch \ - patches/icedtea-ssl.patch \ + patches/icedtea-graphics.patch patches/icedtea-antialias.patch \ + patches/icedtea-paths.patch patches/icedtea-debuginfo.patch \ + patches/icedtea-java.security.patch patches/icedtea-ssl.patch \ patches/icedtea-assembler_amd64.patch \ patches/icedtea-license-headers.patch \ - patches/icedtea-libpng.patch \ - patches/icedtea-plugin.patch \ + patches/icedtea-libpng.patch patches/icedtea-plugin.patch \ patches/icedtea-rmi_amd64.patch \ patches/icedtea-lesstif_amd64.patch \ - patches/icedtea-tools.patch \ - patches/icedtea-certbundle.patch \ - patches/icedtea-demos.patch \ - $(FAST_BUILD_PATCH) - + patches/icedtea-tools.patch patches/icedtea-certbundle.patch \ + patches/icedtea-demos.patch $(FAST_BUILD_PATCH) \ + $(am__append_2) # Patch OpenJDK for plug replacements and ecj. ICEDTEA_ECJ_PATCH = patches/icedtea-ecj-bootstrap.patch @@ -831,7 +832,7 @@ icedtea: stamps/tools.stamp stamps/plugs stamps/patch.stamp gcjwebplugin.so $(MAKE) \ $(ICEDTEA_ENV) \ - -C openjdk/control/make + -C openjdk/control/make j2se_only cp -af gcjwebplugin.so \ openjdk/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ @@ -844,7 +845,7 @@ icedtea-debug: stamps/bootstrap-director $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk/control/make \ - debug_build + j2se_fastdebug_only cp -af gcjwebplugin.so \ openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ @@ -868,7 +869,7 @@ stamps/icedtea-ecj.stamp: stamps/tools.s stamps/extract-ecj.stamp stamps/patch-ecj.stamp $(MAKE) \ $(ICEDTEA_ENV_ECJ) \ - -C openjdk-ecj/control/make + -C openjdk-ecj/control/make j2se_only @echo "ecj-poured IcedTea is served:" \ openjdk-ecj/control/build/$(LINUX_DIR) mkdir -p stamps diff -r 3ce5b4fff04b -r 8b0be2eafb18 acinclude.m4 --- a/acinclude.m4 Wed Sep 12 16:44:45 2007 -0400 +++ b/acinclude.m4 Wed Sep 12 23:13:50 2007 +0200 @@ -528,3 +528,31 @@ AC_DEFUN([FIND_TOOL], fi AC_SUBST([$1]) ]) + + +AC_DEFUN([AC_CHECK_WITH_CACAO], +[ + AC_MSG_CHECKING(whether to use CACAO as VM) + AC_ARG_WITH([cacao], + [AS_HELP_STRING(--with-cacao,use CACAO as VM)], + [ + case "${withval}" in + yes) + CACAO=/usr/local/cacao + ;; + no) + CACAO=no + ;; + *) + CACAO=${withval} + ;; + esac + ], + [ + CACAO=no + ]) + + AC_MSG_RESULT(${CACAO}) + AM_CONDITIONAL(WITH_CACAO, test x"${CACAO}" != "xno") + AC_SUBST(CACAO) +]) diff -r 3ce5b4fff04b -r 8b0be2eafb18 configure --- a/configure Wed Sep 12 16:44:45 2007 -0400 +++ b/configure Wed Sep 12 23:13:50 2007 +0200 @@ -734,6 +734,9 @@ OPENJDK_SRC_DIR OPENJDK_SRC_DIR GNU_CLASSLIB_FOUND_TRUE GNU_CLASSLIB_FOUND_FALSE +WITH_CACAO_TRUE +WITH_CACAO_FALSE +CACAO FAST_BUILD_TRUE FAST_BUILD_FALSE CPP @@ -1372,6 +1375,7 @@ Optional Packages: --with-xerces2-jar specify location of the xerces2 jar --with-openjdk-src-zip specify the location of the openjdk source zip --with-openjdk-src-dir specify the location of the openjdk sources + --with-cacao use CACAO as VM Some influential environment variables: CC C compiler command @@ -6854,6 +6858,44 @@ fi + { echo "$as_me:$LINENO: checking whether to use CACAO as VM" >&5 +echo $ECHO_N "checking whether to use CACAO as VM... $ECHO_C" >&6; } + +# Check whether --with-cacao was given. +if test "${with_cacao+set}" = set; then + withval=$with_cacao; + case "${withval}" in + yes) + CACAO=/usr/local/cacao + ;; + no) + CACAO=no + ;; + *) + CACAO=${withval} + ;; + esac + +else + + CACAO=no + +fi + + + { echo "$as_me:$LINENO: result: ${CACAO}" >&5 +echo "${ECHO_T}${CACAO}" >&6; } + if test x"${CACAO}" != "xno"; then + WITH_CACAO_TRUE= + WITH_CACAO_FALSE='#' +else + WITH_CACAO_TRUE='#' + WITH_CACAO_FALSE= +fi + + + + # Check whether --enable-fast-build was given. if test "${enable_fast_build+set}" = set; then enableval=$enable_fast_build; @@ -9551,6 +9593,13 @@ if test -z "${GNU_CLASSLIB_FOUND_TRUE}" { { echo "$as_me:$LINENO: error: conditional \"GNU_CLASSLIB_FOUND\" was never defined. Usually this means the macro was only invoked conditionally." >&5 echo "$as_me: error: conditional \"GNU_CLASSLIB_FOUND\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${WITH_CACAO_TRUE}" && test -z "${WITH_CACAO_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"WITH_CACAO\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"WITH_CACAO\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi @@ -10245,6 +10294,9 @@ OPENJDK_SRC_DIR!$OPENJDK_SRC_DIR$ac_deli OPENJDK_SRC_DIR!$OPENJDK_SRC_DIR$ac_delim GNU_CLASSLIB_FOUND_TRUE!$GNU_CLASSLIB_FOUND_TRUE$ac_delim GNU_CLASSLIB_FOUND_FALSE!$GNU_CLASSLIB_FOUND_FALSE$ac_delim +WITH_CACAO_TRUE!$WITH_CACAO_TRUE$ac_delim +WITH_CACAO_FALSE!$WITH_CACAO_FALSE$ac_delim +CACAO!$CACAO$ac_delim FAST_BUILD_TRUE!$FAST_BUILD_TRUE$ac_delim FAST_BUILD_FALSE!$FAST_BUILD_FALSE$ac_delim CPP!$CPP$ac_delim @@ -10261,7 +10313,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 39; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -r 3ce5b4fff04b -r 8b0be2eafb18 configure.ac --- a/configure.ac Wed Sep 12 16:44:45 2007 -0400 +++ b/configure.ac Wed Sep 12 23:13:50 2007 +0200 @@ -82,6 +82,7 @@ FIND_FREETYPE FIND_FREETYPE WITH_OPENJDK_SRC_ZIP WITH_OPENJDK_SRC_DIR +AC_CHECK_WITH_CACAO ENABLE_FAST_BUILD CHECK_HEADERS diff -r 3ce5b4fff04b -r 8b0be2eafb18 patches/icedtea-cacao-Compiler-gcc-gmk.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-cacao-Compiler-gcc-gmk.patch Wed Sep 12 23:13:50 2007 +0200 @@ -0,0 +1,46 @@ +Index: j2se/make/common/shared/Compiler-gcc.gmk +=================================================================== +--- j2se/make/common/shared/Compiler-gcc.gmk (revision 250) ++++ openjdk/j2se/make/common/shared/Compiler-gcc.gmk (working copy) +@@ -75,22 +75,36 @@ ifeq ($(PLATFORM), linux) + REQUIRED_CC_VER = 4.0 + REQUIRED_GCC_VER = 4.0.* + else +- ifeq ($(ARCH_DATA_MODEL), 32) +- # i586 ++ ifeq ($(ARCH), alpha) ++ # alpha + REQUIRED_CC_VER = 3.2 +- REQUIRED_GCC_VER = 3.2.1* +- REQUIRED_GCC_VER_INT = 3.2.1-7a +- else ++ REQUIRED_GCC_VER = 3.2 ++ endif + ifeq ($(ARCH), amd64) + # amd64 + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.* + endif ++ ifeq ($(ARCH), i586) ++ # i586 ++ REQUIRED_CC_VER = 3.2 ++ REQUIRED_GCC_VER = 3.2.1* ++ REQUIRED_GCC_VER_INT = 3.2.1-7a ++ endif + ifeq ($(ARCH), ia64) + # ia64 + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 2.9[56789].* + endif ++ ifeq ($(ARCH), ppc) ++ # ppc ++ REQUIRED_CC_VER = 3.2 ++ REQUIRED_GCC_VER = 3.2 ++ endif ++ ifeq ($(ARCH), ppc64) ++ # ppc64 ++ REQUIRED_CC_VER = 3.2 ++ REQUIRED_GCC_VER = 3.2 + endif + endif + # Option used to create a shared library diff -r 3ce5b4fff04b -r 8b0be2eafb18 patches/icedtea-cacao-Defs-linux-gmk.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-cacao-Defs-linux-gmk.patch Wed Sep 12 23:13:50 2007 +0200 @@ -0,0 +1,13 @@ +Index: j2se/make/common/Defs-linux.gmk +=================================================================== +--- j2se/make/common/Defs-linux.gmk (revision 250) ++++ openjdk/j2se/make/common/Defs-linux.gmk (working copy) +@@ -215,7 +215,7 @@ endif + + EXTRA_LIBS += -lc + +-LDFLAGS_DEFS_OPTION = -z defs ++LDFLAGS_DEFS_OPTION = -Xlinker -z -Xlinker defs + LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) + + # diff -r 3ce5b4fff04b -r 8b0be2eafb18 patches/icedtea-cacao-Platform-gmk.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-cacao-Platform-gmk.patch Wed Sep 12 23:13:50 2007 +0200 @@ -0,0 +1,32 @@ +Index: j2se/make/common/shared/Platform.gmk +=================================================================== +--- j2se/make/common/shared/Platform.gmk (revision 250) ++++ openjdk/j2se/make/common/shared/Platform.gmk (working copy) +@@ -225,11 +225,25 @@ ifeq ($(SYSTEM_UNAME), Linux) + ARCH=sparcv9 + endif + else +- # i586 is 32-bit, amd64 is 64-bit + ifndef ARCH_DATA_MODEL ++ ifeq ($(ARCH), alpha) ++ # alpha is 64-bit ++ ARCH_DATA_MODEL=64 ++ endif ++ ifeq ($(ARCH), amd64) ++ # amd64 is 64-bit ++ ARCH_DATA_MODEL=64 ++ endif + ifeq ($(ARCH), i586) ++ # i586 is 32-bit + ARCH_DATA_MODEL=32 +- else ++ endif ++ ifeq ($(ARCH), ppc) ++ # ppc is 32-bit ++ ARCH_DATA_MODEL=32 ++ endif ++ ifeq ($(ARCH), ppc64) ++ # ppc64 is 64-bit + ARCH_DATA_MODEL=64 + endif + endif diff -r 3ce5b4fff04b -r 8b0be2eafb18 patches/icedtea-cacao-Program-gmk.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-cacao-Program-gmk.patch Wed Sep 12 23:13:50 2007 +0200 @@ -0,0 +1,13 @@ +Index: j2se/make/common/Program.gmk +=================================================================== +--- j2se/make/common/Program.gmk (revision 250) ++++ openjdk/j2se/make/common/Program.gmk (working copy) +@@ -85,7 +85,7 @@ ifneq (,$(findstring $(PLATFORM), linux + endif + endif + ifeq ($(PLATFORM), linux) +- LDFLAGS += -z origin ++ LDFLAGS += -Xlinker -z -Xlinker origin + LDFLAGS += -Wl,--allow-shlib-undefined + LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli + LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli diff -r 3ce5b4fff04b -r 8b0be2eafb18 patches/icedtea-cacao-java-c.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-cacao-java-c.patch Wed Sep 12 23:13:50 2007 +0200 @@ -0,0 +1,14 @@ +Index: j2se/src/share/bin/java.c +=================================================================== +--- j2se/src/share/bin/java.c (revision 250) ++++ openjdk/j2se/src/share/bin/java.c (working copy) +@@ -367,7 +367,8 @@ main(int argc, char ** argv) + args.classname = classname; + args.ifn = ifn; + +- return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret); ++/* return ContinueInNewThread(JavaMain, threadStackSize, (void*)&args, ret); */ From twisti at complang.tuwien.ac.at Wed Sep 12 13:53:48 2007 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Wed, 12 Sep 2007 20:53:48 +0000 Subject: changeset in /hg/icedtea: 2007-09-12 Christan Thalinger changeset aa0a4444e88d in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=aa0a4444e88d description: 2007-09-12 Christan Thalinger * Makefile.am (icedtea-debug): Added -debug to target directory, as found today by Andrew Haley. * Makefile.in: Likewise. diffstat: 3 files changed, 10 insertions(+), 4 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 4 ++-- Makefile.in | 4 ++-- diffs (43 lines): diff -r 1d24d15ad821 -r aa0a4444e88d ChangeLog --- a/ChangeLog Wed Sep 12 20:41:19 2007 +0200 +++ b/ChangeLog Wed Sep 12 22:53:29 2007 +0200 @@ -1,3 +1,9 @@ 2007-09-12 Christan Thalinger + + * Makefile.am (icedtea-debug): Added -debug to target directory, + as found today by Andrew Haley. + * Makefile.in: Likewise. + 2007-09-12 Christan Thalinger * .hgignore: Added *~. diff -r 1d24d15ad821 -r aa0a4444e88d Makefile.am --- a/Makefile.am Wed Sep 12 20:41:19 2007 +0200 +++ b/Makefile.am Wed Sep 12 22:53:29 2007 +0200 @@ -360,9 +360,9 @@ icedtea-debug: stamps/bootstrap-director -C openjdk/control/make \ debug_build cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + openjdk/control/build/$(LINUX_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) @echo "Debug-flavoured IcedTea is served:" \ openjdk/control/build/$(LINUX_DIR)-debug diff -r 1d24d15ad821 -r aa0a4444e88d Makefile.in --- a/Makefile.in Wed Sep 12 20:41:19 2007 +0200 +++ b/Makefile.in Wed Sep 12 22:53:29 2007 +0200 @@ -846,9 +846,9 @@ icedtea-debug: stamps/bootstrap-director -C openjdk/control/make \ debug_build cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + openjdk/control/build/$(LINUX_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) @echo "Debug-flavoured IcedTea is served:" \ openjdk/control/build/$(LINUX_DIR)-debug From langel at redhat.com Wed Sep 12 13:44:50 2007 From: langel at redhat.com (Lillian Angel) Date: Wed, 12 Sep 2007 20:44:50 +0000 Subject: changeset in /hg/icedtea: Dummy commit to test branches Message-ID: changeset 3ce5b4fff04b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3ce5b4fff04b description: Dummy commit to test branches diffstat: 3 files changed, 5 insertions(+), 5 deletions(-) ChangeLog | 2 +- Makefile.am | 4 ++-- Makefile.in | 4 ++-- diffs (42 lines): diff -r 9600595967d8 -r 3ce5b4fff04b ChangeLog --- a/ChangeLog Wed Sep 12 22:31:23 2007 +0200 +++ b/ChangeLog Wed Sep 12 16:44:45 2007 -0400 @@ -15,7 +15,7 @@ 2007-09-12 Lillian Angel diff -r 9600595967d8 -r 3ce5b4fff04b Makefile.am --- a/Makefile.am Wed Sep 12 22:31:23 2007 +0200 +++ b/Makefile.am Wed Sep 12 16:44:45 2007 -0400 @@ -360,9 +360,9 @@ icedtea-debug: stamps/bootstrap-director -C openjdk/control/make \ debug_build cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + openjdk/control/build/$(LINUX_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) @echo "Debug-flavoured IcedTea is served:" \ openjdk/control/build/$(LINUX_DIR)-debug diff -r 9600595967d8 -r 3ce5b4fff04b Makefile.in --- a/Makefile.in Wed Sep 12 22:31:23 2007 +0200 +++ b/Makefile.in Wed Sep 12 16:44:45 2007 -0400 @@ -846,9 +846,9 @@ icedtea-debug: stamps/bootstrap-director -C openjdk/control/make \ debug_build cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ - openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + openjdk/control/build/$(LINUX_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) @echo "Debug-flavoured IcedTea is served:" \ openjdk/control/build/$(LINUX_DIR)-debug From twisti at complang.tuwien.ac.at Wed Sep 12 13:41:10 2007 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Wed, 12 Sep 2007 20:41:10 +0000 Subject: changeset in /hg/icedtea: 2007-09-12 Christan Thalinger changeset 9600595967d8 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9600595967d8 description: 2007-09-12 Christan Thalinger * README.cacao: New file. diffstat: 2 files changed, 8 insertions(+) ChangeLog | 4 ++++ README.cacao | 4 ++++ diffs (19 lines): diff -r 1d24d15ad821 -r 9600595967d8 ChangeLog --- a/ChangeLog Wed Sep 12 20:41:19 2007 +0200 +++ b/ChangeLog Wed Sep 12 22:31:23 2007 +0200 @@ -1,3 +1,7 @@ 2007-09-12 Christan Thalinger + + * README.cacao: New file. + 2007-09-12 Christan Thalinger * .hgignore: Added *~. diff -r 1d24d15ad821 -r 9600595967d8 README.cacao --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README.cacao Wed Sep 12 22:31:23 2007 +0200 @@ -0,0 +1,4 @@ +IcedTea with CACAO as VM +======================== + +TODO From langel at redhat.com Wed Sep 12 21:15:46 2007 From: langel at redhat.com (Lillian Angel) Date: Thu, 13 Sep 2007 04:15:46 +0000 Subject: changeset in /hg/icedtea: 2007-09-13 Lillian Angel changeset d312ad01f249 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d312ad01f249 description: 2007-09-13 Lillian Angel * Makefile.am: Fixed target typo. * Makefile.in: Regenerated. diffstat: 3 files changed, 7 insertions(+), 2 deletions(-) ChangeLog | 5 +++++ Makefile.am | 2 +- Makefile.in | 2 +- diffs (36 lines): diff -r aa0a4444e88d -r d312ad01f249 ChangeLog --- a/ChangeLog Wed Sep 12 22:53:29 2007 +0200 +++ b/ChangeLog Thu Sep 13 00:15:40 2007 -0400 @@ -1,3 +1,8 @@ 2007-09-12 Christan Thalinger + + * Makefile.am: Fixed target typo. + * Makefile.in: Regenerated. + 2007-09-12 Christan Thalinger * Makefile.am (icedtea-debug): Added -debug to target directory, diff -r aa0a4444e88d -r d312ad01f249 Makefile.am --- a/Makefile.am Wed Sep 12 22:53:29 2007 +0200 +++ b/Makefile.am Thu Sep 13 00:15:40 2007 -0400 @@ -608,7 +608,7 @@ extract: stamps/extract.stamp icedtea-against-ecj: stamps/icedtea-against-ecj.stamp -icedtea-ecj: stamps/icedtea-ecj +icedtea-ecj: stamps/icedtea-ecj.stamp jce-class-files: stamps/jce-class-files.stamp diff -r aa0a4444e88d -r d312ad01f249 Makefile.in --- a/Makefile.in Wed Sep 12 22:53:29 2007 +0200 +++ b/Makefile.in Thu Sep 13 00:15:40 2007 -0400 @@ -1063,7 +1063,7 @@ extract: stamps/extract.stamp icedtea-against-ecj: stamps/icedtea-against-ecj.stamp -icedtea-ecj: stamps/icedtea-ecj +icedtea-ecj: stamps/icedtea-ecj.stamp jce-class-files: stamps/jce-class-files.stamp From twisti at complang.tuwien.ac.at Thu Sep 13 02:52:33 2007 From: twisti at complang.tuwien.ac.at (Christian Thalinger) Date: Thu, 13 Sep 2007 09:52:33 +0000 Subject: changeset in /hg/icedtea: 2007-09-13 Christan Thalinger changeset 2698d7b2eed8 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=2698d7b2eed8 description: 2007-09-13 Christan Thalinger * patches/icedtea-cacao-instrument-Makefile.patch: New file. diffstat: 2 files changed, 17 insertions(+) ChangeLog | 4 ++++ patches/icedtea-cacao-instrument-Makefile.patch | 13 +++++++++++++ diffs (28 lines): diff -r 8b0be2eafb18 -r 2698d7b2eed8 ChangeLog --- a/ChangeLog Wed Sep 12 23:13:50 2007 +0200 +++ b/ChangeLog Thu Sep 13 11:52:25 2007 +0200 @@ -1,3 +1,7 @@ 2007-09-12 Christan Thalinger + + * patches/icedtea-cacao-instrument-Makefile.patch: New file. + 2007-09-12 Christan Thalinger * Makefile.am: Added WITH_CACAO stuff. diff -r 8b0be2eafb18 -r 2698d7b2eed8 patches/icedtea-cacao-instrument-Makefile.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-cacao-instrument-Makefile.patch Thu Sep 13 11:52:25 2007 +0200 @@ -0,0 +1,13 @@ +Index: j2se/make/java/instrument/Makefile +=================================================================== +--- j2se/make/java/instrument/Makefile (revision 250) ++++ openjdk/j2se/make/java/instrument/Makefile (working copy) +@@ -109,7 +109,7 @@ else + LDFLAGS += -R \$$ORIGIN/jli + endif + ifeq ($(PLATFORM), linux) +- LDFLAGS += -z origin ++ LDFLAGS += -Xlinker -z -Xlinker origin + LDFLAGS += -Wl,--allow-shlib-undefined + LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli + endif From aph at redhat.com Thu Sep 13 05:23:46 2007 From: aph at redhat.com (Andrew Haley) Date: Thu, 13 Sep 2007 13:23:46 +0100 Subject: Make icedtea-debug work again Message-ID: <18153.11218.2727.440971@zebedee.pink> This fixes the icedtea-debug target. I think the only thing wrong was the dependencies: we were depending on stamps/bootstrap-directory-symlink-ecj.stamp instead of stamps/bootstrap-directory-symlink.stamp, so we were trying to build openjdk with ecj, but without the necessary ecj patches. I'm still testing this. Andrew. 2007-09-13 Andrew Haley * Makefile.am (icedtea-debug): Correct dependencies. diff -r d312ad01f249 Makefile.am --- a/Makefile.am Thu Sep 13 00:15:40 2007 -0400 +++ b/Makefile.am Thu Sep 13 14:16:26 2007 +0100 @@ -341,6 +341,8 @@ else MEMORY_LIMIT = endif +# If you change anything here in the icedtea target, please make sure +# you change it in the icedtea-debug target as well. icedtea: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \ stamps/patch.stamp gcjwebplugin.so $(MAKE) \ @@ -352,8 +354,8 @@ icedtea: stamps/tools.stamp stamps/plugs openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) @echo "IcedTea is served:" openjdk/control/build/$(LINUX_DIR) -icedtea-debug: stamps/bootstrap-directory-symlink-ecj.stamp stamps/tools.stamp \ - stamps/plugs.stamp stamps/extract.stamp \ +icedtea-debug: stamps/bootstrap-directory-symlink.stamp \ + stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \ stamps/patch.stamp gcjwebplugin.so $(MAKE) \ $(ICEDTEA_ENV) \ @@ -363,7 +365,7 @@ icedtea-debug: stamps/bootstrap-director openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ openjdk/control/build/$(LINUX_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) - @echo "Debug-flavoured IcedTea is served:" \ + @echo "IcedTea (debug build) is served:" \ openjdk/control/build/$(LINUX_DIR)-debug clean-icedtea: stamps/extract.stamp -- Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, UK Registered in England and Wales No. 3798903 From aph at redhat.com Thu Sep 13 06:14:55 2007 From: aph at redhat.com (Andrew Haley) Date: Thu, 13 Sep 2007 13:14:55 +0000 Subject: changeset in /hg/icedtea: 2007-09-13 Andrew Haley changeset 9cd798d1956b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9cd798d1956b description: 2007-09-13 Andrew Haley * Makefile.am (icedtea-debug): Correct dependencies. diffstat: 3 files changed, 14 insertions(+), 6 deletions(-) ChangeLog | 4 ++++ Makefile.am | 8 +++++--- Makefile.in | 8 +++++--- diffs (75 lines): diff -r d312ad01f249 -r 9cd798d1956b ChangeLog --- a/ChangeLog Thu Sep 13 00:15:40 2007 -0400 +++ b/ChangeLog Thu Sep 13 15:11:28 2007 +0100 @@ -1,3 +1,7 @@ 2007-09-13 Lillian Angel + + * Makefile.am (icedtea-debug): Correct dependencies. + 2007-09-13 Lillian Angel * Makefile.am: Fixed target typo. diff -r d312ad01f249 -r 9cd798d1956b Makefile.am --- a/Makefile.am Thu Sep 13 00:15:40 2007 -0400 +++ b/Makefile.am Thu Sep 13 15:11:28 2007 +0100 @@ -341,6 +341,8 @@ else MEMORY_LIMIT = endif +# If you change anything here in the icedtea target, please make sure +# you change it in the icedtea-debug target as well. icedtea: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \ stamps/patch.stamp gcjwebplugin.so $(MAKE) \ @@ -352,8 +354,8 @@ icedtea: stamps/tools.stamp stamps/plugs openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) @echo "IcedTea is served:" openjdk/control/build/$(LINUX_DIR) -icedtea-debug: stamps/bootstrap-directory-symlink-ecj.stamp stamps/tools.stamp \ - stamps/plugs.stamp stamps/extract.stamp \ +icedtea-debug: stamps/bootstrap-directory-symlink.stamp \ + stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \ stamps/patch.stamp gcjwebplugin.so $(MAKE) \ $(ICEDTEA_ENV) \ @@ -363,7 +365,7 @@ icedtea-debug: stamps/bootstrap-director openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ openjdk/control/build/$(LINUX_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) - @echo "Debug-flavoured IcedTea is served:" \ + @echo "IcedTea (debug build) is served:" \ openjdk/control/build/$(LINUX_DIR)-debug clean-icedtea: stamps/extract.stamp diff -r d312ad01f249 -r 9cd798d1956b Makefile.in --- a/Makefile.in Thu Sep 13 00:15:40 2007 -0400 +++ b/Makefile.in Thu Sep 13 15:11:28 2007 +0100 @@ -827,6 +827,8 @@ clean-bootstrap-directory-symlink-ecj: rm -f stamps/bootstrap-directory-symlink-ecj.stamp rm -f bootstrap/jdk1.6.0 +# If you change anything here in the icedtea target, please make sure +# you change it in the icedtea-debug target as well. icedtea: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \ stamps/patch.stamp gcjwebplugin.so $(MAKE) \ @@ -838,8 +840,8 @@ icedtea: stamps/tools.stamp stamps/plugs openjdk/control/build/$(LINUX_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) @echo "IcedTea is served:" openjdk/control/build/$(LINUX_DIR) -icedtea-debug: stamps/bootstrap-directory-symlink-ecj.stamp stamps/tools.stamp \ - stamps/plugs.stamp stamps/extract.stamp \ +icedtea-debug: stamps/bootstrap-directory-symlink.stamp \ + stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \ stamps/patch.stamp gcjwebplugin.so $(MAKE) \ $(ICEDTEA_ENV) \ @@ -849,7 +851,7 @@ icedtea-debug: stamps/bootstrap-director openjdk/control/build/$(LINUX_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) cp -af gcjwebplugin.so \ openjdk/control/build/$(LINUX_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR) - @echo "Debug-flavoured IcedTea is served:" \ + @echo "IcedTea (debug build) is served:" \ openjdk/control/build/$(LINUX_DIR)-debug clean-icedtea: stamps/extract.stamp From langel at redhat.com Thu Sep 13 09:09:36 2007 From: langel at redhat.com (Lillian Angel) Date: Thu, 13 Sep 2007 16:09:36 +0000 Subject: changeset in /hg/icedtea: 2007-09-13 Lillian Angel changeset e809ab08a3b4 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e809ab08a3b4 description: 2007-09-13 Lillian Angel * Makefile.am: Added JRE_RELEASE_VERSION and HOTSPOT_RELEASE_VERSION to environment. Removed BUILD_NUMBER. * Makefile.in: Regenerated diffstat: 3 files changed, 14 insertions(+), 4 deletions(-) ChangeLog | 6 ++++++ Makefile.am | 6 ++++-- Makefile.in | 6 ++++-- diffs (59 lines): diff -r 9cd798d1956b -r e809ab08a3b4 ChangeLog --- a/ChangeLog Thu Sep 13 15:11:28 2007 +0100 +++ b/ChangeLog Thu Sep 13 12:09:30 2007 -0400 @@ -1,3 +1,9 @@ 2007-09-13 Andrew Haley + + * Makefile.am: Added JRE_RELEASE_VERSION and + HOTSPOT_RELEASE_VERSION to environment. Removed BUILD_NUMBER. + * Makefile.in: Regenerated + 2007-09-13 Andrew Haley * Makefile.am (icedtea-debug): Correct dependencies. diff -r 9cd798d1956b -r e809ab08a3b4 Makefile.am --- a/Makefile.am Thu Sep 13 15:11:28 2007 +0100 +++ b/Makefile.am Thu Sep 13 12:09:30 2007 -0400 @@ -44,7 +44,8 @@ ICEDTEA_ENDORSED_DIR = \ ICEDTEA_ENDORSED_DIR = \ $(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed ICEDTEA_ENV = \ - "BUILD_NUMBER=b19" \ + "JRE_RELEASE_VERSION=1.7.0-b19" \ + "HOTSPOT_RELEASE_VERSION=1.7.0-b19" \ "LANG=C" \ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ @@ -72,7 +73,8 @@ ICEDTEA_CLS_DIR_ECJ = \ ICEDTEA_CLS_DIR_ECJ = \ $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes ICEDTEA_ENV_ECJ = \ - "BUILD_NUMBER=b19" \ + "JRE_RELEASE_VERSION=1.7.0-b19" \ + "HOTSPOT_RELEASE_VERSION=1.7.0-b19" \ "LANG=C" \ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ diff -r 9cd798d1956b -r e809ab08a3b4 Makefile.in --- a/Makefile.in Thu Sep 13 15:11:28 2007 +0100 +++ b/Makefile.in Thu Sep 13 12:09:30 2007 -0400 @@ -210,7 +210,8 @@ ICEDTEA_ENDORSED_DIR = \ $(abs_top_srcdir)/bootstrap/jdk1.6.0/lib/endorsed ICEDTEA_ENV = \ - "BUILD_NUMBER=b19" \ + "JRE_RELEASE_VERSION=1.7.0-b19" \ + "HOTSPOT_RELEASE_VERSION=1.7.0-b19" \ "LANG=C" \ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ @@ -238,7 +239,8 @@ ICEDTEA_CLS_DIR_ECJ = \ $(abs_top_srcdir)/openjdk-ecj/control/build/$(LINUX_DIR)/classes ICEDTEA_ENV_ECJ = \ - "BUILD_NUMBER=b19" \ + "JRE_RELEASE_VERSION=1.7.0-b19" \ + "HOTSPOT_RELEASE_VERSION=1.7.0-b19" \ "LANG=C" \ "PATH=/usr/bin:/bin:/usr/sbin:/sbin" \ "ALT_BOOTDIR=$(abs_top_srcdir)/bootstrap/jdk1.6.0" \ From GNUtoo at no-log.org Thu Sep 13 13:40:14 2007 From: GNUtoo at no-log.org (GNUtoo at no-log.org) Date: Thu, 13 Sep 2007 22:40:14 +0200 (CEST) Subject: ALT_BOOTDIR problem for gentoo Message-ID: <36864.AQdWDl5SDH8=.1189716014.squirrel@webmail.no-log.org> hello, I am trying to make a gentoo ebuild for icedtea An ebuild is a little bit like bash scripts for installing configurating compiling and installing the program The problem with the ebuilds is that the variables inside the makefile doesn't get exported or unset...so you have to unset or export them in the ebuild so here's the problem...compiling it manualy following the howto for gentoo works... but within the ebuild i have a problem with the variable ALT_BOOTDIR i've set the variable : ALT_BOOTDIR="${WORKDIR}/${PN}/bootstrap/jdk1.6.0" ${WORKDIR}/${PN} are the locations of the sources it says that: RROR: Your BOOTDIR environment variable does not point to a valid JDK for bootstrapping this build. A JDK 7 build must be bootstrapped using JDK 1.5.0 fcs (or later). Apparently, your bootstrap JDK is version 1.4 Please update your ALT_BOOTDIR setting and start your build what should i do? i do not undestand well the process of bootstraping...(the compilers it uses and similar like gcc->gcj->ecj->icedtea) From harpal.grover at gmail.com Thu Sep 13 15:26:40 2007 From: harpal.grover at gmail.com (Harpal Grover) Date: Thu, 13 Sep 2007 18:26:40 -0400 Subject: IcedTea for Windows anyone? Message-ID: <1e76f07c0709131526i46d05937la063f081d2a7eb03@mail.gmail.com> Are there any plans to create a build for Windows XP and/or Vista? If not, but some of you know how to go about it, could you please help steer me in the right direction to get started? Or does IcedTea come with cross-compiling capabilities? I think it would be awesome to have this available for Windows as it would definitely convert the .NET developers looking for the capability to code with the latest JDK, yet compile into native executables... Thanks! -- Harpal Grover President Harpal Grover Consulting Inc -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20070913/27a3c342/attachment.html From matthew.flaschen at gatech.edu Thu Sep 13 17:10:41 2007 From: matthew.flaschen at gatech.edu (Matthew Flaschen) Date: Thu, 13 Sep 2007 20:10:41 -0400 Subject: pluginappletviewer location/installation Message-ID: <46E9D181.5010808@gatech.edu> I use the IcedTea version of gcjwebplugin by symlinking it to my ~/.plugins. By default, this will give an error like: gcjwebplugin error: Failed to run /home/user/IcedTea/hg/../../bin/pluginappletviewer. For more detail rerun "firefox -g" in a terminal window. This is because line 1530 of gcjwebplugin.cc says: appletviewer_executable = g_strdup_printf ("%s/../../bin/pluginappletviewer", As a workaround, I created a bin symlink to IcedTea/hg/openjdk/control/build/linux-i586/bin two directories above the hg directory (where gcjwebplugin.so is). So now, hg/gcjwebplugin.so can find hg/../../bin, which goes to hg/openjdk/control/build/linux-i586/bin But this doesn't make much sense. One option is to hard-code the correct path (openjdk/control/build/linux-i586/bin), but that's not a good long-term option either. Can someone think of a solution that isn't a hack? Perhaps it's time for an install target. Matt Flaschen From mjw at icedtea.classpath.org Thu Sep 13 15:44:18 2007 From: mjw at icedtea.classpath.org (Mark Wielaard) Date: Thu, 13 Sep 2007 22:44:18 +0000 Subject: openjdk: [svn] Load openjdk/jdk7/b20 into jdk/trunk. Message-ID: changeset: 8:37f131a4a8e7 branch: trunk tag: tip user: xiomara date: Thu Sep 13 22:27:49 2007 +0000 files: control/make/Makefile control/make/common/Defs.gmk control/make/control-rules.gmk control/make/deploy-rules.gmk control/make/hotspot-rules.gmk control/make/install-rules.gmk control/make/j2se-rules.gmk control/make/jprt.config control/make/langtools-rules.gmk control/make/motif-rules.gmk control/make/sanity-rules.gmk control/make/sponsors-rules.gmk hotspot/agent/make/Makefile hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java hotspot/build/linux/Makefile hotspot/build/linux/makefiles/gcc.make hotspot/build/linux/makefiles/jvmti.make hotspot/build/linux/makefiles/sa.make hotspot/build/solaris/Makefile hotspot/build/solaris/makefiles/fastdebug.make hotspot/build/solaris/makefiles/gcc.make hotspot/build/solaris/makefiles/jvmti.make hotspot/build/solaris/makefiles/sa.make hotspot/build/windows/build.make hotspot/build/windows/makefiles/jvmti.make hotspot/build/windows/makefiles/sa.make hotspot/build/windows/makefiles/vm.make hotspot/make/defs.make hotspot/make/hotspot_version hotspot/src/cpu/amd64/vm/bytecodeInterpreter_amd64.cpp hotspot/src/cpu/amd64/vm/bytecodeInterpreter_amd64.hpp hotspot/src/cpu/amd64/vm/bytecodeInterpreter_amd64.inline.hpp hotspot/src/cpu/amd64/vm/c2_globals_amd64.hpp hotspot/src/cpu/amd64/vm/cInterpreter_amd64.hpp hotspot/src/cpu/amd64/vm/cInterpreter_amd64.inline.hpp hotspot/src/cpu/amd64/vm/cppInterpreterGenerator_amd64.hpp hotspot/src/cpu/amd64/vm/cppInterpreter_amd64.cpp hotspot/src/cpu/amd64/vm/cppInterpreter_amd64.hpp hotspot/src/cpu/amd64/vm/interpreterGenerator_amd64.hpp hotspot/src/cpu/amd64/vm/interpreterRT_amd64.cpp hotspot/src/cpu/amd64/vm/interpreter_amd64.cpp hotspot/src/cpu/amd64/vm/interpreter_amd64.hpp hotspot/src/cpu/amd64/vm/sharedRuntime_amd64.cpp hotspot/src/cpu/amd64/vm/templateInterpreterGenerator_amd64.hpp hotspot/src/cpu/amd64/vm/templateInterpreter_amd64.cpp hotspot/src/cpu/amd64/vm/templateInterpreter_amd64.hpp hotspot/src/cpu/i486/vm/assembler_i486.cpp hotspot/src/cpu/i486/vm/assembler_i486.hpp hotspot/src/cpu/i486/vm/bytecodeInterpreter_i486.cpp hotspot/src/cpu/i486/vm/bytecodeInterpreter_i486.hpp hotspot/src/cpu/i486/vm/bytecodeInterpreter_i486.inline.hpp hotspot/src/cpu/i486/vm/c1_globals_i486.hpp hotspot/src/cpu/i486/vm/c2_globals_i486.hpp hotspot/src/cpu/i486/vm/cInterpreter_i486.hpp hotspot/src/cpu/i486/vm/cInterpreter_i486.inline.hpp hotspot/src/cpu/i486/vm/cppInterpreterGenerator_i486.hpp hotspot/src/cpu/i486/vm/cppInterpreter_i486.cpp hotspot/src/cpu/i486/vm/cppInterpreter_i486.hpp hotspot/src/cpu/i486/vm/frame_i486.cpp hotspot/src/cpu/i486/vm/frame_i486.hpp hotspot/src/cpu/i486/vm/frame_i486.inline.hpp hotspot/src/cpu/i486/vm/interp_masm_i486.cpp hotspot/src/cpu/i486/vm/interp_masm_i486.hpp hotspot/src/cpu/i486/vm/interpreterGenerator_i486.hpp hotspot/src/cpu/i486/vm/interpreterRT_i486.cpp hotspot/src/cpu/i486/vm/interpreter_i486.cpp hotspot/src/cpu/i486/vm/interpreter_i486.hpp hotspot/src/cpu/i486/vm/javaFrameAnchor_i486.hpp hotspot/src/cpu/i486/vm/sharedRuntime_i486.cpp hotspot/src/cpu/i486/vm/templateInterpreterGenerator_i486.hpp hotspot/src/cpu/i486/vm/templateInterpreter_i486.cpp hotspot/src/cpu/i486/vm/templateInterpreter_i486.hpp hotspot/src/cpu/i486/vm/templateTable_i486.cpp hotspot/src/cpu/sparc/vm/assembler_sparc.cpp hotspot/src/cpu/sparc/vm/assembler_sparc.hpp hotspot/src/cpu/sparc/vm/bytecodeInterpreter_sparc.cpp hotspot/src/cpu/sparc/vm/bytecodeInterpreter_sparc.hpp hotspot/src/cpu/sparc/vm/bytecodeInterpreter_sparc.inline.hpp hotspot/src/cpu/sparc/vm/c1_globals_sparc.hpp hotspot/src/cpu/sparc/vm/c2_globals_sparc.hpp hotspot/src/cpu/sparc/vm/cInterpreter_sparc.hpp hotspot/src/cpu/sparc/vm/cInterpreter_sparc.inline.hpp hotspot/src/cpu/sparc/vm/cppInterpreterGenerator_sparc.hpp hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.hpp hotspot/src/cpu/sparc/vm/frame_sparc.cpp hotspot/src/cpu/sparc/vm/frame_sparc.hpp hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp hotspot/src/cpu/sparc/vm/interp_masm_sparc.hpp hotspot/src/cpu/sparc/vm/interpreterGenerator_sparc.hpp hotspot/src/cpu/sparc/vm/interpreterRT_sparc.cpp hotspot/src/cpu/sparc/vm/interpreter_sparc.cpp hotspot/src/cpu/sparc/vm/interpreter_sparc.hpp hotspot/src/cpu/sparc/vm/javaFrameAnchor_sparc.hpp hotspot/src/cpu/sparc/vm/register_definitions_sparc.cpp hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp hotspot/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.hpp hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.hpp hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp hotspot/src/os/solaris/vm/hpi_solaris.cpp hotspot/src/os/solaris/vm/hpi_solaris.hpp hotspot/src/os/solaris/vm/os_solaris.cpp hotspot/src/os_cpu/solaris_i486/vm/globals_solaris_i486.hpp hotspot/src/os_cpu/solaris_i486/vm/os_solaris_i486.cpp hotspot/src/os_cpu/solaris_i486/vm/solaris_i486.ad hotspot/src/share/tools/MakeDeps/Platform.java hotspot/src/share/vm/ci/ciField.cpp hotspot/src/share/vm/ci/ciMethod.cpp hotspot/src/share/vm/classfile/javaClasses.cpp hotspot/src/share/vm/classfile/systemDictionary.cpp hotspot/src/share/vm/code/codeCache.cpp hotspot/src/share/vm/code/codeCache.hpp hotspot/src/share/vm/code/dependencies.cpp hotspot/src/share/vm/code/dependencies.hpp hotspot/src/share/vm/code/nmethod.cpp hotspot/src/share/vm/code/nmethod.hpp hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentGCThread.hpp hotspot/src/share/vm/gc_implementation/parNew/vmStructs_parNew.hpp hotspot/src/share/vm/includeDB_compiler1 hotspot/src/share/vm/includeDB_compiler2 hotspot/src/share/vm/includeDB_core hotspot/src/share/vm/includeDB_features hotspot/src/share/vm/interpreter/abstractInterpreter.hpp hotspot/src/share/vm/interpreter/bytecodeHistogram.hpp hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xml hotspot/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xsl hotspot/src/share/vm/interpreter/cInterpretMethod.hpp hotspot/src/share/vm/interpreter/cInterpreter.cpp hotspot/src/share/vm/interpreter/cInterpreter.hpp hotspot/src/share/vm/interpreter/cInterpreter.inline.hpp hotspot/src/share/vm/interpreter/cppInterpreter.cpp hotspot/src/share/vm/interpreter/cppInterpreter.hpp hotspot/src/share/vm/interpreter/cppInterpreterGenerator.hpp hotspot/src/share/vm/interpreter/interpreter.cpp hotspot/src/share/vm/interpreter/interpreter.hpp hotspot/src/share/vm/interpreter/interpreterGenerator.hpp hotspot/src/share/vm/interpreter/interpreterRuntime.cpp hotspot/src/share/vm/interpreter/invocationCounter.hpp hotspot/src/share/vm/interpreter/rewriter.cpp hotspot/src/share/vm/interpreter/templateInterpreter.cpp hotspot/src/share/vm/interpreter/templateInterpreter.hpp hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp hotspot/src/share/vm/memory/cardTableModRefBS.hpp hotspot/src/share/vm/memory/universe.cpp hotspot/src/share/vm/oops/constMethodKlass.cpp hotspot/src/share/vm/oops/constantPoolOop.hpp hotspot/src/share/vm/oops/instanceKlass.cpp hotspot/src/share/vm/oops/instanceKlass.hpp hotspot/src/share/vm/oops/methodDataOop.hpp hotspot/src/share/vm/oops/methodOop.cpp hotspot/src/share/vm/oops/methodOop.hpp hotspot/src/share/vm/prims/jniCheck.cpp hotspot/src/share/vm/prims/jvmtiEventController.cpp hotspot/src/share/vm/runtime/arguments.cpp hotspot/src/share/vm/runtime/arguments.hpp hotspot/src/share/vm/runtime/deoptimization.cpp hotspot/src/share/vm/runtime/frame.cpp hotspot/src/share/vm/runtime/frame.hpp hotspot/src/share/vm/runtime/globals.hpp hotspot/src/share/vm/runtime/init.cpp hotspot/src/share/vm/runtime/javaFrameAnchor.hpp hotspot/src/share/vm/runtime/os.cpp hotspot/src/share/vm/runtime/safepoint.cpp hotspot/src/share/vm/runtime/safepoint.hpp hotspot/src/share/vm/runtime/sharedRuntime.hpp hotspot/src/share/vm/runtime/thread.cpp hotspot/src/share/vm/runtime/vframe.cpp hotspot/src/share/vm/runtime/vframeArray.cpp hotspot/src/share/vm/runtime/vmThread.cpp hotspot/src/share/vm/services/management.cpp hotspot/src/share/vm/utilities/copy.cpp hotspot/src/share/vm/utilities/macros.hpp j2se/make/Makefile j2se/make/com/sun/Makefile j2se/make/com/sun/corba/se/impl/activation/orbd/Makefile j2se/make/com/sun/corba/se/impl/activation/servertool/Makefile j2se/make/com/sun/corba/se/impl/naming/cosnaming/Makefile j2se/make/com/sun/corba/se/rmi/Makefile j2se/make/com/sun/corba/se/rmi/rmic/Makefile j2se/make/com/sun/corba/se/sources/Makefile j2se/make/com/sun/extcheck/Makefile j2se/make/com/sun/inputmethods/indicim/Makefile j2se/make/com/sun/inputmethods/thaiim/Makefile j2se/make/com/sun/java/pack/Makefile j2se/make/com/sun/java/pack/launcher/Makefile j2se/make/com/sun/java2d/Makefile j2se/make/com/sun/java_cup/Makefile j2se/make/com/sun/javah/Makefile j2se/make/com/sun/jmx/snmp/Makefile j2se/make/com/sun/org/apache/bcel/Makefile j2se/make/com/sun/org/apache/regexp/Makefile j2se/make/com/sun/org/apache/xalan/Makefile j2se/make/com/sun/org/apache/xalan/internal/other/Makefile j2se/make/com/sun/org/apache/xalan/internal/xsltc/Makefile j2se/make/com/sun/org/apache/xerces/Makefile j2se/make/com/sun/org/apache/xerces/internal/dom/Makefile j2se/make/com/sun/org/apache/xerces/internal/impl/Makefile j2se/make/com/sun/org/apache/xerces/internal/jaxp/Makefile j2se/make/com/sun/org/apache/xerces/internal/parsers/Makefile j2se/make/com/sun/org/apache/xerces/internal/util/Makefile j2se/make/com/sun/org/apache/xerces/internal/xinclude/Makefile j2se/make/com/sun/org/apache/xerces/internal/xni/Makefile j2se/make/com/sun/org/apache/xerces/internal/xs/Makefile j2se/make/com/sun/org/apache/xml/Makefile j2se/make/com/sun/org/apache/xpath/Makefile j2se/make/com/sun/rowset/Makefile j2se/make/com/sun/security/auth/Makefile j2se/make/com/sun/security/auth/module/Makefile j2se/make/com/sun/tools/Makefile j2se/make/com/sun/tools/doclets/Makefile j2se/make/com/sun/xml/Makefile j2se/make/common/BinaryPlugs.gmk j2se/make/common/BuildToolJar.gmk j2se/make/common/Defs-linux.gmk j2se/make/common/Defs-solaris.gmk j2se/make/common/Defs-windows.gmk j2se/make/common/Defs.gmk j2se/make/common/Demo.gmk j2se/make/common/NativeCompileRules.gmk j2se/make/common/Release.gmk j2se/make/common/Resources.gmk j2se/make/common/Rules.gmk j2se/make/common/Sanity.gmk j2se/make/common/internal/BinaryPlugs.gmk j2se/make/common/internal/ImportComponents.gmk j2se/make/common/internal/NativeCompileRules.gmk j2se/make/common/internal/Resources.gmk j2se/make/common/shared/Compiler-msvc.gmk j2se/make/common/shared/Defs-java.gmk j2se/make/common/shared/Defs-linux.gmk j2se/make/common/shared/Defs-solaris.gmk j2se/make/common/shared/Defs-utils.gmk j2se/make/common/shared/Defs-windows.gmk j2se/make/common/shared/Defs.gmk j2se/make/common/shared/Platform.gmk j2se/make/common/shared/Sanity-Settings.gmk j2se/make/common/shared/Sanity.gmk j2se/make/docs/CORE_PKGS.gmk j2se/make/docs/Makefile j2se/make/docs/NON_CORE_PKGS.gmk j2se/make/java/Makefile j2se/make/java/awt/Makefile j2se/make/java/hpi/hpi_common.gmk j2se/make/java/java/Makefile j2se/make/java/java/localegen.sh j2se/make/java/java/localelist.sh j2se/make/java/java/reflect/Makefile j2se/make/java/java_hprof_demo/Makefile j2se/make/java/javac/Makefile j2se/make/java/javah/Makefile j2se/make/java/logging/Makefile j2se/make/java/management/Makefile j2se/make/java/net/Makefile j2se/make/java/nio/Makefile j2se/make/java/nio/genCharsetProvider.sh j2se/make/java/redist/Makefile j2se/make/java/sun_nio/Makefile j2se/make/java/text/Makefile j2se/make/java/zip/Makefile j2se/make/javax/accessibility/Makefile j2se/make/javax/imageio/Makefile j2se/make/javax/print/Makefile j2se/make/javax/sound/FILES_c.gmk j2se/make/javax/sound/Makefile j2se/make/javax/sound/SoundDefs.gmk j2se/make/javax/sound/jsoundalsa/Makefile j2se/make/javax/sound/jsoundalsa/mapfile-vers j2se/make/javax/sound/jsoundds/Makefile j2se/make/javax/sound/jsoundhs/FILES.gmk j2se/make/javax/sound/jsoundhs/Makefile j2se/make/javax/sound/jsoundhs/mapfile-vers j2se/make/javax/sound/mapfile-vers j2se/make/javax/swing/Makefile j2se/make/javax/swing/beaninfo/SwingBeans.gmk j2se/make/javax/swing/html32dtd/Makefile j2se/make/javax/swing/html32dtd/SwingHTML32DTD.gmk j2se/make/javax/swing/plaf/Makefile j2se/make/javax/xml/Makefile j2se/make/jpda/Makefile j2se/make/jpda/back/Makefile j2se/make/jpda/front/Makefile j2se/make/jpda/jdwp/Makefile j2se/make/jpda/jdwp/jdwp.spec j2se/make/jpda/jdwpgen/Makefile j2se/make/jpda/transport/shmem/Makefile j2se/make/jpda/transport/socket/Makefile j2se/make/jpda/tty/Makefile j2se/make/jprt.config j2se/make/jprt.properties j2se/make/launchers/Makefile j2se/make/launchers/Makefile.launcher j2se/make/mkdemo/Makefile j2se/make/mkdemo/applets/Animator/Makefile j2se/make/mkdemo/applets/ArcTest/Makefile j2se/make/mkdemo/applets/BarChart/Makefile j2se/make/mkdemo/applets/Blink/Makefile j2se/make/mkdemo/applets/CardTest/Makefile j2se/make/mkdemo/applets/Clock/Makefile j2se/make/mkdemo/applets/DemoApplets.gmk j2se/make/mkdemo/applets/DitherTest/Makefile j2se/make/mkdemo/applets/DrawTest/Makefile j2se/make/mkdemo/applets/Fractal/Makefile j2se/make/mkdemo/applets/GraphLayout/Makefile j2se/make/mkdemo/applets/GraphicsTest/Makefile j2se/make/mkdemo/applets/JumpingBox/Makefile j2se/make/mkdemo/applets/MoleculeViewer/Makefile j2se/make/mkdemo/applets/NervousText/Makefile j2se/make/mkdemo/applets/SimpleGraph/Makefile j2se/make/mkdemo/applets/SortDemo/Makefile j2se/make/mkdemo/applets/SpreadSheet/Makefile j2se/make/mkdemo/applets/TicTacToe/Makefile j2se/make/mkdemo/applets/WireFrame/Makefile j2se/make/mkdemo/jfc/CodePointIM/FILES.gmk j2se/make/mkdemo/jfc/CodePointIM/Makefile j2se/make/mkdemo/jfc/DemoSwing.gmk j2se/make/mkdemo/jfc/FileChooserDemo/FILES.gmk j2se/make/mkdemo/jfc/FileChooserDemo/Makefile j2se/make/mkdemo/jfc/Font2DTest/FILES.gmk j2se/make/mkdemo/jfc/Font2DTest/Makefile j2se/make/mkdemo/jfc/Java2D/DemoJava2D.gmk j2se/make/mkdemo/jfc/Java2D/FILES.gmk j2se/make/mkdemo/jfc/Java2D/Makefile j2se/make/mkdemo/jfc/Java2D/demos/Arcs_Curves/Makefile j2se/make/mkdemo/jfc/Java2D/demos/Clipping/Makefile j2se/make/mkdemo/jfc/Java2D/demos/Colors/Makefile j2se/make/mkdemo/jfc/Java2D/demos/Composite/Makefile j2se/make/mkdemo/jfc/Java2D/demos/Fonts/Makefile j2se/make/mkdemo/jfc/Java2D/demos/Images/Makefile j2se/make/mkdemo/jfc/Java2D/demos/Lines/Makefile j2se/make/mkdemo/jfc/Java2D/demos/Makefile j2se/make/mkdemo/jfc/Java2D/demos/Mix/Makefile j2se/make/mkdemo/jfc/Java2D/demos/Paint/Makefile j2se/make/mkdemo/jfc/Java2D/demos/Paths/Makefile j2se/make/mkdemo/jfc/Java2D/demos/Transforms/Makefile j2se/make/mkdemo/jfc/Java2D/gui/FILES.gmk j2se/make/mkdemo/jfc/Java2D/gui/Makefile j2se/make/mkdemo/jfc/Makefile j2se/make/mkdemo/jfc/Metalworks/FILES.gmk j2se/make/mkdemo/jfc/Metalworks/Makefile j2se/make/mkdemo/jfc/Notepad/FILES.gmk j2se/make/mkdemo/jfc/Notepad/Makefile j2se/make/mkdemo/jfc/SampleTree/FILES.gmk j2se/make/mkdemo/jfc/SampleTree/Makefile j2se/make/mkdemo/jfc/Stylepad/FILES.gmk j2se/make/mkdemo/jfc/Stylepad/Makefile j2se/make/mkdemo/jfc/SwingApplet/FILES.gmk j2se/make/mkdemo/jfc/SwingApplet/Makefile j2se/make/mkdemo/jfc/SwingSet2/FILES.gmk j2se/make/mkdemo/jfc/SwingSet2/Makefile j2se/make/mkdemo/jfc/TableExample/FILES.gmk j2se/make/mkdemo/jfc/TableExample/Makefile j2se/make/mkdemo/jni/Makefile j2se/make/mkdemo/jni/Poller/Makefile j2se/make/mkdemo/jpda/Makefile j2se/make/mkdemo/jvmti/Demo.gmk j2se/make/mkdemo/jvmti/Makefile j2se/make/mkdemo/jvmti/README.txt j2se/make/mkdemo/jvmti/agent_util/Makefile j2se/make/mkdemo/jvmti/gctest/Makefile j2se/make/mkdemo/jvmti/heapTracker/Makefile j2se/make/mkdemo/jvmti/heapViewer/Makefile j2se/mak