[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v2.12-23-g3cf9a74
From: |
Jim Meyering |
Subject: |
grep branch, master, updated. v2.12-23-g3cf9a74 |
Date: |
Wed, 04 Jul 2012 14:55:34 +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 "grep".
The branch, master has been updated
via 3cf9a74980188292de6710f7b3b1e6eaff8eacb8 (commit)
via d40bc5fd419f55dc9a1ce9d8dcd811fbc592587b (commit)
from 2be0c6591ea5d56ee7fbc364228f24b85f569a5c (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 -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=3cf9a74980188292de6710f7b3b1e6eaff8eacb8
commit 3cf9a74980188292de6710f7b3b1e6eaff8eacb8
Author: Jim Meyering <address@hidden>
Date: Tue Jul 3 14:53:25 2012 +0200
build: update gnulib submodule, bootstrap, init.sh
diff --git a/bootstrap b/bootstrap
index ce37a2c..e984910 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2012-05-15.06; # UTC
+scriptversion=2012-07-03.20; # UTC
# Bootstrap this package from checked-out sources.
@@ -215,7 +215,7 @@ find_tool ()
eval "export $find_tool_envvar"
}
-# Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6.
+# Find sha1sum, named gsha1sum on MacPorts, and shasum on Mac OS X 10.6.
find_tool SHA1SUM sha1sum gsha1sum shasum
# Override the default configuration, if necessary.
@@ -230,7 +230,6 @@ esac
test -z "${gnulib_extra_files}" && \
gnulib_extra_files="
$build_aux/install-sh
- $build_aux/missing
$build_aux/mdate-sh
$build_aux/texinfo.tex
$build_aux/depcomp
@@ -855,7 +854,8 @@ echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
for file in $gnulib_files; do
- symlink_to_dir "$GNULIB_SRCDIR" $file || exit
+ symlink_to_dir "$GNULIB_SRCDIR" $file \
+ || { echo "$0: failed to symlink $file" 1>&2; exit 1; }
done
bootstrap_post_import_hook \
@@ -896,7 +896,8 @@ for file in $gnulib_extra_files; do
build-aux/*) dst=$build_aux/${file#build-aux/};;
*) dst=$file;;
esac
- symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit
+ symlink_to_dir "$GNULIB_SRCDIR" $file $dst \
+ || { echo "$0: failed to symlink $file" 1>&2; exit 1; }
done
if test $with_gettext = yes; then
diff --git a/gnulib b/gnulib
index f6c2431..d8f90ad 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit f6c2431e873d1c9972f97cb610ab26491d626410
+Subproject commit d8f90adf5f01512958b6da46bd5eea01294a434e
diff --git a/tests/init.sh b/tests/init.sh
index f525a7c..5f6e638 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -411,8 +411,7 @@ path_prepend_ ()
case $path_dir_ in
'') fail_ "invalid path dir: '$1'";;
/*) abs_path_dir_=$path_dir_;;
- *) abs_path_dir_=`cd "$initial_cwd_/$path_dir_" && echo "$PWD"` \
- || fail_ "invalid path dir: $path_dir_";;
+ *) abs_path_dir_=$initial_cwd_/$path_dir_;;
esac
case $abs_path_dir_ in
*:*) fail_ "invalid path dir: '$abs_path_dir_'";;
@@ -448,7 +447,7 @@ setup_ ()
pfx_=`testdir_prefix_`
test_dir_=`mktempd_ "$initial_cwd_" "$pfx_-$ME_.XXXX"` \
|| fail_ "failed to create temporary directory in $initial_cwd_"
- cd "$test_dir_"
+ cd "$test_dir_" || fail_ "failed to cd to temporary directory"
# As autoconf-generated configure scripts do, ensure that IFS
# is defined initially, so that saving and restoring $IFS works.
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=d40bc5fd419f55dc9a1ce9d8dcd811fbc592587b
commit 3cf9a74980188292de6710f7b3b1e6eaff8eacb8
Author: Jim Meyering <address@hidden>
Date: Tue Jul 3 14:53:25 2012 +0200
build: update gnulib submodule, bootstrap, init.sh
diff --git a/bootstrap b/bootstrap
index ce37a2c..e984910 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2012-05-15.06; # UTC
+scriptversion=2012-07-03.20; # UTC
# Bootstrap this package from checked-out sources.
@@ -215,7 +215,7 @@ find_tool ()
eval "export $find_tool_envvar"
}
-# Find sha1sum, named gsha1sum on MacPorts, and shasum on MacOS 10.6.
+# Find sha1sum, named gsha1sum on MacPorts, and shasum on Mac OS X 10.6.
find_tool SHA1SUM sha1sum gsha1sum shasum
# Override the default configuration, if necessary.
@@ -230,7 +230,6 @@ esac
test -z "${gnulib_extra_files}" && \
gnulib_extra_files="
$build_aux/install-sh
- $build_aux/missing
$build_aux/mdate-sh
$build_aux/texinfo.tex
$build_aux/depcomp
@@ -855,7 +854,8 @@ echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
$gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
for file in $gnulib_files; do
- symlink_to_dir "$GNULIB_SRCDIR" $file || exit
+ symlink_to_dir "$GNULIB_SRCDIR" $file \
+ || { echo "$0: failed to symlink $file" 1>&2; exit 1; }
done
bootstrap_post_import_hook \
@@ -896,7 +896,8 @@ for file in $gnulib_extra_files; do
build-aux/*) dst=$build_aux/${file#build-aux/};;
*) dst=$file;;
esac
- symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit
+ symlink_to_dir "$GNULIB_SRCDIR" $file $dst \
+ || { echo "$0: failed to symlink $file" 1>&2; exit 1; }
done
if test $with_gettext = yes; then
diff --git a/gnulib b/gnulib
index f6c2431..d8f90ad 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit f6c2431e873d1c9972f97cb610ab26491d626410
+Subproject commit d8f90adf5f01512958b6da46bd5eea01294a434e
diff --git a/tests/init.sh b/tests/init.sh
index f525a7c..5f6e638 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -411,8 +411,7 @@ path_prepend_ ()
case $path_dir_ in
'') fail_ "invalid path dir: '$1'";;
/*) abs_path_dir_=$path_dir_;;
- *) abs_path_dir_=`cd "$initial_cwd_/$path_dir_" && echo "$PWD"` \
- || fail_ "invalid path dir: $path_dir_";;
+ *) abs_path_dir_=$initial_cwd_/$path_dir_;;
esac
case $abs_path_dir_ in
*:*) fail_ "invalid path dir: '$abs_path_dir_'";;
@@ -448,7 +447,7 @@ setup_ ()
pfx_=`testdir_prefix_`
test_dir_=`mktempd_ "$initial_cwd_" "$pfx_-$ME_.XXXX"` \
|| fail_ "failed to create temporary directory in $initial_cwd_"
- cd "$test_dir_"
+ cd "$test_dir_" || fail_ "failed to cd to temporary directory"
# As autoconf-generated configure scripts do, ensure that IFS
# is defined initially, so that saving and restoring $IFS works.
-----------------------------------------------------------------------
Summary of changes:
bootstrap | 11 ++++++-----
gnulib | 2 +-
tests/init.sh | 5 ++---
tests/turkish-I-without-dot | 8 ++++++++
4 files changed, 17 insertions(+), 9 deletions(-)
hooks/post-receive
--
grep
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v2.12-23-g3cf9a74,
Jim Meyering <=