Re: Missing GdkClasspathFontPeer files in classpath 0.10

[Mark Wielaard]

Hi,

On Sat, 2004-08-07 at 18:15, news.gmane.org wrote:
> native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c
> native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c
> 
> have not been included in the classpath 0.10 release ?

They are part of the cairo/pango setup (for Graphics2D written by
Graydon Hoare) which were never enabled in GNU Classpath.

> Due to this I get the following errors:
> 
> LOG: warning: native function initStaticState: ()V not found in class 
> gnu/java/awt/peer/gtk/GdkClasspathFontPeer
> LOG: warning: native function initState: ()V not found in class 
> gnu/java/awt/peer/gtk/GdkClasspathFontPeer
> LOG: warning: native function dispose: ()V not found in class 
> gnu/java/awt/peer/gtk/GdkClasspathFontPeer
> LOG: warning: native function setFont: (Ljava/lang/String;II)V not found 
> in class gnu/java/awt/peer/gtk/GdkClasspathFontPeer

Interesting. Which tool gives this output?
We could use something that warns us about missing native methods.

> Is it possible to get this running without those files or do I have to 
> use the cvs version ?

No, CVS still has the same problem.
You can try the attached patch though (and get those two C files from
CVS). It adds all build infrastructure. But does not detect whether the
correct cairo libs have been installed and have not been tested at all.
You will have to configure with --enable-regen-headers.

Graydon, how ready is this code and how would people test it out?

Cheers,

Mark


Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.27
diff -u -r1.27 Makefile.am
--- include/Makefile.am 31 Jul 2004 16:07:21 -0000      1.27
+++ include/Makefile.am 9 Aug 2004 22:25:52 -0000
@@ -5,8 +5,12 @@
 JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) 
../lib:$(USER_CLASSLIB)
 
 H_FILES = \
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.h \
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkFontMetrics.h \
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkGlyphVector.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkGraphics.h \
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkGraphics2D.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkButtonPeer.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkCanvasPeer.h \
@@ -66,10 +70,18 @@
 
 all-local: $(H_FILES)
 
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.h: 
$(top_srcdir)/gnu/java/awt/peer/gtk/GdkClasspathFontPeer.java
+       $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GdkClasspathFontPeer
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.h: 
$(top_srcdir)/gnu/java/awt/peer/gtk/GdkClasspathFontPeerMetrics.java
+       $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GdkClasspathFontPeerMetrics
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkFontMetrics.h: 
$(top_srcdir)/gnu/java/awt/peer/gtk/GdkFontMetrics.java
        $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GdkFontMetrics
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkGlyphVector.h: 
$(top_srcdir)/gnu/java/awt/peer/gtk/GdkGlyphVector.java
+       $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GdkGlyphVector
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkGraphics.h: 
$(top_srcdir)/gnu/java/awt/peer/gtk/GdkGraphics.java
        $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GdkGraphics
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkGraphics2D.h: 
$(top_srcdir)/gnu/java/awt/peer/gtk/GdkGraphics2D.java
+       $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GdkGraphics2D
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h: 
$(top_srcdir)/gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
        $(JAVAH) -o $@ gnu.java.awt.peer.gtk.GdkPixbufDecoder
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkButtonPeer.h: 
$(top_srcdir)/gnu/java/awt/peer/gtk/GtkButtonPeer.java
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- native/jni/gtk-peer/Makefile.am     1 Aug 2004 08:31:17 -0000       1.12
+++ native/jni/gtk-peer/Makefile.am     9 Aug 2004 22:25:52 -0000
@@ -1,10 +1,14 @@
 pkglib_LTLIBRARIES = libgtkpeer.la
 
 libgtkpeer_la_SOURCES = \
+                       gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c \
+                       gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c \
+                       gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c \
                        gnu_java_awt_peer_gtk_GdkFontMetrics.c \
+                       gnu_java_awt_peer_gtk_GdkGlyphVector.c \
                        gnu_java_awt_peer_gtk_GdkGraphics.c \
+                       gnu_java_awt_peer_gtk_GdkGraphics2D.c \
                        gnu_java_awt_peer_gtk_GdkPixbufDecoder.c \
-                       gnu_java_awt_peer_gtk_GtkFileDialogPeer.c \
                        gnu_java_awt_peer_gtk_GtkButtonPeer.c \
                        gnu_java_awt_peer_gtk_GtkCanvasPeer.c \
                        gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.c \
@@ -13,15 +17,16 @@
                        gnu_java_awt_peer_gtk_GtkChoicePeer.c \
                        gnu_java_awt_peer_gtk_GtkClipboard.c \
                        gnu_java_awt_peer_gtk_GtkComponentPeer.c \
-                       gnu_java_awt_peer_gtk_GtkEvents.c \
                        gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c \
-                       gnu_java_awt_peer_gtk_GtkGenericPeer.c  \
+                       gnu_java_awt_peer_gtk_GtkEvents.c \
+                       gnu_java_awt_peer_gtk_GtkFileDialogPeer.c \
+                       gnu_java_awt_peer_gtk_GtkGenericPeer.c \
                        gnu_java_awt_peer_gtk_GtkImagePainter.c \
                        gnu_java_awt_peer_gtk_GtkLabelPeer.c \
-                       gnu_java_awt_peer_gtk_GtkListPeer.c     \
+                       gnu_java_awt_peer_gtk_GtkListPeer.c \
                        gnu_java_awt_peer_gtk_GtkMainThread.c \
                        gnu_java_awt_peer_gtk_GtkMenuBarPeer.c \
-                        gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c \
+                       gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c \
                        gnu_java_awt_peer_gtk_GtkMenuItemPeer.c \
                        gnu_java_awt_peer_gtk_GtkMenuPeer.c \
                        gnu_java_awt_peer_gtk_GtkPanelPeer.c \
@@ -33,10 +38,11 @@
                        gnu_java_awt_peer_gtk_GtkTextFieldPeer.c \
                        gnu_java_awt_peer_gtk_GtkToolkit.c \
                        gnu_java_awt_peer_gtk_GtkWindowPeer.c \
-                       gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c \
                        gthread-jni.c \
+                       gdkfont.h \
                        gthread-jni.h \
-                       gtkpeer.h 
+                       gtkcairopeer.h \
+                       gtkpeer.h
 
 libgtkpeer_la_CPPFLAGS = $(AM_CPPFLAGS) @GTK_CFLAGS@
 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo

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