X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b9c85d5cef6ecfd068a1010b4e130c83d1f802e5..9350499cfce9122ebb065a582ab17e321b2e8ff3:/bootstrap?ds=sidebyside diff --git a/bootstrap b/bootstrap index dcea122b..62a8977e 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, 2006 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,21 @@ # 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 +# 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 + # Parse options. for option @@ -43,39 +51,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 +66,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,22 +80,27 @@ 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}cvs.savannah.gnu.org:/cvsroot/gnulib co gnulib || + cleanup_gnulib + + trap - 1 2 13 15 fi GNULIB_SRCDIR=gnulib esac -<$GNULIB_SRCDIR/gnulib-tool || exit +gnulib_tool=$GNULIB_SRCDIR/gnulib-tool +<$gnulib_tool || exit gnulib_modules=' -alloca argmatch dirname error +extensions +fopen-safer getopt -hard-locale +gettext hash malloc mbswidth @@ -125,8 +108,16 @@ obstack quote quotearg stdbool +stdint stpcpy +strerror +strtoul +strverscmp +unistd-safer +unlocked-io +verify xalloc +xalloc-die xstrndup ' @@ -136,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 ` @@ -152,28 +144,77 @@ 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;; - esac - rm -f $dest && echo "$0: Copying file $GNULIB_SRCDIR/$gnulib_file" && 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 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 '') - 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/ && - ls *.po | sed 's/\.po$//' >LINGUAS - ) || exit;; + case `wget --help` in + *'--no-cache'*) + no_cache='--no-cache';; + *'--cache=on/off'*) + no_cache='--cache=off';; + *) + no_cache='';; + esac + + WGET_COMMAND="wget -nv $no_cache" + export WGET_COMMAND + + get_translations po $package || exit + + case $package in + bison) + get_translations runtime-po $package-runtime || exit + esac;; esac @@ -181,72 +222,95 @@ 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 + m4/glibc2.m4 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/lock.m4 m4/longdouble.m4 - m4/longlong.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 -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 +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 ' + 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 \