Kelly O'Hair's Blog

OpenJDK Mercurial Transition Update 5

Update 5

Well we had a few snafus with Build 22. A hotspot bug 6616627 managed to sneak in, and the jaxws workspace lost some GPL markings and we will need to back out the jaxws integration in Build 23 (this should be temporary, expect jaxws to be re-integrated in a few builds).

The split of the langtools, corba, jaxp, and jaxws workspaces has continued to cause some minor issues with regards to doing partial builds from the j2se workspace. Most of these have been resolved in build 23 coming up.

We did have a few changes to the plan. Build 23 is being used (in TeamWare) to hold changes like whitespace normalization, SCCS keyword removal, and also the j2se name change ("j2se" is being changed to "jdk"). No team integrations will be allowed in Build 23 with the exception of emergency fixes (like the above hotspot bug fix).

Build 24 will be in Mercurial and the files managed by TeamWare in Build 23 will be the same files that enter the initial Build 24 Mercurial repositories. There are a few restructuring things that will happen though as the Mercurial images are created. There will not be a "control" repository, instead there will be a Makefile at the top of the forest which is the same Makefile that used to be at control/make. So when you used to:


cd control/make && gnumake

Now you would:

gnumake

See OpenJDK forest for more information on the layout.

Build 23 is being worked on now and should be available within a week, doing the Mercurial conversion for Build 24 should be fairly straight forward, but getting everything all setup for the integrators and developers is not a trivial task, so once we have repositories it may take a few weeks to get it all setup. Hopefully, read-only MASTER repositories can be made available as soon as possible, and maybe sooner so that we can get help trying things out and looking for issues.

Stay tuned...

-kto

Comments

• "lost some GPL markings" sounds fascinating. :)

  Posted by: robilad on October 22, 2007 at 04:04 AM

• I take it that it's this issue: http://thread.gmane.org/gmane.comp.java.openjdk.build.devel/242/focus=243

  Posted by: robilad on October 22, 2007 at 07:01 AM

• Yes, that bug fix was also lost along with the GPL's. Different teams use different source code management systems, so we had some issues when some newer jaxws code got transported into our teamware workspaces. Part of this whole split process along with the Mercurial transition should make these kind of issues less likely to happen, we hope.

  Posted by: kellyohair on October 22, 2007 at 08:46 AM

This work is licensed under a Creative Commons License.