FYI, here are 3 changes I've just pushed:
Accommodate building on OS/2 (www.ecomstation.com Ecs v2 rc4)
* configure.ac: Filter out carriage returns in more places.
Reported by Elbert Pol, details here:
http://thread.gmane.org/gmane.org.fsf.announce/867/focus=13332
guard against inserting a NEWS entry into a block for a prior release
Without a guard like this, it is far too easy to apply a patch
prepared against a preceding release, and not notice that a NEWS
entry is inserted into the wrong block.
* maint.mk (sc_immutable_NEWS): New rule.
(update-NEWS-hash): New rule to update the hard-coded hash.
tests: ensure that all exec-$PERL lines are the same
* maint.mk (sc_perl_coreutils_test): New rule.
>From 79a98d9bc1ee67dadc8df376d336c4f1270c464d Mon Sep 17 00:00:00 2001
From: Jim Meyering <[EMAIL PROTECTED]>
Date: Tue, 22 Apr 2008 09:33:25 +0200
Subject: [PATCH] tests: ensure that all exec-$PERL lines are the same
* maint.mk (sc_perl_coreutils_test): New rule.
Signed-off-by: Jim Meyering <[EMAIL PROTECTED]>
---
maint.mk | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/maint.mk b/maint.mk
index 586596b..46bc8b6 100644
--- a/maint.mk
+++ b/maint.mk
@@ -407,6 +407,24 @@ sc_GPL_version:
@grep -n 'either ''version [^3]' $$($(VC_LIST_EXCEPT)) && \
{ echo '$(ME): GPL vN, N!=3' 1>&2; exit 1; } || :
+exec_perl_re = \
+ exec \$$PERL -w -I\$$top_srcdir/tests -MCoreutils \
+ -M"CuTmpdir qw(\$$me)" -- - <<\\EOF
+# Ensure that each test invoking $PERL with -MCoreutils uses the same line.
+sc_perl_coreutils_test:
+ @if test -f $(srcdir)/tests/Coreutils.pm; then \
+ die=0; \
+ for i in $$(grep -l '^exec *\$$PERL.*MCoreutils' \
+ $$($(VC_LIST) tests)); do \
+ grep '$(exec_perl_re)' $$i > /dev/null \
+ && : || { die=1; echo $$i; } \
+ done; \
+ test $$die = 1 && \
+ { echo 1>&2 '$(ME): each of the above execs PERL differently:'; \
+ echo 1>&2 '(exit $$fail); exit $$fail'; \
+ exit 1; } || :; \
+ fi
+
# Ensure that the c99-to-c89 patch applies cleanly.
patch-check:
rm -rf src-c89 [EMAIL PROTECTED] [EMAIL PROTECTED]
--
1.5.5.1.68.gbdcd8
>From 68466d44b1ff35383271930c12186b3d2fd53976 Mon Sep 17 00:00:00 2001
From: Jim Meyering <[EMAIL PROTECTED]>
Date: Tue, 22 Apr 2008 10:45:21 +0200
Subject: [PATCH] guard against inserting a NEWS entry into a block for a prior
release
Without a guard like this, it is far too easy to apply a patch
prepared against a preceding release, and not notice that a NEWS
entry is inserted into the wrong block.
* maint.mk (sc_immutable_NEWS): New rule.
(update-NEWS-hash): New rule to update the hard-coded hash.
Signed-off-by: Jim Meyering <[EMAIL PROTECTED]>
---
maint.mk | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/maint.mk b/maint.mk
index 46bc8b6..e2a8e1c 100644
--- a/maint.mk
+++ b/maint.mk
@@ -42,6 +42,7 @@ endif
PREV_VERSION := $(shell cat $(prev_version_file))
VERSION_REGEXP = $(subst .,\.,$(VERSION))
+PREV_VERSION_REGEXP = $(subst .,\.,$(PREV_VERSION))
ifeq ($(VC),$(GIT))
this-vc-tag = v$(VERSION)
@@ -425,6 +426,22 @@ sc_perl_coreutils_test:
exit 1; } || :; \
fi
+NEWS_hash = \
+ $$(sed -n '/^\*.* $(PREV_VERSION_REGEXP) ([0-9-]*)/,$$p' \
+ $(srcdir)/NEWS | md5sum -)
+
+# Ensure that we don't accidentally insert an entry into an old NEWS block.
+old_NEWS_hash = c58d611d93d218181ed77f81ff2395ff -
+sc_immutable_NEWS:
+ @if test -f $(srcdir)/NEWS; then \
+ test "$(NEWS_hash)" = '$(old_NEWS_hash)' && : || \
+ { echo '$(ME): you have modified old NEWS' 1>&2; exit 1; }; \
+ fi
+
+# Update the hash stored above. Do this after each release.
+update-NEWS-hash: NEWS
+ perl -pi -e 's/^(old_NEWS_hash = ).*/$${1}'"$(NEWS_hash)/" $(ME)
+
# Ensure that the c99-to-c89 patch applies cleanly.
patch-check:
rm -rf src-c89 [EMAIL PROTECTED] [EMAIL PROTECTED]
--
1.5.5.1.68.gbdcd8
>From 0bc8813b1e40435ced17c555149e26c5aadbdda6 Mon Sep 17 00:00:00 2001
From: Jim Meyering <[EMAIL PROTECTED]>
Date: Tue, 22 Apr 2008 10:52:37 +0200
Subject: [PATCH] Accommodate building on OS/2 (www.ecomstation.com Ecs v2 rc4)
* configure.ac: Filter out carriage returns in more places.
Reported by Elbert Pol, details here:
http://thread.gmane.org/gmane.org.fsf.announce/867/focus=13332
Signed-off-by: Jim Meyering <[EMAIL PROTECTED]>
---
configure.ac | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4cd0d7c..adf2903 100644
--- a/configure.ac
+++ b/configure.ac
@@ -259,7 +259,7 @@ mk="$srcdir/src/Makefile.am"
v=EXTRA_PROGRAMS
for gl_i in `sed -n '/^'$v' =/,/[[^\]]$/p' $mk \
| sed 's/^ *//;/^\$.*/d;/^'$v' =/d' \
- | tr -s '\\012\\\\' ' '`; do
+ | tr -s '\\015\\012\\\\' ' '`; do
gl_ADD_PROG([optional_bin_progs], $gl_i)
done
@@ -310,10 +310,11 @@ case " $optional_bin_progs " in
*) INSTALL_SU=no ;;
esac
-MAN=`echo "$optional_bin_progs "|sed 's/ /.1 /g;s/ $//'`
+MAN=`echo "$optional_bin_progs "|sed 's/ /.1 /g;s/ $//'|tr -d '\\015\\012'`
# Change ginstall.1 to "install.h" in $MAN.
-MAN=`for m in $MAN; do test $m = ginstall.1 && m=install.1; echo $m; done | tr
'\012' ' '; echo`
+MAN=`for m in $MAN; do test $m = ginstall.1 && m=install.1; echo $m; done \
+ | tr '\015\012' ' '; echo`
# Remove [.1, since writing a portable rule for it in man/Makefile.am
# is not practical. The sed LHS below uses the autoconf quadrigraph
--
1.5.5.1.68.gbdcd8
_______________________________________________
Bug-coreutils mailing list
Bug-coreutils@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-coreutils
