[kaffe] CVS kaffe (jim): Release 1.1.3 (on branch)

Kaffe CVS cvs-commits at kaffe.org
Sun Dec 7 19:01:02 PST 2003


PatchSet 4202 
Date: 2003/12/08 01:06:02
Author: jim
Branch: Release_1_1_3_Branch
Tag: Release_1_1_3 
Log:
Release 1.1.3 (on branch)

Members: 
	ChangeLog:1.1793->1.1793.2.1 
	Makefile.am:1.50->1.50.2.1 
	Makefile.in:1.118->1.118.2.1 
	README:1.29->1.29.4.1 
	RELEASE-NOTES:1.3->1.3.4.1 
	WHATSNEW:1.30->1.30.4.1 
	aclocal.m4:1.73->1.73.2.1 
	configure:1.266->1.266.2.1 
	configure.in:1.232->1.232.2.1 
	config/Makefile.in:1.92->1.92.2.1 
	kaffe/Makefile.in:1.84->1.84.2.1 
	kaffe/kaffe/Makefile.in:1.98->1.98.2.1 
	kaffe/kaffevm/Makefile.in:1.117->1.117.2.1 
	kaffe/kaffevm/gcj/Makefile.in:1.66->1.66.2.1 
	kaffe/scripts/Makefile.in:1.107->1.107.2.1 
	libltdl/config-h.in:1.9->1.9.2.1 
	libraries/clib/Makefile.in:1.77->1.77.2.1 
	libraries/javalib/Makefile.in:1.195->1.195.2.1 
	test/internal/Makefile.in:1.31->1.31.2.1 
	test/regression/Makefile.am:1.84->1.84.2.1 
	test/regression/Makefile.in:1.140->1.140.2.1 
	test/regression/run_time/Makefile.am:1.2->1.2.4.1 
	test/regression/run_time/Makefile.in:1.5->1.5.2.1 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1793 kaffe/ChangeLog:1.1793.2.1
--- kaffe/ChangeLog:1.1793	Sun Dec  7 20:04:04 2003
+++ kaffe/ChangeLog	Mon Dec  8 01:06:02 2003
@@ -1,3 +1,37 @@
+2003-12-07  Jim Pick <jim at kaffe.org>
+
+	(On Release 1.1.3 Branch)
+
+	* README,
+	RELEASE-NOTES,
+	WHATSNEW:
+	Updated version number in docs, summarized
+	changes.
+
+	* configure.in:
+	Bumped version number.
+
+	* Makefile.am,
+	test/regression/Makefile.am,
+	test/regression/run_time/Makefile.am:
+	Some fixes for "make dist".
+
+	* aclocal.m4,
+	configure,
+	kaffe/Makefile.in,
+	kaffe/kaffe/Makefile.in,
+	kaffe/kaffevm/Makefile.in,
+	kaffe/kaffevm/gcj/Makefile.in,
+	kaffe/scripts/Makefile.in,
+	kaffe/scripts/compat/Makefile.in,
+	libltdl/config-h.in,
+	libraries/clib/Makefile.in,
+	libraries/javalib/Makefile.in,
+	test/internal/Makefile.in,
+	test/regression/Makefile.in,
+	test/regression/run_time/Makefile.in:
+	Regenerated.
+
 2003-12-07  Dalibor Topic <robilad at kaffe.org>
 
 	* developers/mauve-kaffe:
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.50 kaffe/Makefile.am:1.50.2.1
--- kaffe/Makefile.am:1.50	Sun Nov 30 23:49:12 2003
+++ kaffe/Makefile.am	Mon Dec  8 01:06:03 2003
@@ -27,6 +27,7 @@
 	license.terms \
 	license-lesser.terms \
 	license-w3c.terms \
+	gnu-crypto.m4 \
 	gwqt.m4 \
 	herrno.m4 \
 	in6addr.m4 \
@@ -58,6 +59,7 @@
 	FAQ/FAQ.gcblock \
 	FAQ/FAQ.gcj \
 	FAQ/FAQ.gcstrategy \
+	FAQ/FAQ.hpux \
 	FAQ/FAQ.hotjava \
 	FAQ/FAQ.install-root \
 	FAQ/FAQ.jit3 \
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.118 kaffe/Makefile.in:1.118.2.1
--- kaffe/Makefile.in:1.118	Sun Nov 30 23:49:12 2003
+++ kaffe/Makefile.in	Mon Dec  8 01:06:03 2003
@@ -274,6 +274,7 @@
 	license.terms \
 	license-lesser.terms \
 	license-w3c.terms \
