Stefano Lattarini [Sat, 29 Dec 2012 14:28:41 +0000 (15:28 +0100)]
sync: update files from upstream with "make fetch"
* lib/config.sub: Update.
* lib/config.guess: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sat, 29 Dec 2012 08:47:33 +0000 (09:47 +0100)]
tests: better names for temporary configure.ac files
When editing a pre-existent 'configure.ac' file in a test script, name
the temporary file 'configure.tmp' rather than 'configure.int'; the
latter was a relict of the times when we used 'configure.in' as the
default name for the Autoconf input files throughout the testsuite.
* t/cond43.sh: Adjust.
* t/depcomp8a.sh: Likewise.
* t/depcomp8b.sh: Likewise.
* t/gettext.sh: Likewise.
* t/mmode.sh: Likewise.
* t/pr401.sh: Likewise.
* t/pr401b.sh: Likewise.
* t/pr401c.sh: Likewise.
* t/python11.sh: Likewise.
* t/cond42.sh: Likewise. Also, while at it, rename ...
(edit_configure_in): ... this function ...
(edit_configure_ac): ... like this.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 28 Dec 2012 17:41:38 +0000 (18:41 +0100)]
post-release: minor version bump
This is for the maint branch.
* configure.ac, m4/amversion.m4: Bump version to 1.13.0a.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 28 Dec 2012 17:12:33 +0000 (18:12 +0100)]
release: stable major release 1.13
* configure.ac (AC_INIT): Bump version number to 1.13.
* m4/amversion.m4 (AM_AUTOMAKE_VERSION): Likewise (regenerated
by "make bootstrap").
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Mon, 24 Dec 2012 09:44:10 +0000 (10:44 +0100)]
news: fix botched URL
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Akim Demaille [Wed, 19 Dec 2012 13:51:58 +0000 (14:51 +0100)]
ylwrap: various fixes
Rename properly header guards in generated header files, instead of
leaving Y_TAB_H.
Convert header guards in implementation files. Because ylwrap failed
to rename properly #include in the implementation files, current
versions of Bison (e.g., 2.7) duplicate the generated header file in
the implementation file. The header guard then protects the
implementation file from duplicate definitions from the header file.
Generate header guards with a single '_' for series of non alphabetic
characters, instead of several. This is what Bison does.
Makes the test t/yacc-d-basic.sh pass again.
* lib/ylwrap (guard): Properly honor $1 to rename properly the
header guards.
Keep a single _ instead of several.
(rename_sed): Rename as...
(sed_fix_filenames): this.
Suggested by Stefano Lattarini.
(sed_fix_header_guards): New.
Use it.
Akim Demaille [Wed, 19 Dec 2012 13:30:06 +0000 (14:30 +0100)]
tests: strengthen the ylwrap tests
* t/yacc-d-basic.sh: Comment changes.
(generated): New.
Use it to factor various tests.
Check that Y_TAB_H is not issued.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Wed, 19 Dec 2012 17:19:42 +0000 (18:19 +0100)]
NEWS: we plan to ditch MS-DOS/DJGPP support in future Automake versions
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Wed, 19 Dec 2012 11:16:27 +0000 (12:16 +0100)]
maint: typofixes in makefile comments
* maint.mk (git-upload-release): Here.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Wed, 19 Dec 2012 11:06:38 +0000 (12:06 +0100)]
maint: remove extra verbosity from a maintainer rule
* maint.mk (git-upload-release): Here, by adding a forgotten
'@' recipe modifier.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Wed, 19 Dec 2012 11:05:08 +0000 (12:05 +0100)]
NEWS: fix grammaro
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Wed, 19 Dec 2012 11:02:21 +0000 (12:02 +0100)]
maint: version bump after beta release
* configure.ac (AC_INIT): Bump version number to 1.12c, as per
HACKING suggestion.
* m4/amversion.m4: Likewise (autoupdated by "make bootstrap").
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Wed, 19 Dec 2012 10:18:53 +0000 (11:18 +0100)]
release: beta release 1.12b (will become 1.13)
* configure.ac (AC_INIT): Bump version number to 1.12b.
* m4/amversion.m4: Likewise (auto-updated by "make bootstrap").
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Wed, 19 Dec 2012 09:42:56 +0000 (10:42 +0100)]
cosmetics: comments fixlets in our Makefile
* Makefile.am: Prefer '#' comments over '##' ones where it makes sense.
Other minor style tweaks to comments about "updated later" variables.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Wed, 19 Dec 2012 09:40:13 +0000 (10:40 +0100)]
cosmetics: consistency changes in some make recipes
* Makefile.am (install-exec-hook, uninstall-hook): Don't use extra
quoting in variable assignments. More consistent use of whitespace.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Tue, 18 Dec 2012 11:20:23 +0000 (12:20 +0100)]
tests: avoid a spurious failure on NetBSD
* t/tags-pr12372.sh (configure.ac): AC_SUBST the LINK variable to a
dummy invocation, to avoid possible errors from make or the linker;
errors we do not care about in the least in this test.
(Makefile.am, sub/Makefile.am): Remove LINK definitions; simply
inherit that in configure.ac.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Tue, 18 Dec 2012 10:51:18 +0000 (11:51 +0100)]
tests: re-enable some checks disabled by mistake ...
* t/subpkg-macrodir.sh: ... in this test. And fix some typos that would
have caused the newly re-enabled check to spuriously fail. Issue revealed
by the lack of '.PHONY' support in Solaris CCS make (yes, so we've been
actually *helped* by that make implementation once, at last. Scary ;-)
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Tue, 18 Dec 2012 10:46:40 +0000 (11:46 +0100)]
tests: avoid a "grep -E" portability issue
As stated in the Autoconf manual, the empty alternative is not portable
with "grep -E". For example, while with GNU grep we have:
$ echo b | grep -E '(|a)b'; echo status = $?
b
status = 0
with Solaris 10 /usr/xpg4/bin/grep we have:
$ echo b | grep -E '(|a)b'; echo status = $?
1
status = 1
* t/silent-texi.sh: That was causing a spurious failure here. Fix it
by simply using '?' instead (as suggested by the Autoconf manual).
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Tue, 18 Dec 2012 10:30:39 +0000 (11:30 +0100)]
tests: avoid a spurious failure due to a Clang bug
This version of clang:
clang version 3.2 (trunk 163574)
Target: powerpc64-unknown-linux-gnu
Thread model: posix
caused the test 't/ltcond2.sh' to spuriously fail due to what
appeared like a clang bug. Here is a part of the diagnostic (trimmed
down for better clarity):
clang: .../cfarm/llvm/lib/MC/MCAsmStreamer.cpp:338: \
virtual void {anonymous}::MCAsmStreamer::EmitLabel(llvm::MCSymbol*): \
Assertion `Symbol->isUndefined() && "Cannot define a symbol twice!"' \
failed.
...
7 clang 0x0000000012a459c4 llvm::AsmPrinter::EmitGlobalVariable\
(llvm::GlobalVariable const*) +
18446744073680468044
8 clang 0x0000000012a490a8 llvm::AsmPrinter::doFinalization\
(llvm::Module&) +
18446744073680481840
...
Stack dump:
0. Program arguments: .../opt/cfarm/clang-2012.09.10/bin/clang \
-cc1 -triple powerpc64-unknown-linux-gnu -S -disable-free \
...
1. <eof> parser at end of file
2. Code generation
3. Running pass 'Function Pass Manager' on module 'hello-generic.c'.
clang: error: unable to execute command: Aborted
clang: error: clang frontend command failed due to signal (use -v to \
see invocation)
clang version 3.2 (trunk 163574)
Target: powerpc64-unknown-linux-gnu
Thread model: posix
So tweak the affected test case to avoid triggering this bug. This is
the easiest way for us to keep the testsuite result clean and meaningful
on our main Clang test bed.
* t/ltcond2.sh: Prefer using "extern const char *" variables rather
than functions returning a statically allocated "const char *" variable.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sun, 16 Dec 2012 12:36:14 +0000 (13:36 +0100)]
NEWS: start preparing for the 1.13 release
* NEWS: Here. In particular, list (some of) the planned future
backward-incompatibilities that will take place in Automake 1.14.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sun, 16 Dec 2012 12:08:13 +0000 (13:08 +0100)]
Merge branch 'maint'
* maint:
tests: typofix in the shebang line of 't/py-compile-destdir.sh'
HACKING: release process: fixlets about the announcement
maint: post-release minor version bump
release: stable release 1.12.5
tests: avoid errors due to underquoted third-party macros
maintcheck: also consider contrib tests for syntax checks
cosmetics: whitespace fixlets in syntax-checks.mk
maint: prefer $(MKDIR_P) over $(mkinstalldirs) in maintainer rules
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sat, 15 Dec 2012 13:17:49 +0000 (14:17 +0100)]
tests: typofix in the shebang line of 't/py-compile-destdir.sh'
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sat, 15 Dec 2012 13:09:10 +0000 (14:09 +0100)]
HACKING: release process: fixlets about the announcement
* HACKING: The announcement should be generate *before* bumping
the version number to the next alpha number. Also, only an
abridged version of the announcement should be copied on the
Savannah news feed (a link to the complete announcement should
be linked from there, though).
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sat, 15 Dec 2012 17:04:58 +0000 (18:04 +0100)]
maint: post-release minor version bump
* configure.ac (AC_INIT): Bump version number to 1.12.6a.
* m4/amversion.m4: Likewise (automatically regenerated by
"make bootstrap").
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sat, 15 Dec 2012 09:37:49 +0000 (10:37 +0100)]
release: stable release 1.12.5
* configure.ac (AC_INIT): Bump version number to 1.12.5.
* m4/amversion.m4: Likewise (auto-updated by "make bootstrap").
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 14 Dec 2012 17:22:33 +0000 (18:22 +0100)]
tests: avoid errors due to underquoted third-party macros
* t/pkg-config-macros.sh: Call aclocal with the warnings in the
"syntax" category disabled.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 14 Dec 2012 16:57:25 +0000 (17:57 +0100)]
maintcheck: also consider contrib tests for syntax checks
* syntax-checks.mk (xtests): By listing them here.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 14 Dec 2012 16:55:09 +0000 (17:55 +0100)]
cosmetics: whitespace fixlets in syntax-checks.mk
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 14 Dec 2012 16:17:20 +0000 (17:17 +0100)]
maint: prefer $(MKDIR_P) over $(mkinstalldirs) in maintainer rules
* maint.mk (check-coverage-run, recheck-coverage-run): Here. This
is especially useful since $(mkinstalldirs) is no longer available
in Automake-NG.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 14 Dec 2012 14:43:27 +0000 (15:43 +0100)]
Merge branch 'maint'
* maint:
sync: update files from upstream with "make fetch"
gitignore: align with recent changes
fixup: add dummy rule for ChangeLog generation in Makefile.am
maint: no longer use AM_MAKEFLAGS in maintainer rules
maint: use more GNU make features in maintainer rules
maint: move maintainer make rules in maint.mk
Stefano Lattarini [Fri, 14 Dec 2012 14:10:00 +0000 (15:10 +0100)]
sync: update files from upstream with "make fetch"
* lib/gnupload: Update. See:
<http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00050.html>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 14 Dec 2012 14:05:58 +0000 (15:05 +0100)]
gitignore: align with recent changes
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 14 Dec 2012 13:56:21 +0000 (14:56 +0100)]
fixup: add dummy rule for ChangeLog generation in Makefile.am
So that automake won't complain about the missing ChangeLog.
The real rule for ChangeLog generation is now in maint.mk (as
it is maintainer-specific).
* Makefile.am (ChangeLog): Dummy.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 14 Dec 2012 13:44:51 +0000 (14:44 +0100)]
maint: no longer use AM_MAKEFLAGS in maintainer rules
They are not required with GNU make.
* maint.mk: Adjust accordingly.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 14 Dec 2012 13:35:06 +0000 (14:35 +0100)]
maint: use more GNU make features in maintainer rules
* maint.mk: Here, throughout the file. Other minor cleanups
and refactorings while at it.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 14 Dec 2012 11:36:16 +0000 (12:36 +0100)]
maint: move maintainer make rules in maint.mk
This is done for two reasons:
1. It will enable us to take advantage of more GNU make
features in our maintainer-specific recipes, if we
want to (and we probably will).
2. The Makefile.am won't have to be modified each time a
maintainer rule needs to be changed or tweaked; this
will prevent useless remaking of (in particular) the
't/testsuite-part.am' file.
* maint.mk: New, several recipes, rules and variables for
maintainer-specific tasks, extracted (with some tweaks)
from ...
* Makefile.am: ... this file.
(EXTRA_DIST): Add 'maint.mk'.
* GNUmakefile: Include 'maint.mk' after 'Makefile'.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 14 Dec 2012 10:03:53 +0000 (11:03 +0100)]
fixup: source 'test-init.sh', not './defs', in a test
* t/pkg-config-macros.sh: Here.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 14 Dec 2012 09:43:21 +0000 (10:43 +0100)]
Merge branch 'maint'
* maint:
docs: fixlet about xz compression levels and command line options
maint: more files excluded in 'update-copyright'
maint: adapt 'update-copyright' recipe to the new $(FETCHFILES) format
HACKING: update instructions to update the manuals at www.gnu.org
maint: add an explicative comment in Makefile
maint: factor out the name of the dir where web manuals are generated
maint: rename rules to build/upload web manuals
cosmetic: minor variable and rules reordering in Makefile.am
docs: build the web manuals for CVS in the builddir, not in the srcdir
release: automate uploading of web manuals in CVS
docs: AM_CFLAGS: remove reference to non-existing "more detailed" desc
tests: avoid two spurious failures on FreeBSD
tests: improve 'pkg-config' requirement
Stefano Lattarini [Fri, 14 Dec 2012 08:50:27 +0000 (09:50 +0100)]
Merge branch 'improve-release-process' into maint
* improve-release-process:
HACKING: update instructions to update the manuals at www.gnu.org
maint: add an explicative comment in Makefile
maint: factor out the name of the dir where web manuals are generated
maint: rename rules to build/upload web manuals
cosmetic: minor variable and rules reordering in Makefile.am
docs: build the web manuals for CVS in the builddir, not in the srcdir
release: automate uploading of web manuals in CVS
docs: AM_CFLAGS: remove reference to non-existing "more detailed" desc
tests: avoid two spurious failures on FreeBSD
Stefano Lattarini [Fri, 14 Dec 2012 08:50:21 +0000 (09:50 +0100)]
Merge branch 'pkgconfing-tests-requirement' into maint
* pkgconfing-tests-requirement:
tests: improve 'pkg-config' requirement
Patrick Welche [Fri, 14 Dec 2012 00:21:39 +0000 (00:21 +0000)]
docs: fixlet about xz compression levels and command line options
* doc/automake.texi (The types of distributions): To display a
progress bar, xz takes "-v" for verbose.
Copyright-paperwork-exempt: yes
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 13 Dec 2012 19:55:17 +0000 (20:55 +0100)]
maint: more files excluded in 'update-copyright'
This will avoid the following spurious warnings when
"make update-copyright" is run:
.autom4te.cfg: warning: copyright statement not found
.git-log-fix: warning: copyright statement not found
.gitattributes: warning: copyright statement not found
.gitignore: warning: copyright statement not found
AUTHORS: warning: copyright statement not found
THANKS: warning: copyright statement not found
contrib/README: warning: copyright statement not found
contrib/multilib/README: warning: copyright statement not found
doc/amhello/README: warning: copyright statement not found
lib/install-sh: warning: copyright statement not found
lib/mkinstalldirs: warning: copyright statement not found
m4/acdir/README: warning: copyright statement not found
t/README: warning: copyright statement not found
* Makefile.am (files_without_copyright): New.
(update-copyright): Use it when computing '$exclude_list'.
Also, skip any README file.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 13 Dec 2012 19:46:09 +0000 (20:46 +0100)]
maint: adapt 'update-copyright' recipe to the new $(FETCHFILES) format
This is a fixup for commit v1.12.5-27-g71ce1b4 of 2012-12-09, "fetch:
improve, and reduce code duplication".
* Makefile.am (update-copyright): Adjust.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 13 Dec 2012 15:03:35 +0000 (16:03 +0100)]
HACKING: update instructions to update the manuals at gnu.org
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 13 Dec 2012 12:22:52 +0000 (13:22 +0100)]
maint: add an explicative comment in Makefile
* Makefile.am (web-manual-update): Here, about a slightly tricky
feature of rsync(1) used in the recipe.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 13 Dec 2012 11:09:32 +0000 (12:09 +0100)]
maint: factor out the name of the dir where web manuals are generated
Just a minor refactoring to reduce duplication; no semantic change is
intended.
* Makefile.am (web_manual_dir): New.
(web-manual, web-manual-update, clean-web-manual): Use it.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 13 Dec 2012 11:02:33 +0000 (12:02 +0100)]
maint: rename rules to build/upload web manuals
The new names are the same used by the similar-purpose rules provided by
the 'top/maint.mk' makefile in gnulib (as of commit v0.0-7741-g4a8c422).
No need to have gratuitous incompatibilities.
* Makefile.am (web-manuals): Rename ...
(web-manual): ... like this.
(upload-web-manuals): Rename ...
(web-manual-update): ... like this.
(clean-web-manuals): Rename ...
(clean-web-manual): ... like this.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 13 Dec 2012 10:54:22 +0000 (11:54 +0100)]
cosmetic: minor variable and rules reordering in Makefile.am
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 13 Dec 2012 10:39:30 +0000 (11:39 +0100)]
docs: build the web manuals for CVS in the builddir, not in the srcdir
We can do so using the '-I' option of the gendocs.sh script.
Inspired by the 'web-manual' rule in the 'top/maint.mk' file provided
by gnulib (as of commit v0.0-7741-g4a8c422) as customized by Bison in
its 'cfg.mk' file (as of commit v2.6.5-1007-gf5fceda).
* Makefile.am (web-manuals): Modify and simplify to take advantage
of gendocs.sh's '-I' option.
(upload-we-manuals): Accordingly adjust sanity checks and the rsync
invocation in the recipe.
(clean_texinfo_clutter_cmd): Delete this variable, it's no longer
required.
(clean-texinfo-clutter): Delete this phony target, it's no longer
required.
(clean-local): Don't depend on it.
* configure.ac: Invoke AC_PROG_LN_S, since we want to use $(LN_S)
in the new 'web-manuals' recipe.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 13 Dec 2012 10:02:59 +0000 (11:02 +0100)]
release: automate uploading of web manuals in CVS
This is partly inspired to the 'gnu-web-doc-update' script from
gnulib. Unfortunately, we can't use that script directly, because
as of now it assumes a build system integrated with gnulib.
* Makefile.am (upload-web-manuals): New .PHONY rule.
(RSYNC, CVS, CVSU, CVS_USER, WEBCVS_ROOT): New variables, used by
the new rule.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sun, 9 Dec 2012 19:00:15 +0000 (20:00 +0100)]
docs: AM_CFLAGS: remove reference to non-existing "more detailed" desc
* doc/automake.texi (Program variables): Here. Reported by NightStrike:
<http://lists.gnu.org/archive/html/automake/2012-12/msg00012.html>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 30 Nov 2012 14:33:15 +0000 (15:33 +0100)]
tests: avoid two spurious failures on FreeBSD
Due to the FreeBSD make bug that causes of the well-known automake
bug#7884, two of our bison-requiring tests were failing on FreeBSD.
To avoid this, simply skip the part of these tests affected by that
bug.
* t/yacc-bison-skeleton.sh: Here, using the 'yl_distcheck' function.
* t/yacc-bison-skeleton-cxx.sh: Likewise.
* t/yacc-nodist.sh: While at it, use the 'yl_distcheck' here
as well, instead of running "$MAKE distcheck" only when $MAKE
is GNU make.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 13 Dec 2012 08:46:18 +0000 (09:46 +0100)]
tests: improve 'pkg-config' requirement
This improves (and unifies among different tests) the detection of
both the 'pkg-config' program and m4 macros provided by it; they are
needed in particular by tests on Vala support.
Before this, some Vala-related tests were failing spuriously when the
pkg-config program was available but the macros from pkg.m4 were not
made explicitly available in ACLOCAL_PATH. These tests were:
vala-mix vala-mix2 vala-parallel vala-vapi vala-vpath
See also similar commit 'v1.11-581-gb7d67d5' of 2011-12-22,
"tests: better handling of gettext and libtool requirements".
* t/ax/am-test-lib.sh (process_requirements): If a requirement
matches the 'pkg-config*' wildcard, try to make available to it
the pkg-config m4 macros, and skip it if it's not possible.
This is done by sourcing the 'get.sh' fragment generated by ...
* t/pkg-config-macros.sh: ... this new test, which looks in
advance for the 'pkg-config' program and the m4 macros that
comes with it.
* t/list-of-tests.mk: Add the new test.
* gen-testsuite-part (%deps_extractor): Tests requiring pkg-config
will need the m4 macros coming with it; so these tests should be
run after the 'pkg-config-macros.sh' test. Automatically generate
proper declarations for such dependencies.
* t/vala-header.sh: No need to explicitly check that the macro
PKG_CHECK_MODULES has been expanded by autoconf.
* t/vala-libs.sh: Likewise.
* t/vala-non-recursive-setup.sh: Likewise.
* t/vala-per-target-flags.sh: Likewise.
* t/vala-recursive-setup.sh: Likewise.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sun, 9 Dec 2012 20:55:32 +0000 (21:55 +0100)]
Merge branch 'maint'
* maint:
docs: AM_CFLAGS: remove reference to non-existing "more detailed" desc
maintcheck: prefer '$(am__cd)' over plain 'cd'
fetch: improve, and reduce code duplication
docs: add rule to generate manuals for www.gnu.org
docs: copy the 'gendocs.sh' script from Texinfo CVS repository
sync: update files from upstream with "make fetch"
release: generate a stub for the release announcement
release: distinguish major and minor releases
tests: avoid two spurious failures on FreeBSD
Stefano Lattarini [Sun, 9 Dec 2012 20:54:57 +0000 (21:54 +0100)]
Merge branch 'improve-release-process' into maint
* improve-release-process:
maintcheck: prefer '$(am__cd)' over plain 'cd'
fetch: improve, and reduce code duplication
docs: add rule to generate manuals for www.gnu.org
docs: copy the 'gendocs.sh' script from Texinfo CVS repository
sync: update files from upstream with "make fetch"
release: generate a stub for the release announcement
release: distinguish major and minor releases
Stefano Lattarini [Sun, 9 Dec 2012 19:00:15 +0000 (20:00 +0100)]
docs: AM_CFLAGS: remove reference to non-existing "more detailed" desc
* doc/automake.texi (Program variables): Here. Reported by NightStrike:
<http://lists.gnu.org/archive/html/automake/2012-12/msg00012.html>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sat, 8 Dec 2012 20:45:53 +0000 (21:45 +0100)]
maintcheck: prefer '$(am__cd)' over plain 'cd'
In a couple of rules in out own build system, as suggested by the
maintainer check 'sc_cd_relative_dir'.
* Makefile.am (web-manuals, clean_texinfo_clutter_cmd): Adjust.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sat, 8 Dec 2012 20:15:47 +0000 (21:15 +0100)]
fetch: improve, and reduce code duplication
* Makefile.am (WGET_SV_CVS, WGET_SV_GIT_CF, WGET_SV_GIT_AC,
WGET_SV_GIT_GL): Delete.
(SV_CVS, SV_GIT_CF, SV_GIT_AC, SV_GIT_GL): New.
(fetch): Simplify and enhance.
(update-copyright): Adjust.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sat, 8 Dec 2012 19:11:39 +0000 (20:11 +0100)]
docs: add rule to generate manuals for www.gnu.org
Less clerical work to do by hand.
* Makefile.am (web-manuals): New rule.
(clean_texinfo_clutter): New macro.
* clean-web-manuals, clean-texinfo-clutter: New cleaning
rules.
(clean-local): Depend on them.
* .gitignore: Update.
* HACKING: Adjust instructions for generation of manuals.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sat, 8 Dec 2012 18:49:33 +0000 (19:49 +0100)]
docs: copy the 'gendocs.sh' script from Texinfo CVS repository
As well as the 'gendocs_template' file. And enhance the "make fetch"
target to keep them synced. It's better than having to fetch these
files by hand each time a release is to be made.
* Makefile.am (FETCHFILES): List 'gendocs.sh' and 'gendocs_template'.
(fetch): Fetch them, into 'lib/'.
(EXRA_DIST): Distribute them.
* HACKING: Adjust instructions for generation of manuals.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sat, 8 Dec 2012 18:33:23 +0000 (19:33 +0100)]
sync: update files from upstream with "make fetch"
* lib/config.sub: Update.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sat, 8 Dec 2012 17:45:42 +0000 (18:45 +0100)]
release: generate a stub for the release announcement
It's much better than having to write it my hand each time; after all,
most of it is either boilerplate or a cope of NEWS entries.
* Makefile.am (determine_release_type): Also set the shell variable
'$announcement_type' appropriately.
(print-release-type): Print the value of this new variable as well.
(announcement): New phony target, generate a files with the same name.
The recipe uses the shell variable '$announcement_type'.
(CLEANFILES): Clean it.
(PACKAGE_MAILINGLIST): New make macro, used when generating the
'announcement' file.
* HACKING: Explain how to take advantage of the new convenience
target.
* .gitignore: Ignore the 'announcement' file.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sat, 8 Dec 2012 16:26:58 +0000 (17:26 +0100)]
release: distinguish major and minor releases
This is mostly a preparatory change, in view of future
improvements in our release process.
* Makefile.am (determine_release_type): Also distinguish
between major and minor releases, with the help of ...
(stable_major_version_rx, stable_minor_version_rx): ... these
new macros.
(stable_version_rx): Remove, it's obsolete now.
(version_rx): Rename ...
(base_version_rx): ... like this, and adjust.
(print-release-type): New target; helps in debugging the code
that determines the release type.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 30 Nov 2012 14:33:15 +0000 (15:33 +0100)]
tests: avoid two spurious failures on FreeBSD
Due to the FreeBSD make bug that causes of the well-known automake
bug#7884, two of our bison-requiring tests were failing on FreeBSD.
To avoid this, simply skip the part of these tests affected by that
bug.
* t/yacc-bison-skeleton.sh: Here, using the 'yl_distcheck' function.
* t/yacc-bison-skeleton-cxx.sh: Likewise.
* t/yacc-nodist.sh: While at it, use the 'yl_distcheck' here
as well, instead of running "$MAKE distcheck" only when $MAKE
is GNU make.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Tue, 27 Nov 2012 20:05:25 +0000 (21:05 +0100)]
Merge branch 'depcomp-work'
* depcomp-work:
depcomp: remove 'icc' depmode, add 'tcc' one
news: update w.r.t. recent depcomp changes
tests: fix spurious failures with tcc
depcomp: improve comments about tcc support
depcomp: remove last relics of libtool 1.4 support
depcomp: remove an unused variable
depcomp: rewrite a sed invocation for less quoting
depcomp: whitespace fixes
depcomp: shell code style changes
depcomp: make some code more self-documenting
depcomp: less duplication between AIX and Tru64 modes
depcomp: avoid an extra fork when possible
depcomp: reduce code duplication
depcomp: don't rely on character ranges working as in C locale
depcomp: cosmetic fixlets to a comment
depcomp: safer quoting in variable expansion
depcomp: correctly propagate exit status in exit trap
depcomp: use "rmdir", not "rm -rf", to remove the empty lock directory
depcomp: remove useless quoting in variable definitions
depcomp: be more idiomatic in checking for zero exit statuses
Stefano Lattarini [Tue, 27 Nov 2012 19:46:32 +0000 (20:46 +0100)]
Merge branch 'maint'
* maint:
news: we'll remove AM_PROG_MKDIR in 1.14, not 1.13
tests: give few vala tests more significant names
vala tests: don't use the 'posix' profile, it's no longer supported
news: fixup: bug#8847 is fixed in 1.12.6, not in 1.12.5
news: document the fix for automake bug#10227
tests: fix a spurious testsuite failure on Solaris
python: make installed modules find by default on Debian and Ubuntu
Stefano Lattarini [Mon, 26 Nov 2012 14:26:44 +0000 (15:26 +0100)]
news: we'll remove AM_PROG_MKDIR in 1.14, not 1.13
See also commit v1.12.4-158-gdf23daf.
* NEWS (Future backward-incompatibilities): Adjust accordingly.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Mon, 26 Nov 2012 14:15:11 +0000 (15:15 +0100)]
tests: give few vala tests more significant names
* t/vala.sh: Rename ...
* t/vala-grepping.sh: ... like this.
* t/vala2.sh: Rename ...
* t/vala-recursive-setup.sh: ... like this.
* t/vala3.sh: Rename ...
* t/vala-non-recursive-setup.sh: ... like this.
* t/vala4.sh: Rename ...
* t/vala-configure.sh: ... like this.
* t/vala5.sh: Rename ...
* t/vala-per-target-flags.sh: ... like this, and slightly
improve heading comments.
* t/list-of-tests.mk: Adjust.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Mon, 26 Nov 2012 13:48:29 +0000 (14:48 +0100)]
vala tests: don't use the 'posix' profile, it's no longer supported
Fixes automake bug#12934 a.k.a. bug#12522.
Some of automake's Vala tests used to rely on "valac --profile posix"
(which makes it not use glib). However, the posix profile was removed
in August 2012, and is no longer present in the GNOME 3.6.2 version
of valac (see commit
ca020bf0 in the vala Git repository).
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* t/vala-libs.sh: Adjust to avoid using the posix profile.
* t/vala-mix.sh: Likewise.
* t/vala-mix2.sh: Likewise.
* t/vala-parallel.sh: Likewise.
* t/vala-vapi.sh: Likewise.
* t/vala-vpath.sh: Likewise.
* NEWS: Update and adjust.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Mon, 26 Nov 2012 12:33:45 +0000 (13:33 +0100)]
news: fixup: bug#8847 is fixed in 1.12.6, not in 1.12.5
* NEWS (Bugs fixed in 1.12.5): So move it from here ...
(Bugs fixed in 1.12.6): ... to here.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Mon, 26 Nov 2012 12:01:46 +0000 (13:01 +0100)]
news: document the fix for automake bug#10227
This is a follow-up commit for v1.12.5-14-g1f113f6.
* NEWS: Update.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Mon, 26 Nov 2012 11:51:16 +0000 (12:51 +0100)]
Merge branch 'python-fix-pr10227' into maint
* python-fix-pr10227:
python: make installed modules find by default on Debian and Ubuntu
Stefano Lattarini [Mon, 26 Nov 2012 11:22:51 +0000 (12:22 +0100)]
tests: fix a spurious testsuite failure on Solaris
Reported in automake bug#11524.
* t/amhello-binpkg.sh: When non-GNU tar is in use, relax grepping of
"tar cvf ..." output a little more.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sun, 25 Nov 2012 11:48:36 +0000 (12:48 +0100)]
tests: give few aclocal tests more significant names
* t/dirlist-abspath.sh: Rename ...
* t/aclocal-dirlist-abspath.sh: ... like this.
* t/dirlist.sh: Rename ...
* t/aclocal-dirlist.sh: ... like this.
* t/dirlist2.sh: Rename ...
* t/aclocal-dirlist-globbing.sh: ... like this.
* t/list-of-tests.mk: Adjust.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sat, 24 Nov 2012 18:36:52 +0000 (19:36 +0100)]
tests: remove a redundant workaround for a testsuite weakness
* t/warnings-unknown.sh: Here, since we have improved our wrapper
scripts for aclocal and automake enough to make that workaround
unneeded.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 19:07:56 +0000 (21:07 +0200)]
depcomp: remove 'icc' depmode, add 'tcc' one
According to the comments in the now-removed test 'depcomp5.test' (removed
by commit 'v1.11-1829-g5066c1b' of 2012-02-08, "tests: improve and rework
tests on dependency tracking") "icc 8.0 and greater understand gcc options,
so depmode is set to gcc". According to Wikipedia, the 8.0 version of the
Intel C compiler has been released in December 2003, that is, almost nine
yeas ago. So we can remove explicit support for icc 7.x from the depcomp
script.
Since our support for tcc has so far been relied on the icc depmode, we
must write a new explicit 'tcc' depmode. That is easy to do, since we can
rely on the simpler and better-specified format of tcc-specified makefiles;
for more info, see:
<http://lists.gnu.org/archive/html/automake/2012-10/msg00043.html>
* lib/depcomp (icc): Remove.
(tcc): New.
* NEWS: Update.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 15:17:17 +0000 (17:17 +0200)]
news: update w.r.t. recent depcomp changes
* NEWS: Here.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 15:47:46 +0000 (17:47 +0200)]
tests: fix spurious failures with tcc
* t/depcomp8a.sh, t/depcomp8b.sh: Here, by avoiding initialization of
global 'extern' variables, preferring functions definitions instead.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 15:42:21 +0000 (17:42 +0200)]
depcomp: improve comments about tcc support
* lib/depcomp (icc): Here. See also tcc commit
0394caf7 "Emit spaces
for -MD" and automake commit v1.11-768-gb96263 "depcomp: support tcc
(Tiny C Compiler)".
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 15:14:15 +0000 (17:14 +0200)]
depcomp: remove last relics of libtool 1.4 support
* lib/depcomp (tru64): Here.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 14:55:44 +0000 (16:55 +0200)]
depcomp: remove an unused variable
* lib/depcomp ($alnum): This.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 14:55:25 +0000 (16:55 +0200)]
depcomp: rewrite a sed invocation for less quoting
* lib/depcomp (dashmstdout): Here.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 14:49:23 +0000 (16:49 +0200)]
depcomp: whitespace fixes
* lib/depcomp: We indent by two spaces, and without using tabs.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 14:47:41 +0000 (16:47 +0200)]
depcomp: shell code style changes
* lib/depcomp: Here, in comments and line continuations.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 14:29:21 +0000 (16:29 +0200)]
depcomp: make some code more self-documenting
* lib/depcomp (make_dummy_makefile): With the help of this function.
Use it throughout.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 12:45:38 +0000 (14:45 +0200)]
depcomp: less duplication between AIX and Tru64 modes
* lib/depcomp (tru64, aix): In these entries of the big 'case'
switch, with the help of ...
(aix_post_process_depfile): ... this new function.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 12:45:21 +0000 (14:45 +0200)]
depcomp: avoid an extra fork when possible
* lib/depcomp (set_dir_from): Here.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 11:59:52 +0000 (13:59 +0200)]
depcomp: reduce code duplication
* lib/depcomp: Here, when we have to get the directory and basename
components of objects or source files; do so with the help of ...
(set_dir_from, set_base_from): ... these new shell functions.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 11:46:48 +0000 (13:46 +0200)]
depcomp: don't rely on character ranges working as in C locale
* lib/depcomp (pgcc): Here.
Related reorganization, with the unconditional definition of ...
($upper, $lower, $digits, $alnum, $alpha): ... these shell variables.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 11:36:20 +0000 (13:36 +0200)]
depcomp: cosmetic fixlets to a comment
* lib/depcomp (pgcc): Here, as that's unportable according to the
autoconf manual. In fact, there's no need to re-trap the signals
just before exiting, since at that point a signal would cause at
most a useless but harmless attempt to remove the
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 11:28:54 +0000 (13:28 +0200)]
depcomp: safer quoting in variable expansion
* lib/depcomp (pgcc): Here. Probably not needed, but since the
rest of the script seems to employ proper quoting, better to be
consistent.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 11:27:19 +0000 (13:27 +0200)]
depcomp: correctly propagate exit status in exit trap
* lib/depcomp (pgcc): Here.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 11:24:21 +0000 (13:24 +0200)]
depcomp: use "rmdir", not "rm -rf", to remove the empty lock directory
* lib/depcomp (pgcc): Here.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 11:22:56 +0000 (13:22 +0200)]
depcomp: remove useless quoting in variable definitions
* lib/depcomp (pgcc): Here.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 18 Oct 2012 10:47:17 +0000 (12:47 +0200)]
depcomp: be more idiomatic in checking for zero exit statuses
* lib/depcomp: Prefer "if test $stat -ne 0; then ..." over the longer
"if test $stat -eq 0; then :; else ...".
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sat, 24 Nov 2012 13:32:06 +0000 (14:32 +0100)]
tests: give some tests more significant names
* t/req.sh: Rename ...
* t/aclocal-req.sh: ... like this.
* t/reqd.sh: Rename ...
* t/add-missing-multiple.sh: ... like this.
* t/block.sh: Rename ...
* t/comment-block.sh: ... like this.
* t/list-of-tests.mk: Adjust.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Sat, 24 Nov 2012 11:38:56 +0000 (12:38 +0100)]
Merge branch 'maint'
* maint:
tests: fix a spurious failure with older flex versions
Stefano Lattarini [Thu, 22 Nov 2012 11:03:07 +0000 (12:03 +0100)]
python: make installed modules find by default on Debian and Ubuntu
This change fixes automake bug#10227.
The code used to get the python package directory was wrong for Python 3,
at least on Debian and Ubuntu distributions. In the case the installation
was using the default prefix "/usr/local", python modules were incorrectly
installed in the directory
/usr/local/lib/python3/dist-packages
(which is *not* searched by default), rather than in a directory like
/usr/local/lib/python3.x/dist-packages
which is searched by default.
* m4/python.m4 (AM_PATH_PYTHON): Try to use the 'sysconfig' module if
possible, for better interactions with python 3.x.
Helped-by: Reuben Thomas <rrt@sc3d.org>
Helped-by: Roumen Petrov <bugtrack@roumenpetrov.info>
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Thu, 22 Nov 2012 09:29:37 +0000 (10:29 +0100)]
tests: fix a spurious failure with older flex versions
See automake bug#11524 and bug#12836.
* t/lex-header.sh: Here, we use flex option '--header-file',
but that option is not supported by some older flex versions.
Simply skip this test if such an old flex version is detected.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Stefano Lattarini [Fri, 23 Nov 2012 09:37:19 +0000 (10:37 +0100)]
tests: avoid a failure due to m4 builtin 'sinclude' in package name
Even with Autoconf 2.69, AC_INIT is not very robust when to package
names that contain some selected m4 builtins; for example:
$ echo 'AC_INIT([sinclude], [1.0])' | autoconf -o/dev/null -
stdin:1: warning: file `' included several times
$ echo 'AC_INIT([dnl], [1.0])' | autoconf -o/dev/null -
/usr/bin/m4:stdin:1: excess arguments to builtin `m4_define' ignored
autom4te: /usr/bin/m4 failed with exit status: 1
Reference:
<http://lists.gnu.org/archive/html/bug-autoconf/2012-11/msg00005.html>
* t/aclocal-m4-sinclude.sh (configure.ac): Use 'm4sinclude' as package
name in the AC_INIT invocation, to avoid tickling the just-described
bug.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
projects / platform / upstream / automake.git / log