Re: [cp-patches] RFC: qt4 peers build machinery

[Mark Wielaard]

Hi, Dalibor,

On Wed, 2005-08-17 at 04:16 +0200, Dalibor Topic wrote:
> OK, thanks to all for feedback on list and IRC, an improved (apapted to 
> latest qt peers checkin, and small environment variable naming fix) 
> version just went into CVS head, attached. ChangeLog below. Have fun. It 
> should be in Kaffe CVS head tomorrow evening, as its a little late here.

Cool thanks!

After the little check_jni_script cleanup I only needed the following
small changes to get a normal make distcheck and a configure with
--with-jikes --enable-Werror --with-javah=gcjh-4.0
--enable-regen-headers working again. That should also fix the
autobuilder. Note that warnings are currently not turned on for the
qt-peer directory. This should also fix the autobuilder.

2005-08-17  Mark Wielaard  <address@hidden>

    * gnu/java/awt/peer/qt/QtFramePeer.java (setIcon): Mark non-native
    and add FIXME.
    (setMaximizedBounds): Likewise.
    * include/gnu_java_awt_peer_qt_QtFramePeer.h: Regenerated.
    * native/jni/qt-peer/.cvsignore: New file.
    * native/jni/qt-peer/Makefile.am (libqtpeer_la_SOURCES):
    Remove eventmethods.h.

Next stop, getting --enable-qt-peer to work :)

Cheers,

Mark

Index: gnu/java/awt/peer/qt/QtFramePeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/qt/QtFramePeer.java,v
retrieving revision 1.2
diff -u -r1.2 QtFramePeer.java
--- gnu/java/awt/peer/qt/QtFramePeer.java       16 Aug 2005 23:22:09 -0000      
1.2
+++ gnu/java/awt/peer/qt/QtFramePeer.java       17 Aug 2005 10:21:00 -0000
@@ -65,9 +65,15 @@
       setMenuBar( ((Frame)owner).getMenuBar() );
   }
 
-  private native void setIcon(QtImage image);
+  private void setIcon(QtImage image)
+  {
+    // FIME - Implement!
+  }
 
-  private native void setMaximizedBounds(int w, int h);
+  private void setMaximizedBounds(int w, int h)
+  {
+    // FIXME - Implement.
+  }
 
   private native void setMenu(QtMenuBarPeer mb);
 
Index: include/gnu_java_awt_peer_qt_QtFramePeer.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/include/gnu_java_awt_peer_qt_QtFramePeer.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_qt_QtFramePeer.h
--- include/gnu_java_awt_peer_qt_QtFramePeer.h  17 Aug 2005 02:03:33 -0000      
1.3
+++ include/gnu_java_awt_peer_qt_QtFramePeer.h  17 Aug 2005 10:21:00 -0000
@@ -11,8 +11,6 @@
 #endif
 
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtFramePeer_init (JNIEnv 
*env, jobject);
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtFramePeer_setIcon (JNIEnv 
*env, jobject, jobject);
-JNIEXPORT void JNICALL 
Java_gnu_java_awt_peer_qt_QtFramePeer_setMaximizedBounds (JNIEnv *env, jobject, 
jint, jint);
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtFramePeer_setMenu (JNIEnv 
*env, jobject, jobject);
 JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_qt_QtFramePeer_menuBarHeight 
(JNIEnv *env, jobject);
 
Index: native/jni/qt-peer/.cvsignore
===================================================================
RCS file: native/jni/qt-peer/.cvsignore
diff -N native/jni/qt-peer/.cvsignore
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ native/jni/qt-peer/.cvsignore       17 Aug 2005 10:21:01 -0000
@@ -0,0 +1,8 @@
+*.o
+*.a
+*.lo
+*.la
+.libs
+.deps
+Makefile
+Makefile.in
Index: native/jni/qt-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- native/jni/qt-peer/Makefile.am      17 Aug 2005 02:03:33 -0000      1.1
+++ native/jni/qt-peer/Makefile.am      17 Aug 2005 10:21:01 -0000
@@ -31,7 +31,6 @@
         componentevent.cpp \
         componentevent.h \
         containers.h \
-        eventmethods.h \
         keybindings.cpp \
         keybindings.h \
         mainqtthread.cpp \

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