Re: [gui][patch] monthly merge from java-gui-branch

[Mark Wielaard]

Hi Graydon,

On Thu, 2004-07-22 at 04:51, graydon hoare wrote:
> this is the "monthly" merge from java-gui-branch to gcc trunk. this will
> be the last such regularly scheduled merge for a while; we're going to
> be taking a slightly less disruptive (to trunk) route for a bit, as an
> experiment: merging between the gui branch and classpath directly more
> frequently, and doing a 1-way merge into trunk at lower frequency (say
> every 2-3 months). this is primarily to reduce the number of times we
> risk breaking the gcc trunk build, which is a recurrent problem of mine.
> 
> I'd ask that future work on gui-related stuff go into the gui branch
> or classpath, *not* gcc trunk, since this will ease integration and
> reduce the risk of a merge clobbering your changes.

I agree. We used to do merges like:
  kaffe <=> classpath <=> libgcj <=> gui-branch
Since most changes for java/awt, javax/swing and native/jni/gtk-peers
take place on the gui branch it makes more sense to change this to:
   kaffe <=> classpath <=> gui-branch <=> libgcj
at least for those (sub)dirs.

I used to be a bit skeptical about splitting off the gui work on a
separate branch. But these days more and more people seem to have no
problem just working with the branch directly. Thomas his jhbuild setup
even makes it fun and easy to do:
http://people.redhat.com/fitzsim/gcj-and-jhbuild.html
And I noticed that being able to just use gdb with native gcj/C/JNI code
is invaluable for debugging at least the gtk-peers.

And lets try to keep GNU Classpath CVS and the gui-branch in sync as
much as possible for java/awt, javax/swing and native/jni/gtk-peers. And
of course for everything else lets keep libgcj head and GNU Classpath
CVS in sync. I'll try to adapt the compare script later today to help us
with that: http://gcc.gnu.org/java/libgcj-classpath-compare.html

(Note that doesn't mean you cannot develop gui stuff directly on GNU
Classpath CVS, but if you do either check it also in on the gui-branch,
or ask someone to do that for you.)

> anyways, the july patch is here:
> 
> http://people.redhat.com/graydon/java-gui-merge-july-20-2004.patch
> 
> it's another 600k of diffs, all confined to java.awt, javax.swing, and
> jni/gtk-peers. I've done a build test against the trunk and run the
> recent "activityboard" test:
> 
> http://people.redhat.com/graydon/activityboard.java
> 
> which appears to work out of the box with it. please let me know if you
> have any objections; I'll be committing shortly (say, tomorrow morning)
> if not. I'd welcome anyone with an extra autobuilder and some spare cycles
> to check it out and make sure I'm not causing any trouble. last time was
> almost too frustrating for me to believe my own test results anymore.

I made some path and build cleanups for GNU Classpath and activity board
now works out of the box for me (you will need the BlueCurve icons on
your machine though) with jamvm. Kissme crashes though. Tests with both
runtimes for testswing, Test, TestAWT and the Visual Test Engine look
great!

Thanks for improving our gui classes so much Andreas, David, Graydon,
Jerry, Kim, Michael, Olga and Thomas!

If you are committing to gcc head I will add it to GNU Classpath also if
there are no objections.

Thanks,

Mark

signature.asc
Description: This is a digitally signed message part