[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2-873-g54afcd6 |
|
Date: |
Sat, 11 Aug 2012 22:21:11 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=54afcd6bc2ec319999a43e67106c10d5523f6d3a
The branch, ng/master has been updated
via 54afcd6bc2ec319999a43e67106c10d5523f6d3a (commit)
via 5999acf9566bab619287622149ae530a968d63bd (commit)
via 55377dd4151cc24659452d8bb445de1dd4d169ad (commit)
via dcdea5c7a8920e36d90a7c7c60eb58bfaf852718 (commit)
via 40f7fa0c2341f7d350a854f041e8ba5b7c9f5bfd (commit)
via 13b71415b2f88fa23d50f568cfac0e364eaba75e (commit)
via b2379a420df4d1a1ffb2a7467cd6b55d14e7e406 (commit)
via 654d3d7d496b67a327bf1e6f06883d8ca0174f82 (commit)
via eeaef7538eca48afb3aec6f9ed261106aabf8b57 (commit)
via 5c580b0ceaa6b508d2d58365b4003e2035e95b69 (commit)
from d8674c2d66ff1cf4ef7ca23316f6654c52c2e0db (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 54afcd6bc2ec319999a43e67106c10d5523f6d3a
Author: Stefano Lattarini <address@hidden>
Date: Sat Aug 11 23:53:20 2012 +0200
[ng] tests: avoid spurious error with ctags from older Emacs and XEmacs
* t/ctags.sh: Here. Those ctags (from Emacs 22.3 and XEmacs 21.5)
apparently have problems grasping "#define" in header files; feed
them an inline function instead.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 5999acf9566bab619287622149ae530a968d63bd
Author: Stefano Lattarini <address@hidden>
Date: Sat Aug 11 23:24:55 2012 +0200
[ng] tests init: honour $ETAGS variable for etags requirement
* t/ax/am-test-lib.sh (require_tool): Here.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 55377dd4151cc24659452d8bb445de1dd4d169ad
Author: Stefano Lattarini <address@hidden>
Date: Sat Aug 11 23:08:11 2012 +0200
[ng] tests: allow overriding of etags/ctags programs
* t/ctags.sh, t/etags.sh: Here, for better coverage and debuggability.
Signed-off-by: Stefano Lattarini <address@hidden>
commit dcdea5c7a8920e36d90a7c7c60eb58bfaf852718
Author: Stefano Lattarini <address@hidden>
Date: Sat Aug 11 22:49:00 2012 +0200
[ng] tests: avoid a spurious failure on OpenIndiana
* t/autodist.sh: Ensure that the 'install-sh' script has legit content,
because it's going to be used by the "make distdir" target on systems
lacking a decent 'install' program.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 40f7fa0c2341f7d350a854f041e8ba5b7c9f5bfd
Author: Stefano Lattarini <address@hidden>
Date: Sat Aug 11 21:51:28 2012 +0200
[ng] contrib: rewrite and fix 'check-html' and 'recheck-html'
That has actually been broken for some time, due to the changes
done in Automake-NG proper in the meantime.
* contrib/check-html.am (.log.html): Re-declare this suffix rule ...
(%.html: %.log): ... as a pattern rule.
(mostlyclean-check-html): Remove, instead ...
(MOSTLYCLEANFILES): ... appending to this variable. Not only this
reduce the code size, but will give us resilience against possible
exceeded command line length limits for free.
(check-html, recheck-html): Rewrite as static pattern rules. Fix
the recursive "make check" and "make recheck" invocation to override
TESTS, not TEST_LOGS (the latter override is not honoured anymore
by the new incarnation of the parallel-test rules).
* contrib/t/parallel-tests-html-recursive.sh: Adjust a little, by
initializing 'MOSTLYCLEANFILES' (to empty) in all the 'Makefile.am'
files that use 'check-html.am'.
* contrib/t/parallel-tests-html.sh: Likewise. Also, since the
parallel-tests API does not allow command-line overriding of
TEST_LOGS anymore, stop doing that.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 13b71415b2f88fa23d50f568cfac0e364eaba75e
Author: Stefano Lattarini <address@hidden>
Date: Sat Aug 11 21:13:43 2012 +0200
[ng] rename: am__config_distclean_files -> am.clean.config-files
Signed-off-by: Stefano Lattarini <address@hidden>
commit b2379a420df4d1a1ffb2a7467cd6b55d14e7e406
Author: Stefano Lattarini <address@hidden>
Date: Sat Aug 11 21:05:42 2012 +0200
[ng] rename: 'am--*' -> '.am/*' for internal Texinfo-related targets
* lib/am/texinfos.am: Here; these being the complete list of renames:
am--install-dvi -> .am/install-dvi
am--install-ps -> .am/install-ps
am--install-pdf -> .am/install-pdf
am--install-info -> .am/install-info
am--install-html -> .am/install-html
Signed-off-by: Stefano Lattarini <address@hidden>
commit 654d3d7d496b67a327bf1e6f06883d8ca0174f82
Author: Stefano Lattarini <address@hidden>
Date: Sat Aug 11 20:29:20 2012 +0200
[ng] refactor: in declaration of Texinfo-related files to be cleaned
Less code, less variables, better locality.
* automake.in (handle_texinfo_helper ): Update '%clean_dirs' and
'%clean_files' from here, rather than returning the files to clean
as a triplet.
(handle_texinfo): Adjust and simplify.
Signed-off-by: Stefano Lattarini <address@hidden>
commit eeaef7538eca48afb3aec6f9ed261106aabf8b57
Author: Stefano Lattarini <address@hidden>
Date: Sat Aug 11 20:06:14 2012 +0200
[ng] texi: less use of transforms in 'texinfos.am'
* automake.in (handle_texinfo): Drop the 'MOSTLYCLEAN', 'TEXICLEAN'
and 'MAINTCLEAN' transforms, instead adding directly to '%clean_dirs'
as appropriate.
* lib/am/texinfos.am: Adjust.
Signed-off-by: Stefano Lattarini <address@hidden>
commit 5c580b0ceaa6b508d2d58365b4003e2035e95b69
Author: Stefano Lattarini <address@hidden>
Date: Sat Aug 11 19:36:08 2012 +0200
[ng] cleanup: drop a redundant %?FIRST% transform
* lib/am/texinfos.am: Here: this file is only included one time
per Makefile by Automake.
Signed-off-by: Stefano Lattarini <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
automake.in | 28 +++++++++----------------
contrib/check-html.am | 20 +++++++-----------
contrib/t/parallel-tests-html-recursive.sh | 4 ++-
contrib/t/parallel-tests-html.sh | 4 ++-
lib/am/clean.mk | 4 +-
lib/am/configure.am | 2 +-
lib/am/texinfos.am | 30 +++++++++------------------
t/autodist.sh | 8 ++++++-
t/ax/am-test-lib.sh | 2 +-
t/ctags.sh | 12 ++++++----
t/etags.sh | 6 ++--
11 files changed, 55 insertions(+), 65 deletions(-)
diff --git a/automake.in b/automake.in
index 7361945..ea1f01a 100644
--- a/automake.in
+++ b/automake.in
@@ -2691,7 +2691,6 @@ sub scan_texinfo_file ($)
return ($outfile, $vfile);
}
-# ($MOSTLYCLEAN, $TEXICLEAN, $MAINTCLEAN)
# handle_texinfo_helper ($info_texinfos)
# --------------------------------------
# Handle all Texinfo source; helper for handle_texinfo.
@@ -2701,7 +2700,6 @@ sub handle_texinfo_helper ($)
my (@infobase, @info_deps_list, @texi_deps);
my %versions;
my $done = 0;
- my (@mostly_cleans, @texi_cleans, @maint_cleans) = ('', '', '');
# Build a regex matching user-cleaned files.
my $d = var 'DISTCLEANFILES';
@@ -2734,8 +2732,8 @@ sub handle_texinfo_helper ($)
or next;
# Directory of auxiliary files and build by-products used by texi2dvi
# and texi2pdf.
- push @mostly_cleans, "$infobase.t2d";
- push @mostly_cleans, "$infobase.t2p";
+ $clean_dirs{"$infobase.t2d"} = MOSTLY_CLEAN;
+ $clean_dirs{"$infobase.t2p"} = MOSTLY_CLEAN;
# If the Texinfo source is in a subdirectory, create the
# resulting info in this subdirectory. If it is in the current
@@ -2870,7 +2868,13 @@ sub handle_texinfo_helper ($)
SOURCE_REAL => $texi,
);
- push @texi_cleans, "$dpfx.dvi", "$dpfx.pdf", "$dpfx.ps", "$dpfx.html";
+ $clean_files{"$dpfx.dvi"} = CLEAN;
+ $clean_files{"$dpfx.pdf"} = CLEAN;
+ $clean_files{"$dpfx.ps"} = CLEAN;
+ # Add to %clean_dirs, not $clean_files, because this will be a
+ # directory (unless '--no-split' is used in MAKEINFOFLAGS).
+ $clean_dirs{"$dpfx.html"} = CLEAN;
+
push @info_deps_list, $out_file;
# If a vers*.texi file is needed, emit the rule.
@@ -2957,10 +2961,6 @@ sub handle_texinfo_helper ($)
'texinfo.tex');
}
}
-
- return (makefile_wrap ("", "\t ", @mostly_cleans),
- makefile_wrap ("", "\t ", @texi_cleans),
- makefile_wrap ("", "\t ", @maint_cleans));
}
@@ -2974,22 +2974,14 @@ sub handle_texinfo ()
reject_var 'html_TEXINFOS', "HTML generation not yet supported";
my $info_texinfos = var ('info_TEXINFOS');
- my ($mostlyclean, $clean, $maintclean) = ('', '', '');
if ($info_texinfos)
{
define_verbose_texinfo;
verbatim ('texibuild');
- ($mostlyclean, $clean, $maintclean) = handle_texinfo_helper
($info_texinfos);
- chomp $mostlyclean;
- chomp $clean;
- chomp $maintclean;
+ handle_texinfo_helper ($info_texinfos);
}
-
$output_rules .= file_contents ('texinfos',
new Automake::Location,
- MOSTLYCLEAN => $mostlyclean,
- TEXICLEAN => $clean,
- MAINTCLEAN => $maintclean,
'LOCAL-TEXIS' => !!$info_texinfos);
}
diff --git a/contrib/check-html.am b/contrib/check-html.am
index 2604c5e..ddcb501 100644
--- a/contrib/check-html.am
+++ b/contrib/check-html.am
@@ -21,14 +21,11 @@
TEST_SUITE_HTML = $(TEST_SUITE_LOG:.log=.html)
-mostlyclean-local: mostlyclean-check-html
-.PHONY: mostlyclean-check-html
-mostlyclean-check-html:
-## Expand $(TEST_LOGS) only once, to avoid exceeding line length limits.
- list='$(TEST_LOGS:.log=.html)'; test -z "$$list" || rm -f $$list
- rm -f $(TEST_SUITE_HTML)
+## This expects MOSTLYCLEANFILES to be pre-defined by the clients (even
+## if just to the empty value). Not ans unreasonable request.
+MOSTLYCLEANFILES += $(TEST_SUITE_HTML) $(TEST_LOGS:.log=.html)
-.log.html:
+%.html: %.log
@list='$(RST2HTML) rst2html rst2html.py'; \
while :; do \
for r2h in $$list; do \
@@ -45,12 +42,11 @@ mostlyclean-check-html:
# Beware of concurrent executions. Run "check" not "check-TESTS", as
# check-SCRIPTS and other dependencies are rebuilt by the former only.
# And expect check to fail.
-check-html recheck-html:
- @target=`echo $@ | sed 's/-html$$//'`; \
- rv=0; $(MAKE) $$target || rv=$$?; \
-## The nullification of $(TEST_LOGS) is required to ensure that
+check-html recheck-html: %-html:
+ @rv=0; $(MAKE) $* || rv=$$?; \
+## The nullification of $(TESTS) is required to ensure that
## "make recheck-html" do not try to uselessly re-run tests.
- $(MAKE) $(TEST_SUITE_HTML) TEST_LOGS= || exit 4; \
+ $(MAKE) $(TEST_SUITE_HTML) TESTS= || exit 4; \
exit $$rv
.PHONY: check-html recheck-html
diff --git a/contrib/t/parallel-tests-html-recursive.sh
b/contrib/t/parallel-tests-html-recursive.sh
index 12d967e..e58cca9 100755
--- a/contrib/t/parallel-tests-html-recursive.sh
+++ b/contrib/t/parallel-tests-html-recursive.sh
@@ -34,6 +34,9 @@ cp "$am_top_srcdir"/contrib/check-html.am . \
cat >> configure.ac << 'END'
AM_EXTRA_RECURSIVE_TARGETS([check-html])
+# This variable must be defined in each Makefile.am that includes
+# 'check-html.am'. It's simpler to do this once here.
+AC_SUBST([MOSTLYCLEANFILES], [])
AC_CONFIG_FILES([sub/Makefile sub/more/Makefile])
AC_OUTPUT
END
@@ -106,7 +109,6 @@ test ! -f test.log
test -f x.txt
END
-
cat > sub/more/mu << 'END'
#!/bin/sh
exit 99
diff --git a/contrib/t/parallel-tests-html.sh b/contrib/t/parallel-tests-html.sh
index 78cae7a..6e853ab 100755
--- a/contrib/t/parallel-tests-html.sh
+++ b/contrib/t/parallel-tests-html.sh
@@ -45,6 +45,8 @@ check_SCRIPTS = bla
bla:
echo bla > $@
CLEANFILES = bla
+## Initialization of this required by 'check-html.am', below.
+MOSTLYCLEANFILES =
include $(srcdir)/check-html.am
END
@@ -120,7 +122,7 @@ test ! -e mylog.html
$MAKE clean
test ! -e mylog.html
-$MAKE check-html TEST_LOGS=foo.log
+$MAKE check-html TESTS=foo
test -f bla
test -f foo.log
test ! -e bar.log
diff --git a/lib/am/clean.mk b/lib/am/clean.mk
index 7d3ee9f..1a2aa04 100644
--- a/lib/am/clean.mk
+++ b/lib/am/clean.mk
@@ -63,9 +63,9 @@ maintainer-clean-generic:
# this, and it's not unreasonable to expect user-defined rules might
# do that as well).
distclean:
- rm -f $(am.relpath.makefile) $(am__config_distclean_files)
+ rm -f $(am.relpath.makefile) $(am.clean.config-files)
maintainer-clean:
- rm -f $(am.relpath.makefile) $(am__config_distclean_files)
+ rm -f $(am.relpath.makefile) $(am.clean.config-files)
.PHONY: clean mostlyclean distclean maintainer-clean \
clean-generic mostlyclean-generic distclean-generic maintainer-clean-generic
diff --git a/lib/am/configure.am b/lib/am/configure.am
index bc9c259..b1b5aa8 100644
--- a/lib/am/configure.am
+++ b/lib/am/configure.am
@@ -133,7 +133,7 @@ if %?TOPDIR_P%
## 'distclean' and 'maintainer-clean' targets there to understand
## why we cannot simply append this to $(am.clean.dist.f) or
## $(am.clean.maint.f).
-am__config_distclean_files = \
+am.clean.config-files = \
config.status \
config.cache \
config.log \
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 9ad7d39..cc75541 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -63,13 +63,11 @@ endif ! %?LOCAL-TEXIS%
## if the user doesn't request it not to be run (through the
## 'AM_UPDATE_INFO_DIR' environment variable). See automake bug#9773
## and Debian Bug#543992.
-if %?FIRST%
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
-endif
## Look in both . and srcdir because the info pages might have been
## rebuilt in the build directory. Can't cd to srcdir; that might
@@ -126,13 +124,13 @@ if %?LOCAL-TEXIS%
# '$^' unusable as a pure list of PDF target files in the recipe of
# 'install-pdf-am'. So we need the following indirections.
-install-dvi-am: am--install-dvi
-install-ps-am: am--install-ps
-install-pdf-am: am--install-pdf
-install-info-am: am--install-info
-install-html-am: am--install-html
+install-dvi-am: .am/install-dvi
+install-ps-am: .am/install-ps
+install-pdf-am: .am/install-pdf
+install-info-am: .am/install-info
+install-html-am: .am/install-html
-am--install-html: $(HTMLS)
+.am/install-html: $(HTMLS)
@$(NORMAL_INSTALL)
$(call am__create_installdir,$(htmldir))
@list=''; \
@@ -153,7 +151,7 @@ am--install-html: $(HTMLS)
$(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
done; }
-am--install-info: $(INFO_DEPS)
+.am/install-info: $(INFO_DEPS)
@$(NORMAL_INSTALL)
$(call am__create_installdir,$(infodir))
@list='$(and $(infodir),$^)'; test -n "$$list" || exit 0; \
@@ -180,7 +178,7 @@ am--install-info: $(INFO_DEPS)
install-info --info-dir="$(DESTDIR)$(infodir)"
"$(DESTDIR)$(infodir)/$$relfile" || :;\
done; \
-am--install-dvi: $(DVIS)
+.am/install-dvi: $(DVIS)
@$(NORMAL_INSTALL)
$(call am__create_installdir,$(dvidir))
@list='$(and $(dvidir),$^)'; test -n "$$list" || exit 0; \
@@ -190,7 +188,7 @@ am--install-dvi: $(DVIS)
$(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \
done
-am--install-pdf: $(PDFS)
+.am/install-pdf: $(PDFS)
@$(NORMAL_INSTALL)
$(call am__create_installdir,$(pdfdir))
@list='$(and $(pdfdir),$^)'; test -n "$$list" || exit 0; \
@@ -200,7 +198,7 @@ am--install-pdf: $(PDFS)
$(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; \
done
-am--install-ps: $(PSS)
+.am/install-ps: $(PSS)
@$(NORMAL_INSTALL)
$(call am__create_installdir,$(psdir))
@list='$(and $(psdir),$^)'; test -n "$$list" || exit 0; \
@@ -282,13 +280,5 @@ endif %?LOCAL-TEXIS%
## ---------- ##
if %?LOCAL-TEXIS%
-## Append to dirs, not files, because the %*CLEAN% substitutions can
-## also contain any directory created by "makeinfo --html", as well as
-## the '*.t2d' and '*.t2p' directories used by texi2dvi and texi2pdf.
-am.clean.mostly.d += %MOSTLYCLEAN%
-am.clean.normal.d += %TEXICLEAN%
-am.clean.maint.d += %MAINTCLEAN%
-
am.clean.maint.f += $(foreach f,$(INFO_DEPS),$f $f-[0-9] $f-[0-9][0-9])
-
endif %?LOCAL-TEXIS%
diff --git a/t/autodist.sh b/t/autodist.sh
index 0f6c2de..6bc5fb3 100755
--- a/t/autodist.sh
+++ b/t/autodist.sh
@@ -88,9 +88,15 @@ rm -rf $me-1.0 # Remove $(distdir).
: > distfiles.am
for f in $list; do
- echo dummy > $f
+ test "$f" = install-sh || echo dummy > $f
done
+# The 'install-sh' script must have legit content, because it's going
+# to be used by the "make distdir" target on systems lacking a decent
+# 'install' program.
+cp "$am_scriptdir/install-sh" . \
+ || fatal_ "fetching auxiliary script 'install-sh'"
+
ls -l # For debugging.
$AUTOMAKE
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
index b9a8c23..e41c840 100644
--- a/t/ax/am-test-lib.sh
+++ b/t/ax/am-test-lib.sh
@@ -416,7 +416,7 @@ require_tool ()
echo "$me: running $CC -?"
$CC -? || skip_all_ "Microsoft C compiler '$CC' not available"
;;
- etags)
+ ${ETAGS-etags})
# Exuberant Ctags will create a TAGS file even
# when asked for --help or --version. (Emacs's etags
# does not have such problem.) Use -o /dev/null
diff --git a/t/ctags.sh b/t/ctags.sh
index 196cad1..bbbb22d 100755
--- a/t/ctags.sh
+++ b/t/ctags.sh
@@ -16,7 +16,7 @@
# Test vi-style tags.
-required=ctags
+required=${CTAGS:=ctags}
. ./defs || exit 1
cat >> configure.ac << 'END'
@@ -44,7 +44,7 @@ test-ctags: ctags
grep 'main' sub1/tags
grep 'choke_me' sub1/tags && exit 1; :
grep 'subsub/foo\.h' sub2/tags
- grep 'DUMMY_DUMMY' sub2/tags
+ grep 'IsBigger' sub2/tags
grep 'bar\.f77' sub2/subsub/tags
grep 'foo\.cxx' sub2/subsub/tags
grep 'foo\.h' sub2/subsub/tags && exit 1; :
@@ -71,7 +71,9 @@ cat > sub2/Makefile.am << 'END'
SUBDIRS = subsub .
noinst_HEADERS = subsub/foo.h
subsub/foo.h:
- echo '#define DUMMY_DUMMY 0' >$@
+ # Use and inlined function, not a #define, for the sake of
+ # Emacs an XEmacs ctags (at least up to versions 22 and 23).
+ echo 'inline int IsBigger (int a, int b) { return (a > b); }' >$@
CLEANFILES = $(noinst_HEADERS)
END
@@ -100,8 +102,8 @@ $AUTOCONF
$AUTOMAKE -i
./configure
-$MAKE test-ctags
-$MAKE distcheck
+$MAKE test-ctags CTAGS="$CTAGS"
+$MAKE distcheck CTAGS="$CTAGS"
$MAKE distclean
find . -name tags | grep . && exit 1
diff --git a/t/etags.sh b/t/etags.sh
index c8a6e90..aa2f0e0 100755
--- a/t/etags.sh
+++ b/t/etags.sh
@@ -17,7 +17,7 @@
# Test to make sure tags and subdirs work correctly. Bug report by
# François Pinard, and later by Akim Demaille.
-required=etags
+required=${ETAGS:=etags}
. ./defs || exit 1
cat >> configure.ac << 'END'
@@ -84,8 +84,8 @@ $AUTOCONF
$AUTOMAKE -i
./configure
-$MAKE test-tags
-$MAKE distcheck
+$MAKE test-tags ETAGS="$ETAGS"
+$MAKE distcheck ETAGS="$ETAGS"
$MAKE distclean
find . -name TAGS | grep . && exit 1
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2-873-g54afcd6,
Stefano Lattarini <=