merging classpath-0.97.2 into trunk

merging classpath-0.97.2 into trunk

[Matthias Klose]

I'd like to merge classpath-0.97.2 into trunk. The merge is currently
prepared on branches/gcj/classpath-0961-import-branch.  The branch
doesn't show regressions on the libjava and the mauve testsuites, both
configured with and without --enable-java-maintainer-mode.  The merge
was ok'd by Tom Tromey [1] with the constraint to not conflict with
another major merge into trunk.  I'd like to do this merge this
weekend, if no other major merge is pending.   Please consider the
libjava directory as (informally) frozen until this merge is done.

This merge doesn't add much new code, but another merge of
classpath-0.98 (adding the gjdoc code) is likely before 4.4 branches.

  Matthias

[1] http://gcc.gnu.org/ml/java-patches/2008-q2/msg00029.html

Re: merging classpath-0.97.2 into trunk

[Matthias Klose]

Matthias Klose writes:
> I'd like to merge classpath-0.97.2 into trunk. The merge is currently
> prepared on branches/gcj/classpath-0961-import-branch.  The branch
> doesn't show regressions on the libjava and the mauve testsuites, both
> configured with and without --enable-java-maintainer-mode.  The merge
> was ok'd by Tom Tromey [1] with the constraint to not conflict with
> another major merge into trunk.  I'd like to do this merge this
> weekend, if no other major merge is pending.   Please consider the
> libjava directory as (informally) frozen until this merge is done.
> 
> This merge doesn't add much new code, but another merge of
> classpath-0.98 (adding the gjdoc code) is likely before 4.4 branches.
> 
>   Matthias
> 
> [1] http://gcc.gnu.org/ml/java-patches/2008-q2/msg00029.html

this is now merged into the trunk. checked with builds on i386-linux
and amd64-linux configured with and without --enable-java-maintainer-mode.

libjava/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (classpath-0_97_2-release).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * gcj/javaprims.h: Define jobjectRefType.
        * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
        (_Jv_JNIFunctions): Initialize GetObjectRefType.
        * gnu/classpath/jdwp/VMVirtualMachine.java,
        java/security/VMSecureRandom.java: Merge from classpath.
        * HACKING: Fix typo.
        * ChangeLog-2007: New file.
        * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.

libjava/classpath/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        * m4/ac_prog_javac.m4: Disable check for JAVAC, when
        not configured with --enable-java-maintainer-mode.
        * aclocal.m4, configure: Regenerate.
        * native/jni/gstreamer-peer/Makefile.am: Do not link with
        libclasspathnative.
        * native/jni/gstreamer-peer/Makefile.in: Regenerate.
        * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
        JCOMPILER, drop flags not understood by gcj.

Re: merging classpath-0.97.2 into trunk

[Tom Tromey]

>>>>> "Matthias" == Matthias Klose <doko@cs.tu-berlin.de> writes:

Matthias> this is now merged into the trunk. checked with builds on
Matthias> i386-linux and amd64-linux configured with and without
Matthias> --enable-java-maintainer-mode.

I'm a bit late, but thank you for doing this.

If you want to make a news entry for the gcj web page, that would be
fine by me :-)

Tom