[PATCH] Use -bootclasspath with JAVAH

commit-classpath

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Use -bootclasspath with JAVAH

From:	Mark Wielaard
Subject:	[PATCH] Use -bootclasspath with JAVAH
Date:	Thu, 25 Dec 2003 18:06:23 +0100

Hi,

I was getting different .h files depending on the JAVAH in use (gcjh
from gcc 3.3 or 3.4). The following patch uses -bootclasspath, not
-classpath for header generation. I have regenerated all header files
with this and the ones that needed updating are also in this patch.

2003-12-25  Mark Wielaard  <address@hidden>

        * include/Makefile.am (ARG_CLASSPATH_JAVAH): Use -bootclasspath.
        * include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h: Regenerated.
        * include/gnu_java_awt_peer_gtk_GtkComponentPeer.h: Likewise.
        * include/gnu_java_awt_peer_gtk_GtkToolkit.h: Likewise.
        * include/java_lang_VMSystem.h: Likewise.

I will commit this.

Cheers,

Mark

P.S. While hacking on classpath from CVS you might want to use the
--enable-regen-headers and --enable-maintainer-mode flags to configure
to catch these kind of things.

? jar_url.patch
? javah.patch
Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- include/Makefile.am 4 Nov 2003 11:24:08 -0000       1.5
+++ include/Makefile.am 25 Dec 2003 17:02:53 -0000
@@ -1,5 +1,5 @@
 ARG_JNI_JAVAH = -jni
-ARG_CLASSPATH_JAVAH = -classpath
+ARG_CLASSPATH_JAVAH = -bootclasspath
 JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) 
../lib:$(USER_CLASSLIB)
 
 H_FILES = \
