[cp-patches] Generating GThreadNativeMethodRunner.h automatically and a workaround

[Mark Wielaard]

Hi,

While merging the new portable native sync code to libgcj gui branch I
noticed a generated JNI header file not in the include directory. When
moving it there I noticed that not all JNI header generation programs
define C #defines for final static (primitive) constants so I added a
workaround in case the .h file doesn't have the constants.

2004-07-31  Mark Wielaard  <address@hidden>

    * include/Makefile.am: Add rules to generate
    gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h.
    * include/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h: New
    generated header file.
    * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h:
    Removed
    * native/jni/gtk-peer/gthread-jni.c: Define MIN_, MAX_ and NORM_
    PRIORITY when not already defined in header file.

For gcjh this is tracked as issue: http://gcc.gnu.org/PR16843

Committed.

Cheers,

Mark

Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.25
diff -u -r1.25 Makefile.am
--- include/Makefile.am 22 Jul 2004 08:30:56 -0000      1.25
+++ include/Makefile.am 31 Jul 2004 10:22:54 -0000
@@ -37,6 +37,7 @@
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkToolkit.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h \
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h \
 $(top_srcdir)/include/gnu_java_net_PlainDatagramSocketImpl.h \
 $(top_srcdir)/include/gnu_java_net_PlainSocketImpl.h \
 $(top_srcdir)/include/gnu_java_nio_NIOServerSocket.h \
@@ -127,6 +128,8 @@
        $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkTextFieldPeer
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkToolkit.h: 
$(top_srcdir)/gnu/java/awt/peer/gtk/GtkToolkit.java
        $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkToolkit
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h: 
$(top_srcdir)/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java
+       $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GThreadNativeMethodRunner
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h: 
$(top_srcdir)/gnu/java/awt/peer/gtk/GtkWindowPeer.java
        $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkWindowPeer
 $(top_srcdir)/include/gnu_java_net_PlainDatagramSocketImpl.h: 
$(top_srcdir)/gnu/java/net/PlainDatagramSocketImpl.java
Index: include/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
===================================================================
RCS file: include/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
diff -N include/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ include/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h   31 Jul 2004 
10:22:54 -0000
@@ -0,0 +1,19 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_awt_peer_gtk_GThreadNativeMethodRunner__
+#define __gnu_java_awt_peer_gtk_GThreadNativeMethodRunner__
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_nativeRun (JNIEnv *env, 
jobject, jlong, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gnu_java_awt_peer_gtk_GThreadNativeMethodRunner__ */
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
===================================================================
RCS file: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
diff -N native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h       
6 Jun 2004 04:14:13 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class gnu_java_awt_peer_gtk_GThreadNativeMethodRunner */
-
-#ifndef _Included_gnu_java_awt_peer_gtk_GThreadNativeMethodRunner
-#define _Included_gnu_java_awt_peer_gtk_GThreadNativeMethodRunner
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_MIN_PRIORITY
-#define gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_MIN_PRIORITY 1L
-#undef gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_NORM_PRIORITY
-#define gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_NORM_PRIORITY 5L
-#undef gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_MAX_PRIORITY
-#define gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_MAX_PRIORITY 10L
-/* Inaccessible static: numAnonymousThreadsCreated */
-/* Inaccessible static: threads */
-/* Inaccessible static: joinable */
-/*
- * Class:     gnu_java_awt_peer_gtk_GThreadNativeMethodRunner
- * Method:    nativeRun
- * Signature: (JJ)V
- */
-JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_nativeRun
-  (JNIEnv *, jobject, jlong, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
Index: native/jni/gtk-peer/gthread-jni.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gthread-jni.c,v
retrieving revision 1.15
diff -u -r1.15 gthread-jni.c
--- native/jni/gtk-peer/gthread-jni.c   26 Jul 2004 21:34:36 -0000      1.15
+++ native/jni/gtk-peer/gthread-jni.c   31 Jul 2004 10:22:55 -0000
@@ -228,7 +228,19 @@
 #include <assert.h>            /* assert() */
 
 /* For Java thread priority constants. */
-#include "gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h"
+#include <gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h>
+
+/* Since not all JNI header generators actually define constants we
+ define them here explicitly. */
+#ifndef gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_MIN_PRIORITY
+#define gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_MIN_PRIORITY 1
+#endif
+#ifndef gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_NORM_PRIORITY
+#define gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_NORM_PRIORITY 5
+#endif
+#ifndef gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_MAX_PRIORITY
+#define gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_MAX_PRIORITY 10
+#endif
 
 /*  The VM handle.  This is set in
     Java_gnu_java_awt_peer_gtk_GtkMainThread_gtkInit */

signature.asc
Description: This is a digitally signed message part