df3e8c70fd
2006-08-22 Thomas Fitzsimmons <fitzsim@redhat.com> PR libgcj/27890 * gnu/classpath/natSystemProperties.cc (insertSystemProperties): Set gnu.classpath.home.url to TOOLEXECLIBDIR. * configure.ac: Do not add --with-native-libdir to ac_configure_args. * java/security/libgcj.security: Remove file. * java/util/logging/logging.properties: Likewise. * classpath/m4/acinclude.m4 (CLASSPATH_TOOLEXECLIBDIR): New macro. * classpath/resource/Makefile.am (loggingdir): Define to toolexeclibdir. (securitydir): Likewise. * classpath/configure.ac: Call CLASSPATH_TOOLEXECLIBDIR. Set default nativeexeclibdir using toolexeclibdir. * HACKING: Fix classpath aclocal arguments. * Makefile.am (secdir): Remove variable. (propdir): Likewise. (AM_CXXFLAGS): Replace LIBDIR definition with TOOLEXECLIBDIR definition. (all_property_files): Remove variable. (install-data-local): Do not install libgcj.security or logging.properties. * configure, Makefile.in, classpath/configure, classpath/Makefile.in, classpath/native/jni/java-lang/Makefile.in, classpath/native/jni/midi-alsa/Makefile.in, classpath/native/jni/classpath/Makefile.in, classpath/native/jni/midi-dssi/Makefile.in, classpath/native/jni/Makefile.in, classpath/native/jni/java-nio/Makefile.in, classpath/native/jni/java-net/Makefile.in, classpath/native/jni/gconf-peer/Makefile.in, classpath/native/jni/java-io/Makefile.in, classpath/native/jni/xmlj/Makefile.in, classpath/native/jni/java-util/Makefile.in, classpath/native/jni/qt-peer/Makefile.in, classpath/native/jni/gtk-peer/Makefile.in, classpath/native/Makefile.in, classpath/native/jawt/Makefile.in, classpath/native/target/Linux/Makefile.in, classpath/native/target/Makefile.in, classpath/native/target/generic/Makefile.in, classpath/native/fdlibm/Makefile.in, classpath/native/plugin/Makefile.in, classpath/resource/Makefile.in, classpath/scripts/Makefile.in, classpath/tools/Makefile.in, classpath/doc/Makefile.in, classpath/doc/api/Makefile.in, classpath/lib/Makefile.in, classpath/external/Makefile.in, classpath/external/sax/Makefile.in, classpath/external/w3c_dom/Makefile.in, classpath/external/relaxngDatatype/Makefile.in, classpath/include/Makefile.in, classpath/aclocal.m4, classpath/examples/Makefile.in, aclocal.m4: Regenerate. From-SVN: r116332
132 lines
4.8 KiB
Plaintext
132 lines
4.8 KiB
Plaintext
Things libgcj hackers should know
|
|
---------------------------------
|
|
|
|
If you want to hack on the libgcj files you need to be aware of the
|
|
following things. There are probably lots of other things that should be
|
|
explained in this HACKING file. Please add them if you discover them :)
|
|
|
|
--
|
|
|
|
libgcj uses GNU Classpath as an upstream provider. Snapshots of
|
|
Classpath are imported into the libgcj source tree. Some classes are
|
|
overridden by local versions; these files still appear in the libgcj
|
|
tree.
|
|
|
|
To import a new release:
|
|
|
|
- Check out a classpath snapshot or take a release tar.gz file.
|
|
I use 'cvs export' for this. Make a tag to ensure future hackers
|
|
know exactly what revision was checked out; tags are of the form
|
|
'libgcj-import-DATE' (when using a tagged checkout do:
|
|
- ./autogen.sh && ./configure && make dist
|
|
to get a proper .tar.gz for importing below).
|
|
- Get a svn checkout of
|
|
svn+ssh://gcc.gnu.org/svn/gcc/branches/CLASSPATH/libjava/classpath
|
|
this contains "pure" GNU Classpath inside the GCC tree.
|
|
- Clean it up and get the files from a new version:
|
|
- find classpath -type f | grep -v /\.svn | grep -v /\.cvs | xargs rm
|
|
- tar zxf classpath-x.tar.gz
|
|
- cp -r classpath-x/* classpath
|
|
- Add/Remove files:
|
|
- svn status classpath | grep ^\! | cut -c8- | xargs svn remove
|
|
- svn status classpath | grep ^\? | cut -c8- | xargs svn add
|
|
- If there are any empty directories now they can be removed. You can find
|
|
candidates (dirs with files removed) with:
|
|
- for i in `svn status classpath | grep ^D | cut -c8-`; \
|
|
do ls -d `dirname $i`; done | uniq
|
|
- Update vendor branch
|
|
- svn commit classpath
|
|
- Note the new revision number (Xrev)
|
|
- Get a fresh svn trunk checkout and cd gcc/libjava
|
|
- Merge the changes between classpath versions into the trunk.
|
|
svn merge -rXrev-1:Xrev \
|
|
svn+ssh://gcc.gnu.org/svn/gcc/branches/CLASSPATH/libjava/classpath \
|
|
classpath
|
|
- Resolve any conflicts pointed out by svn status classpath | grep ^C
|
|
- Makefile.in files will be regenerated in the next step.
|
|
- Other files should have a "GCJ LOCAL" comment, and/or are mentioned
|
|
in the classpath/ChangeLog.gcj file.
|
|
(Don't forget to svn resolved files.)
|
|
- Use auto* to create configure, Makefile.in, etc
|
|
Make sure you have Automake 1.9.6 installed. Exactly that version!
|
|
You have to make sure to use the gcc libtool.m4 and gcc lt* scripts
|
|
cd .../classpath
|
|
cp ../../lt* .
|
|
cp ../../config.sub ../../config.guess .
|
|
aclocal -I m4 -I ../.. -I ../../config
|
|
autoconf
|
|
autoheader
|
|
automake
|
|
rm -rf autom4te.cache
|
|
cd ..
|
|
scripts/makemake.tcl > sources.am
|
|
automake
|
|
- Build, fix, till everything works.
|
|
Possibly update the gcj/javaprims.h file with scripts/classes.pl
|
|
(See below, it can only be done after the first source->bytecode
|
|
pass has finished.)
|
|
|
|
Over time we plan to remove as many of the remaining divergences as
|
|
possible.
|
|
|
|
File additions and deletions require running scripts/makemake.tcl
|
|
before running automake.
|
|
|
|
--
|
|
|
|
In general you should not make any changes in the classpath/
|
|
directory. Changes here should come via imports from upstream.
|
|
However, there are two (known) exceptions to this rule:
|
|
|
|
* In an emergency, such as a bootstrap breakage, it is ok to commit a
|
|
patch provided that the problem is resolved (by fixing a compiler
|
|
bug or fixing the Classpath bug upstream) somehow and the resolution
|
|
is later checked in (erasing the local diff).
|
|
|
|
* On a release branch to fix a bug, where a full-scale import of
|
|
Classpath is not advisable.
|
|
|
|
--
|
|
|
|
You can develop in a GCC tree using a CVS checkout of Classpath, most
|
|
of the time. (The exceptions are when an incompatible change has been
|
|
made in Classpath and some core part of libgcj has not yet been
|
|
updated.)
|
|
|
|
The way to set this up is very similar to importing a new version of
|
|
Classpath into the libgcj tree. In your working tree:
|
|
|
|
* cd gcc/libjava; rm -rf classpath
|
|
* cvs co classpath
|
|
* cd classpath
|
|
Now run the auto tools as specified in the import process; then
|
|
cd ..
|
|
* Run 'scripts/makemake.tcl > sources.am' in the source tree
|
|
* Run automake for libgcj
|
|
|
|
Now you should be ready to go.
|
|
|
|
If you are working in a tree like this, you must remember to run
|
|
makemake.tcl and automake whenever you update your embedded classpath
|
|
tree.
|
|
|
|
--
|
|
|
|
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. This must be run from the build tree, in
|
|
<build>/classpath/lib; it uses the .class file name to determine
|
|
what to print.
|
|
|
|
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/
|