Status of IcedTea7

[Andrew John Hughes]

I'm about to push through a set of patches which will bump IcedTea7 to
the latest build drop (b49) and merged the latest IcedTea6 patches in.

For IcedTea6 this time round, I've been using the Mercurial transplant
extension (http://www.selenic.com/mercurial/wiki/index.cgi/TransplantExtension)
mentioned by Mark Wielaard.  This made it possible to just ignore
quite a few patches that were irrelevant for 7, but it wasn't by any
means simple.  A lot of IcedTea6 patches generate merge conflicts and
so the process would stall on these a lot.  I basically got into a
series of doing:

1. hg transplant -s $HOME/projects/openjdk/icedtea6 --log
2. Fix conflicts
3. hg resolve -m $(conflicted files)
3. hg transplant --continue

If anyone knows a better way, let me know.  The biggest issue was that
unlike a direct merge it didn't spot that the plugin code moved on the
7 tree from rt to overlays (the same should probably happen on 6 so we
don't piggyback the binary plug system any more and instead build with
IMPORT_BINARY_PLUGS).  I think it's also a case of there were a lot of
patches that would not have merged cleanly either way e.g. the
VisualVM stuff was never going to go in cleanly either way due to its
extensive changes to Makefile.am.

I've also been pushing patches to my new
http://icedtea.classpath.org/people/andrew/icedtea branch as I go, and
that seems to have worked without a hitch.

If you spot any problems, let me know.

Happy hacking,
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8