Hash :
326ecba2
Author :
Date :
2011-09-30T12:12:43
dist: auxiliary files can be distributed from subdir Makefiles With this change, we make it possible for a subdir Makefile.am to distribute files in the config auxdir; while this means that some files might be copied multiple times, it simplify some logic in the automake script, and fix at least one important bug. In fact, before this change, the auxiliary script `test-driver' was not being distributed as expected when TESTS was defined only in a subdir Makefile (which is a pretty common setup indeed). Now this does not happen anymore: so the present change fixes automake bug#9546. Another welcome collateral effect is that `dist-auxfile-2.test' now passes. OTOH, the present changes *breaks threaded automake*. The reason is that automake needs to serialize file installations spawned by `--add-missing' (this isn't for cosmetic reasons, but is really needed to avoid possible race conditions and botched output files). Currently the code that installs required files is intertwined with the code that declares the DIST_COMMON variables; so, upon de-serialization, the definition of DIST_COMMON might get emitted in the wrong Makefile.in. Some follow-up refactoring in automake will soon take care of remedying this situation. For the moment, we just declare some "parallel-am" tests as xfailing. * automake.in (maybe_push_required_file): Add ad-hoc handling for the case where the directory part of the required file is different from the subdir where the current Makefile.am resides, but is equal to the "config-aux directory" ($config_auxdir). This is needed to allow a construct in a non-top-level Makefile.am to require a file in the config-aux directory. * tests/test-driver-is-distributed.test: Extend and adjust. This test now passes. * tests/java-compile-run-nested.test: Call automake with the `-a' option to ensure that the `test-driver' auxiliary script gets correctly installed. This test now passes. * tests/distcom-subdir.test: New test. * tests/dist-readonly.test: Likewise. * tests/dist-repeated.test: Likewise. * tests/dist-auxdir-many-subdirs.test: Likewise. * tests/distcom7.test: Removed, it's obsolete now. * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102
#! /bin/sh
# Copyright (C) 2011 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 <http://www.gnu.org/licenses/>.
# Test that we can distribute the same file as many times as we want.
# The distdir target should take care of not copying it more than one
# time anyway.
. ./defs || Exit 1
echo AC_OUTPUT >> configure.in
cat > Makefile.am <<'END'
bin_PROGRAMS = foo bar
foo_SOURCES = foo.c
bar_SOURCES = foo.c
python_PYTHON = bar.py
EXTRA_DIST = foo.c bar.py
.PHONY: sanity-check
sanity-check:
for f in $(DISTFILES); do echo " $$f "; done > dist.txt
cat dist.txt
test `grep ' foo\.c ' dist.txt | wc -l` -eq 3
test `grep ' bar\.py ' dist.txt | wc -l` -eq 2
# So that we don't have to require a C compiler.
AUTOMAKE_OPTIONS = no-dependencies
CC = false
# So that we don't have to require a Python interpreter.
pythondir = ${prefix}/py
PYTHON = false
END
ocwd=`pwd` || fatal_ "cannot get current working directory"
# Help to ensure cp won't see the same file twice.
mkdir bin
cat > bin/cp <<END
#!/bin/sh
PATH='$PATH'; export PATH
case " \$* " in
*foo.c\ *)
if test -f '$ocwd'/foo-c-copied; then
echo "\$0: we tried to copy foo.c twice" >&2
exit 1
else
# For a sanity check later.
echo ok > '$ocwd'/cp-wrapper-has-seen-foo-c
fi
;;
esac
case " \$* " in
*bar.py\ *)
if test -f '$ocwd'/bar-py-copied; then
echo "\$0: we tried to copy bar.py twice" >&2
exit 1
else
# For a sanity check later.
echo ok > '$ocwd'/cp-wrapper-has-seen-bar-py
fi
;;
esac
exec cp "\$@"
END
chmod a+x bin/cp
PATH=`pwd`/bin$PATH_SEPARATOR$PATH; export PATH;
: > foo.c
: > bar.py
: > py-compile
# Help to ensure cp won't try to copy the same file twice.
chmod a-w foo.c bar.py
$ACLOCAL
$AUTOCONF
$AUTOMAKE
./configure
$MAKE sanity-check || fatal_ "expected invariants not verified"
$MAKE distdir
test -f cp-wrapper-has-seen-foo-c && test -f cp-wrapper-has-seen-bar-py \
|| fatal_ "our cp wrapper hasn't run correctly"
: