X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b9c85d5cef6ecfd068a1010b4e130c83d1f802e5..3e7a2cd95f9ca7ee02eca7ca91df5b4a85fea9ff:/bootstrap?ds=sidebyside diff --git a/bootstrap b/bootstrap index dcea122b..7d094737 100755 --- a/bootstrap +++ b/bootstrap @@ -2,7 +2,7 @@ # Bootstrap this package from CVS. -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,13 +16,19 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # Written by Paul Eggert. 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 + # Parse options. for option @@ -43,39 +49,12 @@ do esac done -# Check that gettext version matches what's in configure.ac. -# FIXME: We shouldn't have to modify configure.ac every time -# a new gettext version comes out. -{ - gettext_version_output=`LC_ALL=C gettext --version` && - case $gettext_version_output in - 'gettext (GNU '*) ;; - *) false;; - esac -} || { - echo >&2 "$0: Please install GNU gettext first." - exit 1 -} -newline=' -' -last_word_in_first_line="[^$newline]* \\([^$newline]*\\)" -gettext_have=`expr "$gettext_version_output" : "$last_word_in_first_line"` -gettext_need=` - sed -n '/^AM_GNU_GETTEXT_VERSION/{ s/.*\[//; s/].*//; p; q; }' configure.ac -` -[ "$gettext_have" = "$gettext_need" ] || { - echo >&2 "$0: Your gettext version is $gettext_have." - echo >&2 "$0: Please install and use gettext-$gettext_need instead." - exit 1 -} - echo "$0: Bootstrapping CVS $package..." -build_cvs_prefix() { - CVS_PREFIX=:${1}: - if [ "${2}" != - ]; then - CVS_PREFIX=${CVS_PREFIX}${2}@ - fi +cleanup_gnulib() { + status=$? + rm -fr gnulib + exit $status } # Get gnulib files. @@ -85,12 +64,9 @@ 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@';; + case ${CVS_AUTH-pserver} in + pserver) + CVS_PREFIX=':pserver:anonymous@';; ssh) CVS_PREFIX="$CVS_USER${CVS_USER+@}";; *) @@ -102,9 +78,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 + + cvs -z3 -q -d ${CVS_PREFIX}cvs.savannah.gnu.org:/cvsroot/gnulib co gnulib || + cleanup_gnulib - trap 0 + trap - 1 2 13 15 fi GNULIB_SRCDIR=gnulib esac @@ -112,11 +91,12 @@ esac <$GNULIB_SRCDIR/gnulib-tool || exit gnulib_modules=' -alloca argmatch dirname error +extensions getopt +gettext hard-locale hash malloc @@ -125,8 +105,16 @@ obstack quote quotearg stdbool +stdio-safer stpcpy +strerror +strtoul +strverscmp +unistd-safer +unlocked-io +verify xalloc +xalloc-die xstrndup ' @@ -155,6 +143,13 @@ for gnulib_file in $gnulib_files; do 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 && @@ -162,18 +157,74 @@ 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\ + AC_DEFUN([AM_INTL_SUBDIR], []) +' m4/gettext.m4 >m4/gettext_gl.m4 || exit + # Get translations. 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 \ - http://www2.iro.umontreal.ca/~gnutra/po/maint/$package/ && + 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;; + ) || 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 + esac;; esac @@ -202,6 +253,8 @@ intl_files_to_remove=' aclocal.m4 intl m4/codeset.m4 + m4/gettext.m4 + m4/glibc2.m4 m4/glibc21.m4 m4/intdiv0.m4 m4/intmax.m4 @@ -210,8 +263,11 @@ intl_files_to_remove=' m4/inttypes-pri.m4 m4/isc-posix.m4 m4/lcmessage.m4 + m4/lib-ld.m4 + m4/lib-prefix.m4 m4/longdouble.m4 m4/longlong.m4 + m4/po.m4 m4/printf-posix.m4 m4/signed.m4 m4/size_max.m4 @@ -225,28 +281,19 @@ intl_files_to_remove=' echo $0: rm -fr $intl_files_to_remove ... rm -fr $intl_files_to_remove || exit -echo "$0: patching m4/gettext.m4 so that AM_INTL_SUBDIR is empty ..." -sed ' - /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\ - AC_DEFUN([AM_INTL_SUBDIR], []) -' m4/gettext.m4 >m4/gettext.m4t && -mv m4/gettext.m4t m4/gettext.m4 || exit - -# Patch what appears to be a bug in gettext 0.14.1; -# remove this once the bug is fixed. -grep @top_builddir@ po/Makefile.in.in >/dev/null || { - echo "$0: prepending 'top_builddir=@top_builddir@' to po/Makefile.in.in ... " - old_contents=`cat po/Makefile.in.in` || exit - cat >po/Makefile.in.in <po/Makevars ..." sed '/^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-bison@gnu.org/' po/Makevars.template >po/Makevars +# Likewise for runtime-po/Makevars, except also change a few other parameters. +sed ' + s/^\(DOMAIN\) *=.*/\1 = bison-runtime/ + s/^\(subdir\) *=.*/\1 = runtime-po/ + s/^\(XGETTEXT_OPTIONS\) *=.*/\1 = --keyword=YY_/ +' runtime-po/Makevars + +# Copy identical files from po to 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 \