Patch: update --version output for tools
Anthony Green
green@redhat.com
Fri Feb 18 22:57:00 GMT 2005
These changes update the copyright year for the --version output of our
tools.
It also tweams gcj-dbtool --version to only emit the most recent
copyright year, like gcc and all of the other java tools.
Ok?
AG
2005-02-18 Anthony Green <green@redhat.com>
* gij.cc (version): Change year for '--version' to 2005.
* gnu/gcj/convert/Convert.java: Ditto.
* gnu/java/rmi/rmic/RMIC.java: Ditto.
* gnu/java/rmi/registry/RegistryImpl.java: Ditto.
* gnu/gcj/tools/gcj_dbtool/Main.java: Only show the most
recent copyright year in `--version' output.
Index: gij.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gij.cc,v
retrieving revision 1.24
diff -c -p -r1.24 gij.cc
*** gij.cc 25 Nov 2004 03:46:56 -0000 1.24
--- gij.cc 18 Feb 2005 20:34:08 -0000
*************** static void
*** 47,53 ****
version ()
{
printf ("gij (GNU libgcj) version %s\n\n", __VERSION__);
! 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");
}
--- 47,53 ----
version ()
{
printf ("gij (GNU libgcj) version %s\n\n", __VERSION__);
! printf ("Copyright (C) 2005 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");
}
Index: gnu/gcj/convert/Convert.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/gcj/convert/Convert.java,v
retrieving revision 1.9
diff -c -p -r1.9 Convert.java
*** gnu/gcj/convert/Convert.java 20 Feb 2004 17:02:35 -0000 1.9
--- gnu/gcj/convert/Convert.java 18 Feb 2005 20:34:08 -0000
***************
*** 1,4 ****
! /* Copyright (C) 1999, 2002 Free Software Foundation
This file is part of libgcj.
--- 1,4 ----
! /* Copyright (C) 1999, 2002, 2005 Free Software Foundation
This file is part of libgcj.
*************** public class Convert
*** 45,51 ****
+ ") "
+ System.getProperty("java.vm.version"));
System.out.println();
! 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);
--- 45,51 ----
+ ") "
+ System.getProperty("java.vm.version"));
System.out.println();
! System.out.println("Copyright (C) 2005 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/gcj/tools/gcj_dbtool/Main.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/gcj/tools/gcj_dbtool/Main.java,v
retrieving revision 1.4
diff -c -p -r1.4 Main.java
*** gnu/gcj/tools/gcj_dbtool/Main.java 16 Feb 2005 17:32:59 -0000 1.4
--- gnu/gcj/tools/gcj_dbtool/Main.java 18 Feb 2005 20:34:09 -0000
*************** public class Main
*** 31,37 ****
+ ") "
+ System.getProperty("java.vm.version"));
System.out.println();
! System.out.println("Copyright 2004, 2005 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.");
return;
--- 31,37 ----
+ ") "
+ System.getProperty("java.vm.version"));
System.out.println();
! System.out.println("Copyright 2005 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.");
return;
Index: gnu/java/rmi/registry/RegistryImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/rmi/registry/RegistryImpl.java,v
retrieving revision 1.4
diff -c -p -r1.4 RegistryImpl.java
*** gnu/java/rmi/registry/RegistryImpl.java 7 Nov 2002 18:01:05 -0000 1.4
--- gnu/java/rmi/registry/RegistryImpl.java 18 Feb 2005 20:34:09 -0000
***************
*** 1,5 ****
/*
! Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
--- 1,6 ----
/*
! Copyright (c) 1996, 1997, 1998, 1999, 2002, 2005
! Free Software Foundation, Inc.
This file is part of GNU Classpath.
*************** public static void version() {
*** 109,115 ****
+ System.getProperty("java.vm.name")
+ ") "
+ System.getProperty("java.vm.version"));
! 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);
--- 110,116 ----
+ System.getProperty("java.vm.name")
+ ") "
+ System.getProperty("java.vm.version"));
! System.out.println("Copyright 2005 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.11
diff -c -p -r1.11 RMIC.java
*** gnu/java/rmi/rmic/RMIC.java 20 Oct 2004 08:45:33 -0000 1.11
--- gnu/java/rmi/rmic/RMIC.java 18 Feb 2005 20:34:09 -0000
***************
*** 1,5 ****
/* RMIC.java --
! Copyright (c) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
Free Software Foundation, Inc.
This file is part of GNU Classpath.
--- 1,5 ----
/* RMIC.java --
! Copyright (c) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This file is part of GNU Classpath.
*************** public class RMIC
*** 978,984 ****
System.out.println("rmic (" + System.getProperty("java.vm.name")
+ ") " + System.getProperty("java.vm.version"));
System.out.println();
! 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);
--- 978,984 ----
System.out.println("rmic (" + System.getProperty("java.vm.name")
+ ") " + System.getProperty("java.vm.version"));
System.out.println();
! System.out.println("Copyright 2005 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);
More information about the Java-patches
mailing list