+	gnu-crypto.m4 \
 	gwqt.m4 \
 	herrno.m4 \
 	in6addr.m4 \
@@ -305,6 +306,7 @@
 	FAQ/FAQ.gcblock \
 	FAQ/FAQ.gcj \
 	FAQ/FAQ.gcstrategy \
+	FAQ/FAQ.hpux \
 	FAQ/FAQ.hotjava \
 	FAQ/FAQ.install-root \
 	FAQ/FAQ.jit3 \
Index: kaffe/README
diff -u kaffe/README:1.29 kaffe/README:1.29.4.1
--- kaffe/README:1.29	Thu Aug 28 00:48:00 2003
+++ kaffe/README	Mon Dec  8 01:06:03 2003
@@ -1,7 +1,7 @@
  
 			 ===================
 
-			 Kaffe (CVS Version)  
+			     Kaffe 1.1.3  
 
 			 ===================
 
Index: kaffe/RELEASE-NOTES
diff -u kaffe/RELEASE-NOTES:1.3 kaffe/RELEASE-NOTES:1.3.4.1
--- kaffe/RELEASE-NOTES:1.3	Thu Aug 28 00:48:00 2003
+++ kaffe/RELEASE-NOTES	Mon Dec  8 01:06:03 2003
@@ -1,6 +1,27 @@
-Release Notes for 1.1.x-CVS
-===========================
+Release Notes for 1.1.3
+=======================
+
+Release 1.1.3 of Kaffe is a "development" release.
+
+It has been tested, but not as thoroughly as a
+production release would be.
+
+Please check the WHATSNEW file to see what has
+been added in this release.
+
+Even though this is not a production release, it
+contains a lot of improvements over 1.0.7, which
+was release over half a year ago.  I anticipate
+that most people will have less trouble with
+this release.
+
+Bug reports, comments and patches are always
+welcome -- send them to the team at kaffe at kaffe.org.
+
+Have fun!
+
+Cheers,
+
+ - Jim
+
 
-This is a placeholder for the RELEASE-NOTES file that will be shipped
-with every production release.  It will contain a list of tested
-ports, and known problems with the release.
Index: kaffe/WHATSNEW
diff -u kaffe/WHATSNEW:1.30 kaffe/WHATSNEW:1.30.4.1
--- kaffe/WHATSNEW:1.30	Sat Oct  4 19:48:22 2003
+++ kaffe/WHATSNEW	Mon Dec  8 01:06:03 2003
@@ -1,4 +1,36 @@
-What's New since Kaffe OpenVM 1.1.1
+What's New in Kaffe 1.1.3
+------------------------------------------------------
+* More merges from GNU Classpath:
+  * java.beans
+  * java.util.Date
+  * java.util.jar
+  * java.net
+  * java.io
+  * javax.swing.EventListenerList
+* More JVMPI support implemented.
+* More NIO support implemented.
+* java.security.SecureRandom bugfix (with security
+   implications)
+* JIT fixes for x86, ARM and Sparc.
+* Interpreter fixes (underflow problem)
+* Fixes for Solaris, Darwin, FreeBSD.
+* Build fixes for powerpc64.
+* IPv6 fixes.
+* KJC fixes:
+  * inner class access
+  * switch labels
+  * constant initializers
+  * concatenating a null to a string
+* Fixes for SHIFT_JIS (Japanese) encoding.
+* Fix for Jetty 4.2.14.
+* AppletViewer fix for <applet> tag.
+* Lots of minor bug fixes.
+* Cleaned up GC code.
+* Compiler warning fixes.
+* Resynced with existing Classpath, GNU JAXP, Jessie.
+* Some successes: JBoss, Eclipse 3.0M4, gjdoc/libxmlj.
+
+What's New in Kaffe 1.1.2
 ------------------------------------------------------
 * New packages:
   * javax.net
@@ -15,7 +47,7 @@
   improvements.
 * Some successes: Tomcat4, eXist, JavaLayer, JOrbis.
 
