From 4fbea729ba361237b09f2ba8e1aeeb814482612a Mon Sep 17 00:00:00 2001 From: jsm28 Date: Thu, 31 Jan 2002 19:36:28 +0000 Subject: [PATCH] gcc: * gccbug.in: Follow GNU Coding Standards for --version. Use GCC version rather than GNATS version in --version output. gcc/f: * g77spec.c (lang_specific_driver): Follow GNU Coding Standards for --version. gcc/java: * gjavah.c (version), jcf-dump.c (version), jv-scan.c (version): Follow GNU Coding Standards for --version. libjava: * gnu/gcj/convert/Convert.java: Only include one copyright year in --version output. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49372 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/f/ChangeLog | 5 +++++ gcc/f/g77spec.c | 2 +- gcc/gccbug.in | 11 +++++++++-- gcc/java/ChangeLog | 5 +++++ gcc/java/gjavah.c | 4 ++-- gcc/java/jcf-dump.c | 6 +++--- gcc/java/jv-scan.c | 6 +++--- libjava/ChangeLog | 5 +++++ libjava/gnu/gcj/convert/Convert.java | 2 +- 10 files changed, 39 insertions(+), 12 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 410e1b0..f7ea229 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2002-01-31 Joseph S. Myers + + * gccbug.in: Follow GNU Coding Standards for --version. Use GCC + version rather than GNATS version in --version output. + 2002-01-31 Richard Sandiford * ifcvt.c (noce_process_if_block): Make a copy of the destination diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index ee4afd7..7cec89c 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,8 @@ +2002-01-31 Joseph S. Myers + + * g77spec.c (lang_specific_driver): Follow GNU Coding Standards + for --version. + 2002-01-30 Richard Henderson * ste.c (ffeste_begin_iterdo_): Use expand_exit_loop_top_cond. diff --git a/gcc/f/g77spec.c b/gcc/f/g77spec.c index 7ba0756..2e094d9 100644 --- a/gcc/f/g77spec.c +++ b/gcc/f/g77spec.c @@ -374,7 +374,7 @@ lang_specific_driver (in_argc, in_argv, in_added_libraries) case OPTION_version: printf ("\ -GNU Fortran %s (Fortran Frontend version %s)\n\ +GNU Fortran (GCC %s) %s\n\ Copyright (C) 2002 Free Software Foundation, Inc.\n\ \n\ GNU Fortran comes with NO WARRANTY, to the extent permitted by law.\n\ diff --git a/gcc/gccbug.in b/gcc/gccbug.in index 5b085b4..9619e61 100755 --- a/gcc/gccbug.in +++ b/gcc/gccbug.in @@ -1,6 +1,6 @@ #!/bin/sh # Submit a problem report to a GNATS site. -# Copyright (C) 1993, 2000, 2001 Free Software Foundation, Inc. +# Copyright (C) 1993, 2000, 2001, 2002 Free Software Foundation, Inc. # Contributed by Brendan Kehoe (brendan@cygnus.com), based on a # version written by Heinz G. Seidl (hgs@cygnus.com). # @@ -183,7 +183,14 @@ while [ $# -gt 0 ]; do -l | -CL | --lisp) FORMAT=lisp ;; --request-id) REQUEST_ID=true ;; -h | --help) echo "$USAGE"; $REMOVE_TEMP; exit 0 ;; - -V | --version) echo "$VERSION"; $REMOVE_TEMP; exit 0 ;; + -V | --version) cat < + + * gjavah.c (version), jcf-dump.c (version), jv-scan.c (version): + Follow GNU Coding Standards for --version. + 2002-01-28 Tom Tromey * expr.c (build_jni_stub): Ensure storage for `meth' is diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c index b128ab7..9b205f4 100644 --- a/gcc/java/gjavah.c +++ b/gcc/java/gjavah.c @@ -2185,8 +2185,8 @@ help () static void version () { - printf ("gcjh (%s)\n\n", version_string); - printf ("Copyright (C) 2001 Free Software Foundation, Inc.\n"); + printf ("gcjh (GCC) %s\n\n", version_string); + 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\n"); exit (0); diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c index 16fce90..fefee03 100644 --- a/gcc/java/jcf-dump.c +++ b/gcc/java/jcf-dump.c @@ -1,7 +1,7 @@ /* Program to dump out a Java(TM) .class file. Functionally similar to Sun's javap. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -822,8 +822,8 @@ help () static void version () { - printf ("jcf-dump (%s)\n\n", version_string); - printf ("Copyright (C) 2001 Free Software Foundation, Inc.\n"); + printf ("jcf-dump (GCC) %s\n\n", version_string); + 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\n"); exit (0); diff --git a/gcc/java/jv-scan.c b/gcc/java/jv-scan.c index 4120a2f..343655e 100644 --- a/gcc/java/jv-scan.c +++ b/gcc/java/jv-scan.c @@ -1,5 +1,5 @@ /* Main for jv-scan - Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. Contributed by Alexandre Petit-Bianco (apbianco@cygnus.com) This file is part of GNU CC. @@ -118,8 +118,8 @@ help () static void version () { - printf ("jv-scan (%s)\n\n", version_string); - printf ("Copyright (C) 2001 Free Software Foundation, Inc.\n"); + printf ("jv-scan (GCC) %s\n\n", version_string); + 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\n"); exit (0); diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1c192d7..ffdf432 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2002-01-31 Joseph S. Myers + + * gnu/gcj/convert/Convert.java: Only include one copyright year in + --version output. + 2002-01-30 Tom Tromey * java/net/natPlainSocketImpl.cc (_Jv_recv): Added template diff --git a/libjava/gnu/gcj/convert/Convert.java b/libjava/gnu/gcj/convert/Convert.java index fe18a67..1858a5f 100644 --- a/libjava/gnu/gcj/convert/Convert.java +++ b/libjava/gnu/gcj/convert/Convert.java @@ -45,7 +45,7 @@ public class Convert + ") " + System.getProperty("java.vm.version")); System.out.println(); - System.out.println("Copyright 1999, 2002 Free Software Foundation"); + System.out.println("Copyright (C) 2002 Free Software Foundation"); 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); -- 2.7.4