[Cp-tools-discuss] Patch: FYI: remove serialver

[Tom Tromey]

I've moved serialver to Classpath, so I'm removing it from cp-tools.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>

        * bin/serialver: Removed.
        * bin/native2ascii: Likewise.
        * Makefile.am (bin_PROGRAMS): Removed serialver.
        (bin_SCRIPTS): Likewise.
        (serialver_SOURCES): Removed.
        (serialver_LINK): Likewise.
        (serialver_LDADD): Likewise.
        (serialver_LDADD): Likewise.
        (serialver_LDFLAGS): Likewise.
        (cptools_jar_SOURCES): Removed serialver.
        (dist-hook): Likewise.
        (serialver): Removed.
        * src/gnu/classpath/tools/serialver/SerialVer.java: Moved to
        Classpath.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/classpath/cp-tools/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- Makefile.am 22 May 2006 06:09:19 -0000 1.7
+++ Makefile.am 22 May 2006 17:11:12 -0000
@@ -17,7 +17,7 @@
 BUILT_SOURCES = $(data_JARS)
 
 if ENABLE_GCJ_BINARY
-bin_PROGRAMS = javap javah serialver localegen currencygen \
+bin_PROGRAMS = javap javah localegen currencygen \
                rmic rmiregistry
 lib_LTLIBRARIES = libcptools.la 
 lib_LTLIBRARIES += libasm.la
@@ -27,7 +27,7 @@
 nodist_libbytecode_la_SOURCES = $(BYTECODE_JAR)
 endif
 else
-bin_SCRIPTS = javap javah serialver localegen currencygen \
+bin_SCRIPTS = javap javah localegen currencygen \
                rmic rmiregistry
 endif
 
@@ -50,15 +50,6 @@
 javah_LDFLAGS = --main=gnu.classpath.tools.javah.JavahMain \
        -Dgnu.gcj.runtime.VMClassLoader.library_control=never
 
-serialver_SOURCES =
-serialver_LINK = $(GCJLINK)
-serialver_LDADD = libcptools.la
-if USE_GNUBYTECODE
-serialver_LDADD += libbytecode.la
-endif
-serialver_LDFLAGS = --main=gnu.classpath.tools.serialver.SerialVer \
-       -Dgnu.gcj.runtime.VMClassLoader.library_control=never
-
 localegen_SOURCES = \
        src/gnu/ldml/AliasElement.java \
        src/gnu/ldml/Analyzer.java \
@@ -108,10 +99,6 @@
        cp $< $@
        chmod +x $@
 
-serialver: $(srcdir)/bin/serialver
-       cp $< $@
-       chmod +x $@
-
 localegen: $(srcdir)/bin/localegen
        cp $< $@
        chmod +x $@
@@ -137,7 +124,6 @@
        src/gnu/classpath/tools/javap/JavapMain.java \
        src/gnu/classpath/tools/javap/Javap.java \
        src/gnu/classpath/tools/javap/GnuByteCodeJavap.java \
-        src/gnu/classpath/tools/serialver/SerialVer.java \
        src/gnu/classpath/tools/Util.java
 
 if ENABLE_GCJ_BINARY
@@ -177,7 +163,6 @@
        cp $(srcdir)/bin/native2ascii $(distdir)/bin/
        cp $(srcdir)/bin/rmic $(distdir)/bin/
        cp $(srcdir)/bin/rmiregistry $(distdir)/bin/
-       cp $(srcdir)/bin/serialver $(distdir)/bin/
 
 install-data-hook:
        $(INSTALL) -d $(datadir)/java
Index: bin/native2ascii
===================================================================
RCS file: bin/native2ascii
diff -N bin/native2ascii
--- bin/native2ascii 30 Jan 2005 04:19:27 -0000 1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-#
-# gnu.classpath.tools
-# Convenience script for Unix boxes
-#
-
-java gnu.classpath.tools.native2ascii.Native2ASCII "$@"
-
Index: bin/serialver
===================================================================
RCS file: bin/serialver
diff -N bin/serialver
--- bin/serialver 30 Jan 2005 04:19:27 -0000 1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-#
-# gnu.classpath.tools
-# Convenience script for Unix boxes
-#
-
-java gnu.classpath.tools.serialver.SerialVer "$@"
-
Index: src/gnu/classpath/tools/serialver/SerialVer.java
===================================================================
RCS file: src/gnu/classpath/tools/serialver/SerialVer.java
diff -N src/gnu/classpath/tools/serialver/SerialVer.java
--- src/gnu/classpath/tools/serialver/SerialVer.java 30 Jan 2005 04:19:27 -0000 
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -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., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 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