Typo.

[bison.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index 1207d6b09909e9c98c6703e310d341f470c02457..a86aeb83f7807b5d4bd53296e3a6d969a77a2012 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -25,6 +25,7 @@ package=bison
 
 # Ensure file names are sorted consistently across platforms;
 # e.g., m4/ulonglong_gl.m4 should follow m4/ulonglong.m4.
+# Also, ensure diagnostics are in English, e.g., "wget --help" below.
 LC_ALL=C
 export LC_ALL
 
@@ -57,6 +58,12 @@ build_cvs_prefix() {
   fi
 }
 
+cleanup_gnulib() {
+  status=$?
+  rm -fr gnulib
+  exit $status
+}
+
 # Get gnulib files.
 
 case ${GNULIB_SRCDIR--} in
@@ -64,9 +71,6 @@ case ${GNULIB_SRCDIR--} in
   if [ ! -d gnulib ]; then
     echo "$0: getting gnulib files..."
 
-    trap exit 1 2 13 15
-    trap 'rm -fr gnulib; exit 1' 0
-
     case ${CVS_AUTH-anoncvs} in
     anoncvs)
       CVS_PREFIX='anoncvs@';;
@@ -81,9 +85,12 @@ case ${GNULIB_SRCDIR--} in
     '') export CVS_RSH=ssh;;
     esac
 
-    cvs -z3 -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib co gnulib || exit
+    trap cleanup_gnulib 1 2 13 15
 
-    trap - 0
+    cvs -z3 -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib co gnulib ||
+      cleanup_gnulib
+
+    trap - 1 2 13 15
   fi
   GNULIB_SRCDIR=gnulib
 esac
@@ -91,7 +98,6 @@ esac
 <$GNULIB_SRCDIR/gnulib-tool || exit
 
 gnulib_modules='
-alloca
 argmatch
 dirname
 error
@@ -108,7 +114,12 @@ quotearg
 stdbool
 stdio-safer
 stpcpy
+strerror
+strtoul
+strverscmp
 unistd-safer
+unlocked-io
+verify
 xalloc
 xalloc-die
 xstrndup
@@ -153,6 +164,8 @@ for gnulib_file in $gnulib_files; do
   cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit
 done
 
+# This suppresses a bogus diagnostic
+# "warning: macro `AM_LANGINFO_CODESET' not found in library".
 echo "$0: patching m4/gettext.m4 so that AM_INTL_SUBDIR is empty ..."
 sed '
   /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
@@ -164,10 +177,19 @@ sed '
 
 case $SKIP_PO in
 '')
+  case `wget --help` in
+  *'--no-cache'*)
+    no_cache='--no-cache';;
+  *'--cache=on/off'*)
+    no_cache='--cache=off';;
+  *)
+    no_cache='';;
+  esac
+
   echo "$0: getting translations into po (please ignore the robots.txt ERROR 404)..."
   (cd po &&
    rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'` &&
-   wget -nv -nd -r -l 1 -A .po -C off \
+   wget -nv -nd -r -l 1 -A .po $no_cache \
      http://www.iro.umontreal.ca/translation/maint/$package/ &&
    ls *.po | sed 's/\.po$//' >LINGUAS
   ) || exit
@@ -177,8 +199,36 @@ case $SKIP_PO in
     echo "$0: getting translations into po (please ignore the robots.txt ERROR 404)..."
     (cd runtime-po &&
      rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po$/p'` &&
-     wget -nv -nd -r -l 1 -A .po -C off \
+     wget -nv -nd -r -l 1 -A .po $no_cache \
        http://www.iro.umontreal.ca/translation/maint/$package-runtime/ &&
+
+     # For translations that have not yet been upgraded to the new
+     # runtime-po domain, prime the pump by extracting the relevant
+     # strings from the obsolete translations.
+     # This code can be removed once the bison-runtime domain
+     # has been translated by each team.
+     for po in ../po/*.po; do
+       test -f "$po" || continue
+       runpo=`basename $po`
+       test -f $runpo || {
+        msggrep -K \
+            -e 'memory exhausted' \
+            -e 'syntax error' \
+            $po 2>/dev/null |
+          sed '
+            s/^#~ //
+            /^msgid "syntax error; also memory exhausted"$/,/^$/d
+            /^$/,${ /^#/d; }
+          ' >$runpo-
+        if cmp -s $runpo- $runpo; then
+          rm $runpo-
+        else
+          mv $runpo- $runpo
+        fi
+        test -s $runpo || rm -f $runpo
+       } || exit
+     done &&
+
      ls *.po | sed 's/\.po$//' >LINGUAS
     ) || exit
   esac;;
@@ -246,11 +296,11 @@ sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/' po/Makevars.template >p
 sed '
   s/^\(DOMAIN\) *=.*/\1 = bison-runtime/
   s/^\(subdir\) *=.*/\1 = runtime-po/
-  s/^\(XGETTEXT_OPTIONS\) *=.*/\1 = --keyword=YYI18N/
+  s/^\(XGETTEXT_OPTIONS\) *=.*/\1 = --keyword=YY_/
 ' <po/Makevars >runtime-po/Makevars
 
 # Copy identical files from po to runtime-po.
-(cd po && cp -p *-quot *.header *.sed *.sin ../runtime-po)
+(cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
 
 # if src/parse-gram.[ch] are out of date, rebuild them.
 parse_gram_y=`find src/parse-gram.y \