From 79c8f00e741771d40478a15c3993e98d22039203 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 17 Dec 2014 20:45:47 +0100 Subject: docs: improve description of ${PACKAGE}, ${VERSION}, and similar variables In particular, suggesting that $PACKAGE and $VERSION should be aliases of the $PACKAGE_TARNAME and $PACKAGE_VERSION definitions coming from AC_INIT, and not be defined via an obsolete 2-argument invocation of AM_INIT_AUTOMAKE; and why that is the best default, given all our historical baggage. See discussion in http://debbugs.gnu.org/16623 for more information and background. * doc/automake.texi: Adjust. * THANKS: Update. Signed-off-by: Stefano Lattarini --- THANKS | 1 + doc/automake.texi | 31 +++++++++++++++++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/THANKS b/THANKS index 6be803e16..7f8485070 100644 --- a/THANKS +++ b/THANKS @@ -156,6 +156,7 @@ Ian Lance Taylor ian@cygnus.com Ignacy Gawedzki i@lri.fr Илья Н. Голубев gin@mo.msk.ru Imacat imacat@mail.imacat.idv.tw +Infirit infirit@gmail.com Inoue inoue@ainet.or.jp Jack Kelly jack@jackkelly.name James Amundson amundson@users.sourceforge.net diff --git a/doc/automake.texi b/doc/automake.texi index 736d61dc6..913dee4f0 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -3914,12 +3914,15 @@ This usage is mostly obsolete because the @var{package} and @var{version} can be obtained from Autoconf's @code{AC_INIT} macro. However, differently from what happens for @code{AC_INIT} invocations, this @code{AM_INIT_AUTOMAKE} invocation supports shell variables' expansions -in the @code{PACKAGE} and @code{VERSION} arguments, and this can be -still be useful in some selected situations. Our hope is that future -Autoconf versions will improve their support for package versions -defined dynamically at configure runtime; when (and if) this happens, -support for the two-args @code{AM_INIT_AUTOMAKE} invocation will likely -be removed from Automake. +in the @code{PACKAGE} and @code{VERSION} arguments (which otherwise +defaults, respectively, to the @code{PACKAGE_TARNAME} and +@code{PACKAGE_VERSION} defined via the @code{AC_INIT} invocation; +@pxref{AC_INIT, , The @code{AC_INIT} macro, autoconf, The Autoconf Manual}); +and this can be still be useful in some selected situations. +Our hope is that future Autoconf versions will improve their support +for package versions defined dynamically at configure runtime; when +(and if) this happens, support for the two-args @code{AM_INIT_AUTOMAKE} +invocation will likely be removed from Automake. @anchor{Modernize AM_INIT_AUTOMAKE invocation} If your @file{configure.ac} has: @@ -8381,9 +8384,13 @@ We recommend that you follow this same set of heuristics in your The @code{dist} rule in the generated @file{Makefile.in} can be used to generate a gzipped @code{tar} file and other flavors of archive for distribution. The file is named based on the @code{PACKAGE} and -@code{VERSION} variables defined by @code{AM_INIT_AUTOMAKE} -(@pxref{Macros}); more precisely the gzipped @code{tar} file is named -@samp{@var{package}-@var{version}.tar.gz}. +@code{VERSION} variables automatically defined by either the +@code{AC_INIT} invocation or by a @emph{deprecated} two-arguments +invocation of the @code{AM_INIT_AUTOMAKE} macro (see @ref{Public Macros} +for how these variables get their values, from either defaults or explicit +values -- it's slightly trickier than one would expect). +More precisely the gzipped @code{tar} file is named +@samp{$@{PACKAGE@}-$@{VERSION@}.tar.gz}. @vindex GZIP_ENV You can use the @command{make} variable @code{GZIP_ENV} to control how gzip is run. The default setting is @option{--best}. @@ -10151,7 +10158,11 @@ brittle. @opindex no-define This option is meaningful only when passed as an argument to @code{AM_INIT_AUTOMAKE}. It will prevent the @code{PACKAGE} and -@code{VERSION} variables from being @code{AC_DEFINE}d. +@code{VERSION} variables from being @code{AC_DEFINE}d. But notice +that they will remain defined as shell variables in the generated +@code{configure}, and as make variables in the generated +@code{Makefile}; this is deliberate, and required for backward +compatibility. @item @option{no-dependencies} @cindex Option, @option{no-dependencies} -- cgit v1.2.1 From 4410ae7f201a1e70da63b95680467223f77dffab Mon Sep 17 00:00:00 2001 From: Aharon Robbins Date: Fri, 19 Dec 2014 11:08:15 +0100 Subject: dist: adjust warning messages about shar and tarZ deprecation They were swapped. Reported in http://debbugs.gnu.org/19108. Signed-off-by: Stefano Lattarini --- lib/am/distdir.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/am/distdir.am b/lib/am/distdir.am index a8ad63cef..0c019605c 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -339,8 +339,8 @@ dist-xz: distdir ?COMPRESS?DIST_ARCHIVES += $(distdir).tar.Z .PHONY: dist-tarZ dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) @@ -348,9 +348,9 @@ dist-tarZ: distdir ?SHAR?DIST_ARCHIVES += $(distdir).shar.gz .PHONY: dist-shar dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) -- cgit v1.2.1 From 0015156bcc4d25db3c5504b29618fe1a02c1e4f6 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 19 Dec 2014 11:44:12 +0100 Subject: Make sure AM_INIT_AUTOMAKE has a trailing newline This used to be the case until Automke 1.13, but we broke it in Automake 1.14 (see commit v1.13.1-71-gf78b0f0). This caused issues like http://debbugs.gnu.org/16841 * m4/init.m4 (AM_INIT_AUTOMAKE): Adjust. * t/aminit-trailing-dnl-comment-pr16841.sh: New test. * t/list-of-tests.mk: Add it. * NEWS, THANKS: Update. Signed-off-by: Stefano Lattarini --- NEWS | 9 +++++++ THANKS | 1 + m4/init.m4 | 6 ++++- t/aminit-trailing-dnl-comment-pr16841.sh | 44 ++++++++++++++++++++++++++++++++ t/list-of-tests.mk | 1 + 5 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 t/aminit-trailing-dnl-comment-pr16841.sh diff --git a/NEWS b/NEWS index 614eba64d..626d295ac 100644 --- a/NEWS +++ b/NEWS @@ -104,6 +104,15 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +New in 1.14.2: + +* Bugs fixed: + + - The expansion of AM_INIT_AUTOMAKE ends once again with a trailing + newline (bug#16841). Regression introduced in Automake 1.14. + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + New in 1.14.1: * Bugs fixed: diff --git a/THANKS b/THANKS index 7f8485070..9ace719e5 100644 --- a/THANKS +++ b/THANKS @@ -152,6 +152,7 @@ Harlan Stenn Harlan.Stenn@pfcs.com He Li tippa000@yahoo.com Henrik Frystyk Nielsen frystyk@w3.org Hib Eris hib@hiberis.nl +Hilko Bengen bengen@debian.org Ian Lance Taylor ian@cygnus.com Ignacy Gawedzki i@lri.fr Илья Н. Голубев gin@mo.msk.ru diff --git a/m4/init.m4 b/m4/init.m4 index 432ff200c..d8350fe44 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -164,7 +164,11 @@ to "yes", and re-run configure. END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further diff --git a/t/aminit-trailing-dnl-comment-pr16841.sh b/t/aminit-trailing-dnl-comment-pr16841.sh new file mode 100644 index 000000000..0f47f16bf --- /dev/null +++ b/t/aminit-trailing-dnl-comment-pr16841.sh @@ -0,0 +1,44 @@ +#! /bin/sh +# Copyright (C) 2014 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program 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 this program. If not, see . + +# Check that a trailing 'dnl' m4 comment automake after the +# AM_INIT_AUTOMAKE invocation doesn't produce a syntactically +# invalid configure script. This used to be the case until +# automake 1.13, but we broke that in automake 1.14. See +# automake bug#16841. + +am_create_testdir=empty +. test-init.sh + +cat > configure.ac < Makefile.am + +$ACLOCAL +$AUTOCONF +$AUTOMAKE -a + +./configure >stdout || { cat stdout; exit 1; } +cat stdout +greop '^OK OK OK$' stdout + +: diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index 462497ee3..c98d69e11 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -132,6 +132,7 @@ t/amhello-cflags.sh \ t/amhello-cross-compile.sh \ t/amhello-binpkg.sh \ t/aminit-moreargs-deprecation.sh \ +t/aminit-trailing-dnl-comment-pr16841.sh \ t/amassign.sh \ t/am-config-header.sh \ t/am-prog-cc-stdc.sh \ -- cgit v1.2.1 From c7803af6d7099a002d7684000070ef945bb067b9 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 19 Dec 2014 12:43:47 +0100 Subject: sync: update third-part files from upstream * lib/config.guess: This. * lib/config.sub: And this. * lib/gitlog-to-changelog: And this. * lib/gnupload: And this. * lib/update-copyright: And this. Signed-off-by: Stefano Lattarini --- lib/config.guess | 173 ++++-------------------------------------------- lib/config.sub | 36 +++++++--- lib/gitlog-to-changelog | 9 ++- lib/gnupload | 2 +- lib/update-copyright | 2 +- 5 files changed, 47 insertions(+), 175 deletions(-) diff --git a/lib/config.guess b/lib/config.guess index 9afd67620..6c32c8645 100755 --- a/lib/config.guess +++ b/lib/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-11-29' +timestamp='2014-11-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ timestamp='2013-11-29' # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ Linux|GNU|GNU/*) LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -579,8 +579,9 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -826,7 +827,7 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +970,10 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1371,154 +1372,6 @@ EOF exit ;; esac -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -68,7 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -283,8 +283,10 @@ case $basic_machine in | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -296,11 +298,11 @@ case $basic_machine in | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -311,6 +313,7 @@ case $basic_machine in | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -325,6 +328,9 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none @@ -402,8 +408,10 @@ case $basic_machine in | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -415,6 +423,7 @@ case $basic_machine in | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -432,6 +441,7 @@ case $basic_machine in | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -769,6 +779,9 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -824,6 +837,10 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -1369,14 +1386,14 @@ case $os in | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1594,9 +1611,6 @@ case $basic_machine in mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff --git a/lib/gitlog-to-changelog b/lib/gitlog-to-changelog index e02d34c21..190f7b5db 100755 --- a/lib/gitlog-to-changelog +++ b/lib/gitlog-to-changelog @@ -3,13 +3,13 @@ eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}' if 0; # Convert git log output to ChangeLog format. -my $VERSION = '2012-07-29 06:11'; # UTC +my $VERSION = '2014-11-20 17:25'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Copyright (C) 2008-2013 Free Software Foundation, Inc. +# Copyright (C) 2008-2014 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 @@ -72,6 +72,7 @@ OPTIONS: directory can be derived. --since=DATE convert only the logs since DATE; the default is to convert all log entries. + --until=DATE convert only the logs older than DATE. --format=FMT set format string for commit subject and body; see 'man git-log' for the list of format metacharacters; the default is '%s%n%b%n' @@ -220,6 +221,7 @@ sub git_dir_option($) { my $since_date; + my $until_date; my $format_string = '%s%n%b%n'; my $amend_file; my $append_dot = 0; @@ -232,6 +234,7 @@ sub git_dir_option($) help => sub { usage 0 }, version => sub { print "$ME version $VERSION\n"; exit }, 'since=s' => \$since_date, + 'until=s' => \$until_date, 'format=s' => \$format_string, 'amend=s' => \$amend_file, 'append-dot' => \$append_dot, @@ -243,6 +246,8 @@ sub git_dir_option($) defined $since_date and unshift @ARGV, "--since=$since_date"; + defined $until_date + and unshift @ARGV, "--until=$until_date"; # This is a hash that maps an SHA1 to perl code (i.e., s/old/new/) # that makes a correction in the log or attribution of that commit. diff --git a/lib/gnupload b/lib/gnupload index e3ac1ba0c..0832e16c9 100755 --- a/lib/gnupload +++ b/lib/gnupload @@ -3,7 +3,7 @@ scriptversion=2013-03-19.17; # UTC -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 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 diff --git a/lib/update-copyright b/lib/update-copyright index c72d0e67d..90624e900 100755 --- a/lib/update-copyright +++ b/lib/update-copyright @@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" ${1+"$@"}' my $VERSION = '2013-01-03.09:41'; # UTC -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 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 -- cgit v1.2.1 From 26aaa1c22db47d2a0ffdb4de79d196164c1e3b18 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 19 Dec 2014 13:30:36 +0100 Subject: Fix stupid typo in test, causing spurious failure * t/aminit-trailing-dnl-comment-pr16841.sh: s/greop/grep/ Signed-off-by: Stefano Lattarini --- t/aminit-trailing-dnl-comment-pr16841.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/aminit-trailing-dnl-comment-pr16841.sh b/t/aminit-trailing-dnl-comment-pr16841.sh index 0f47f16bf..fc73ebead 100644 --- a/t/aminit-trailing-dnl-comment-pr16841.sh +++ b/t/aminit-trailing-dnl-comment-pr16841.sh @@ -39,6 +39,6 @@ $AUTOMAKE -a ./configure >stdout || { cat stdout; exit 1; } cat stdout -greop '^OK OK OK$' stdout +grep '^OK OK OK$' stdout : -- cgit v1.2.1