[kaffe] CVS kaffe (robilad): fixed xlib peer build

Tue Jan 15 11:28:51 PST 2008

PatchSet 7676 
Date: 2008/01/15 19:25:10
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
fixed xlib peer build

2008-01-15  Dalibor Topic  <robilad at kaffe.org>

* libraries/clib/awt/X/Makefile.am (libxawt_la_SOURCES):
Added the headers. (noinst_HEADERS) Removed.
(libxawt_la_LIBADD) Removed the classpath library.

* libraries/clib/awt/X/toolkit.h: Don't include jcl.h.

* libraries/javalib/awt-implementations/kaffe/Makefile.am
(JAVAROOT): Removed.
(CPATH): Removed unnecessary entries.

* libraries/javalib/awt-implementations/kaffe/org/kaffe/awt/DoNothingPeer.java
(requestFocus, updateIconImages, updateMinimumSize, setModelBlocked,
updateFocusableWindowState, setAlwaysOnTop):
Added missing methods to make it compile again.

Members: 
	ChangeLog:1.5178->1.5179 
	libraries/clib/awt/X/Makefile.am:1.22->1.23 
	libraries/clib/awt/X/Makefile.in:1.193->1.194 
	libraries/clib/awt/X/toolkit.h:1.34->1.35 
	libraries/javalib/awt-implementations/kaffe/Makefile.am:1.27->1.28 
	libraries/javalib/awt-implementations/kaffe/Makefile.in:1.97->1.98 
	libraries/javalib/awt-implementations/kaffe/org/kaffe/awt/DoNothingPeer.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5178 kaffe/ChangeLog:1.5179

--- kaffe/ChangeLog:1.5178	Sun Jan  6 19:41:25 2008
+++ kaffe/ChangeLog	Tue Jan 15 19:25:10 2008
@@ -1,3 +1,20 @@
+2008-01-15  Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/clib/awt/X/Makefile.am (libxawt_la_SOURCES):
+	Added the headers. (noinst_HEADERS) Removed. 
+	(libxawt_la_LIBADD) Removed the classpath library.
+
+	* libraries/clib/awt/X/toolkit.h: Don't include jcl.h.
+
+	* libraries/javalib/awt-implementations/kaffe/Makefile.am
+	(JAVAROOT): Removed.
+	(CPATH): Removed unnecessary entries.
+
+	* libraries/javalib/awt-implementations/kaffe/org/kaffe/awt/DoNothingPeer.java
+	(requestFocus, updateIconImages, updateMinimumSize, setModelBlocked, 
+	updateFocusableWindowState, setAlwaysOnTop):
+	Added missing methods to make it compile again.
+	
 2008-01-06  Dalibor Topic  <robilad at kaffe.org>
 
 	* kaffe/kaffevm/Makefile.am (noinst_HEADERS): Removed. Moved
Index: kaffe/libraries/clib/awt/X/Makefile.am
diff -u kaffe/libraries/clib/awt/X/Makefile.am:1.22 kaffe/libraries/clib/awt/X/Makefile.am:1.23
--- kaffe/libraries/clib/awt/X/Makefile.am:1.22	Wed Sep 12 13:06:46 2007
+++ kaffe/libraries/clib/awt/X/Makefile.am	Tue Jan 15 19:25:16 2008
@@ -11,7 +11,6 @@
 AM_CPPFLAGS = \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/kaffe/kaffevm/jni \
-	-I$(top_srcdir)/libraries/javalib/external/classpath/native/jni/classpath \
         -I$(top_srcdir)/config/$(Khost_cpu) \
         -I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os) 
 
@@ -30,7 +29,6 @@
 
 libxawt_la_LIBADD = \
 	$(top_builddir)/kaffe/kaffevm/libkaffevm.la \