-What's New in Kaffe OpenVM 1.1.1
+What's New in Kaffe 1.1.1
 ------------------------------------------------------
 * Much of the new bytecode verifier has been added (but not all of
   it).  Soon, we will be able to safely run untrusted code!
@@ -28,7 +60,7 @@
 * Some successes: Eclipse (loads, doesn't completely work yet),
   Jetty w/JSP, Java-Gnome, Qt AWT under QTopia, Snark, hsqldb
 
-What's New in Kaffe OpenVM 1.1.0
+What's New in Kaffe 1.1.0
 ------------------------------------------------------
 * Port to x86-64 GNU/Linux
 
@@ -115,7 +147,7 @@
 
 * Lots of bug fixes.
 
-What's New in Kaffe OpenVM 1.0.7
+What's New in Kaffe 1.0.7
 ------------------------------------------------------
 
 This release is dedicated to the memory of Edouard G. Parmelan, one of
@@ -141,7 +173,7 @@
 * Lots of bug fixes.
 
 
-What's New in Kaffe OpenVM 1.0.6
+What's New in Kaffe 1.0.6
 --------------------------------
 
 * New cross language debugging support for JIT3 engine.
@@ -161,7 +193,7 @@
 * Lots of bug fixes.
 
 
-What's New in Kaffe OpenVM 1.0.5
+What's New in Kaffe 1.0.5
 --------------------------------
 
 * JIT port for StrongARM
Index: kaffe/aclocal.m4
diff -u kaffe/aclocal.m4:1.73 kaffe/aclocal.m4:1.73.2.1
--- kaffe/aclocal.m4:1.73	Tue Dec  2 20:11:12 2003
+++ kaffe/aclocal.m4	Mon Dec  8 01:06:03 2003
@@ -8723,7 +8723,7 @@
 AU_DEFUN([fp_WITH_DMALLOC], [AM_WITH_DMALLOC])
 
 # ----------------------------------------------------------------------------
-# $Id: aclocal.m4,v 1.73 2003/12/02 20:11:12 dalibor Exp $
+# $Id: aclocal.m4,v 1.73.2.1 2003/12/08 01:06:03 jim Exp $
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 #
@@ -8767,7 +8767,7 @@
 #
 # GNU Crypto m4 macro for use by VM Providers
 #
-# $Revision: 1.73 $
+# $Revision: 1.73.2.1 $
 #
 
 # process --with-gnu-crypto configure option.
Index: kaffe/configure
diff -u kaffe/configure:1.266 kaffe/configure:1.266.2.1
--- kaffe/configure:1.266	Sun Nov 30 23:49:12 2003
+++ kaffe/configure	Mon Dec  8 01:06:04 2003
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.58 for kaffe 1.1.x-cvs.
+# Generated by GNU Autoconf 2.58 for kaffe 1.1.3.
 #
 # Report bugs to <kaffe at kaffe.org>.
 #
@@ -423,8 +423,8 @@
 # Identity of this package.
 PACKAGE_NAME='kaffe'
 PACKAGE_TARNAME='kaffe'
-PACKAGE_VERSION='1.1.x-cvs'
-PACKAGE_STRING='kaffe 1.1.x-cvs'
+PACKAGE_VERSION='1.1.3'
+PACKAGE_STRING='kaffe 1.1.3'
 PACKAGE_BUGREPORT='kaffe at kaffe.org'
 
 ac_unique_file="kaffe"
@@ -956,7 +956,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures kaffe 1.1.x-cvs to adapt to many kinds of systems.
+\`configure' configures kaffe 1.1.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1026,7 +1026,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of kaffe 1.1.x-cvs:";;
+     short | recursive ) echo "Configuration of kaffe 1.1.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1207,7 +1207,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-kaffe configure 1.1.x-cvs
+kaffe configure 1.1.3
 generated by GNU Autoconf 2.58
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1221,7 +1221,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by kaffe $as_me 1.1.x-cvs, which was
+It was created by kaffe $as_me 1.1.3, which was
 generated by GNU Autoconf 2.58.  Invocation command line was
 
   $ $0 $@
@@ -1833,7 +1833,7 @@
 
 # Define the identity of the package.
  PACKAGE=kaffe
- VERSION=1.1.x-cvs
+ VERSION=1.1.3
 
 
 cat >>confdefs.h <<_ACEOF
@@ -46595,7 +46595,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by kaffe $as_me 1.1.x-cvs, which was
+This file was extended by kaffe $as_me 1.1.3, which was
 generated by GNU Autoconf 2.58.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -46658,7 +46658,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-kaffe config.status 1.1.x-cvs
+kaffe config.status 1.1.3
 configured by $0, generated by GNU Autoconf 2.58,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
Index: kaffe/configure.in
diff -u kaffe/configure.in:1.232 kaffe/configure.in:1.232.2.1
--- kaffe/configure.in:1.232	Sun Nov 30 23:49:17 2003
+++ kaffe/configure.in	Mon Dec  8 01:06:09 2003
@@ -1,6 +1,6 @@
-AC_INIT([kaffe],[1.1.x-cvs],[kaffe at kaffe.org])
+AC_INIT([kaffe],[1.1.3],[kaffe at kaffe.org])
 AC_CONFIG_SRCDIR([kaffe])
-AM_INIT_AUTOMAKE(kaffe, 1.1.x-cvs)
+AM_INIT_AUTOMAKE(kaffe, 1.1.3)
 
 AC_PREFIX_DEFAULT(/usr/local/kaffe)
 
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.92 kaffe/config/Makefile.in:1.92.2.1
--- kaffe/config/Makefile.in:1.92	Sun Nov 30 23:49:17 2003
+++ kaffe/config/Makefile.in	Mon Dec  8 01:06:11 2003
@@ -252,12 +252,12 @@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
- at USE_JIT_FALSE@ENGINE_GEN_HDRS = 
 
 @USE_JIT_TRUE at ENGINE_GEN_HDRS = jit-md.h
+ at USE_JIT_FALSE@ENGINE_GEN_HDRS = 
+ at ENABLE_XPROF_FALSE@XPROF_HDRS = 
 
 @ENABLE_XPROF_TRUE at XPROF_HDRS = xprofile-md.h
- at ENABLE_XPROF_FALSE@XPROF_HDRS = 
 
 GEN_HDRS = md.h $(XPROF_HDRS) $(ENGINE_GEN_HDRS)
 
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.84 kaffe/kaffe/Makefile.in:1.84.2.1
--- kaffe/kaffe/Makefile.in:1.84	Sun Nov 30 23:49:19 2003
+++ kaffe/kaffe/Makefile.in	Mon Dec  8 01:06:11 2003
@@ -252,12 +252,12 @@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
- at NEED_LIBXPROF_FALSE@XPROF_SUBDIRS = #
 
 @NEED_LIBXPROF_TRUE at XPROF_SUBDIRS = xprof
- at ENABLE_JVMPI_FALSE@JVMPI_SUBDIRS = #
+ at NEED_LIBXPROF_FALSE@XPROF_SUBDIRS = #
 
 @ENABLE_JVMPI_TRUE at JVMPI_SUBDIRS = jvmpi
+ at ENABLE_JVMPI_FALSE@JVMPI_SUBDIRS = #
 
 SUBDIRS = kaffeh kaffevm $(XPROF_SUBDIRS) $(JVMPI_SUBDIRS) kaffe scripts man
 subdir = kaffe
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.98 kaffe/kaffe/kaffe/Makefile.in:1.98.2.1
--- kaffe/kaffe/kaffe/Makefile.in:1.98	Sun Nov 30 23:49:20 2003
+++ kaffe/kaffe/kaffe/Makefile.in	Mon Dec  8 01:06:12 2003
@@ -254,12 +254,12 @@
 with_engine = @with_engine@
 
 jrebin_PROGRAMS = kaffe-bin
- at NEED_LIBXPROF_FALSE@libxprof = #
 
 @NEED_LIBXPROF_TRUE at libxprof = ../xprof/libkaffexprof.la
- at ENABLE_JVMPI_FALSE@libjvmpi = #
+ at NEED_LIBXPROF_FALSE@libxprof = #
 
 @ENABLE_JVMPI_TRUE at libjvmpi = ../jvmpi/libkaffejvmpi.la
+ at ENABLE_JVMPI_FALSE@libjvmpi = #
 
 AM_CPPFLAGS = \
 	-I../kaffevm \
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.117 kaffe/kaffe/kaffevm/Makefile.in:1.117.2.1
--- kaffe/kaffe/kaffevm/Makefile.in:1.117	Sun Nov 30 23:49:21 2003
+++ kaffe/kaffe/kaffevm/Makefile.in	Mon Dec  8 01:06:12 2003
@@ -269,9 +269,9 @@
 AM_CPPFLAGS = -I$(top_srcdir)/kaffe/kaffevm/$(THREAD_DIR) $(ENGINE_INCLUDES) -I$(top_srcdir)/libltdl $(ENGINE_DEFS) -I$(top_srcdir)/kaffe/jvmpi -I$(top_srcdir)/kaffe/xprof -I$(top_builddir)/include
 
 native_LTLIBRARIES = libkaffevm.la
+ at HAVE_GCJ_SUPPORT_FALSE@libgcj = #
 
 @HAVE_GCJ_SUPPORT_TRUE at libgcj = gcj/libgcj.la
- at HAVE_GCJ_SUPPORT_FALSE@libgcj = #
 
 libkaffevm_la_LDFLAGS = $(KVMLIBFLAGS) -export-dynamic -release $(KVER)
 libkaffevm_la_DEPENDENCIES = \
Index: kaffe/kaffe/kaffevm/gcj/Makefile.in
diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.66 kaffe/kaffe/kaffevm/gcj/Makefile.in:1.66.2.1
--- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.66	Sun Nov 30 23:49:21 2003
+++ kaffe/kaffe/kaffevm/gcj/Makefile.in	Mon Dec  8 01:06:12 2003
@@ -254,9 +254,9 @@
 with_engine = @with_engine@
 
 AM_CPPFLAGS = -I$(top_srcdir)/kaffe/kaffevm/$(THREAD_DIR) -I.. -I$(srcdir)/.. $(ENGINE_DEFS) -I$(top_srcdir)/compat-include -I$(top_builddir)/include
+ at HAVE_GCJ_SUPPORT_FALSE@libgcj = #
 
 @HAVE_GCJ_SUPPORT_TRUE at libgcj = libgcj.la
- at HAVE_GCJ_SUPPORT_FALSE@libgcj = #
 
 noinst_LTLIBRARIES = $(libgcj)
 
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.107 kaffe/kaffe/scripts/Makefile.in:1.107.2.1
--- kaffe/kaffe/scripts/Makefile.in:1.107	Sun Nov 30 23:49:25 2003
+++ kaffe/kaffe/scripts/Makefile.in	Mon Dec  8 01:06:13 2003
@@ -269,9 +269,9 @@
 @SUN_COMPAT_TRUE at SUBDIRS = compat
 @SUN_COMPAT_FALSE at SCRIPTFILES_COMPAT = appletviewer javac javadoc
 @SUN_COMPAT_TRUE at SCRIPTFILES_COMPAT = 
+ at ENABLE_XPROF_FALSE@SCRIPTFILES_XPROF = 
 
 @ENABLE_XPROF_TRUE at SCRIPTFILES_XPROF = kaffexprof nm2as.awk
- at ENABLE_XPROF_FALSE@SCRIPTFILES_XPROF = 
 
 PSCRIPTFILES = install-jar
 
Index: kaffe/libltdl/config-h.in
diff -u kaffe/libltdl/config-h.in:1.9 kaffe/libltdl/config-h.in:1.9.2.1
--- kaffe/libltdl/config-h.in:1.9	Wed Dec  3 20:26:05 2003
+++ kaffe/libltdl/config-h.in	Mon Dec  8 01:06:13 2003
@@ -188,8 +188,6 @@
 /* Define to a type to use for `error_t' if it is not otherwise available. */
 #undef error_t
 
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
+/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+   if it is not supported. */
 #undef inline
-#endif
Index: kaffe/libraries/clib/Makefile.in
diff -u kaffe/libraries/clib/Makefile.in:1.77 kaffe/libraries/clib/Makefile.in:1.77.2.1
--- kaffe/libraries/clib/Makefile.in:1.77	Sun Nov 30 23:49:28 2003
+++ kaffe/libraries/clib/Makefile.in	Mon Dec  8 01:06:14 2003
@@ -252,10 +252,10 @@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
+ at COND_PURE_JAVA_MATH_FALSE@MAYBE_NATIVE_MATH = math
 
 # Build math library only if native implementation of java.math should be used.
 @COND_PURE_JAVA_MATH_TRUE at MAYBE_NATIVE_MATH = 
- at COND_PURE_JAVA_MATH_FALSE@MAYBE_NATIVE_MATH = math
 
 SUBDIRS = native io nio net zip $(MAYBE_NATIVE_MATH) security management awt
 subdir = libraries/clib
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.195 kaffe/libraries/javalib/Makefile.in:1.195.2.1
--- kaffe/libraries/javalib/Makefile.in:1.195	Tue Dec  2 20:11:13 2003
+++ kaffe/libraries/javalib/Makefile.in	Mon Dec  8 01:06:14 2003
@@ -269,9 +269,9 @@
 with_engine = @with_engine@
 
 SRCDIRS = gnu java javax kaffe org
+ at COND_PURE_JAVA_MATH_FALSE@JAVA_MATH_FILES = native_java_math.files
 
 @COND_PURE_JAVA_MATH_TRUE at JAVA_MATH_FILES = pure_java_math.files
- at COND_PURE_JAVA_MATH_FALSE@JAVA_MATH_FILES = native_java_math.files
 
 JAVA = $(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
 KAFFELIBRARYPATH = $(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/
@@ -2981,11 +2981,11 @@
 LIBDIR = lib
 
 rebuildLib = ./rebuildLib
- at HAVE_ZIP_FALSE@JAR_CMD1 = $(JAR) -cvf rt.jar -C $(LIBDIR) $(SRCDIRS)
 
 @HAVE_ZIP_TRUE at JAR_CMD1 = (dstdir=`pwd`; cd $(srcdir) && $(ZIP) -r $$dstdir/rt.jar META-INF)
- at HAVE_ZIP_FALSE@JAR_CMD2 = $(JAR) -uvf rt.jar -C $(srcdir) META-INF/
+ at HAVE_ZIP_FALSE@JAR_CMD1 = $(JAR) -cvf rt.jar -C $(LIBDIR) $(SRCDIRS)
 @HAVE_ZIP_TRUE at JAR_CMD2 = (cd $(LIBDIR) && $(ZIP) -DX -r ../rt.jar $(SRCDIRS))
+ at HAVE_ZIP_FALSE@JAR_CMD2 = $(JAR) -uvf rt.jar -C $(srcdir) META-INF/
 subdir = libraries/javalib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
Index: kaffe/test/internal/Makefile.in
diff -u kaffe/test/internal/Makefile.in:1.31 kaffe/test/internal/Makefile.in:1.31.2.1
--- kaffe/test/internal/Makefile.in:1.31	Sun Nov 30 23:49:41 2003
+++ kaffe/test/internal/Makefile.in	Mon Dec  8 01:06:15 2003
@@ -256,12 +256,12 @@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
- at NEED_LIBXPROF_FALSE@libxprof = #
 
 @NEED_LIBXPROF_TRUE at libxprof = ../../kaffe/xprof/libkaffexprof.la
- at ENABLE_JVMPI_FALSE@libjvmpi = #
+ at NEED_LIBXPROF_FALSE@libxprof = #
 
 @ENABLE_JVMPI_TRUE at libjvmpi = ../../kaffe/jvmpi/libkaffejvmpi.la
+ at ENABLE_JVMPI_FALSE@libjvmpi = #
 
 check_PROGRAMS = jitBasic
 
Index: kaffe/test/regression/Makefile.am
diff -u kaffe/test/regression/Makefile.am:1.84 kaffe/test/regression/Makefile.am:1.84.2.1
--- kaffe/test/regression/Makefile.am:1.84	Sun Nov 30 23:49:41 2003
+++ kaffe/test/regression/Makefile.am	Mon Dec  8 01:06:15 2003
@@ -222,8 +222,7 @@
 TEST_NATIVE = \
 	TestNative.java
 
-if HAVE_JASMIN
-JASMIN_TESTS = \
+JASMIN_TESTS_DIST = \
 	FloatAlias.j \
 	BadCatch1.j \
 	BadCatch2.j \
@@ -259,14 +258,17 @@
 	MethodSignature7.j \
 	MethodSignature8.j \
 	MethodSignature9.j
+if HAVE_JASMIN
+JASMIN_TESTS = JASMIN_TESTS_DIST
 else
 JASMIN_TESTS =
 endif
 
-if HAVE_BCEL
-BCEL_TESTS = \
+BCEL_TESTS_DIST = \
 	BadClassFileCode.java \
 	BadClassFileConstants.java
+if HAVE_BCEL
+BCEL_TESTS = BCEL_TESTS_DIST
 else
 BCEL_TESTS =
 endif
@@ -303,7 +305,10 @@
 	LoaderTest_Class3.java \
 	LoaderTest_Loader1.java \
 	LoaderTest_Loader2.java \
-	CatchLimits.j
+	$(JASMIN_TESTS_DIST) \
+	CatchLimits.j \
+	$(BCEL_TESTS_DIST) \
+	TestGnuCrypto.java
 
 CLEANFILES = *.class *.fail *.out core *.core ExceptionTest ziptest1.zip \
 	ziptest2.zip frozen_serial
Index: kaffe/test/regression/Makefile.in
diff -u kaffe/test/regression/Makefile.in:1.140 kaffe/test/regression/Makefile.in:1.140.2.1
--- kaffe/test/regression/Makefile.in:1.140	Sun Nov 30 23:49:41 2003
+++ kaffe/test/regression/Makefile.in	Mon Dec  8 01:06:15 2003
@@ -467,60 +467,62 @@
 	TestNative.java
 
 
- at HAVE_JASMIN_TRUE@JASMIN_TESTS = \
- at HAVE_JASMIN_TRUE@	FloatAlias.j \
- at HAVE_JASMIN_TRUE@	BadCatch1.j \
- at HAVE_JASMIN_TRUE@	BadCatch2.j \
- at HAVE_JASMIN_TRUE@	CircularClass.j \
- at HAVE_JASMIN_TRUE@	CircularInterface.j \
- at HAVE_JASMIN_TRUE@	ClassFlags1.j \
- at HAVE_JASMIN_TRUE@	ClassFlags2.j \
- at HAVE_JASMIN_TRUE@	DuplicateField.j \
- at HAVE_JASMIN_TRUE@	EmptyMethod.j \
- at HAVE_JASMIN_TRUE@	FieldFlags1.j \
- at HAVE_JASMIN_TRUE@	FieldFlags2.j \
- at HAVE_JASMIN_TRUE@	FieldFlags3.j \
- at HAVE_JASMIN_TRUE@	FieldFlags4.j \
- at HAVE_JASMIN_TRUE@	FieldRefSignature1.j \
- at HAVE_JASMIN_TRUE@	FieldSignature1.j \
- at HAVE_JASMIN_TRUE@	FieldSignature2.j \
- at HAVE_JASMIN_TRUE@	FieldSignature3.j \
- at HAVE_JASMIN_TRUE@	FieldSignature4.j \
- at HAVE_JASMIN_TRUE@	InvokedMethodSignature1.j \
- at HAVE_JASMIN_TRUE@	InvokedMethodSignature2.j \
- at HAVE_JASMIN_TRUE@	InvokedMethodSignature3.j \
- at HAVE_JASMIN_TRUE@	MethodFlags1.j \
- at HAVE_JASMIN_TRUE@	MethodFlags2.j \
- at HAVE_JASMIN_TRUE@	MethodFlags3.j \
- at HAVE_JASMIN_TRUE@	MethodFlags4.j \
- at HAVE_JASMIN_TRUE@	MethodFlags5.j \
- at HAVE_JASMIN_TRUE@	MethodSignature1.j \
- at HAVE_JASMIN_TRUE@	MethodSignature2.j \
- at HAVE_JASMIN_TRUE@	MethodSignature3.j \
- at HAVE_JASMIN_TRUE@	MethodSignature4.j \
- at HAVE_JASMIN_TRUE@	MethodSignature5.j \
- at HAVE_JASMIN_TRUE@	MethodSignature6.j \
- at HAVE_JASMIN_TRUE@	MethodSignature7.j \
- at HAVE_JASMIN_TRUE@	MethodSignature8.j \
- at HAVE_JASMIN_TRUE@	MethodSignature9.j
+JASMIN_TESTS_DIST = \
+	FloatAlias.j \
+	BadCatch1.j \
+	BadCatch2.j \
+	CircularClass.j \
+	CircularInterface.j \
+	ClassFlags1.j \
+	ClassFlags2.j \
+	DuplicateField.j \
+	EmptyMethod.j \
+	FieldFlags1.j \
+	FieldFlags2.j \
+	FieldFlags3.j \
+	FieldFlags4.j \
+	FieldRefSignature1.j \
+	FieldSignature1.j \
+	FieldSignature2.j \
+	FieldSignature3.j \
+	FieldSignature4.j \
+	InvokedMethodSignature1.j \
+	InvokedMethodSignature2.j \
+	InvokedMethodSignature3.j \
+	MethodFlags1.j \
+	MethodFlags2.j \
+	MethodFlags3.j \
+	MethodFlags4.j \
+	MethodFlags5.j \
+	MethodSignature1.j \
+	MethodSignature2.j \
+	MethodSignature3.j \
+	MethodSignature4.j \
+	MethodSignature5.j \
+	MethodSignature6.j \
+	MethodSignature7.j \
+	MethodSignature8.j \
+	MethodSignature9.j
 
 @HAVE_JASMIN_FALSE at JASMIN_TESTS = 
+ at HAVE_JASMIN_TRUE@JASMIN_TESTS = JASMIN_TESTS_DIST
 
- at HAVE_BCEL_TRUE@BCEL_TESTS = \
- at HAVE_BCEL_TRUE@	BadClassFileCode.java \
- at HAVE_BCEL_TRUE@	BadClassFileConstants.java
+BCEL_TESTS_DIST = \
+	BadClassFileCode.java \
+	BadClassFileConstants.java
 
+ at HAVE_BCEL_TRUE@BCEL_TESTS = BCEL_TESTS_DIST
 @HAVE_BCEL_FALSE at BCEL_TESTS = 
- at USER_WANT_GNU_CRYPTO_FALSE@TEST_GNU_CRYPTO = 
 
 @USER_WANT_GNU_CRYPTO_TRUE at TEST_GNU_CRYPTO = \
 @USER_WANT_GNU_CRYPTO_TRUE@	TestGnuCrypto.java
 
+ at USER_WANT_GNU_CRYPTO_FALSE@TEST_GNU_CRYPTO = 
 
 TEST_Overflow = Overflow.java
+ at HAVE_GCJ_SUPPORT_FALSE@TESTS = $(ALWAYS_TESTS)
 
 @HAVE_GCJ_SUPPORT_TRUE at TESTS = $(ALWAYS_TESTS) $(TEST_Overflow)
- at HAVE_GCJ_SUPPORT_FALSE@TESTS = $(ALWAYS_TESTS)
 
 XFAIL_TESTS = 
 
@@ -537,7 +539,10 @@
 	LoaderTest_Class3.java \
 	LoaderTest_Loader1.java \
 	LoaderTest_Loader2.java \
-	CatchLimits.j
+	$(JASMIN_TESTS_DIST) \
+	CatchLimits.j \
+	$(BCEL_TESTS_DIST) \
+	TestGnuCrypto.java
 
 
 CLEANFILES = *.class *.fail *.out core *.core ExceptionTest ziptest1.zip \
Index: kaffe/test/regression/run_time/Makefile.am
diff -u kaffe/test/regression/run_time/Makefile.am:1.2 kaffe/test/regression/run_time/Makefile.am:1.2.4.1
--- kaffe/test/regression/run_time/Makefile.am:1.2	Tue Sep 16 14:34:05 2003
+++ kaffe/test/regression/run_time/Makefile.am	Mon Dec  8 01:06:16 2003
@@ -78,4 +78,5 @@
 	a/PublicToPackage.java \
 	a/PublicToProtected.java \
 	PublicToPrivate.java \
+	PublicToPrivateField.java \
 	StaticToInst.java
Index: kaffe/test/regression/run_time/Makefile.in
diff -u kaffe/test/regression/run_time/Makefile.in:1.5 kaffe/test/regression/run_time/Makefile.in:1.5.2.1
--- kaffe/test/regression/run_time/Makefile.in:1.5	Sun Nov 30 23:49:42 2003
+++ kaffe/test/regression/run_time/Makefile.in	Mon Dec  8 01:06:16 2003
@@ -286,6 +286,7 @@
 	a/PublicToPackage.java \
 	a/PublicToProtected.java \
 	PublicToPrivate.java \
+	PublicToPrivateField.java \
 	StaticToInst.java
 
 subdir = test/regression/run_time




More information about the kaffe mailing list