From bc960df8c789c878f1c1c54a28a3c2648dead8d9 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 24 Oct 2007 22:12:56 +0200 Subject: [PATCH] * build-aux/bootstrap: Sync from coreutils: 2007-10-24 Jim Meyering Get gnulib from the git repository, not from an obsolete cvs one. * build-aux/bootstrap: Suggestion from Micah Cowan. 2007-10-04 Jim Meyering * build-aux/bootstrap (slurp): Adapt to _.h -> .in.h name change. (update_po_files): Work also when there are no .po files in po/. --- ChangeLog | 10 ++++++++++ build-aux/bootstrap | 19 +++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ed561cff9..177b87b537 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-10-24 Jim Meyering + + * build-aux/bootstrap: Sync from coreutils: + 2007-10-24 Jim Meyering + Get gnulib from the git repository, not from an obsolete cvs one. + * build-aux/bootstrap: Suggestion from Micah Cowan. + 2007-10-04 Jim Meyering + * build-aux/bootstrap (slurp): Adapt to _.h -> .in.h name change. + (update_po_files): Work also when there are no .po files in po/. + 2007-10-24 Paul Eggert * README: Append ".git" to git and cg examples. diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 14b2d4d8e6..22e3a41f5e 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -242,7 +242,7 @@ case ${GNULIB_SRCDIR--} in trap cleanup_gnulib 1 2 13 15 - cvs -z3 -q -d ${CVS_PREFIX}cvs.savannah.gnu.org:/cvsroot/gnulib co gnulib || + git clone --depth 2 git://git.sv.gnu.org/gnulib || cleanup_gnulib trap - 1 2 13 15 @@ -280,13 +280,16 @@ update_po_files() { && ls "$ref_po_dir"/*.po 2>/dev/null | sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" + langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'` + test "$langs" = '*' && langs=x for po in `cd $ref_po_dir && echo *.po|sed 's/\.po//g'`; do - new_po="$ref_po_dir/$po.po" - cksum_file="$ref_po_dir/$po.s1" - if ! sha1sum -c --status "$cksum_file" < "$new_po" > /dev/null; then - echo "updated $po_dir/$po.po..." - cp "$new_po" "$po_dir/$po.po" && sha1sum < "$new_po" > "$cksum_file" - fi + case $po in x) continue;; esac + new_po="$ref_po_dir/$po.po" + cksum_file="$ref_po_dir/$po.s1" + if ! sha1sum -c --status "$cksum_file" < "$new_po" > /dev/null; then + echo "updated $po_dir/$po.po..." + cp "$new_po" "$po_dir/$po.po" && sha1sum < "$new_po" > "$cksum_file" + fi done } @@ -468,7 +471,7 @@ slurp() { ig=$dir/$dot_ig if test -n "$copied"; then insert_sorted_if_absent $ig "$copied" - # If an ignored file name ends with _.h, then also add + # If an ignored file name ends with .in.h, then also add # the name with just ".h". Many gnulib headers are generated, # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc. # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed -- 2.30.2