[kaffe] CVS kaffe (robilad): removed redundant native2ascii and serialver tools implementations

Kaffe CVS cvs-commits at kaffe.org
Fri Jun 2 14:54:24 PDT 2006


PatchSet 7301 
Date: 2006/06/02 21:46:14
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
removed redundant native2ascii and serialver tools implementations

2006-06-02  Dalibor Topic  <robilad at kaffe.org>

        * kaffe/scripts/native2ascii.in,
        kaffe/scripts/serialver.in:
        Use merged in tools from GNU Classpath's tools.zip.

        * tools/javatools/javalib/Makefile.am:
        Removed gnu/classpath/tools/native2ascii/Native2ASCII.java
        and gnu/classpath/tools/serialver/SerialVer.java.

        * tools/javatools/javalib/gnu/classpath/tools/native2ascii/Native2ASCII.java,
        tools/javatools/javalib/gnu/classpath/tools/serialver/SerialVer.java:
        Removed.

Members: 
	ChangeLog:1.4805->1.4806 
	kaffe/scripts/native2ascii.in:1.9->1.10 
	kaffe/scripts/serialver.in:1.8->1.9 
	tools/javatools/javalib/Makefile.am:1.6->1.7 
	tools/javatools/javalib/Makefile.in:1.20->1.21 
	tools/javatools/javalib/gnu/classpath/tools/native2ascii/Native2ASCII.java:1.2->1.3(DEAD) 
	tools/javatools/javalib/gnu/classpath/tools/serialver/SerialVer.java:1.1->1.2(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4805 kaffe/ChangeLog:1.4806
--- kaffe/ChangeLog:1.4805	Thu May 25 22:26:29 2006
+++ kaffe/ChangeLog	Fri Jun  2 21:46:14 2006
@@ -1,3 +1,17 @@
+2006-06-02  Dalibor Topic  <robilad at kaffe.org>
+
+	* kaffe/scripts/native2ascii.in,
+	kaffe/scripts/serialver.in:
+	Use merged in tools from GNU Classpath's tools.zip.
+
+	* tools/javatools/javalib/Makefile.am:
+	Removed gnu/classpath/tools/native2ascii/Native2ASCII.java 
+	and gnu/classpath/tools/serialver/SerialVer.java.
+
+	* tools/javatools/javalib/gnu/classpath/tools/native2ascii/Native2ASCII.java,
+	tools/javatools/javalib/gnu/classpath/tools/serialver/SerialVer.java:
+	Removed.
+
 2006-05-25  Dalibor Topic  <robilad at kaffe.org>
 
 	* kaffe/kaffevm/classMethod.h (Hjava_lang_Class):
Index: kaffe/kaffe/scripts/native2ascii.in
diff -u kaffe/kaffe/scripts/native2ascii.in:1.9 kaffe/kaffe/scripts/native2ascii.in:1.10
--- kaffe/kaffe/scripts/native2ascii.in:1.9	Sun Sep 18 01:20:30 2005
+++ kaffe/kaffe/scripts/native2ascii.in	Fri Jun  2 21:46:17 2006
@@ -1,6 +1,6 @@
 #! /bin/sh
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS gnu.classpath.tools.native2ascii.Native2ASCII ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ -cp @datadir@/classpath/tools.zip $JAVA_OPTS gnu.classpath.tools.native2ascii.Native2ASCII ${1+"$@"}
 exit $?
 
Index: kaffe/kaffe/scripts/serialver.in
diff -u kaffe/kaffe/scripts/serialver.in:1.8 kaffe/kaffe/scripts/serialver.in:1.9
--- kaffe/kaffe/scripts/serialver.in:1.8	Tue Sep 13 21:37:44 2005
+++ kaffe/kaffe/scripts/serialver.in	Fri Jun  2 21:46:17 2006
@@ -1,6 +1,6 @@
 #! /bin/sh
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS  -cp @toolslibdir@/tools.jar gnu.classpath.tools.serialver.SerialVer ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS  -cp @datadir@/classpath/tools.zip gnu.classpath.tools.serialver.SerialVer ${1+"$@"}
 exit $?
 
Index: kaffe/tools/javatools/javalib/Makefile.am
diff -u kaffe/tools/javatools/javalib/Makefile.am:1.6 kaffe/tools/javatools/javalib/Makefile.am:1.7
--- kaffe/tools/javatools/javalib/Makefile.am:1.6	Tue Feb  7 21:49:01 2006
+++ kaffe/tools/javatools/javalib/Makefile.am	Fri Jun  2 21:46:18 2006
@@ -17,11 +17,9 @@
 	gnu/classpath/tools/javap/GnuByteCodeJavap.java \
 	gnu/classpath/tools/javap/Javap.java \
 	gnu/classpath/tools/javap/JavapMain.java \
-	gnu/classpath/tools/native2ascii/Native2ASCII.java \
 	gnu/classpath/tools/rmi/rmic/RMIC.java \
 	gnu/classpath/tools/rmi/rmic/RMICException.java \
-	gnu/classpath/tools/rmi/rmic/Variables.java \
-	gnu/classpath/tools/serialver/SerialVer.java
+	gnu/classpath/tools/rmi/rmic/Variables.java 
 		 
 
 ## Do not delete the previous blank line; update-class-list depends on it
Index: kaffe/tools/javatools/javalib/Makefile.in
diff -u kaffe/tools/javatools/javalib/Makefile.in:1.20 kaffe/tools/javatools/javalib/Makefile.in:1.21
--- kaffe/tools/javatools/javalib/Makefile.in:1.20	Tue Feb  7 21:49:01 2006
+++ kaffe/tools/javatools/javalib/Makefile.in	Fri Jun  2 21:46:19 2006
@@ -365,11 +365,9 @@
 	gnu/classpath/tools/javap/GnuByteCodeJavap.java \
 	gnu/classpath/tools/javap/Javap.java \
 	gnu/classpath/tools/javap/JavapMain.java \
-	gnu/classpath/tools/native2ascii/Native2ASCII.java \
 	gnu/classpath/tools/rmi/rmic/RMIC.java \
 	gnu/classpath/tools/rmi/rmic/RMICException.java \
-	gnu/classpath/tools/rmi/rmic/Variables.java \
-	gnu/classpath/tools/serialver/SerialVer.java
+	gnu/classpath/tools/rmi/rmic/Variables.java 
 
 EXTRA_DIST = \
 	$(tools_jar_SRCS)
@@ -446,7 +444,7 @@
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/gnu/classpath/tools $(distdir)/gnu/classpath/tools/javap $(distdir)/gnu/classpath/tools/native2ascii $(distdir)/gnu/classpath/tools/rmi/rmic $(distdir)/gnu/classpath/tools/serialver
+	$(mkdir_p) $(distdir)/gnu/classpath/tools $(distdir)/gnu/classpath/tools/javap $(distdir)/gnu/classpath/tools/rmi/rmic
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
===================================================================
Checking out kaffe/tools/javatools/javalib/gnu/classpath/tools/native2ascii/Native2ASCII.java
RCS:  /home/cvs/kaffe/kaffe/tools/javatools/javalib/gnu/classpath/tools/native2ascii/Attic/Native2ASCII.java,v
VERS: 1.2
***************
--- kaffe/tools/javatools/javalib/gnu/classpath/tools/native2ascii/Native2ASCII.java	Fri Jun  2 21:54:24 2006
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,109 +0,0 @@
-/*
- * Java core library component.
- * 
- * Copyright (c) 2003 Ito Kazumitsu <kaz at maczuka.gcd.org>. All rights reserved.
- * 
- * See the file "license.terms" for information on usage and redistribution of
- * this file.
- */
-package gnu.classpath.tools.native2ascii;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-
-public class Native2ASCII
-{
-  public static void main(String[] args)
-  {
-    String encoding = System.getProperty("file.encoding");
-    String input = null;
-    String output = null;
-    for (int i = 0; i < args.length; i++)
-      {
-        if (args[i].equals("-encoding"))
-          {
-            i++;
-            if (i >= args.length)
-              {
-                System.err.println("encoding is missing");
-              }
-            else
-              {
-                encoding = args[i];
-              }
-          }
-        else if (args[i].equals("-reverse") || args[i].startsWith("-J"))
-          {
-            System.err.println(args[i] + ": not supported");
-          }
-        else
-          {
-            if (input == null)
-              {
-                input = args[i];
-              }
-            else if (output == null)
-              {
-                output = args[i];
-              }
-            else
-              {
-                System.err.println(args[i] + ": ignored");
-              }
-          }
-      }
-    try
-      {
-        InputStream is = (input == null ? System.in
-            : new FileInputStream(input));
-        OutputStream os = (output == null ? (OutputStream) System.out
-            : new FileOutputStream(output));
-        BufferedReader rdr = new BufferedReader(new InputStreamReader(is,
-                                                                      encoding));
-        PrintWriter wtr = new PrintWriter(
-                                          new BufferedWriter(
-                                                             new OutputStreamWriter(
-                                                                                    os,
-                                                                                    encoding)));
-        while (true)
-          {
-            String s = rdr.readLine();
-            if (s == null)
-              break;
-            StringBuffer sb = new StringBuffer(s.length() + 80);
-            for (int i = 0; i < s.length(); i++)
-              {
-                char c = s.charAt(i);
-                if ((int)c <= 127)
-                  {
-                    sb.append(c);
-                  }
-                else
-                  {
-                    sb.append("\\u");
-                    if ((int)c <= 0xff)
-                      sb.append("00");
-                    else if ((int)c <= 0xfff)
-                      sb.append("0");
-                    sb.append(Integer.toHexString((int) c));
-                  }
-              }
-            wtr.println(sb.toString());
-          }
-        rdr.close();
-        wtr.flush();
-        wtr.close();
-      }
-    catch (Exception e)
-      {
-        e.printStackTrace();
-      }
-  }
-}
===================================================================
Checking out kaffe/tools/javatools/javalib/gnu/classpath/tools/serialver/SerialVer.java
RCS:  /home/cvs/kaffe/kaffe/tools/javatools/javalib/gnu/classpath/tools/serialver/Attic/SerialVer.java,v
VERS: 1.1
***************
--- kaffe/tools/javatools/javalib/gnu/classpath/tools/serialver/SerialVer.java	Fri Jun  2 21:54:24 2006
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,60 +0,0 @@
-/* gnu.classpath.tools.SerialVer
- Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-
- This file is part of GNU Classpath.
-
- GNU Classpath is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
- 
- GNU Classpath is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNU Classpath; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA. */
-package gnu.classpath.tools.serialver;
-
-import java.io.ObjectStreamClass;
-
-/**
- * This class is an implementation of the `serialver' program. Any number of
- * class names can be passed as arguments, and the serial version unique
- * identitfier for each class will be printed in a manner suitable for cuting
- * and pasting into a Java source file.
- */
-public class SerialVer
-{
-  public static void main(String[] args)
-  {
-    if (args.length == 0)
-      {
-        System.out.println("Usage: serialver [CLASS]...");
-        return;
-      }
-    Class clazz;
-    ObjectStreamClass osc;
-    for (int i = 0; i < args.length; i++)
-      {
-        try
-          {
-            clazz = Class.forName(args[i]);
-            osc = ObjectStreamClass.lookup(clazz);
-            if (osc != null)
-              System.out.println(clazz.getName() + ": "
-                                 + "static final long serialVersionUID = "
-                                 + osc.getSerialVersionUID() + "L;");
-            else
-              System.err.println("Class " + args[i] + " is not serializable");
-          }
-        catch (ClassNotFoundException e)
-          {
-            System.err.println("Class for " + args[i] + " not found");
-          }
-      }
-  }
-}
\ No newline at end of file




More information about the kaffe mailing list