On Fri, 23 Jul 2004 19:18:34 -0700
Kaffe CVS <[EMAIL PROTECTED]> wrote:
> PatchSet 5005
> Date: 2004/07/24 01:43:27
> Author: dalibor
> Branch: HEAD
> Tag: (none)
> Log:
> Fixed turning off native AWT backends
>
> 2004-07-24 Dalibor Topic <[EMAIL PROTECTED]>
>
> Fixed disabling of native AWT code.
>
> * Makefile.am (DIRECTORIES_AFTER_RTJAR): Added explicit support
> for AWT directories to ensure that disabling of native
> directories works.
>
> * libraries/clib/awt/Makefile.am: Added handling of COND_KAFFE_X_AWT,
> COND_KAFFE_QT_AWT and COND_CLASSPATH_GTK_AWT.
> (SUBDIRS) Use conditional cubdirs.
> (DIST_SUBDIRS) List all subdirs here.
>
> * libraries/clib/Makefile.am: Added handling of COND_NATIVE_AWT.
I don't think that this combination makes sense. Since
we don't want to include all the awt classes in the jar
file Klasses.jar.bootstrap (do we?), we have to build
the native awt stuff after rt.jar, which is done by adding
the directories to DIRECTORIES_AFTER_RTJAR. However, also
adding awt to SUBDIRS in javalib/clib will cause the awt
stuff to be built before rt.jar, which means that we would
have to include the awt classes into Klasses.jar.bootstrap.
Therefore, I would like to commit the attached patch. Could
you probably try whether it breaks anything?
Thanks,
Helmer
Index: libraries/clib/Makefile.am
===================================================================
RCS file: /cvs/kaffe/kaffe/libraries/clib/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- libraries/clib/Makefile.am 24 Jul 2004 01:44:00 -0000 1.10
+++ libraries/clib/Makefile.am 24 Jul 2004 09:52:05 -0000
@@ -9,19 +9,6 @@
# See the file "license.terms" for information on usage and redistribution
# of this file.
-# Build libxmlj only desired
-if COND_LIBXMLJ
-MAYBE_LIBXMLJ = libxmlj
-else
-MAYBE_LIBXMLJ =
-endif
-
-if COND_NATIVE_AWT
-MAYBE_AWT = awt
-else
-MAYBE_AWT =
-endif
-
-SUBDIRS = native io nio net zip math security management $(MAYBE_LIBXMLJ) $(MAYBE_AWT)
+SUBDIRS = native io nio net zip math security management
DIST_SUBDIRS = native io nio net zip math libxmlj security management awt sound
Index: include/Makefile.am
===================================================================
RCS file: /cvs/kaffe/kaffe/include/Makefile.am,v
retrieving revision 1.65
diff -u -r1.65 Makefile.am
--- include/Makefile.am 22 Jul 2004 19:03:31 -0000 1.65
+++ include/Makefile.am 24 Jul 2004 09:52:05 -0000
@@ -105,54 +105,6 @@
INSTALL_JNI_DERIVED_HDRS =
NOINSTALL_JNI_DERIVED_HDRS = \
- gnu_java_awt_peer_gtk_GdkFontMetrics.h \
- gnu_java_awt_peer_gtk_GdkGraphics.h \
- gnu_java_awt_peer_gtk_GdkPixbufDecoder.h \
- gnu_java_awt_peer_gtk_GtkButtonPeer.h \
- gnu_java_awt_peer_gtk_GtkCanvasPeer.h \
- gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h \
- gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h \
- gnu_java_awt_peer_gtk_GtkCheckboxPeer.h \
- gnu_java_awt_peer_gtk_GtkChoicePeer.h \
- gnu_java_awt_peer_gtk_GtkClipboard.h \
- gnu_java_awt_peer_gtk_GtkComponentPeer.h \
- gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h \
- gnu_java_awt_peer_gtk_GtkFileDialogPeer.h \
- gnu_java_awt_peer_gtk_GtkFramePeer.h \
- gnu_java_awt_peer_gtk_GtkGenericPeer.h \
- gnu_java_awt_peer_gtk_GtkImagePainter.h \
- gnu_java_awt_peer_gtk_GtkLabelPeer.h \
- gnu_java_awt_peer_gtk_GtkListPeer.h \
- gnu_java_awt_peer_gtk_GtkMainThread.h \
- gnu_java_awt_peer_gtk_GtkMenuBarPeer.h \
- gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h \
- gnu_java_awt_peer_gtk_GtkMenuItemPeer.h \
- gnu_java_awt_peer_gtk_GtkMenuPeer.h \
- gnu_java_awt_peer_gtk_GtkPanelPeer.h \
- gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h \
- gnu_java_awt_peer_gtk_GtkScrollbarPeer.h \
- gnu_java_awt_peer_gtk_GtkScrollPanePeer.h \
- gnu_java_awt_peer_gtk_GtkTextAreaPeer.h \
- gnu_java_awt_peer_gtk_GtkTextComponentPeer.h \
- gnu_java_awt_peer_gtk_GtkTextFieldPeer.h \
- gnu_java_awt_peer_gtk_GtkToolkit.h \
- gnu_java_awt_peer_gtk_GtkWindowPeer.h \
- gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h \
- gnu_xml_libxmlj_dom_GnomeAttr.h \
- gnu_xml_libxmlj_dom_GnomeDocument.h \
- gnu_xml_libxmlj_dom_GnomeDocumentBuilder.h \
- gnu_xml_libxmlj_dom_GnomeDocumentType.h \
- gnu_xml_libxmlj_dom_GnomeElement.h \
- gnu_xml_libxmlj_dom_GnomeEntity.h \
- gnu_xml_libxmlj_dom_GnomeNamedNodeMap.h \
- gnu_xml_libxmlj_dom_GnomeNode.h \
- gnu_xml_libxmlj_dom_GnomeNodeList.h \
- gnu_xml_libxmlj_dom_GnomeProcessingInstruction.h \
- gnu_xml_libxmlj_dom_MatchingNodeList.h \
- gnu_xml_libxmlj_sax_GnomeLocator.h \
- gnu_xml_libxmlj_sax_GnomeXMLReader.h \
- gnu_xml_libxmlj_transform_LibxsltStylesheet.h \
- gnu_xml_libxmlj_transform_JavaContext.h \
java_math_BigInteger.h \
gnu_java_nio_channels_FileChannelImpl.h \
gnu_java_nio_NIOServerSocket.h \
@@ -204,10 +156,6 @@
org_tritonus_lowlevel_esd_Esd.h \
org_tritonus_lowlevel_esd_EsdRecordingStream.h \
org_tritonus_lowlevel_esd_EsdSample.h \
- org_tritonus_lowlevel_esd_EsdStream.h \
- org_tritonus_lowlevel_esd_Esd.h \
- org_tritonus_lowlevel_esd_EsdRecordingStream.h \
- org_tritonus_lowlevel_esd_EsdSample.h \
org_tritonus_lowlevel_esd_EsdStream.h
@@ -226,10 +174,42 @@
gnu_xml_libxmlj_sax_GnomeLocator.h \
gnu_xml_libxmlj_sax_GnomeXMLReader.h \
gnu_xml_libxmlj_transform_LibxsltStylesheet.h \
- gnu_xml_libxmlj_transform_TransformerFactoryImpl.h \
- gnu_xml_libxmlj_transform_JavaContext.h \
- gnu_xml_libxmlj_transform_LibxmlDocument.h
+ gnu_xml_libxmlj_transform_JavaContext.h
+LIBGTKPEER_JNI_HDRS = \
+ gnu_java_awt_peer_gtk_GdkFontMetrics.h \
+ gnu_java_awt_peer_gtk_GdkGraphics.h \
+ gnu_java_awt_peer_gtk_GdkPixbufDecoder.h \
+ gnu_java_awt_peer_gtk_GtkButtonPeer.h \
+ gnu_java_awt_peer_gtk_GtkCanvasPeer.h \
+ gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h \
+ gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h \
+ gnu_java_awt_peer_gtk_GtkCheckboxPeer.h \
+ gnu_java_awt_peer_gtk_GtkChoicePeer.h \
+ gnu_java_awt_peer_gtk_GtkClipboard.h \
+ gnu_java_awt_peer_gtk_GtkComponentPeer.h \
+ gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h \
+ gnu_java_awt_peer_gtk_GtkFileDialogPeer.h \
+ gnu_java_awt_peer_gtk_GtkFramePeer.h \
+ gnu_java_awt_peer_gtk_GtkGenericPeer.h \
+ gnu_java_awt_peer_gtk_GtkImagePainter.h \
+ gnu_java_awt_peer_gtk_GtkLabelPeer.h \
+ gnu_java_awt_peer_gtk_GtkListPeer.h \
+ gnu_java_awt_peer_gtk_GtkMainThread.h \
+ gnu_java_awt_peer_gtk_GtkMenuBarPeer.h \
+ gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h \
+ gnu_java_awt_peer_gtk_GtkMenuItemPeer.h \
+ gnu_java_awt_peer_gtk_GtkMenuPeer.h \
+ gnu_java_awt_peer_gtk_GtkPanelPeer.h \
+ gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h \
+ gnu_java_awt_peer_gtk_GtkScrollbarPeer.h \
+ gnu_java_awt_peer_gtk_GtkScrollPanePeer.h \
+ gnu_java_awt_peer_gtk_GtkTextAreaPeer.h \
+ gnu_java_awt_peer_gtk_GtkTextComponentPeer.h \
+ gnu_java_awt_peer_gtk_GtkTextFieldPeer.h \
+ gnu_java_awt_peer_gtk_GtkToolkit.h \
+ gnu_java_awt_peer_gtk_GtkWindowPeer.h \
+ gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
if USE_COMPAT_IFADDRS
ifaddrs_compat = ifaddrs.h
@@ -325,7 +305,6 @@
rm -f $$f; mv stamp-h1$$f $$f; \
fi; \
done
- @echo timestamp > $@
#
@@ -338,40 +317,67 @@
stamp-h1all: HDRS = $(JNI_DERIVED_HDRS)
stamp-h1all: rebuild-jni-hdrs
+ @echo timestamp > $@
#
# header files for alsa backend of tritonus
#
-libtritonusalsa_headers: stamp-libtritonusalsa
+.PHONY:libtritonusalsa_headers
+libtritonusalsa_headers: $(LIBTRITONUSALSA_JNI_HDRS)
+
+$(LIBTRITONUSALSA_JNI_HDRS): stamp-libtritonusalsa
@if test -f $@; then :; else \
- rm -f stamp-libtritonusalsa; $(MAKE) JNI_DERIVED_HDRS=$@
stamp-libtritonusalsa; \
+ rm -f stamp-libtritonusalsa; $(MAKE) stamp-libtritonusalsa; \
fi
stamp-libtritonusalsa: HDRS = $(LIBTRITONUSALSA_JNI_HDRS)
stamp-libtritonusalsa: rebuild-jni-hdrs
+ @echo timestamp > $@
#
# header files for esd backend of tritonus
#
-libtritonusesd_headers: stamp-libtritonusesd
+.PHONY:libtritonusesd_headers
+libtritonusesd_headers: $(LIBTRITONUSESD_JNI_HDRS)
+
+$(LIBTRITONUSESD_JNI_HDRS): stamp-libtritonusesd
@if test -f $@; then :; else \
- rm -f stamp-libtritonusesd; $(MAKE) JNI_DERIVED_HDRS=$@
stamp-libtritonusesd; \
+ rm -f stamp-libtritonusesd; $(MAKE) stamp-libtritonusesd; \
fi
stamp-libtritonusesd: HDRS = $(LIBTRITONUSESD_JNI_HDRS)
stamp-libtritonusesd: rebuild-jni-hdrs
+ @echo timestamp > $@
#
# header files for libxmlj
#
-libxmlj_headers: stamp-libxmlj
+.PHONY:libxmlj_headers
+libxmlj_headers: $(LIBXMLJ_JNI_HDRS)
+
+$(LIBXMLJ_JNI_HDRS): stamp-libxmlj
@if test -f $@; then :; else \
- rm -f stamp-libxmlj; $(MAKE) JNI_DERIVED_HDRS=$@ stamp-libxmlj; \
+ rm -f stamp-libxmlj; $(MAKE) stamp-libxmlj; \
fi
stamp-libxmlj: HDRS = $(LIBXMLJ_JNI_HDRS)
stamp-libxmlj: rebuild-jni-hdrs
+ @echo timestamp > $@
+
+#
+# header files for classpath's gtk awt backend
+#
+.PHONY:libgtkpeer_headers
+libgtkpeer_headers: $(LIBGTKPEER_JNI_HDRS)
+
+$(LIBGTKPEER_JNI_HDRS): stamp-libgtkpeer
+ @if test -f $@; then :; else \
+ rm -f stamp-libgtkpeer; $(MAKE) stamp-libgtkpeer; \
+ fi
+stamp-libgtkpeer: HDRS = $(LIBGTKPEER_JNI_HDRS)
+stamp-libgtkpeer: rebuild-jni-hdrs
+ @echo timestamp > $@
CLEANFILES = \
@@ -390,7 +396,8 @@
stamp-h1all \
stamp-libtritonusalsa \
stamp-libtritonusesd \
- stamp-libxmlj
+ stamp-libxmlj \
+ stamp-libgtkpeer
dist-hook:
@for file in $(DISTCLEANFILES); do \
Index: libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am
===================================================================
RCS file: /cvs/kaffe/kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am 22 Jul 2004 19:04:00
-0000 1.1
+++ libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am 24 Jul 2004 09:52:05
-0000
@@ -41,3 +41,8 @@
libgtkpeer_la_CPPFLAGS = $(AM_CPPFLAGS) @GTK_CFLAGS@
-I$(top_srcdir)/libraries/clib/awt/classpath-gtk/classpath/ -I$(top_builddir)/include/
libgtkpeer_la_LIBADD =
$(top_builddir)/libraries/clib/awt/classpath-gtk/classpath/native_state.lo
libgtkpeer_la_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@
+
+$(libgtkpeer_la_SOURCES): libgtkpeer_headers
+.PHONY:libgtkpeer_headers
+libgtkpeer_headers:
+ @$(MAKE) -C $(top_builddir)/include libgtkpeer_headers
\ No newline at end of file
Index: libraries/javalib/bootstrap.classlist
===================================================================
RCS file: /cvs/kaffe/kaffe/libraries/javalib/bootstrap.classlist,v
retrieving revision 1.55
diff -u -r1.55 bootstrap.classlist
--- libraries/javalib/bootstrap.classlist 22 Jul 2004 19:19:23 -0000 1.55
+++ libraries/javalib/bootstrap.classlist 24 Jul 2004 09:52:05 -0000
@@ -346,97 +346,3 @@
java/io/VMObjectStreamClass.class
java/nio/MappedByteBufferImpl.class
java/nio/MappedByteBuffer.class
-
-# needed for tritonus
-org/tritonus/lowlevel/esd/Esd.class
-org/tritonus/lowlevel/esd/EsdRecordingStream.class
-org/tritonus/lowlevel/esd/EsdSample.class
-org/tritonus/lowlevel/esd/EsdStream.class
-org/tritonus/lowlevel/alsa/AlsaCtlCardInfo.class
-org/tritonus/lowlevel/alsa/AlsaCtl.class
-org/tritonus/lowlevel/alsa/Alsa.class
-org/tritonus/lowlevel/alsa/AlsaMixerElement.class
-org/tritonus/lowlevel/alsa/AlsaMixer.class
-org/tritonus/lowlevel/alsa/AlsaPcmHWParamsFormatMask.class
-org/tritonus/lowlevel/alsa/AlsaPcmHWParams.class
-org/tritonus/lowlevel/alsa/AlsaPcm.class
-org/tritonus/lowlevel/alsa/AlsaPcmSWParams.class
-org/tritonus/lowlevel/alsa/AlsaSeqClientInfo.class
-org/tritonus/lowlevel/alsa/AlsaSeqEvent.class
-org/tritonus/lowlevel/alsa/AlsaSeq.class
-org/tritonus/lowlevel/alsa/AlsaSeqPortInfo.class
-org/tritonus/lowlevel/alsa/AlsaSeqPortSubscribe.class
-org/tritonus/lowlevel/alsa/AlsaSeqQueueInfo.class
-org/tritonus/lowlevel/alsa/AlsaSeqQueueStatus.class
-org/tritonus/lowlevel/alsa/AlsaSeqQueueTempo.class
-org/tritonus/lowlevel/alsa/AlsaSeqQueueTimer.class
-org/tritonus/lowlevel/alsa/AlsaSeqRemoveEvents.class
-org/tritonus/lowlevel/alsa/AlsaSeqSystemInfo.class
-
-# needed for libxmlj
-gnu/xml/libxmlj/dom/GnomeAttr.class
-gnu/xml/libxmlj/dom/GnomeDocument.class
-gnu/xml/libxmlj/dom/GnomeDocumentBuilder.class
-gnu/xml/libxmlj/dom/GnomeDocumentType.class
-gnu/xml/libxmlj/dom/GnomeElement.class
-gnu/xml/libxmlj/dom/GnomeEntity.class
-gnu/xml/libxmlj/dom/GnomeNamedNodeMap.class
-gnu/xml/libxmlj/dom/GnomeNode.class
-gnu/xml/libxmlj/dom/GnomeNodeList.class
-gnu/xml/libxmlj/dom/GnomeProcessingInstruction.class
-gnu/xml/libxmlj/dom/MatchingNodeList.class
-gnu/xml/libxmlj/sax/GnomeLocator.class
-gnu/xml/libxmlj/sax/GnomeXMLReader.class
-gnu/xml/libxmlj/transform/LibxsltStylesheet.class
-gnu/xml/libxmlj/transform/JavaContext.class
-javax/xml/parsers/DocumentBuilder.class
-javax/xml/transform/TransformerFactory.class
-
-#needed for classpath awt
-
-gnu/java/awt/EmbeddedWindow.class
-gnu/java/awt/peer/gtk/GdkFontMetrics.class
-gnu/java/awt/peer/gtk/GdkGraphics.class
-gnu/java/awt/peer/gtk/GdkPixbufDecoder.class
-gnu/java/awt/peer/gtk/GtkButtonPeer.class
-gnu/java/awt/peer/gtk/GtkCanvasPeer.class
-gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.class
-gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.class
-gnu/java/awt/peer/gtk/GtkCheckboxPeer.class
-gnu/java/awt/peer/gtk/GtkChoicePeer.class
-gnu/java/awt/peer/gtk/GtkClipboard.class
-gnu/java/awt/peer/gtk/GtkComponentPeer.class
-gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.class
-gnu/java/awt/peer/gtk/GtkFileDialogPeer.class
-gnu/java/awt/peer/gtk/GtkFramePeer.class
-gnu/java/awt/peer/gtk/GtkGenericPeer.class
-gnu/java/awt/peer/gtk/GtkImagePainter.class
-gnu/java/awt/peer/gtk/GtkLabelPeer.class
-gnu/java/awt/peer/gtk/GtkListPeer.class
-gnu/java/awt/peer/gtk/GtkMainThread.class
-gnu/java/awt/peer/gtk/GtkMenuBarPeer.class
-gnu/java/awt/peer/gtk/GtkMenuComponentPeer.class
-gnu/java/awt/peer/gtk/GtkMenuItemPeer.class
-gnu/java/awt/peer/gtk/GtkMenuPeer.class
-gnu/java/awt/peer/gtk/GtkPanelPeer.class
-gnu/java/awt/peer/gtk/GtkPopupMenuPeer.class
-gnu/java/awt/peer/gtk/GtkScrollbarPeer.class
-gnu/java/awt/peer/gtk/GtkScrollPanePeer.class
-gnu/java/awt/peer/gtk/GtkTextAreaPeer.class
-gnu/java/awt/peer/gtk/GtkTextComponentPeer.class
-gnu/java/awt/peer/gtk/GtkTextFieldPeer.class
-gnu/java/awt/peer/gtk/GtkToolkit.class
-gnu/java/awt/peer/gtk/GtkWindowPeer.class
-java/awt/Frame.class
-java/awt/Window.class
-java/awt/Container.class
-java/awt/Component.class
-java/awt/FontMetrics.class
-java/awt/Graphics.class
-gnu/java/awt/image/ImageDecoder.class
-java/awt/datatransfer/Clipboard.class
-gnu/java/awt/peer/gtk/GtkContainerPeer.class
-gnu/java/awt/peer/gtk/GtkDialogPeer.class
-gnu/java/awt/ClasspathToolkit.class
-java/awt/Toolkit.class
-gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.class
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
