any conflicts created by the merge, and test the final result.
The merged files can be recognized by the standard Classpath copyright
-comments at the top of the file. If you make changes to these files then
-you should also send a patch to the classpath mailinglist.
+comments at the top of the file. If you make changes to these files
+then you should also check in the fix to Classpath. For small changes
+it may be easier to send a patch to the classpath mailinglist. For
+large changes, if you have direct write access to the libgcj tree,
+then you will also need to get a Classpath account and do the work
+yourself.
<http://mail.gnu.org/mailman/listinfo/classpath/>
<mailto:classpath@gnu.org>
> Makefile?
Yup, you need the magic libgcj automake ;-)
-<ftp://ftp.freesoftware.com/.0/sourceware/java/automake-gcj-1.4.tar.gz>
+<ftp://sources.redhat.com/pub/java/automake-gcj-1.4.tar.gz>
-Install that (dont worry, it should still work for other projects), add your
+Install that (don't worry, it should still work for other projects), add your
files to the Makefile.am, then just type "automake" and it will regenerate the
Makefile.in. Easy!
+Tom Tromey adds:
+If you add a class to java.lang, java.io, or java.util
+(including sub-packages, like java.lang.ref).
+
+* Edit gcj/javaprims.h
+
+* Go to the `namespace java' line, and delete that entire block (the
+ entire contents of the namespace)
+
+* Then insert the output of `perl ../scripts/classes.pl' into the file
+ at that point.
+
+If you're generating a patch there is a program you can get to do an
+offline `cvs add' (it will fake an `add' if you don't have write
+permission yet). Then you can use `cvs diff -N' to generate the
+patch. See http://www.red-bean.com/cvsutils/
+