X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/47671055438197794c88a6f7fb90acbc19fe413b..47aee066ccabdb3aeb96735532167c551f8e7194:/bootstrap

diff --git a/bootstrap b/bootstrap
index a52c233e..62a8977e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -23,8 +23,10 @@
 
 package=bison
 
-# Ensure file names are sorted consistently across platforms;
-# e.g., m4/ulonglong_gl.m4 should follow m4/ulonglong.m4.
+# Translation Project URL, for the registry of all projects.
+TP_URL='http://www.iro.umontreal.ca/translation/registry.cgi?domain='
+
+# Ensure file names are sorted consistently across platforms.
 # Also, ensure diagnostics are in English, e.g., "wget --help" below.
 LC_ALL=C
 export LC_ALL
@@ -88,16 +90,17 @@ case ${GNULIB_SRCDIR--} in
   GNULIB_SRCDIR=gnulib
 esac
 
-<$GNULIB_SRCDIR/gnulib-tool || exit
+gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
+<$gnulib_tool || exit
 
 gnulib_modules='
 argmatch
 dirname
 error
 extensions
+fopen-safer
 getopt
 gettext
-hard-locale
 hash
 malloc
 mbswidth
@@ -105,7 +108,7 @@ obstack
 quote
 quotearg
 stdbool
-stdio-safer
+stdint
 stpcpy
 strerror
 strtoul
@@ -124,14 +127,15 @@ while [ "$gnulib_modules" != "$previous_gnulib_modules" ]; do
   gnulib_modules=`
     (echo "$gnulib_modules"
      for gnulib_module in $gnulib_modules; do
-       $GNULIB_SRCDIR/gnulib-tool --extract-dependencies $gnulib_module
+       $gnulib_tool --extract-dependencies $gnulib_module
      done) | sort -u
   `
 done
 
 gnulib_files=`
-  (for gnulib_module in $gnulib_modules; do
-     $GNULIB_SRCDIR/gnulib-tool --extract-filelist $gnulib_module
+  (echo m4/warning.m4
+   for gnulib_module in $gnulib_modules; do
+     $gnulib_tool --extract-filelist $gnulib_module
    done) | sort -u
 `
 
@@ -140,18 +144,6 @@ mkdir -p $gnulib_dirs || exit
 
 for gnulib_file in $gnulib_files; do
   dest=$gnulib_file
-
-  case $gnulib_file in
-  m4/onceonly_2_57.m4) dest=m4/onceonly.m4;;
-  # These will be overwritten by autopoint, which still uses
-  # old jm_.* macro names, so we have to keep both copies.
-  # m4/gettext.m4 isn't mentioned here, since it's patched below.
-  m4/glibc21.m4 | m4/inttypes_h.m4 | m4/lib-ld.m4 | \
-  m4/lib-prefix.m4 | m4/po.m4 | m4/stdint_h.m4 | m4/uintmax_t.m4 | \
-  m4/ulonglong.m4)
-    dest=`expr $gnulib_file : '\(.*\).m4'`_gl.m4;;
-  esac
-
   rm -f $dest &&
   echo "$0: Copying file $GNULIB_SRCDIR/$gnulib_file" &&
   cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit
@@ -159,15 +151,50 @@ 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 ..."
+echo "$0: patching m4/gettext.m4 to remove need for intl/* ..."
 sed '
   /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
     AC_DEFUN([AM_INTL_SUBDIR], [])
+  /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
+    AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
 ' m4/gettext.m4 >m4/gettext_gl.m4 || exit
 
 
 # Get translations.
 
+get_translations() {
+  subdir=$1
+  domain=$2
+
+  echo "$0: getting translations into $subdir for $domain..."
+  (cd $subdir && rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'`) &&
+
+  $WGET_COMMAND -O "$subdir/$domain.html" "$TP_URL$domain" &&
+
+  sed -n 's|.*"http://[^"]*/translation/teams/PO/\([^/"]*\)/'"$domain"'-\([^/"]*\)\.[^."]*\.po".*|\1.\2|p' <"$subdir/$domain.html" |
+  sort -k 1,1 -k 2,2n -k2,2 -k3,3n -k3,3 -k4,4n -k4,4 -k5,5n -k5.5 |
+  awk -F. '
+    { if (lang && $1 != lang) print lang, ver }
+    { lang = $1; ver = substr($0, index($0, ".") + 1) }
+    END { if (lang) print lang, ver }
+  ' | awk -v domain="$domain" -v subdir="$subdir" '
+    {
+      lang = $1
+
+      # Work around bugs in Bison 2.3 translations uncovered by gettext 0.15.
+      # This workaround can be removed once the translations are fixed.
+      if (lang == "id" || lang == "tr") next
+
+      ver = $2
+      urlfmt = ""
+      printf "$WGET_COMMAND -O %s/%s.po 'http://www.iro.umontreal.ca/translation/teams/PO/%s/%s-%s.%s.po' &&\n", subdir, lang, lang, domain, ver, lang
+    }
+    END { print ":" }
+  ' | sh &&
+  ls "$subdir"/*.po | sed 's|.*/||; s|\.po$||' >"$subdir/LINGUAS" &&
+  rm "$subdir/$domain.html"
+}
+
 case $SKIP_PO in
 '')
   case `wget --help` in
