From 1696d6d719639a1896638d0cf72e57737a4d2870 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 19 Jun 2024 08:59:18 -0700 Subject: [PATCH] lib scripts: add "(GNU Automake)" to --version output, etc. * lib/ar-lib: add "(GNU Automake)" to --version output, and the "Report bugs" block to --help. * lib/compile: likewise. * lib/depcomp: likewise. * lib/install-sh: likewise. * lib/mdate-sh: likewise. * lib/missing: likewise. * lib/mkinstalldirs: likewise. * lib/py-compile: likewise. * lib/tap-driver.sh: likewise. * lib/test-driver: likewise. * lib/ylwrap: likewise. * t/py-compile-usage.sh: update --version pattern. --- lib/ar-lib | 8 ++++++-- lib/compile | 4 ++-- lib/depcomp | 4 ++-- lib/install-sh | 4 ++-- lib/mdate-sh | 4 ++-- lib/missing | 2 +- lib/mkinstalldirs | 4 ++-- lib/py-compile | 4 ++-- lib/tap-driver.sh | 8 ++++++-- lib/test-driver | 9 +++++++-- lib/ylwrap | 4 ++-- t/py-compile-usage.sh | 4 ++-- 12 files changed, 36 insertions(+), 23 deletions(-) diff --git a/lib/ar-lib b/lib/ar-lib index c74c46c37..152198749 100755 --- a/lib/ar-lib +++ b/lib/ar-lib @@ -2,7 +2,7 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2019-07-04.01; # UTC +scriptversion=2024-06-19.01; # UTC # Copyright (C) 2010-2024 Free Software Foundation, Inc. # Written by Peter Rosin . @@ -105,11 +105,15 @@ case $1 in Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...] Members may be specified in a file named with @FILE. + +Report bugs to . +GNU Automake home page: . +General help using GNU software: . EOF exit $? ;; -v | --v*) - echo "$me, version $scriptversion" + echo "$me (GNU Automake) $scriptversion" exit $? ;; esac diff --git a/lib/compile b/lib/compile index 2818b7ded..49b3d05fd 100755 --- a/lib/compile +++ b/lib/compile @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2023-11-23.18; # UTC +scriptversion=2024-06-19.01; # UTC # Copyright (C) 1999-2024 Free Software Foundation, Inc. # Written by Tom Tromey . @@ -254,7 +254,7 @@ EOF exit $? ;; -v | --v*) - echo "compile $scriptversion" + echo "compile (GNU Automake) $scriptversion" exit $? ;; cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ diff --git a/lib/depcomp b/lib/depcomp index 4ade06624..1f0aa972c 100755 --- a/lib/depcomp +++ b/lib/depcomp @@ -1,7 +1,7 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2024-06-07.03; # UTC +scriptversion=2024-06-19.01; # UTC # Copyright (C) 1999-2024 Free Software Foundation, Inc. @@ -53,7 +53,7 @@ EOF exit $? ;; -v | --v*) - echo "depcomp $scriptversion" + echo "depcomp (GNU Automake) $scriptversion" exit $? ;; esac diff --git a/lib/install-sh b/lib/install-sh index e0af0fe2f..b1d7a6f67 100755 --- a/lib/install-sh +++ b/lib/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2024-06-07.14; # UTC +scriptversion=2024-06-19.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -170,7 +170,7 @@ while test $# -ne 0; do -T) is_target_a_directory=never;; - --version) echo "$0 $scriptversion"; exit $?;; + --version) echo "$0 (GNU Automake) $scriptversion"; exit $?;; --) shift break;; diff --git a/lib/mdate-sh b/lib/mdate-sh index 88f306d70..764e142ee 100755 --- a/lib/mdate-sh +++ b/lib/mdate-sh @@ -1,7 +1,7 @@ #!/bin/sh # Get modification time of a file or directory and pretty-print it. -scriptversion=2023-11-23.18; # UTC +scriptversion=2024-06-19.01; # UTC # Copyright (C) 1995-2024 Free Software Foundation, Inc. # written by Ulrich Drepper , June 1995 @@ -56,7 +56,7 @@ EOF exit $? ;; -v | --v*) - echo "mdate-sh $scriptversion" + echo "mdate-sh (GNU Automake) $scriptversion" exit $? ;; esac diff --git a/lib/missing b/lib/missing index 303e65563..7e7d78ec5 100755 --- a/lib/missing +++ b/lib/missing @@ -69,7 +69,7 @@ General help using GNU software: ." ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" + echo "missing (GNU Automake) $scriptversion" exit $? ;; diff --git a/lib/mkinstalldirs b/lib/mkinstalldirs index 83e8e31ec..e536369cc 100755 --- a/lib/mkinstalldirs +++ b/lib/mkinstalldirs @@ -1,7 +1,7 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -scriptversion=2023-11-23.18; # UTC +scriptversion=2024-06-19.01; # UTC # Original author: Noah Friedman # Created: 1993-05-16 @@ -41,7 +41,7 @@ while test $# -gt 0 ; do shift ;; --version) - echo "$0 $scriptversion" + echo "$0 (GNU Automake) $scriptversion" exit $? ;; --) # stop option processing diff --git a/lib/py-compile b/lib/py-compile index 4989ceee9..c9d4fde94 100755 --- a/lib/py-compile +++ b/lib/py-compile @@ -1,7 +1,7 @@ #!/bin/sh # py-compile - Compile a Python program -scriptversion=2023-11-23.18; # UTC +scriptversion=2024-06-19.01; # UTC # Copyright (C) 2000-2024 Free Software Foundation, Inc. @@ -85,7 +85,7 @@ EOF exit $? ;; -v|--version) - echo "$me $scriptversion" + echo "$me (GNU Automake) $scriptversion" exit $? ;; --) diff --git a/lib/tap-driver.sh b/lib/tap-driver.sh index 01d362fa5..bd9597588 100755 --- a/lib/tap-driver.sh +++ b/lib/tap-driver.sh @@ -23,7 +23,7 @@ # bugs to or send patches to # . -scriptversion=2013-12-23.17; # UTC +scriptversion=2024-06-19.01; # UTC # Make unconditional expansion of undefined variables an error. This # helps a lot in preventing typo-related bugs. @@ -54,6 +54,10 @@ Usage: [--diagnostic-string STRING] [--merge|--no-merge] [--comments|--no-comments] [--] TEST-COMMAND The '--test-name', '-log-file' and '--trs-file' options are mandatory. + +Report bugs to . +GNU Automake home page: . +General help using GNU software: . END } @@ -71,7 +75,7 @@ diag_string='#' while test $# -gt 0; do case $1 in --help) print_usage; exit $?;; - --version) echo "$me $scriptversion"; exit $?;; + --version) echo "$me (GNU Automake) $scriptversion"; exit $?;; --test-name) test_name=$2; shift;; --log-file) log_file=$2; shift;; --trs-file) trs_file=$2; shift;; diff --git a/lib/test-driver b/lib/test-driver index e04b5a210..5c3ae820f 100755 --- a/lib/test-driver +++ b/lib/test-driver @@ -1,7 +1,7 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2024-06-07.11; # UTC +scriptversion=2024-06-19.01; # UTC # Copyright (C) 2011-2024 Free Software Foundation, Inc. # @@ -50,6 +50,11 @@ Usage: The '--test-name', '--log-file' and '--trs-file' options are mandatory. See the GNU Automake documentation for information. + + +Report bugs to . +GNU Automake home page: . +General help using GNU software: . END } @@ -63,7 +68,7 @@ enable_hard_errors=yes while test $# -gt 0; do case $1 in --help) print_usage; exit $?;; - --version) echo "test-driver $scriptversion"; exit $?;; + --version) echo "test-driver (GNU Automake) $scriptversion"; exit $?;; --test-name) test_name=$2; shift;; --log-file) log_file=$2; shift;; --trs-file) trs_file=$2; shift;; diff --git a/lib/ylwrap b/lib/ylwrap index f945f4b9e..9e63acd92 100755 --- a/lib/ylwrap +++ b/lib/ylwrap @@ -1,7 +1,7 @@ #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. -scriptversion=2023-11-23.18; # UTC +scriptversion=2024-06-19.01; # UTC # Copyright (C) 1996-2024 Free Software Foundation, Inc. # @@ -87,7 +87,7 @@ EOF exit $? ;; -v|--v*) - echo "ylwrap $scriptversion" + echo "ylwrap (GNU Automake) $scriptversion" exit $? ;; esac diff --git a/t/py-compile-usage.sh b/t/py-compile-usage.sh index 5ab92e13f..d134faca6 100644 --- a/t/py-compile-usage.sh +++ b/t/py-compile-usage.sh @@ -38,11 +38,11 @@ $FGREP ' --destdir DIR ' stdout || { cat stdout; cat stderr >&2; exit 1; } cat stdout test -s stderr && { cat stderr >&2; exit 1; } -year='20[0-9][0-9]' # Hopefully automake will be obsolete in 80 years ;-) +year='2[0-9][0-9][0-9]' month='(0[0-9]|1[012])' day='([012][0-9]|3[01])' hour='([01][0-9]|2[0123])' -LC_ALL=C $EGREP "^py-compile $year-$month-$day\.$hour" stdout +LC_ALL=C $EGREP "^py-compile .* $year-$month-$day\.$hour" stdout test $(wc -l