Index: include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GdkPixbufDecoder.h
--- include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h    2 Dec 2003 19:42:10 
-0000       1.2
+++ include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h    25 Dec 2003 17:02:53 
-0000
@@ -10,10 +10,10 @@
 {
 #endif
 
-extern void Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_initStaticState 
(JNIEnv *env, jclass);
-extern void Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_initState (JNIEnv 
*env, jobject);
-extern void Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_pumpBytes (JNIEnv 
*env, jobject, jbyteArray, jint);
-extern void Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_finish (JNIEnv *env, 
jobject);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_initStaticState (JNIEnv *env, 
jclass);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_initState (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_pumpBytes (JNIEnv *env, jobject, 
jbyteArray, jint);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GdkPixbufDecoder_finish (JNIEnv *env, jobject);
 
 #ifdef __cplusplus
 }
Index: include/gnu_java_awt_peer_gtk_GtkComponentPeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h,v
retrieving revision 1.5
diff -u -r1.5 gnu_java_awt_peer_gtk_GtkComponentPeer.h
--- include/gnu_java_awt_peer_gtk_GtkComponentPeer.h    2 Dec 2003 19:42:10 
-0000       1.5
+++ include/gnu_java_awt_peer_gtk_GtkComponentPeer.h    25 Dec 2003 17:02:53 
-0000
@@ -10,24 +10,24 @@
 {
 #endif
 
-extern jboolean Java_gnu_java_awt_peer_gtk_GtkComponentPeer_isEnabled (JNIEnv 
*env, jobject);
-extern jboolean Java_gnu_java_awt_peer_gtk_GtkComponentPeer_modalHasGrab 
(JNIEnv *env, jclass);
-extern jintArray 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetForeground (JNIEnv 
*env, jobject);
-extern jintArray 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetBackground (JNIEnv 
*env, jobject);
-extern void Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetVisible 
(JNIEnv *env, jobject, jboolean);
-extern void Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetDimensions 
(JNIEnv *env, jobject, jintArray);
-extern void 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetLocationOnScreen 
(JNIEnv *env, jobject, jintArray);
-extern void Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursor 
(JNIEnv *env, jobject, jint);
-extern void Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetBackground 
(JNIEnv *env, jobject, jint, jint, jint);
-extern void Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetForeground 
(JNIEnv *env, jobject, jint, jint, jint);
-extern void Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks (JNIEnv 
*env, jobject);
-extern void Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus__ (JNIEnv 
*env, jobject);
-extern void Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds 
(JNIEnv *env, jobject, jint, jint, jint, jint);
-extern void 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_String_2
 (JNIEnv *env, jobject, jstring, jstring);
-extern void 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Z (JNIEnv 
*env, jobject, jstring, jboolean);
-extern void 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2I (JNIEnv 
*env, jobject, jstring, jint);
-extern void 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2F (JNIEnv 
*env, jobject, jstring, jfloat);
-extern void 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_Object_2
 (JNIEnv *env, jobject, jstring, jobject);
+extern JNIEXPORT jboolean JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_isEnabled (JNIEnv *env, jobject);
+extern JNIEXPORT jboolean JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_modalHasGrab (JNIEnv *env, jclass);
+extern JNIEXPORT jintArray JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetForeground (JNIEnv 
*env, jobject);
+extern JNIEXPORT jintArray JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetBackground (JNIEnv 
*env, jobject);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetVisible (JNIEnv *env, 
jobject, jboolean);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetDimensions (JNIEnv 
*env, jobject, jintArray);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetGetLocationOnScreen 
(JNIEnv *env, jobject, jintArray);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursor (JNIEnv *env, 
jobject, jint);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetBackground (JNIEnv 
*env, jobject, jint, jint, jint);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetForeground (JNIEnv 
*env, jobject, jint, jint, jint);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectHooks (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus__ (JNIEnv *env, 
jobject);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds (JNIEnv *env, 
jobject, jint, jint, jint, jint);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_String_2
 (JNIEnv *env, jobject, jstring, jstring);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Z (JNIEnv 
*env, jobject, jstring, jboolean);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2I (JNIEnv 
*env, jobject, jstring, jint);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2F (JNIEnv 
*env, jobject, jstring, jfloat);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkComponentPeer_set__Ljava_lang_String_2Ljava_lang_Object_2
 (JNIEnv *env, jobject, jstring, jobject);
 
 #ifdef __cplusplus
 }
Index: include/gnu_java_awt_peer_gtk_GtkToolkit.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkToolkit.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkToolkit.h
--- include/gnu_java_awt_peer_gtk_GtkToolkit.h  2 Dec 2003 19:42:10 -0000       
1.3
+++ include/gnu_java_awt_peer_gtk_GtkToolkit.h  25 Dec 2003 17:02:53 -0000
@@ -10,10 +10,10 @@
 {
 #endif
 
-extern void Java_gnu_java_awt_peer_gtk_GtkToolkit_beep (JNIEnv *env, jobject);
-extern void Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenSizeDimensions 
(JNIEnv *env, jobject, jintArray);
-extern jint Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenResolution (JNIEnv 
*env, jobject);
-extern void Java_gnu_java_awt_peer_gtk_GtkToolkit_sync (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_beep 
(JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenSizeDimensions (JNIEnv *env, 
jobject, jintArray);
+extern JNIEXPORT jint JNICALL 
Java_gnu_java_awt_peer_gtk_GtkToolkit_getScreenResolution (JNIEnv *env, 
jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkToolkit_sync 
(JNIEnv *env, jobject);
 
 #ifdef __cplusplus
 }
Index: include/java_lang_VMSystem.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_lang_VMSystem.h,v
retrieving revision 1.2
diff -u -r1.2 java_lang_VMSystem.h
--- include/java_lang_VMSystem.h        4 Apr 2003 04:55:40 -0000       1.2
+++ include/java_lang_VMSystem.h        25 Dec 2003 17:02:53 -0000
@@ -10,13 +10,13 @@
 {
 #endif
 
-extern void Java_java_lang_VMSystem_arraycopy (JNIEnv *env, jclass, jobject, 
jint, jobject, jint, jint);
-extern jint Java_java_lang_VMSystem_identityHashCode (JNIEnv *env, jclass, 
jobject);
-extern jboolean Java_java_lang_VMSystem_isWordsBigEndian (JNIEnv *env, jclass);
-extern void Java_java_lang_VMSystem_setIn (JNIEnv *env, jclass, jobject);
-extern void Java_java_lang_VMSystem_setOut (JNIEnv *env, jclass, jobject);
-extern void Java_java_lang_VMSystem_setErr (JNIEnv *env, jclass, jobject);
-extern jlong Java_java_lang_VMSystem_currentTimeMillis (JNIEnv *env, jclass);
+extern JNIEXPORT void JNICALL Java_java_lang_VMSystem_arraycopy (JNIEnv *env, 
jclass, jobject, jint, jobject, jint, jint);
+extern JNIEXPORT jint JNICALL Java_java_lang_VMSystem_identityHashCode (JNIEnv 
*env, jclass, jobject);
+extern JNIEXPORT jboolean JNICALL Java_java_lang_VMSystem_isWordsBigEndian 
(JNIEnv *env, jclass);
+extern JNIEXPORT void JNICALL Java_java_lang_VMSystem_setIn (JNIEnv *env, 
jclass, jobject);
+extern JNIEXPORT void JNICALL Java_java_lang_VMSystem_setOut (JNIEnv *env, 
jclass, jobject);
+extern JNIEXPORT void JNICALL Java_java_lang_VMSystem_setErr (JNIEnv *env, 
jclass, jobject);
+extern JNIEXPORT jlong JNICALL Java_java_lang_VMSystem_currentTimeMillis 
(JNIEnv *env, jclass);
 
 #ifdef __cplusplus
 }

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

[Prev in Thread]

Current Thread

[Next in Thread]

[PATCH] Use -bootclasspath with JAVAH, Mark Wielaard <=

Prev by Date: [PATCH] Better jar URL parsing.
Next by Date: [PATCH] Sync gnu/java/rmi/server with kaffe (primitive types and void return values)
Previous by thread: [PATCH] Better jar URL parsing.
Next by thread: [PATCH] Sync gnu/java/rmi/server with kaffe (primitive types and void return values)
Index(es):
- Date
- Thread