@@ -179,51 +206,14 @@ case $SKIP_PO in
     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 $no_cache \
-     http://www.iro.umontreal.ca/translation/maint/$package/ &&
-   ls *.po | sed 's/\.po$//' >LINGUAS
-  ) || exit
+  WGET_COMMAND="wget -nv $no_cache"
+  export WGET_COMMAND
+
+  get_translations po $package || exit
 
   case $package in
   bison)
-    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 $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
+    get_translations runtime-po $package-runtime || exit
   esac;;
 esac
 
@@ -232,26 +222,24 @@ esac
 
 (echo '# This file is generated automatically by "bootstrap".' &&
  echo 'AC_DEFUN([GNULIB_AUTOCONF_SNIPPET],[' &&
- $GNULIB_SRCDIR/gnulib-tool --extract-autoconf-snippet $gnulib_modules &&
+ $gnulib_tool --extract-autoconf-snippet $gnulib_modules |
+   sed 's/AM_GNU_GETTEXT(\[external]/&, [need-ngettext]/' &&
  echo '])'
 ) >m4/gnulib.m4 || exit
 
 (echo '# This file is generated automatically by "bootstrap".' &&
- $GNULIB_SRCDIR/gnulib-tool --extract-automake-snippet $gnulib_modules |
+ $gnulib_tool --extract-automake-snippet $gnulib_modules |
  sed 's/^[	 ]*AM_CPPFLAGS[	 ]*+=/# (commented out by bootstrap) &/'
 ) >lib/gnulib.mk || exit
 
 
 # Reconfigure, getting other files.
 
-echo "$0: autoreconf --verbose --install --force ..."
-autoreconf --verbose --install --force || exit
-
+echo "$0: autopoint --force ..."
+autopoint --force || exit
 
 # We don't need intl, so remove it.
-# Remove aclocal.m4 too, so that it gets rebuilt.
 intl_files_to_remove='
-  aclocal.m4
   intl
   m4/codeset.m4
   m4/gettext.m4
@@ -259,29 +247,22 @@ intl_files_to_remove='
   m4/glibc21.m4
   m4/intdiv0.m4
   m4/intmax.m4
-  m4/inttypes_h.m4
-  m4/inttypes.m4
+  m4/inttypes-h.m4
   m4/inttypes-pri.m4
-  m4/isc-posix.m4
   m4/lcmessage.m4
-  m4/lib-ld.m4
-  m4/lib-prefix.m4
+  m4/lock.m4
   m4/longdouble.m4
-  m4/longlong.m4
-  m4/po.m4
   m4/printf-posix.m4
   m4/signed.m4
   m4/size_max.m4
-  m4/stdint_h.m4
-  m4/uintmax_t.m4
-  m4/ulonglong.m4
-  m4/wchar_t.m4
+  m4/visibility.m4
   m4/wint_t.m4
   m4/xsize.m4
 '
 echo $0: rm -fr $intl_files_to_remove ...
 rm -fr $intl_files_to_remove || exit
 
+
 # Undo changes to gnulib files that autoreconf made.
 for gnulib_file in $gnulib_files; do
   test ! -f $gnulib_file || cmp -s $gnulib_file $GNULIB_SRCDIR/$gnulib_file || {
@@ -291,9 +272,35 @@ for gnulib_file in $gnulib_files; do
   }
 done
 
+# Make sure aclocal.m4 is not older than input files.
+sleep 1
+
+for command in \
+  'aclocal --force -I m4' \
+  'autoconf --force' \
+  'autoheader --force' \
+  'automake --add-missing --copy --force-missing';
+do
+  echo "$0: $command ..."
+  $command || exit
+done
+
+
 # Put bug-reporting address into po/Makevars.
-echo "$0: sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/' po/Makevars.template >po/Makevars ..."
-sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/' po/Makevars.template >po/Makevars
+echo "$0: Creating po/Makevars from po/Makevars.template ..."
+sed '
+  /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/
+  /^XGETTEXT_OPTIONS *=/{
+    s/$/ \\/
+    a\
+	--flag=_:1:pass-c-format \\\
+	--flag=N_:1:pass-c-format \\\
+	--flag=error:3:c-format --flag=error_at_line:5:c-format \\\
+	--flag=warn:1:c-format --flag=warn_at:2:c-format \\\
+	--flag=complain:1:c-format --flag=complain_at:2:c-format \\\
+	--flag=fatal:1:c-format --flag=fatal_at:2:c-format
+  }
+' po/Makevars.template >po/Makevars
 
 # Likewise for runtime-po/Makevars, except also change a few other parameters.
 sed '