PatchSet 6999
Date: 2005/12/12 02:36:20
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Switched back to use VMPipe from GNU classpath
2005-12-11 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/clib/nio/gnu_java_nio_VMPipe.c:
Added file from GNU Classpath.
* include/Makefile.am: Added gnu_java_nio_VMPipe.h to
generated headers.
* libraries/clib/nio/Makefile.am: Added gnu_java_nio_VMPipe.c.
* libraries/javalib/Makefile.am.in: Only link glibj.zip to rt.jar if
such link does not exist.
* libraries/javalib/vmspecific/gnu/java/nio/VMPipe.java:
Switched back to version from GNU Classpath, to avoid confusing the
GNU Classpath jni function comparison scripts.
Members:
ChangeLog:1.4520->1.4521
include/Makefile.am:1.114->1.115
include/Makefile.in:1.251->1.252
libraries/clib/nio/Makefile.am:1.19->1.20
libraries/clib/nio/Makefile.in:1.89->1.90
libraries/clib/nio/gnu_java_nio_VMPipe.c:INITIAL->1.1
libraries/javalib/Makefile.am:1.409->1.410
libraries/javalib/Makefile.am.in:1.56->1.57
libraries/javalib/Makefile.in:1.506->1.507
libraries/javalib/vmspecific/gnu/java/nio/VMPipe.java:1.1->1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4520 kaffe/ChangeLog:1.4521
--- kaffe/ChangeLog:1.4520 Sun Dec 11 13:36:46 2005
+++ kaffe/ChangeLog Mon Dec 12 02:36:20 2005
@@ -1,3 +1,20 @@
+2005-12-11 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * libraries/clib/nio/gnu_java_nio_VMPipe.c:
+ Added file from GNU Classpath.
+
+ * include/Makefile.am: Added gnu_java_nio_VMPipe.h to
+ generated headers.
+
+ * libraries/clib/nio/Makefile.am: Added gnu_java_nio_VMPipe.c.
+
+ * libraries/javalib/Makefile.am.in: Only link glibj.zip to rt.jar if
+ such link does not exist.
+
+ * libraries/javalib/vmspecific/gnu/java/nio/VMPipe.java:
+ Switched back to version from GNU Classpath, to avoid confusing the
+ GNU Classpath jni function comparison scripts.
+
2005-12-11 Guilhem Lavaux <[EMAIL PROTECTED]>
* test/regression/TestSerialPersistent.java: Fix expected output.
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.114 kaffe/include/Makefile.am:1.115
--- kaffe/include/Makefile.am:1.114 Mon Oct 24 21:36:24 2005
+++ kaffe/include/Makefile.am Mon Dec 12 02:36:28 2005
@@ -89,6 +89,7 @@
java_util_zip_ZipFile.h \
org_kaffe_management_Classpath.h \
gnu_java_nio_VMSelector.h \
+ gnu_java_nio_VMPipe.h \
gnu_classpath_VMStackWalker.h
DERIVED_HDRS = $(INSTALL_DERIVED_HDRS) $(NOINSTALL_DERIVED_HDRS)
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.251 kaffe/include/Makefile.in:1.252
--- kaffe/include/Makefile.in:1.251 Sun Dec 11 00:59:17 2005
+++ kaffe/include/Makefile.in Mon Dec 12 02:36:28 2005
@@ -431,6 +431,7 @@
java_util_zip_ZipFile.h \
org_kaffe_management_Classpath.h \
gnu_java_nio_VMSelector.h \
+ gnu_java_nio_VMPipe.h \
gnu_classpath_VMStackWalker.h
DERIVED_HDRS = $(INSTALL_DERIVED_HDRS) $(NOINSTALL_DERIVED_HDRS)
Index: kaffe/libraries/clib/nio/Makefile.am
diff -u kaffe/libraries/clib/nio/Makefile.am:1.19
kaffe/libraries/clib/nio/Makefile.am:1.20
--- kaffe/libraries/clib/nio/Makefile.am:1.19 Sat Oct 29 19:43:09 2005
+++ kaffe/libraries/clib/nio/Makefile.am Mon Dec 12 02:36:30 2005
@@ -28,8 +28,9 @@
java_nio_VMDirectByteBuffer.c \
gnu_java_nio_charset_iconv_IconvDecoder.c \
gnu_java_nio_charset_iconv_IconvEncoder.c \
+ gnu_java_nio_channels_FileChannelImpl.c \
gnu_java_nio_VMSelector.c \
- gnu_java_nio_channels_FileChannelImpl.c
+ gnu_java_nio_VMPipe.c
libjavanio_la_LIBADD = \
$(LTLIBICONV) \
Index: kaffe/libraries/clib/nio/Makefile.in
diff -u kaffe/libraries/clib/nio/Makefile.in:1.89
kaffe/libraries/clib/nio/Makefile.in:1.90
--- kaffe/libraries/clib/nio/Makefile.in:1.89 Sun Dec 11 00:59:40 2005
+++ kaffe/libraries/clib/nio/Makefile.in Mon Dec 12 02:36:30 2005
@@ -88,8 +88,9 @@
libjavanio_la-java_nio_VMDirectByteBuffer.lo \
libjavanio_la-gnu_java_nio_charset_iconv_IconvDecoder.lo \
libjavanio_la-gnu_java_nio_charset_iconv_IconvEncoder.lo \
+ libjavanio_la-gnu_java_nio_channels_FileChannelImpl.lo \
libjavanio_la-gnu_java_nio_VMSelector.lo \
- libjavanio_la-gnu_java_nio_channels_FileChannelImpl.lo
+ libjavanio_la-gnu_java_nio_VMPipe.lo
libjavanio_la_OBJECTS = $(am_libjavanio_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
@@ -388,8 +389,9 @@
java_nio_VMDirectByteBuffer.c \
gnu_java_nio_charset_iconv_IconvDecoder.c \
gnu_java_nio_charset_iconv_IconvEncoder.c \
+ gnu_java_nio_channels_FileChannelImpl.c \
gnu_java_nio_VMSelector.c \
- gnu_java_nio_channels_FileChannelImpl.c
+ gnu_java_nio_VMPipe.c
libjavanio_la_LIBADD = \
$(LTLIBICONV) \
@@ -466,6 +468,7 @@
distclean-compile:
-rm -f *.tab.c
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@@ -522,6 +525,13 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavanio_la_CFLAGS) $(CFLAGS) -c -o
libjavanio_la-gnu_java_nio_charset_iconv_IconvEncoder.lo `test -f
'gnu_java_nio_charset_iconv_IconvEncoder.c' || echo
'$(srcdir)/'`gnu_java_nio_charset_iconv_IconvEncoder.c
+libjavanio_la-gnu_java_nio_channels_FileChannelImpl.lo:
gnu_java_nio_channels_FileChannelImpl.c
[EMAIL PROTECTED]@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavanio_la_CFLAGS) $(CFLAGS) -MT
libjavanio_la-gnu_java_nio_channels_FileChannelImpl.lo -MD -MP -MF
"$(DEPDIR)/libjavanio_la-gnu_java_nio_channels_FileChannelImpl.Tpo" -c -o
libjavanio_la-gnu_java_nio_channels_FileChannelImpl.lo `test -f
'gnu_java_nio_channels_FileChannelImpl.c' || echo
'$(srcdir)/'`gnu_java_nio_channels_FileChannelImpl.c; \
[EMAIL PROTECTED]@ then mv -f
"$(DEPDIR)/libjavanio_la-gnu_java_nio_channels_FileChannelImpl.Tpo"
"$(DEPDIR)/libjavanio_la-gnu_java_nio_channels_FileChannelImpl.Plo"; else rm -f
"$(DEPDIR)/libjavanio_la-gnu_java_nio_channels_FileChannelImpl.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@
source='gnu_java_nio_channels_FileChannelImpl.c'
object='libjavanio_la-gnu_java_nio_channels_FileChannelImpl.lo' libtool=yes
@AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavanio_la_CFLAGS) $(CFLAGS) -c -o
libjavanio_la-gnu_java_nio_channels_FileChannelImpl.lo `test -f
'gnu_java_nio_channels_FileChannelImpl.c' || echo
'$(srcdir)/'`gnu_java_nio_channels_FileChannelImpl.c
+
libjavanio_la-gnu_java_nio_VMSelector.lo: gnu_java_nio_VMSelector.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavanio_la_CFLAGS) $(CFLAGS) -MT libjavanio_la-gnu_java_nio_VMSelector.lo
-MD -MP -MF "$(DEPDIR)/libjavanio_la-gnu_java_nio_VMSelector.Tpo" -c -o
libjavanio_la-gnu_java_nio_VMSelector.lo `test -f 'gnu_java_nio_VMSelector.c'
|| echo '$(srcdir)/'`gnu_java_nio_VMSelector.c; \
@am__fastdepCC_TRUE@ then mv -f
"$(DEPDIR)/libjavanio_la-gnu_java_nio_VMSelector.Tpo"
"$(DEPDIR)/libjavanio_la-gnu_java_nio_VMSelector.Plo"; else rm -f
"$(DEPDIR)/libjavanio_la-gnu_java_nio_VMSelector.Tpo"; exit 1; fi
@@ -529,12 +539,12 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavanio_la_CFLAGS) $(CFLAGS) -c -o
libjavanio_la-gnu_java_nio_VMSelector.lo `test -f 'gnu_java_nio_VMSelector.c'
|| echo '$(srcdir)/'`gnu_java_nio_VMSelector.c
-libjavanio_la-gnu_java_nio_channels_FileChannelImpl.lo:
gnu_java_nio_channels_FileChannelImpl.c
[EMAIL PROTECTED]@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavanio_la_CFLAGS) $(CFLAGS) -MT
libjavanio_la-gnu_java_nio_channels_FileChannelImpl.lo -MD -MP -MF
"$(DEPDIR)/libjavanio_la-gnu_java_nio_channels_FileChannelImpl.Tpo" -c -o
libjavanio_la-gnu_java_nio_channels_FileChannelImpl.lo `test -f
'gnu_java_nio_channels_FileChannelImpl.c' || echo
'$(srcdir)/'`gnu_java_nio_channels_FileChannelImpl.c; \
[EMAIL PROTECTED]@ then mv -f
"$(DEPDIR)/libjavanio_la-gnu_java_nio_channels_FileChannelImpl.Tpo"
"$(DEPDIR)/libjavanio_la-gnu_java_nio_channels_FileChannelImpl.Plo"; else rm -f
"$(DEPDIR)/libjavanio_la-gnu_java_nio_channels_FileChannelImpl.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@
source='gnu_java_nio_channels_FileChannelImpl.c'
object='libjavanio_la-gnu_java_nio_channels_FileChannelImpl.lo' libtool=yes
@AMDEPBACKSLASH@
+libjavanio_la-gnu_java_nio_VMPipe.lo: gnu_java_nio_VMPipe.c
[EMAIL PROTECTED]@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavanio_la_CFLAGS) $(CFLAGS) -MT libjavanio_la-gnu_java_nio_VMPipe.lo -MD
-MP -MF "$(DEPDIR)/libjavanio_la-gnu_java_nio_VMPipe.Tpo" -c -o
libjavanio_la-gnu_java_nio_VMPipe.lo `test -f 'gnu_java_nio_VMPipe.c' || echo
'$(srcdir)/'`gnu_java_nio_VMPipe.c; \
[EMAIL PROTECTED]@ then mv -f
"$(DEPDIR)/libjavanio_la-gnu_java_nio_VMPipe.Tpo"
"$(DEPDIR)/libjavanio_la-gnu_java_nio_VMPipe.Plo"; else rm -f
"$(DEPDIR)/libjavanio_la-gnu_java_nio_VMPipe.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCC_FALSE@ source='gnu_java_nio_VMPipe.c'
object='libjavanio_la-gnu_java_nio_VMPipe.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavanio_la_CFLAGS) $(CFLAGS) -c -o
libjavanio_la-gnu_java_nio_channels_FileChannelImpl.lo `test -f
'gnu_java_nio_channels_FileChannelImpl.c' || echo
'$(srcdir)/'`gnu_java_nio_channels_FileChannelImpl.c
[EMAIL PROTECTED]@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(libjavanio_la_CFLAGS) $(CFLAGS) -c -o libjavanio_la-gnu_java_nio_VMPipe.lo
`test -f 'gnu_java_nio_VMPipe.c' || echo '$(srcdir)/'`gnu_java_nio_VMPipe.c
mostlyclean-libtool:
-rm -f *.lo
===================================================================
Checking out kaffe/libraries/clib/nio/gnu_java_nio_VMPipe.c
RCS: /home/cvs/kaffe/kaffe/libraries/clib/nio/gnu_java_nio_VMPipe.c,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/libraries/clib/nio/gnu_java_nio_VMPipe.c Mon Dec 12 02:43:41 2005
@@ -0,0 +1,56 @@
+/* gnu_java_nio_VMPipe.c - Native methods for PipeImpl class
+ Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+#include <config.h>
+#include <errno.h>
+
+#include <jni.h>
+#include <jcl.h>
+
+#include "gnu_java_nio_VMPipe.h"
+
+#define IO_EXCEPTION "java/io/IOException"
+
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_VMPipe_init (JNIEnv * env,
+ jclass cls __attribute__ ((__unused__)),
+ jobject self __attribute__ ((__unused__)),
+ jobject provider __attribute__ ((__unused__)))
+{
+ JCL_ThrowException (env, IO_EXCEPTION,
+ "gnu.java.nio.VMPipe.init(): not implemented");
+}
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.409
kaffe/libraries/javalib/Makefile.am:1.410
--- kaffe/libraries/javalib/Makefile.am:1.409 Sat Dec 10 23:17:53 2005
+++ kaffe/libraries/javalib/Makefile.am Mon Dec 12 02:36:30 2005
@@ -43,7 +43,9 @@
export JAVA_COMPILER
install-data-local: installdirs
- $(LN_S) ${jrelibdir}/glibj.zip ${jrelibdir}/rt.jar
+ if ! test -f ${jrelibdir}/rt.jar ; then \
+ $(LN_S) ${jrelibdir}/glibj.zip ${jrelibdir}/rt.jar ; \
+ fi
uninstall-local:
$(RM) ${jrelibdir}/rt.jar
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.56
kaffe/libraries/javalib/Makefile.am.in:1.57
--- kaffe/libraries/javalib/Makefile.am.in:1.56 Sat Dec 10 23:17:54 2005
+++ kaffe/libraries/javalib/Makefile.am.in Mon Dec 12 02:36:32 2005
@@ -43,7 +43,9 @@
export JAVA_COMPILER
install-data-local: installdirs
- $(LN_S) ${jrelibdir}/glibj.zip ${jrelibdir}/rt.jar
+ if ! test -f ${jrelibdir}/rt.jar ; then \
+ $(LN_S) ${jrelibdir}/glibj.zip ${jrelibdir}/rt.jar ; \
+ fi
uninstall-local:
$(RM) ${jrelibdir}/rt.jar
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.506
kaffe/libraries/javalib/Makefile.in:1.507
--- kaffe/libraries/javalib/Makefile.in:1.506 Sun Dec 11 00:59:50 2005
+++ kaffe/libraries/javalib/Makefile.in Mon Dec 12 02:36:32 2005
@@ -2049,7 +2049,9 @@
export JAVA_COMPILER
install-data-local: installdirs
- $(LN_S) ${jrelibdir}/glibj.zip ${jrelibdir}/rt.jar
+ if ! test -f ${jrelibdir}/rt.jar ; then \
+ $(LN_S) ${jrelibdir}/glibj.zip ${jrelibdir}/rt.jar ; \
+ fi
uninstall-local:
$(RM) ${jrelibdir}/rt.jar
Index: kaffe/libraries/javalib/vmspecific/gnu/java/nio/VMPipe.java
diff -u kaffe/libraries/javalib/vmspecific/gnu/java/nio/VMPipe.java:1.1
kaffe/libraries/javalib/vmspecific/gnu/java/nio/VMPipe.java:1.2
--- kaffe/libraries/javalib/vmspecific/gnu/java/nio/VMPipe.java:1.1 Wed Oct
19 20:16:03 2005
+++ kaffe/libraries/javalib/vmspecific/gnu/java/nio/VMPipe.java Mon Dec 12
02:36:34 2005
@@ -59,9 +59,6 @@
}
}
- static void init(PipeImpl self, SelectorProvider provider)
- throws IOException
- {
- throw new IOException("gnu.java.nio.VMPipe.init(): not
implemented");
- }
+ static native void init(PipeImpl self, SelectorProvider provider)
+ throws IOException;
}
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