-	$(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la \
 	$(AWT_LIBS)
 
 libxawt_la_SOURCES = \
Index: kaffe/libraries/clib/awt/X/Makefile.in
diff -u kaffe/libraries/clib/awt/X/Makefile.in:1.193 kaffe/libraries/clib/awt/X/Makefile.in:1.194
--- kaffe/libraries/clib/awt/X/Makefile.in:1.193	Sun Jan  6 19:05:31 2008
+++ kaffe/libraries/clib/awt/X/Makefile.in	Tue Jan 15 19:25:17 2008
@@ -81,7 +81,6 @@
 LTLIBRARIES = $(native_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libxawt_la_DEPENDENCIES = $(top_builddir)/kaffe/kaffevm/libkaffevm.la \
-	$(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la \
 	$(am__DEPENDENCIES_1)
 am_libxawt_la_OBJECTS = libxawt_la-tlk.lo libxawt_la-wnd.lo \
 	libxawt_la-evt.lo libxawt_la-gra.lo libxawt_la-fnt.lo \
@@ -313,7 +312,6 @@
 AM_CPPFLAGS = \
 	-I$(top_builddir)/include \
 	-I$(top_srcdir)/kaffe/kaffevm/jni \
-	-I$(top_srcdir)/libraries/javalib/external/classpath/native/jni/classpath \
         -I$(top_srcdir)/config/$(Khost_cpu) \
         -I$(top_srcdir)/config/$(Khost_cpu)/$(Khost_os) 
 
@@ -332,7 +330,6 @@
 
 libxawt_la_LIBADD = \
 	$(top_builddir)/kaffe/kaffevm/libkaffevm.la \
-	$(top_builddir)/libraries/javalib/external/classpath/native/jni/classpath/libclasspath.la \
 	$(AWT_LIBS)
 
 libxawt_la_SOURCES = \
Index: kaffe/libraries/clib/awt/X/toolkit.h
diff -u kaffe/libraries/clib/awt/X/toolkit.h:1.34 kaffe/libraries/clib/awt/X/toolkit.h:1.35
--- kaffe/libraries/clib/awt/X/toolkit.h:1.34	Tue Oct 25 15:43:26 2005
+++ kaffe/libraries/clib/awt/X/toolkit.h	Tue Jan 15 19:25:17 2008
@@ -16,7 +16,6 @@
 #include "config-mem.h"
 #include "config-setjmp.h"
 
-#include "jcl.h"
 #undef DBG
 
 #include <X11/Xlib.h>
Index: kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.27 kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.28
--- kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.27	Sun Dec  9 20:47:18 2007
+++ kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am	Tue Jan 15 19:25:17 2008
@@ -2,9 +2,8 @@
 jrelib_DATA = $(CLASSFILE)
 JAR_CMD1 = $(FASTJAR) cf $(CLASSFILE) `find . -name "*.class"`
 
-CPATH =  .:$(srcdir):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(GLIBJ_ZIP)
+CPATH =  $(GLIBJ_ZIP):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar
 AM_JAVACFLAGS = -bootclasspath $(CPATH)
-JAVAROOT = $(LIBDIR)
 
 $(CLASSFILE): classdist_kaffeawt.stamp
 	rm -f $(CLASSFILE)
Index: kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.97 kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.98
--- kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.97	Sun Jan  6 19:05:34 2008
+++ kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in	Tue Jan 15 19:25:18 2008
@@ -64,6 +64,7 @@
 SOURCES =
 DIST_SOURCES =
 CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT):$$CLASSPATH
+JAVAROOT = $(top_builddir)
 am__installdirs = "$(DESTDIR)$(kaffeawtdir)" "$(DESTDIR)$(jrelibdir)"
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -278,9 +279,8 @@
 CLASSFILE = kaffeawt.jar
 jrelib_DATA = $(CLASSFILE)
 JAR_CMD1 = $(FASTJAR) cf $(CLASSFILE) `find . -name "*.class"`
-CPATH = .:$(srcdir):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(GLIBJ_ZIP)
+CPATH = $(GLIBJ_ZIP):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar
 AM_JAVACFLAGS = -bootclasspath $(CPATH)
-JAVAROOT = $(LIBDIR)
 
 # Use a fake install class and dir to keep automake's JAVA (un)install tasks happy.
 FAKE = fakeinstall
Index: kaffe/libraries/javalib/awt-implementations/kaffe/org/kaffe/awt/DoNothingPeer.java
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/org/kaffe/awt/DoNothingPeer.java:1.2 kaffe/libraries/javalib/awt-implementations/kaffe/org/kaffe/awt/DoNothingPeer.java:1.3
--- kaffe/libraries/javalib/awt-implementations/kaffe/org/kaffe/awt/DoNothingPeer.java:1.2	Tue Apr 18 11:54:41 2006
+++ kaffe/libraries/javalib/awt-implementations/kaffe/org/kaffe/awt/DoNothingPeer.java	Tue Jan 15 19:25:19 2008
@@ -226,4 +226,20 @@
   }
 
   public void restack() {}
+
+    public boolean requestFocus(java.awt.Component a, boolean b, 
+				boolean c, long d, sun.awt.CausedFocusEvent$Cause e) {
+	return false;
+    }
+
+    public void updateIconImages() {}
+
+    public void updateMinimumSize() {}
+
+    public void setModalBlocked(java.awt.Dialog a, boolean b) {}
+
+    public void updateFocusableWindowState() {}
+
+    public void setAlwaysOnTop(boolean a) {}
+
  }


