Hi, On Sun, 2003-12-21 at 15:25, Mark Wielaard wrote: > Then to find the files that differ or don't exist (anymore) do: > > for i in `cat files_libgcj`; do if test -f classpath/$i; \ > then cmp classpath/$i ~/src/gcc/libjava/$i | cut -f1 -d\ | cut -f2- -d/;\ > else echo "$i"; fi; done > > Which gives 212 files that differ.
Thanks to Michael Koch this has already gone down to 140 files. Did the first half of these. Since the interesting merging has already been done there isn't that much to report. We do need to keep our merge status a bit more clean. Read for some observations. No real anomalies found. Cheers, Mark
gnu/classpath/Configuration.java.in - libgcj specific version (seems based on old classpath version). gnu/gcj/runtime/StackTrace.java - Not really part of classpath, but derived from other classes. gnu/gcj/runtime/StringBuffer.java - Not really part of classpath, but derived from java/lang/StringBuffer.java gnu/java/awt/ClasspathToolkit.java - libgcj version of getFont() doesn't ignore name. gnu/java/awt/EmbeddedWindow.java gnu/java/awt/EmbeddedWindowSupport.java gnu/java/awt/peer/EmbeddedWindowPeer.java gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java - Not (yet) part of classpath. gnu/java/awt/image/ImageDecoder.java - Classpath version has a public abstric produce() method for subclasses. (bug in gcj?) gnu/java/awt/peer/gtk/GtkButtonPeer.java - libgcj has newer version with connectJObject() and connectSignals() methods. gnu/java/awt/peer/gtk/GtkCheckboxPeer.java - libgcj has newer version that keep gtk checkbox state. gnu/java/awt/peer/gtk/GtkChoicePeer.java - libgcj has newer version removes postItemEvent(), adds choicePostItemEvent(). gnu/java/awt/peer/gtk/GtkComponentPeer.java - libgcj has newer version that replaces connectHooks() with connectJObject() and connectSignals(). gnu/java/awt/peer/gtk/GtkContainerPeer.java - libgcj has newer version that handles cases where peers like GtkFileDialogPeer are repainted by Gtk itself gnu/java/awt/peer/gtk/GtkFileDialogPeer.java - libgcj has newer version that replaces connectHooks() with connectJObject(). gnu/java/awt/peer/gtk/GtkListPeer.java - libgcj has newer version that with its own handleEvent(). gnu/java/awt/peer/gtk/GtkPanelPeer.java gnu/java/awt/peer/gtk/GtkScrollbarPeer.java gnu/java/awt/peer/gtk/GtkTextComponentPeer.java gnu/java/awt/peer/gtk/GtkWindowPeer.java - libgcj has newer version that replaces connectHooks() with connectJObject() and/or connectSignals(). gnu/java/awt/peer/gtk/GtkToolkit.java - libgcj version implements EmbeddedWindowSupport which isn't in classpath yet. gnu/java/lang/ArrayHelper.java - libgcj version has redundant equalsArray() method. (see java.util.Array) gnu/java/lang/CharData.java - libgcj and classpath both have a geenerated file. Don't know why they are so different - INVESTIGATE gnu/java/lang/reflect/TypeSignature.java - Mostly formatting/documentation changes. One funtional change in the way Class.forName() is called in getClassForEncoding(). libgcj seems wrong. gnu/java/net/PlainDatagramSocketImpl.java - Large number of changes. Ask Michael Koch to look into it. Probably nio related. gnu/java/net/PlainSocketImpl.java - Likewise. gnu/java/net/protocol/file/Connection.java gnu/java/net/protocol/file/Handler.java gnu/java/net/protocol/jar/Connection.java - Looks like completely different implementations. WERE THESE ACTUALLY MERGED? gnu/java/net/protocol/http/Connection.java - Lots of differences, but both Michael and Guilhem have been hacking on this today. gnu/java/nio/ChannelInputStream.java gnu/java/nio/ChannelOutputStream.java gnu/java/nio/DatagramChannelImpl.java gnu/java/nio/InputStreamChannel.java gnu/java/nio/OutputStreamChannel.java gnu/java/nio/PipeImpl.java gnu/java/nio/SelectorImpl.java gnu/java/nio/ServerSocketChannelImpl.java gnu/java/nio/SocketChannelImpl.java - Michael is hacking on these classes currently. SKIPPED. include/java-chartables.h - Generated file, not actually part of classpath. java/awt/Choice.java - libgcj version is newer and generates ItemEvents. java/awt/Container.java - Graydon Hoare checked in changes to classpath on 12-02 that didn't go into libgcj. java/awt/image/PixelGrabber.java - libgcj uses asserts, classpath doesn't. java/io/BufferedReader.java - Same except for the latest patch from Guilhem for readLine(). java/io/CharArrayReader.java - Likewise for [Array]IndexOutOfBoundsException. java/io/File.java - Largely different. WAS THIS ACTUALLY MERGED? java/io/InputStreamReader.java - Some large diffs because char conversion diffs between classpath and libgcj. Also the locking/synchonize mechanism looks different and libgcj uses knowledge of the internals of BufferedInputStream (Eww.) java/io/ObjectInputStream.java java/io/ObjectOutputStream.java java/io/ObjectStreamClass.java java/io/OutputStreamWriter.java java/io/VMObjectStreamClass.java - Much hacking going on around these classes. SKIPPED. java/io/PrintStream.java - libgcj has newer version that fixes a recent mauve failure. Diff is big. Ask Michael to look at it. java/lang/Character.java - See note at start of class: This class must not be merged with Classpath. java/lang/Double.java java/lang/Float.java - libgcj differs because they cannot optimize some method calls. Claims efficiency problems. java/lang/Package.java - libgcj seems to have a strange/buggy getPackage(String) implementation. java/lang/Runtime.java - Was just split in Classpath. Needs to be remerged. java/lang/SecurityManager.java - Some small diffs. Might be good to finally merge completly. java/lang/String.java java/lang/StringBuffer.java java/lang/System.java java/lang/VMClassLoader.java java/lang/VMThrowable.java java/lang/natCharacter.cc java/lang/ref/Reference.java java/lang/reflect/Modifier.java java/net/InetAddress.java java/net/JarURLConnection.java java/net/URL.java java/net/URLClassLoader.java java/net/URLConnection.java java/nio/DirectByteBufferImpl.java java/nio/MappedByteBufferImpl.java java/nio/channels/Channels.java java/nio/channels/FileChannelImpl.java java/security/BasicPermission.java java/text/CollationElementIterator.java java/text/CollationKey.java java/text/Collator.java java/text/RuleBasedCollator.java java/util/GregorianCalendar.java java/util/HashMap.java java/util/Hashtable.java java/util/ResourceBundle.java java/util/zip/Deflater.java java/util/zip/DeflaterOutputStream.java java/util/zip/DeflaterOutputStream.java.fixed java/util/zip/GZIPInputStream.java java/util/zip/GZIPOutputStream.java java/util/zip/Inflater.java java/util/zip/InflaterInputStream.java jni/classpath/jcl.c jni/classpath/jcl.h jni/classpath/jnilink.c jni/classpath/jnilink.h jni/classpath/native_state.c jni/classpath/native_state.h jni/classpath/primlib.c jni/classpath/primlib.h jni/gtk-peer/gdkfont.h jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c jni/gtk-peer/gthread-jni.c jni/gtk-peer/gthread-jni.h jni/gtk-peer/gtkpeer.h scripts/MakeCharTables.java scripts/unicode-blocks.pl scripts/unicode-muncher.pl
signature.asc
Description: This is a digitally signed message part
_______________________________________________ Classpath mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/classpath
