Re: Patch for --version output

[Tom Tromey <tromey at redhat dot com>]

>>>>> "Joseph" == Joseph S Myers <jsm28@cam.ac.uk> writes:

Joseph> This patch makes some programs in GCC follow the GNU Coding
Joseph> Standards for --version output.

A reply to some old email.

Joseph> Note (Java): I haven't touched the programs from Classpath.

I've fixed rmic in both the Classpath and libgcj repositories.

Joseph> But note that rmic should only include the most recent
Joseph> copyright year in its --version output, and rmiregistry
Joseph> doesn't seem to support --version yet.

I'm leaving rmiregistry alone for now.

Joseph> Note (Java): is the full version string, which except for
Joseph> releases includes the date and "(experimental)" or
Joseph> "(prerelease)", available within libgcj?

As far as I know it is not available.  What is the easiest way to make
it available?

Joseph> Note (general): should the copyright notices in --version
Joseph> output say "Free Software Foundation, Inc." (most programs) or
Joseph> just plain "Free Software Foundation" (some libgcj programs)?

Mark said to include the "Inc", and I've made this change as well.

Patch appended.  I'm checking this in.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>

	* java/lang/natSystem.cc (init_properties): Include the `Inc.' in
	java.vendor and java.vm.vendor.
	* gnu/java/rmi/rmic/RMIC.java (parseOptions): Only print most
	recent copyright date.
	* gnu/gcj/convert/Convert.java (version): Print `Inc'.
	* gij.cc (version): Print `Inc'.

Index: gij.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gij.cc,v
retrieving revision 1.16
diff -u -r1.16 gij.cc
--- gij.cc 2001/12/12 20:56:08 1.16
+++ gij.cc 2002/02/22 23:19:54
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000, 2001  Free Software Foundation
+/* Copyright (C) 1999, 2000, 2001, 2002  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -41,7 +41,7 @@
 version ()
 {
   printf ("gij (GNU libgcj) version %s\n\n", GCJVERSION);
-  printf ("Copyright (C) 2001 Free Software Foundation.\n");
+  printf ("Copyright (C) 2002 Free Software Foundation, Inc.\n");
   printf ("This is free software; see the source for copying conditions.  There is NO\n");
   printf ("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n");
   exit (0);
Index: gnu/gcj/convert/Convert.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/gcj/convert/Convert.java,v
retrieving revision 1.6
diff -u -r1.6 Convert.java
--- gnu/gcj/convert/Convert.java 2002/01/31 19:36:28 1.6
+++ gnu/gcj/convert/Convert.java 2002/02/22 23:19:54
@@ -45,7 +45,7 @@
 		       + ") "
 		       + System.getProperty("java.vm.version"));
     System.out.println();
-    System.out.println("Copyright (C) 2002 Free Software Foundation");
+    System.out.println("Copyright (C) 2002 Free Software Foundation, Inc.");
     System.out.println("This is free software; see the source for copying conditions.  There is NO");
     System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
     System.exit(0);
Index: gnu/java/rmi/rmic/RMIC.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/rmic/RMIC.java,v
retrieving revision 1.5
diff -u -r1.5 RMIC.java
--- gnu/java/rmi/rmic/RMIC.java 2002/01/22 22:40:00 1.5
+++ gnu/java/rmi/rmic/RMIC.java 2002/02/22 23:19:59
@@ -944,7 +944,7 @@
 					   + ") "
 					   + System.getProperty("java.vm.version"));
 			System.out.println();
-			System.out.println("Copyright 1996, 1997, 1998, 1999, 2001, 2002 Free Software Foundation");
+			System.out.println("Copyright 2002 Free Software Foundation, Inc.");
 			System.out.println("This is free software; see the source for copying conditions.  There is NO");
 			System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
 			System.exit(0);
Index: java/lang/natSystem.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/natSystem.cc,v
retrieving revision 1.47
diff -u -r1.47 natSystem.cc
--- java/lang/natSystem.cc 2002/02/07 18:59:52 1.47
+++ java/lang/natSystem.cc 2002/02/22 23:19:59
@@ -304,14 +304,14 @@
   // A mixture of the Java Product Versioning Specification
   // (introduced in 1.2), and earlier versioning properties.
   SET ("java.version", VERSION);
-  SET ("java.vendor", "Free Software Foundation");
+  SET ("java.vendor", "Free Software Foundation, Inc.");
   SET ("java.vendor.url", "http://gcc.gnu.org/java/";);
   SET ("java.class.version", GCJVERSION);
   SET ("java.vm.specification.version", "1.1");
   SET ("java.vm.specification.name", "Java(tm) Virtual Machine Specification");
   SET ("java.vm.specification.vendor", "Sun Microsystems Inc.");
   SET ("java.vm.version", GCJVERSION);
-  SET ("java.vm.vendor", "Free Software Foundation");
+  SET ("java.vm.vendor", "Free Software Foundation, Inc.");
   SET ("java.vm.name", "libgcj");
   SET ("java.specification.version", "1.1");
   SET ("java.specification.name", "Java(tm) Language Specification");