[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.10b-54-
|
From: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.10b-54-gb6bebfc |
|
Date: |
Sun, 03 May 2009 08:08:26 +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=b6bebfca48c126f13ff9ddc86c809564b3d7e56a
The branch, master has been updated
via b6bebfca48c126f13ff9ddc86c809564b3d7e56a (commit)
via 553f13a39d6d340d47f2c6875dc6f69cf0376b59 (commit)
from 9fe8259884e73d48c1962ba69cbb9aa59050b000 (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 b6bebfca48c126f13ff9ddc86c809564b3d7e56a
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 3 09:59:21 2009 +0200
Fix copyright years in *.am files.
* lib/am/check.am, lib/am/check2.am, lib/am/distdir.am,
lib/am/program.am, lib/am/tags.am: Fix copyright years.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 553f13a39d6d340d47f2c6875dc6f69cf0376b59
Author: Ralf Wildenhues <address@hidden>
Date: Sun May 3 09:47:58 2009 +0200
distdir: avoid duplicate `find' traversal with subpackages.
* lib/am/distdir.am (distdir) [%?SUBDIRS%]: When recursing, set
`am__skip_mode_fix'.
[%?TOPDIR_P%]: When `$(am__skip_mode_fix)' is set, avoid tree
walk.
* tests/subpkg4.test: New test, to ensure that we still walk the
whole tree while fixing permissions. We don't ensure it is
walked once only.
* tests/Makefile.am: Update.
Signed-off-by: Ralf Wildenhues <address@hidden>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 14 ++++++++++++++
Makefile.in | 6 ++++--
lib/Automake/Makefile.in | 3 ++-
lib/Makefile.in | 3 ++-
lib/am/check.am | 4 ++--
lib/am/check2.am | 2 +-
lib/am/distdir.am | 15 +++++++++++----
lib/am/program.am | 2 +-
lib/am/tags.am | 2 +-
tests/Makefile.am | 1 +
tests/Makefile.in | 1 +
tests/{subpkg3.test => subpkg4.test} | 30 +++++++++++++++++++++++-------
12 files changed, 63 insertions(+), 20 deletions(-)
copy tests/{subpkg3.test => subpkg4.test} (57%)
diff --git a/ChangeLog b/ChangeLog
index c8e4689..722ac98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
2009-05-03 Ralf Wildenhues <address@hidden>
+ Fix copyright years in *.am files.
+ * lib/am/check.am, lib/am/check2.am, lib/am/distdir.am,
+ lib/am/program.am, lib/am/tags.am: Fix copyright years.
+
+ distdir: avoid duplicate `find' traversal with subpackages.
+ * lib/am/distdir.am (distdir) [%?SUBDIRS%]: When recursing, set
+ `am__skip_mode_fix'.
+ [%?TOPDIR_P%]: When `$(am__skip_mode_fix)' is set, avoid tree
+ walk.
+ * tests/subpkg4.test: New test, to ensure that we still walk the
+ whole tree while fixing permissions. We don't ensure it is
+ walked once only.
+ * tests/Makefile.am: Update.
+
Disable test cleanup trap with OSF1/Tru64 sh.
* configure.ac: Test whether /bin/sh has working 'set -e'
in conjunction with an exit trap. Set $am_cv_sh_errexit_works
diff --git a/Makefile.in b/Makefile.in
index 320635a..56a3126 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -552,13 +552,14 @@ distdir: $(DISTFILES)
$(am__relativize); \
new_top_distdir=$$reldir; \
echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: distdir)"; \
+ echo " am__remove_distdir=: am__skip_length_check=:
am__skip_mode_fix=: distdir)"; \
($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$new_top_distdir" \
distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -566,7 +567,8 @@ distdir: $(DISTFILES)
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
- -find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ -test -n "$(am__skip_mode_fix)" \
+ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 9a62aa2..25c2843 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -498,13 +498,14 @@ distdir: $(DISTFILES)
$(am__relativize); \
new_top_distdir=$$reldir; \
echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: distdir)"; \
+ echo " am__remove_distdir=: am__skip_length_check=:
am__skip_mode_fix=: distdir)"; \
($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$new_top_distdir" \
distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index ba470fe..3773bd1 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -473,13 +473,14 @@ distdir: $(DISTFILES)
$(am__relativize); \
new_top_distdir=$$reldir; \
echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: distdir)"; \
+ echo " am__remove_distdir=: am__skip_length_check=:
am__skip_mode_fix=: distdir)"; \
($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$new_top_distdir" \
distdir="$$new_distdir" \
am__remove_distdir=: \
am__skip_length_check=: \
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
diff --git a/lib/am/check.am b/lib/am/check.am
index 6653f7b..5ea33c8 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -1,6 +1,6 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2003, 2006, 2007, 2008 Free Software Foundation,
-## Inc.
+## Copyright (C) 2001, 2003, 2006, 2007, 2008, 2009 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/am/check2.am b/lib/am/check2.am
index 3e9eed2..2734286 100644
--- a/lib/am/check2.am
+++ b/lib/am/check2.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2008 Free Software Foundation, Inc.
+## Copyright (C) 2008, 2009 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/am/distdir.am b/lib/am/distdir.am
index 5ee7b5c..43af361 100644
--- a/lib/am/distdir.am
+++ b/lib/am/distdir.am
@@ -1,6 +1,6 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free
-## Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+## 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
@@ -249,7 +249,7 @@ if %?SUBDIRS%
$(am__relativize); \
new_top_distdir=$$reldir; \
echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS)
top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: distdir)"; \
+ echo " am__remove_distdir=: am__skip_length_check=:
am__skip_mode_fix=: distdir)"; \
($(am__cd) $$subdir && \
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$new_top_distdir" \
@@ -260,6 +260,8 @@ if %?SUBDIRS%
am__remove_distdir=: \
## Disable filename length check:
am__skip_length_check=: \
+## No need to fix modes more than once:
+ am__skip_mode_fix=: \
distdir) \
|| exit 1; \
fi; \
@@ -293,8 +295,13 @@ endif %?DIST-TARGETS%
## We use $(install_sh) because that is a known-portable way to modify
## the file in place in the source tree.
##
+## If we are being invoked recursively, then there is no need to walk
+## the whole subtree again. This is a complexity reduction for a deep
+## hierarchy of subpackages.
+##
if %?TOPDIR_P%
- -find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ -test -n "$(am__skip_mode_fix)" \
+ || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
diff --git a/lib/am/program.am b/lib/am/program.am
index 8f69c77..3277c5d 100644
--- a/lib/am/program.am
+++ b/lib/am/program.am
@@ -1,5 +1,5 @@
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 2001, 2003, 2005
+## Copyright (C) 1994, 1995, 1996, 1997, 2001, 2003, 2005, 2009
## Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
diff --git a/lib/am/tags.am b/lib/am/tags.am
index 1eabe58..f6661e2 100644
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -1,6 +1,6 @@
## automake - create Makefile.in from Makefile.am
## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003,
-## 2004, 2007, 2008 Free Software Foundation, Inc.
+## 2004, 2007, 2008, 2009 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/tests/Makefile.am b/tests/Makefile.am
index 09b979c..afcfda8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -629,6 +629,7 @@ subobjname.test \
subpkg.test \
subpkg2.test \
subpkg3.test \
+subpkg4.test \
subst.test \
subst2.test \
subst3.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index d735afa..ce8e779 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -862,6 +862,7 @@ subobjname.test \
subpkg.test \
subpkg2.test \
subpkg3.test \
+subpkg4.test \
subst.test \
subst2.test \
subst3.test \
diff --git a/tests/subpkg3.test b/tests/subpkg4.test
similarity index 57%
copy from tests/subpkg3.test
copy to tests/subpkg4.test
index 3e9e824..592b37e 100755
--- a/tests/subpkg3.test
+++ b/tests/subpkg4.test
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009 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
@@ -14,7 +14,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# make sure different subpackages may share files and directories.
+# Test to ensure `distdir' fixes the mode of files and directories
+# copied into `$(distdir)', even with sub-packages.
. ./defs || Exit 1
@@ -22,7 +23,17 @@ set -e
cat >Makefile.am <<'END'
SUBDIRS = subpkg
-EXTRA_DIST = subpkg/foobar
+test-distdir-is-readable:
+ bad_dirs=`find $(distdir) -type d ! -perm -777 -print`; \
+ if test -n "$$bad_dirs"; then \
+ echo "directories not permissive: $$bad_dirs" >&2; \
+ exit 1; \
+ fi
+ bad_files=`find $(distdir) ! -type d ! -perm -444 -print`; \
+ if test -n "$$bad_files"; then \
+ echo "file not permissive: $$bad_files" >&2; \
+ exit 1; \
+ fi
END
cat >>configure.in <<'END'
@@ -30,11 +41,15 @@ AC_CONFIG_SUBDIRS([subpkg])
AC_OUTPUT
END
-mkdir subpkg
-
+mkdir subpkg subpkg/dir
echo foobar >subpkg/foobar
+echo baz > subpkg/dir/baz
+
+chmod go-rwx subpkg/foobar subpkg/dir/baz subpkg/dir
-echo SUBDIRS = >subpkg/Makefile.am
+cat >subpkg/Makefile.am <<'END'
+EXTRA_DIST = foobar dir
+END
cat >subpkg/configure.in <<'END'
AC_INIT([subpkg], [1.0])
@@ -54,4 +69,5 @@ $AUTOCONF
cd ..
./configure
-$MAKE distcheck
+$MAKE distdir
+$MAKE test-distdir-is-readable
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.10b-54-gb6bebfc,
Ralf Wildenhues <=