On Jul 13, 2011, at 8:39 AM, Kelly O'Hair wrote: > On Jul 10, 2011, at 1:45 PM, Mike Swingler wrote: > >> On Jul 8, 2011, at 9:57 AM, Greg Lewis wrote: >> >>> On Wed, Jul 06, 2011 at 09:39:17AM -0700, Kelly O'Hair wrote: >>> >>>> Ok, I'll ask. >>>> >>>> So what are the plans with regards to integrating all the bsd and macosx >>>> port changes into jdk8? >>>> In a more permanent way? >>> >>> Ummm, yes please? :-) >>> >>> I guess the first thing to do is to start a discussion of whether the >>> overall strategy of a separate bsd directory hierarchy that mirrors the >>> linux and solaris directory hierarchies is acceptable in terms of merging >>> the changes in. If that is approved then we can start posting some >>> webrevs. Since the macosx-port is a child of bsd-port and picks up the >>> bsd-port changes, it would make sense to merge that in, with some checks >>> to make sure it still compiles on {Free,Net,Open}BSD. >>> >>> Kelly whats the best list to start that discussion on? >> >> +1. >> >> I think the most logical plan to integrate Mac OS X into mainline JDK8 is >> for us to begin integrating the BSD port changes, where most of the >> divergences from mainline are at the HotSpot level. These changes don't >> access anything above the Darwin/BSD level on Mac OS X, so I am fine leaving >> the parallel directories left named "bsd". >> >> Once integrated, if there is obvious duplication with the solaris/linux >> hierarchy, we can proceed with further consolidation. > > The changes to hotspot may need to take a slightly different ride into jdk8, > so I'd suggest doing that work separately > with the hotspot team.
Who would be our best point of contact for discuss integrating the HotSpot changes so we can move quickly on this? > For everything else, if someone could prepare webrevs of the BSD changes for > each repository involved, and send > them to the build-...@openjdk.java.net alias, we can get reviews started and > get the changes integrated. > I have a feeling that as the changes get reviewed we might have some cleanup > ideas. > Keep in mind that we cannot and will not just drag over all the changesets in > the existing BSD/MAC repositories, > we will need to create fresh, probably large, changesets that identify > themselves as BSD or MAC porting > changes. We can create multiple CRs and break it up into separate pieces if > necessary. > If you need CRs filed, let me know. So the detailed history and the > changesets in the BSD/MAC repositories will > stay with those repositories, just so people understand. Not a problem for me. Initially if we start with just the bsd-port changesets, that should be a good digestible chunk of changes which should result in a fully Mac buildable source (just without the Mac-specific features that are being worked on in the macosx-port. Greg, would you like to prepare the changesets? One of my guys could do it too if your busy. > Formally getting BSD builds to happen on a regular basis may be an issue, but > first step (in my opinion) is to > get the source code and makefile logic merged in, making sure the existing > platform builds are not impacted. > If someone has references to BSD iso images I can at least get started on > creating my own VirtualBox setup. You can also use Mac OS X as a builder for the bsd-port changes if you already have a configuration available to you. It would be nice to get a FreeBSD turn of these changes as well, but it might not be necessary if the setup will take a while. > --- > > I have a major concern here with the build changes involved colliding with > our build infrastructure changes > and the jigsaw/modularity changes coming into jdk8. > Right now, jdk8 is basically jdk7 plus a little change, so doing this now may > be best, but it needs to happen > quickly, if we wait too long, the merge could be very painful. I agree, and am available to drive this ASAP. Mike Swingler Java Engineering Apple Inc.