From f3eea031a630e7a37689e64ef5bc4f3fda49ceb2 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 16 Jan 2008 08:37:50 +0100 Subject: [PATCH] upgrade autoboot --- autoboot | 594 ++++++++++++++++++++++++++++++++++++------ autoboot.conf | 61 +++++ lib/Makefile.am | 13 +- po/.gitignore | 4 + po/it.po | 562 --------------------------------------- testsuite/Makefile.am | 4 +- 6 files changed, 584 insertions(+), 654 deletions(-) mode change 100644 => 100755 autoboot create mode 100644 autoboot.conf delete mode 100644 po/it.po diff --git a/autoboot b/autoboot old mode 100644 new mode 100755 index 44f8202..36940b4 --- a/autoboot +++ b/autoboot @@ -1,13 +1,13 @@ #! /bin/sh -# Bootstrap this package from CVS. +# Bootstrap this package from checked-out sources. -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. -# This program is free software; you can redistribute it and/or modify +# 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 -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,44 +15,200 @@ # GNU General Public License for more details. # 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., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see . # Written by Paul Eggert. -package=sed - -# Translation Project URL, for the registry of all projects. -TP_URL='http://www.iro.umontreal.ca/translation/registry.cgi?domain=' -TP_PO_URL='http://www.iro.umontreal.ca/translation/teams/PO/' +nl=' +' # 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 +local_gl_dir=gl + +# Temporary directory names. +bt='._bootmp' +bt_regex=`echo "$bt"| sed 's/\./[.]/g'` +bt2=${bt}2 + +usage() { + echo >&2 "\ +Usage: $0 [OPTION]... +Bootstrap this package from the checked-out sources. + +Options: + --gnulib-srcdir=DIRNAME Specify the local directory where gnulib + sources reside. Use this if you already + have gnulib sources on your machine, and + do not want to waste your bandwidth downloading + them again. + --copy Copy files instead of creating symbolic links. + --force Attempt to bootstrap even if the sources seem + not to have been checked out. + --skip-po Do not download po files. + +If the file bootstrap.conf exists in the current working directory, its +contents are read as shell variables to configure the bootstrap. + +Running without arguments will suffice in most cases. +" +} + +# Configuration. + +# Name of the Makefile.am +gnulib_mk=gnulib.mk + +# List of gnulib modules needed. +gnulib_modules= + +# Any gnulib files needed that are not in modules. +gnulib_files= + +# The command to download all .po files for a specified domain into +# a specified directory. Fill in the first %s is the domain name, and +# the second with the destination directory. Use rsync's -L and -r +# options because the latest/%s directory and the .po files within are +# all symlinks. +po_download_command_format=\ +"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'" + +extract_package_name=' + /^AC_INIT(/{ + /.*,.*,.*, */{ + s/// + s/[][]//g + s/)$// + p + q + } + s/AC_INIT(\[*// + s/]*,.*// + s/^GNU // + y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ + s/[^A-Za-z0-9_]/-/g + p + } +' +package=`sed -n "$extract_package_name" configure.ac` || exit +gnulib_name=lib$package + +build_aux=build-aux +# Extra files from gnulib, which override files from other sources. +gnulib_extra_files=" + $build_aux/install-sh + $build_aux/missing + $build_aux/mdate-sh + $build_aux/texinfo.tex + $build_aux/depcomp + $build_aux/config.guess + $build_aux/config.sub + doc/INSTALL +" + +# Additional gnulib-tool options to use. Use "\newline" to break lines. +gnulib_tool_option_extras= + +# Other locale categories that need message catalogs. +EXTRA_LOCALE_CATEGORIES= + +# Additional xgettext options to use. Use "\\\newline" to break lines. +XGETTEXT_OPTIONS='\\\ + --flag=_:1:pass-c-format\\\ + --flag=N_:1:pass-c-format\\\ + --flag=error:3:c-format --flag=error_at_line:5:c-format\\\ +' + +# Files we don't want to import. +excluded_files= + +# File that should exist in the top directory of a checked out hierarchy, +# but not in a distribution tarball. +checkout_only_file=README-hacking + +# Whether to use copies instead of symlinks. +copy=false + +# Set this to '.cvsignore .gitignore' in bootstrap.conf if you want +# those files to be generated in directories like lib/, m4/, and po/. +# Or set it to 'auto' to make this script select which to use based +# on which version control system (if any) is used in the source directory. +vc_ignore=auto + +# Override the default configuration, if necessary. +test -r autoboot.conf && . ./autoboot.conf + +if test "$vc_ignore" = auto; then + vc_ignore= + test -d .git && vc_ignore=.gitignore + test -d CVS && vc_ignore="$vc_ignore .cvsignore" +fi + +# Translate configuration into internal form. + # Parse options. for option do case $option in --help) - echo "$0: usage: $0 [--gnulib-srcdir=DIR] [--cvs-user=USERNAME] [--skip-po]" + usage exit;; --gnulib-srcdir=*) GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;; - --cvs-user=*) - ;; --skip-po) SKIP_PO=t;; + --force) + checkout_only_file=;; + --copy) + copy=true;; *) echo >&2 "$0: $option: unknown option" exit 1;; esac done -echo "$0: Bootstrapping CVS $package..." +if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then + echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2 + exit 1 +fi + +# If $STR is not already on a line by itself in $FILE, insert it, +# sorting the new contents of the file and replacing $FILE with the result. +insert_sorted_if_absent() { + file=$1 + str=$2 + test -f $file || touch $file + echo "$str" | sort -u - $file | cmp -s - $file \ + || echo "$str" | sort -u - $file -o $file \ + || exit 1 +} + +# Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac. +found_aux_dir=no +grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \ + >/dev/null && found_aux_dir=yes +grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \ + >/dev/null && found_aux_dir=yes +if test $found_aux_dir = no; then + echo "$0: expected line not found in configure.ac. Add the following:" >&2 + echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2 + exit 1 +fi + +# If $build_aux doesn't exist, create it now, otherwise some bits +# below will malfunction. If creating it, also mark it as ignored. +if test ! -d $build_aux; then + mkdir $build_aux + for dot_ig in x $vc_ignore; do + test $dot_ig = x && continue + insert_sorted_if_absent $dot_ig $build_aux + done +fi + +echo "$0: Bootstrapping from checked-out $package sources..." cleanup_gnulib() { status=$? @@ -68,103 +224,379 @@ case ${GNULIB_SRCDIR--} in echo "$0: getting gnulib files..." trap cleanup_gnulib 1 2 13 15 - cvs -q -d :pserver:anonymous@pserver.git.sv.gnu.org:/gnulib.git \ - co -d gnulib HEAD || cleanup_gnulib + + git clone --depth 2 git://git.sv.gnu.org/gnulib || + cleanup_gnulib trap - 1 2 13 15 - else - if [ -d gnulib/CVS ]; then - (cd gnulib && cvs up) - fi fi GNULIB_SRCDIR=gnulib esac gnulib_tool=$GNULIB_SRCDIR/gnulib-tool -test -x $gnulib_tool || exit - -# $gnulib_tool --import --m4-base=build-aux --lib=libsed --no-changelog --makefile-name=gnulib.mk \ -# acl alloca getline getopt gettext memchr memcmp memmove \ -# mkstemp obstack regex stdbool strerror strverscmp unlocked-io verify +<$gnulib_tool || exit # Get translations. -get_translations() { +download_po_files() { subdir=$1 domain=$2 + echo "$0: getting translations into $subdir for $domain..." + cmd=`printf "$po_download_command_format" "$domain" "$subdir"` + eval "$cmd" +} - case $SKIP_PO in - '') - echo "$0: getting translations into $subdir for $domain..." - (cd $subdir && rm -f *.gmo) && +# Download .po files to $po_dir/.reference and copy only the new +# or modified ones into $po_dir. Also update $po_dir/LINGUAS. +update_po_files() { + # Directory containing primary .po files. + # Overwrite them only when we're sure a .po file is new. + po_dir=$1 + domain=$2 - $WGET_COMMAND -O "$subdir/$domain.html" "$TP_URL$domain" && + # Download *.po files into this dir. + # Usually contains *.s1 checksum files. + ref_po_dir="$po_dir/.reference" - 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" ' + test -d $ref_po_dir || mkdir $ref_po_dir || return + download_po_files $ref_po_dir $domain \ + && 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 + case $po in x) continue;; esac + new_po="$ref_po_dir/$po.po" + cksum_file="$ref_po_dir/$po.s1" + if ! test -f "$cksum_file" || + ! 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 +} + +case $SKIP_PO in +'') + if test -d po; then + update_po_files po $package || exit + fi + + if test -d runtime-po; then + update_po_files runtime-po $package-runtime || exit + fi;; +esac + +symlink_to_dir() +{ + src=$1/$2 + dst=${3-$2} + + test -f "$src" && { + + # If the destination directory doesn't exist, create it. + # This is required at least for "lib/uniwidth/cjk.h". + dst_dir=`dirname "$dst"` + if ! test -d "$dst_dir"; then + mkdir -p "$dst_dir" + + # If we've just created a directory like lib/uniwidth, + # tell version control system(s) it's ignorable. + # FIXME: for now, this does only one level + parent=`dirname "$dst_dir"` + for dot_ig in x $vc_ignore; do + test $dot_ig = x && continue + ig=$parent/$dot_ig + insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'` + done + fi + + if $copy; then { - lang = $1 - - # Same maintainer as sed, so this one is more up to date. - if (lang == "it") next - - ver = $2 - printf "{ $WGET_COMMAND -O %s/%s.po '\'"$TP_PO_URL"'/%s/%s-%s.%s.po'\'' &&\n", subdir, lang, lang, domain, ver, lang - printf " msgfmt -c -o /dev/null %s/%s.po || {\n", subdir, lang - printf " echo >&2 '\'"$0"': omitting translation for %s'\''\n", lang - printf " rm -f %s/%s.po; }; } &&\n", subdir, lang + test ! -h "$dst" || { + echo "$0: rm -f $dst" && + rm -f "$dst" + } + } && + test -f "$dst" && + cmp -s "$src" "$dst" || { + echo "$0: cp -fp $src $dst" && + cp -fp "$src" "$dst" } - END { print ":" } - ' | sh && - rm "$subdir/$domain.html" - ;; - esac + else + test -h "$dst" && + src_ls=`ls -diL "$src" 2>/dev/null` && set $src_ls && src_i=$1 && + dst_ls=`ls -diL "$dst" 2>/dev/null` && set $dst_ls && dst_i=$1 && + test "$src_i" = "$dst_i" || { + dot_dots= + case $src in + /*) ;; + *) + case /$dst/ in + *//* | */../* | */./* | /*/*/*/*/*/) + echo >&2 "$0: invalid symlink calculation: $src -> $dst" + exit 1;; + /*/*/*/*/) dot_dots=../../../;; + /*/*/*/) dot_dots=../../;; + /*/*/) dot_dots=../;; + esac;; + esac - set "$subdir"/*.po - if test "$1" != "$subdir/*.po"; then - echo "$*" | sed 's|po/||g; s|\.po||g' >"$subdir/LINGUAS" + echo "$0: ln -fs $dot_dots$src $dst" && + ln -fs "$dot_dots$src" "$dst" + } + fi + } +} + +cp_mark_as_generated() +{ + cp_src=$1 + cp_dst=$2 + + if cmp -s "$cp_src" "$GNULIB_SRCDIR/$cp_dst"; then + symlink_to_dir "$GNULIB_SRCDIR" "$cp_dst" + elif cmp -s "$cp_src" "$local_gl_dir/$cp_dst"; then + symlink_to_dir $local_gl_dir "$cp_dst" + else + case $cp_dst in + *.[ch]) c1='/* '; c2=' */';; + *.texi) c1='@c '; c2= ;; + *.m4|*/Make*|Make*) c1='# ' ; c2= ;; + *) c1= ; c2= ;; + esac + + # If the destination directory doesn't exist, create it. + # This is required at least for "lib/uniwidth/cjk.h". + dst_dir=`dirname "$cp_dst"` + test -d "$dst_dir" || mkdir -p "$dst_dir" + + if test -z "$c1"; then + cmp -s "$cp_src" "$cp_dst" || { + echo "$0: cp -f $cp_src $cp_dst" && + rm -f "$cp_dst" && + sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst" + } + else + # Copy the file first to get proper permissions if it + # doesn't already exist. Then overwrite the copy. + cp "$cp_src" "$cp_dst-t" && + ( + echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" && + echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" && + sed "s!$bt_regex/!!g" "$cp_src" + ) > $cp_dst-t && + if cmp -s "$cp_dst-t" "$cp_dst"; then + rm -f "$cp_dst-t" + else + echo "$0: cp $cp_src $cp_dst # with edits" && + mv -f "$cp_dst-t" "$cp_dst" + fi + fi fi } -case `wget --help` in -*'--no-cache'*) - no_cache='--no-cache';; -*'--cache=on/off'*) - no_cache='--cache=off';; -*) - no_cache='';; -esac +version_controlled_file() { + dir=$1 + file=$2 + found=no + if test -d CVS; then + grep -F "/$file/" $dir/CVS/Entries 2>/dev/null | + grep '^/[^/]*/[0-9]' > /dev/null && found=yes + elif test -d .git; then + git-rm -n "$dir/$file" > /dev/null 2>&1 && found=yes + else + echo "$0: no version control for $dir/$file?" >&2 + fi + test $found = yes +} -WGET_COMMAND="wget -nv $no_cache" -export WGET_COMMAND +slurp() { + for dir in . `(cd $1 && find * -type d -print)`; do + copied= + sep= + for file in `ls -a $1/$dir`; do + case $file in + .|..) continue;; + .*) continue;; # FIXME: should all file names starting with "." be ignored? + esac + test -d $1/$dir/$file && continue + for excluded_file in $excluded_files; do + test "$dir/$file" = "$excluded_file" && continue 2 + done + if test $file = Makefile.am; then + copied=$copied${sep}$gnulib_mk; sep=$nl + remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g" + sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/$gnulib_mk || { + echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." && + rm -f $dir/$gnulib_mk && + sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk + } + elif { test "${2+set}" = set && test -r $2/$dir/$file; } || + version_controlled_file $dir $file; then + echo "$0: $dir/$file overrides $1/$dir/$file" + else + copied=$copied$sep$file; sep=$nl + if test $file = gettext.m4; then + echo "$0: patching m4/gettext.m4 to remove need for intl/* ..." + rm -f $dir/$file + 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], []) + $a\ + AC_DEFUN([gl_LOCK_EARLY], []) + ' $1/$dir/$file >$dir/$file + else + cp_mark_as_generated $1/$dir/$file $dir/$file + fi + fi || exit + done -get_translations po $package || exit + for dot_ig in x $vc_ignore; do + test $dot_ig = x && continue + ig=$dir/$dot_ig + if test -n "$copied"; then + insert_sorted_if_absent $ig "$copied" + # 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 + f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'` + insert_sorted_if_absent $ig "$f" + + # For files like sys_stat.in.h and sys_time.in.h, record as + # ignorable the directory we might eventually create: sys/. + f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'` + insert_sorted_if_absent $ig "$f" + fi + done + done +} + + +# Create boot temporary directories to import from gnulib and gettext. +rm -fr $bt $bt2 && +mkdir $bt $bt2 || exit + +# Import from gnulib. + +gnulib_tool_options="\ + --import\ + --no-changelog\ + --aux-dir $bt/$build_aux\ + --doc-base $bt/doc\ + --lib $gnulib_name\ + --m4-base $bt/m4/\ + --source-base $bt/lib/\ + --tests-base $bt/tests\ + --local-dir $local_gl_dir\ + $gnulib_tool_option_extras\ +" +echo "$0: $gnulib_tool $gnulib_tool_options --import ..." +$gnulib_tool $gnulib_tool_options --import $gnulib_modules && +slurp $bt || exit + +for file in $gnulib_files; do + symlink_to_dir "$GNULIB_SRCDIR" $file || exit +done + + +# Import from gettext. +with_gettext=yes +grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \ + with_gettext=no + +if test $with_gettext = yes; then + echo "$0: (cd $bt2; autopoint) ..." + cp configure.ac $bt2 && + (cd $bt2 && autopoint && rm configure.ac) && + slurp $bt2 $bt || exit + + rm -fr $bt $bt2 || exit +fi + +# Coreutils is unusual in that it generates some of its test-related +# Makefile.am files. That must be done before invoking automake. +mam_template=tests/Makefile.am.in +if test -f $mam_template; then + PERL=perl + for tool in cut head join pr sort tac tail test tr uniq wc; do + m=tests/$tool/Makefile.am + t=${m}t + rm -f $m $t + sed -n '1,/^##test-files-begin/p' $mam_template > $t + echo "x = $tool" >> $t + srcdir=tests/$tool + $PERL -I$srcdir -w -- tests/mk-script $srcdir --list >> $t + sed -n '/^##test-files-end/,$p' $mam_template >> $t + chmod -w $t + mv $t $m + done +fi # Reconfigure, getting other files. -echo "$0: autopoint --force ..." -autopoint --force || exit - -echo "$0: $gnulib_tool --import ..." -$gnulib_tool --import - -# Make sure aclocal.m4 is not older than input files. -sleep 1 - for command in \ - 'aclocal --force -I build-aux' \ + libtool \ + 'aclocal --force -I m4' \ 'autoconf --force' \ 'autoheader --force' \ 'automake --add-missing --copy --force-missing'; do + if test "$command" = libtool; then + grep '^[ ]*AM_PROG_LIBTOOL\>' configure.ac >/dev/null || + continue + command='libtoolize -c -f' + fi echo "$0: $command ..." $command || exit done +# Get some extra files from gnulib, overriding existing files. +for file in $gnulib_extra_files; do + case $file in + */INSTALL) dst=INSTALL;; + build-aux/*) dst=$build_aux/`expr "$file" : 'build-aux/\(.*\)'`;; + *) dst=$file;; + esac + symlink_to_dir "$GNULIB_SRCDIR" $file $dst || exit +done + +if test $with_gettext = yes; then + # Create gettext configuration. + echo "$0: Creating po/Makevars from po/Makevars.template ..." + rm -f po/Makevars + sed ' + /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/ + /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/ + /^XGETTEXT_OPTIONS *=/{ + s/$/ \\/ + a\ + '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+} + } + ' po/Makevars.template >po/Makevars + + if test -d runtime-po; then + # Similarly for runtime-po/Makevars, but not quite the same. + rm -f runtime-po/Makevars + sed ' + /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/ + /^subdir *=.*/s/=.*/= runtime-po/ + /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/ + /^XGETTEXT_OPTIONS *=/{ + s/$/ \\/ + a\ + '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+} + } + ' runtime-po/Makevars + + # Copy identical files from po to runtime-po. + (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) + fi +fi + echo "$0: done. Now you can run './configure'." diff --git a/autoboot.conf b/autoboot.conf new file mode 100644 index 0000000..cb0d937 --- /dev/null +++ b/autoboot.conf @@ -0,0 +1,61 @@ +# Bootstrap configuration. + +# Copyright (C) 2006, 2007 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 +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +# gnulib modules used by this package. +gnulib_modules=" + acl alloca getline getopt gettext memchr memcmp memmove \ + mkstemp obstack regex stdbool strerror strverscmp unlocked-io verify" + +# Additional xgettext options to use. Use "\\\newline" to break lines. +XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\ + --from-code=UTF-8\\\ + --flag=asprintf:2:c-format --flag=vasprintf:2:c-format\\\ + --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\ + --flag=wrapf:1:c-format\\\ + --flag=error:3:c-format --flag=error_at_line:5:c-format\\\ +' + +# If "AM_GNU_GETTEXT(external" or "AM_GNU_GETTEXT([external]" +# appears in configure.ac, exclude some unnecessary files. +# Without grep's -E option (not portable enough, pre-configure), +# the following test is ugly. Also, this depends on the existence +# of configure.ac, not the obsolescent-named configure.in. But if +# you're using this infrastructure, you should care about such things. + +gettext_external=0 +grep '^[ ]*AM_GNU_GETTEXT(external\>' configure.ac > /dev/null && + gettext_external=1 +grep '^[ ]*AM_GNU_GETTEXT(\[external\]' configure.ac > /dev/null && + gettext_external=1 + +if test $gettext_external = 1; then + # Gettext supplies these files, but we don't need them since + # we don't have an intl subdirectory. + excluded_files=' + m4/glibc2.m4 + m4/intdiv0.m4 + m4/lcmessage.m4 + m4/lock.m4 + m4/printf-posix.m4 + m4/size_max.m4 + m4/uintmax_t.m4 + m4/ulonglong.m4 + m4/visibility.m4 + m4/xsize.m4 + ' +fi diff --git a/lib/Makefile.am b/lib/Makefile.am index 6629320..21f670c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,16 +1,9 @@ ## Process this file with automake to produce Makefile.in -noinst_LIBRARIES = -EXTRA_DIST = -BUILT_SOURCES = -CLEANFILES = -MOSTLYCLEANFILES = -MOSTLYCLEANDIRS = +include gnulib.mk -# Pacify automake -SUFFIXES = .a .o .c .y .l .h .sh .elc .el +SUFFIXES += .a .o .c .y .l .h .sh .elc .el -AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/intl -I$(top_srcdir) \ +AM_CPPFLAGS += -I$(top_srcdir)/lib -I$(top_srcdir)/intl -I$(top_srcdir) \ -I$(top_builddir)/lib -I$(top_builddir)/intl -include gnulib.mk diff --git a/po/.gitignore b/po/.gitignore index 3a6433e..e0df5d3 100644 --- a/po/.gitignore +++ b/po/.gitignore @@ -5,6 +5,10 @@ Rules-quot boldquot.sed en@boldquot.header en@quot.header +insert-header.sed insert-header.sin quot.sed +remove-potcdate.sed remove-potcdate.sin +.reference +*.po diff --git a/po/it.po b/po/it.po deleted file mode 100644 index 3da38ff..0000000 --- a/po/it.po +++ /dev/null @@ -1,562 +0,0 @@ -# traduzione di sed -# Copyright (C) 1999 Free Software Foundation, Inc. -# Paolo Bonzini , 2001 -# -msgid "" -msgstr "" -"Project-Id-Version: sed 4.0a\n" -"Report-Msgid-Bugs-To: bonzini@gnu.org\n" -"POT-Creation-Date: 2007-06-29 10:24+0200\n" -"PO-Revision-Date: 2002-11-26 12:44+0100\n" -"Last-Translator: Paolo Bonzini \n" -"Language-Team: Italian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8-bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" - -# sed/compile.c:166 -#: sed/compile.c:162 -msgid "multiple `!'s" -msgstr "`!' multipli" - -# sed/compile.c:167 -#: sed/compile.c:163 -msgid "unexpected `,'" -msgstr "`,' inattesa" - -# sed/compile.c:169 -#: sed/compile.c:164 -msgid "invalid usage of +N or ~N as first address" -msgstr "impossibile usare +N o ~N come primo indirizzo" - -# sed/compile.c:170 -#: sed/compile.c:165 -msgid "unmatched `{'" -msgstr "`{' non bilanciata" - -# sed/compile.c:171 -#: sed/compile.c:166 -msgid "unexpected `}'" -msgstr "`}' inattesa" - -# sed/compile.c:172 -#: sed/compile.c:167 -msgid "extra characters after command" -msgstr "ci sono altri caratteri dopo il comando" - -# sed/compile.c:173 -#: sed/compile.c:168 -msgid "expected \\ after `a', `c' or `i'" -msgstr "atteso \\ dopo `a', `c' o `i'" - -# sed/compile.c:174 -#: sed/compile.c:169 -msgid "`}' doesn't want any addresses" -msgstr "`}' non accetta indirizzi" - -# sed/compile.c:175 -#: sed/compile.c:170 -msgid ": doesn't want any addresses" -msgstr ": non accetta indirizzi" - -# sed/compile.c:176 -#: sed/compile.c:171 -msgid "comments don't accept any addresses" -msgstr "i commenti non accettano indirizzi" - -# sed/compile.c:177 -#: sed/compile.c:172 -msgid "missing command" -msgstr "manca il comando" - -# sed/compile.c:178 -#: sed/compile.c:173 -msgid "command only uses one address" -msgstr "il comando usa solo un indirizzo" - -# sed/compile.c:179 -#: sed/compile.c:174 -msgid "unterminated address regex" -msgstr "espressione regolare non terminata nell'indirizzo" - -# sed/compile.c:180 -#: sed/compile.c:175 -msgid "unterminated `s' command" -msgstr "comando `s' non terminato" - -# sed/compile.c:181 -#: sed/compile.c:176 -msgid "unterminated `y' command" -msgstr "comando `y' non terminato" - -# sed/compile.c:182 -#: sed/compile.c:177 -msgid "unknown option to `s'" -msgstr "opzione di `s' sconosciuta" - -# sed/compile.c:183 -#: sed/compile.c:178 -msgid "multiple `p' options to `s' command" -msgstr "opzioni `p' multiple al comando `s'" - -# sed/compile.c:184 -#: sed/compile.c:179 -msgid "multiple `g' options to `s' command" -msgstr "opzioni `g' multiple al comando `s'" - -# sed/compile.c:186 -#: sed/compile.c:180 -msgid "multiple number options to `s' command" -msgstr "opzioni numeriche multiple al comando `s'" - -# sed/compile.c:188 -#: sed/compile.c:181 -msgid "number option to `s' command may not be zero" -msgstr "l'opzione numerica del comando `s' non può essere zero" - -# sed/compile.c:190 -#: sed/compile.c:182 -msgid "strings for `y' command are different lengths" -msgstr "le stringhe per il comandi `y' hanno lunghezze diverse" - -#: sed/compile.c:183 -msgid "delimiter character is not a single-byte character" -msgstr "il carattere delimitatore è multi-byte" - -#: sed/compile.c:184 -msgid "expected newer version of sed" -msgstr "attesa una versione piu' recente di sed" - -# sed/compile.c:178 -#: sed/compile.c:185 -msgid "invalid usage of line address 0" -msgstr "utilizzo non valido dell'indirizzo 0" - -# sed/compile.c:1319 -#: sed/compile.c:186 -#, c-format -msgid "unknown command: `%c'" -msgstr "comando sconosciuto: `%c'" - -# sed/compile.c:1340 -#: sed/compile.c:209 -#, c-format -msgid "%s: file %s line %lu: %s\n" -msgstr "%s: file %s riga %lu: %s\n" - -# sed/compile.c:1343 -#: sed/compile.c:212 -#, c-format -msgid "%s: -e expression #%lu, char %lu: %s\n" -msgstr "%s: espressione -e #%lu, carattere %lu: %s\n" - -# sed/compile.c:1543 -#: sed/compile.c:1645 -#, c-format -msgid "can't find label for jump to `%s'" -msgstr "impossibile trovare un'etichetta per il salto a `%s'" - -# sed/execute.c:516 -#: sed/execute.c:699 -#, c-format -msgid "%s: can't read %s: %s\n" -msgstr "%s: impossibile leggere %s: %s\n" - -# sed/execute.c:675 -#: sed/execute.c:722 -#, c-format -msgid "couldn't edit %s: is a terminal" -msgstr "impossibile modificare %s: è un terminale" - -#: sed/execute.c:727 -#, c-format -msgid "couldn't edit %s: not a regular file" -msgstr "impossibile modificare %s: non è un file normale" - -# lib/utils.c:131 -#: sed/execute.c:734 sed/utils.c:233 -#, c-format -msgid "couldn't open temporary file %s: %s" -msgstr "impossibile aprire il file temporaneo %s: %s" - -# sed/execute.c:1003 sed/execute.c:1183 -#: sed/execute.c:1266 sed/execute.c:1446 -msgid "error in subprocess" -msgstr "errore in un sottoprocesso" - -# sed/execute.c:1005 -#: sed/execute.c:1268 -msgid "option `e' not supported" -msgstr "opzione `e' non supportata" - -# sed/execute.c:1185 -#: sed/execute.c:1448 -msgid "`e' command not supported" -msgstr "comando `e' non supportato" - -#: sed/execute.c:1788 -msgid "no input files" -msgstr "nessun file in ingresso" - -# lib/regcomp.c:658 sed/regex.c:47 -#: sed/regexp.c:41 -msgid "no previous regular expression" -msgstr "occorre un'espressione regolare precedente" - -# sed/regex.c:48 -#: sed/regexp.c:42 -msgid "cannot specify modifiers on empty regexp" -msgstr "non è possibile specificare dei modificatori per l'espressione vuota" - -# sed/regex.c:146 -#: sed/regexp.c:131 -#, c-format -msgid "invalid reference \\%d on `s' command's RHS" -msgstr "riferimento non valido \\%d nel secondo membro del comando `s'" - -# sed/sed.c:98 -#: sed/sed.c:101 -msgid "" -" -R, --regexp-perl\n" -" use Perl 5's regular expressions syntax in the script.\n" -msgstr "" -" -R, --regexp-perl\n" -" usa la sintassi Perl 5 per le espressioni regolari\n" - -#: sed/sed.c:106 -#, c-format -msgid "" -"Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n" -"\n" -msgstr "" -"Utilizzo: %s [OPZIONE]... {script-se-nessun-altro-specificato} [input-" -"file]...\n" -"\n" - -#: sed/sed.c:110 -#, c-format -msgid "" -" -n, --quiet, --silent\n" -" suppress automatic printing of pattern space\n" -msgstr "" -" -n, --quiet, --silent\n" -" sopprime la stampa automatica del pattern space\n" - -#: sed/sed.c:112 -#, c-format -msgid "" -" -e script, --expression=script\n" -" add the script to the commands to be executed\n" -msgstr "" -" -e script, --expression=script\n" -" aggiunge lo script ai comandi da eseguire\n" - -#: sed/sed.c:114 -#, c-format -msgid "" -" -f script-file, --file=script-file\n" -" add the contents of script-file to the commands to be " -"executed\n" -msgstr "" -" -f script-file, --file=file-script\n" -" aggiunge il contenuto di file-script ai comandi da " -"eseguire\n" - -#: sed/sed.c:117 -#, c-format -msgid "" -" --follow-symlinks\n" -" follow symlinks when processing in place\n" -msgstr "" -" --follow-symlinks\n" -" segue i link simbolici quando viene utilizzato -i\n" - -#: sed/sed.c:120 -#, c-format -msgid "" -" -i[SUFFIX], --in-place[=SUFFIX]\n" -" edit files in place (makes backup if extension supplied)\n" -msgstr "" -" -i[SUFFIX], --in-place[=SUFFIX]\n" -" scrive il risultato sul file originale (facendo una copia\n" -" se è fornita un'estensione)\n" - -#: sed/sed.c:123 -#, c-format -msgid "" -" -b, --binary\n" -" open files in binary mode (CR+LFs are not processed " -"specially)\n" -msgstr "" -" -b, --binary\n" -" apre i file in modo binario (lasciando le sequenze CR" -"+LF se è immutate)\n" - -#: sed/sed.c:126 -#, c-format -msgid "" -" -l N, --line-length=N\n" -" specify the desired line-wrap length for the `l' command\n" -msgstr "" -" -l N, --line-length=N\n" -" specifica la lunghezza delle linee generate dal comando " -"`l'\n" - -#: sed/sed.c:128 -#, c-format -msgid "" -" --posix\n" -" disable all GNU extensions.\n" -msgstr "" -" --posix\n" -" disabilita tutte le estensioni GNU.\n" - -# sed/sed.c:98 -#: sed/sed.c:130 -#, c-format -msgid "" -" -r, --regexp-extended\n" -" use extended regular expressions in the script.\n" -msgstr "" -" -r, --regexp-extended\n" -" usa la sintassi di `egrep' per le espressioni regolari\n" - -#: sed/sed.c:133 -#, c-format -msgid "" -" -s, --separate\n" -" consider files as separate rather than as a single " -"continuous\n" -" long stream.\n" -msgstr "" -" -s, --separate\n" -" considera i file di input come separati invece che come un\n" -" unico file lungo.\n" - -#: sed/sed.c:136 -#, c-format -msgid "" -" -u, --unbuffered\n" -" load minimal amounts of data from the input files and " -"flush\n" -" the output buffers more often\n" -msgstr "" -" -u, --unbuffered\n" -" carica e visualizza i dati una a pezzetti piu' piccoli\n" - -#: sed/sed.c:139 -#, c-format -msgid " --help display this help and exit\n" -msgstr " --help mostra questo aiuto ed esce\n" - -#: sed/sed.c:140 -#, c-format -msgid " --version output version information and exit\n" -msgstr " --version stampa le informazioni sulla versione ed esce\n" - -#: sed/sed.c:141 -#, c-format -msgid "" -"\n" -"If no -e, --expression, -f, or --file option is given, then the first\n" -"non-option argument is taken as the sed script to interpret. All\n" -"remaining arguments are names of input files; if no input files are\n" -"specified, then the standard input is read.\n" -"\n" -msgstr "" -"\n" -"Se non è usata nessuna delle opzioni -e, --expression, -f o --file allora " -"il\n" -"primo argomento che non è una opzione sarà usato come lo script sed da\n" -"interpretare. Tutti gli argomenti rimanenti sono nomi di file di input; se " -"non\n" -"sono specificati file di input sarà letto lo standard input.\n" -"\n" - -# sed/sed.c:132 -#: sed/sed.c:147 -#, c-format -msgid "" -"E-mail bug reports to: %s .\n" -"Be sure to include the word ``%s'' somewhere in the ``Subject:'' field.\n" -msgstr "" -"Segnalare eventuali bug a: %s .\n" -"Assicurarsi di includere la parola ``%s'' nell'oggetto del messaggio.\n" - -# sed/sed.c:255 -#: sed/sed.c:299 -#, c-format -msgid "super-sed version %s\n" -msgstr "super-sed versione %s\n" - -# sed/sed.c:256 -#: sed/sed.c:300 -#, c-format -msgid "" -"based on GNU sed version %s\n" -"\n" -msgstr "" -"basato su GNU sed versione %s\n" -"\n" - -# sed/sed.c:258 -#: sed/sed.c:302 -#, c-format -msgid "GNU sed version %s\n" -msgstr "GNU sed versione %s\n" - -# sed/sed.c:260 -#: sed/sed.c:304 -#, c-format -msgid "" -"%s\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,\n" -"to the extent permitted by law.\n" -msgstr "" -"%s\n" -"Questo è software libero; si veda il sorgente per le condizioni di " -"copiatura.\n" -"NON c'è garanzia; neppure di COMMERCIABILITA' o IDONEITA' AD UN PARTICOLARE\n" -"SCOPO, nei limiti permessi dalla legge.\n" - -# sed/execute.c:516 -#: sed/utils.c:104 sed/utils.c:444 -#, c-format -msgid "cannot remove %s: %s" -msgstr "impossibile rimuovere %s: %s" - -# lib/utils.c:131 -#: sed/utils.c:174 -#, c-format -msgid "couldn't open file %s: %s" -msgstr "impossibile aprire il file %s: %s" - -# lib/utils.c:161 -#: sed/utils.c:197 -#, c-format -msgid "couldn't attach to %s: %s" -msgstr "impossibile accedere a %s: %s" - -# lib/utils.c:161 -#: sed/utils.c:251 -#, c-format -msgid "couldn't write %d item to %s: %s" -msgid_plural "couldn't write %d items to %s: %s" -msgstr[0] "impossibile scrivere %d elemento su %s: %s" -msgstr[1] "impossibile scrivere %d elementi su %s: %s" - -# lib/utils.c:176 -#: sed/utils.c:266 sed/utils.c:282 -#, c-format -msgid "read error on %s: %s" -msgstr "errore di lettura su %s: %s" - -# lib/utils.c:131 -#: sed/utils.c:384 -#, c-format -msgid "couldn't follow symlink %s: %s" -msgstr "impossibile seguire il link simbolico %s: %s" - -# sed/execute.c:516 -#: sed/utils.c:418 -#, c-format -msgid "cannot stat %s: %s" -msgstr "impossibile ottenere informazioni su %s: %s" - -# sed/execute.c:516 -#: sed/utils.c:449 -#, c-format -msgid "cannot rename %s: %s" -msgstr "impossibile rinominare %s: %s" - -# lib/regcomp.c:179 -#: lib/regcomp.c:131 -msgid "Success" -msgstr "Successo" - -# lib/regcomp.c:182 -#: lib/regcomp.c:134 -msgid "No match" -msgstr "Nessuna corrispondenza trovata" - -# lib/regcomp.c:185 -#: lib/regcomp.c:137 -msgid "Invalid regular expression" -msgstr "Espressione regolare non valida" - -# lib/regcomp.c:188 -#: lib/regcomp.c:140 -msgid "Invalid collation character" -msgstr "Carattere di ordinamento non valido" - -# lib/regcomp.c:191 -#: lib/regcomp.c:143 -msgid "Invalid character class name" -msgstr "Nome non valido per una classe di caratteri" - -# lib/regcomp.c:194 -#: lib/regcomp.c:146 -msgid "Trailing backslash" -msgstr "Barra rovesciata alla fine dell'espressione regolare" - -# lib/regcomp.c:197 -#: lib/regcomp.c:149 -msgid "Invalid back reference" -msgstr "Riferimento non valido" - -# lib/regcomp.c:200 -#: lib/regcomp.c:152 -msgid "Unmatched [ or [^" -msgstr "`[' non bilanciata" - -# lib/regcomp.c:203 -#: lib/regcomp.c:155 -msgid "Unmatched ( or \\(" -msgstr "`(' o `\\(' non bilanciata" - -# lib/regcomp.c:206 -#: lib/regcomp.c:158 -msgid "Unmatched \\{" -msgstr "`\\{' non bilanciata" - -# lib/regcomp.c:209 -#: lib/regcomp.c:161 -msgid "Invalid content of \\{\\}" -msgstr "numero di ripetizioni specificato tra graffe non valido" - -# lib/regcomp.c:212 -#: lib/regcomp.c:164 -msgid "Invalid range end" -msgstr "Fine dell'intervallo non valida" - -# lib/regcomp.c:215 -#: lib/regcomp.c:167 -msgid "Memory exhausted" -msgstr "Memoria esaurita" - -# lib/regcomp.c:218 -#: lib/regcomp.c:170 -msgid "Invalid preceding regular expression" -msgstr "Espressione regolare precedente non valida" - -# lib/regcomp.c:221 -#: lib/regcomp.c:173 -msgid "Premature end of regular expression" -msgstr "Fine prematura dell'espressione regolare" - -# lib/regcomp.c:224 -#: lib/regcomp.c:176 -msgid "Regular expression too big" -msgstr "Espressione regolare troppo grande" - -# lib/regcomp.c:227 -#: lib/regcomp.c:179 -msgid "Unmatched ) or \\)" -msgstr "`)' o `\\)' non bilanciata" - -# lib/regcomp.c:658 sed/regex.c:47 -#: lib/regcomp.c:680 -msgid "No previous regular expression" -msgstr "Occorre un'espressione regolare precedente" diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 7b6dc0d..95d016a 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -27,7 +27,9 @@ SEDTESTS += \ help version file quiet \ factor binary3 binary2 binary dc -TESTS_ENVIRONMENT = MAKE="$(MAKE)" VERSION="$(VERSION)" $(srcdir)/runtest +TESTS_ENVIRONMENT = MAKE="$(MAKE)" VERSION="$(VERSION)" \ + @LOCALCHARSET_TESTS_ENVIRONMENT@ $(srcdir)/runtest + EXTRA_DIST = \ PCRE.tests BOOST.tests SPENCER.tests \