Re: libgcj-classpath-20060719 merge

[Mark Wielaard <mark at klomp dot org>]

Hi,

On Thu, 2006-07-20 at 21:55 +0200, Mark Wielaard wrote:
> On Thu, 2006-07-20 at 09:26 -0400, Thomas Fitzsimmons wrote:
> > >>> What more do you want anyway!
> > >> Can you also test gappletviewer and gcjwebplugin?
> > > 
> > > I can try them out tonight. Anything special to do for
> > > installing/configuring gcjwebplugin?
> > 
> > Yes, you must add --enable-plugin to the GCC configure line.  Then to 
> > install it you must create a link from 
> > ~/.mozilla/plugins/libgcjwebplugin.so to 
> > $prefix/lib*/gcj-4.2.0/libgcjwebplugin.so.
> > 
> >   Any special applets you think are
> > > "must work"?
> > 
> > No, just try a sampling of applets at
> > 
> > http://developer.classpath.org/mediation/Applets
> 
> Tried some gappletviewer and it seems to work well.
> Now rebuilding with --enable-plugin.

Unfortunately that didn't work. I haven't debugged it yet, but attached
is a small testcase that shows a NullPointerException which it shouldn't
give. This might be something subtle gone wrong in the merge since
OutputStreamWriter is an override in libgcj. (Note the name of the
testcase is misleading it has nothing to do with the Charset used.)

> > > BTW. My notes say:
> > > - Check gconf dependency stuff.
> > 
> > The patch doesn't apply to GCC trunk because of the new gconf-peer 
> > directory.  Specifically, the 
> > classpath/native/jni/gconf-peer/Makefile.in fragment fails to apply, 
> > since the classpath/native/jni/gconf-peer directory doesn't exist on 
> > trunk yet.
> 
> How strange. I see that it contains a diff but not the whole file even
> though it is clearly new. No idea why svn did that. But it should be
> easy to regenerate with automake in the classpath dir.

I figured this out. Apparently this is a "feature" of svn. Since we are
doing a svn merge from a branch the new files are seen as "copies" so
they are not included in the diff because "they are already there". And
if you merge a new file in and then change it a little (like the
Makefile.in file) then the svn diff is against the branch, not the
trunk. There is a logic to all of this I am sure.

Anyway. All new files are now also available at:
http://www.klomp.org/mark/classpath/libgcj-classpath-20060719-merge-new.tar.bz2
Just untar over your patched tree.

Cheers,

Mark

import java.nio.charset.Charset;
import java.io.*;

public class utf8
{
  public static void main(String[] args) throws Exception
  {
    ByteArrayOutputStream baos = new ByteArrayOutputStream();
    OutputStreamWriter osw = new OutputStreamWriter(baos,
                                                    Charset.forName("UTF-8"));
    BufferedWriter bw = new BufferedWriter(osw);
    bw.write("hello", 0, 5);
    bw.newLine();
    bw.flush();
  }
}