Add append02.at

[chaz/tar] / bootstrap

diff --git a/bootstrap b/bootstrap
index d113f5a0ff19aa064c2c44f84ebe1a1f99fd5abf..5c42b3426d6c4ef728da467aa760bfda9a701740 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -2,7 +2,7 @@
 
 # Bootstrap 'tar' from CVS.
 
 
 # Bootstrap 'tar' from CVS.
 

-# Copyright (C) 2003, 2004, 2005 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
 
 # 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


@@ -52,14 +52,14 @@ usage() {
  --no-po                      Do not download po files.
  --update-po[=LANG]           Update po file(s) and exit.
 
  --no-po                      Do not download po files.
  --update-po[=LANG]           Update po file(s) and exit.
 

-If the file `.bootstrap' exists in the current working directory, its
+If the file \`.bootstrap' exists in the current working directory, its

 contents is read, comments and empty lines removed, shell variables expanded
 and the result is prepended to the command line options.
 
 Running without arguments will suffice in most cases. It is equivalent
 to
 
 contents is read, comments and empty lines removed, shell variables expanded
 and the result is prepended to the command line options.
 
 Running without arguments will suffice in most cases. It is equivalent
 to
 

-    ./bootstrap --cvs-auth=ext --cvs-user=anoncvs
+    ./bootstrap --cvs-auth=pserver

 
 EOF
 }
 
 EOF
 }


@@ -71,12 +71,18 @@ update_po() {
     *)     POFILE=${1}.po;;
     esac
     echo "$0: getting translation for $1..."
     *)     POFILE=${1}.po;;
     esac
     echo "$0: getting translation for $1..."

-    wget -r -C off $TP_URL/$POFILE
+    (cd po;
+     wget -r --cache=off -O $POFILE $TP_URL/$POFILE || exit
+     LANG=`expr $POFILE : '\(.*\)\.po'`
+     if ! grep -q $LANG LINGUAS; then
+       mv LINGUAS LINGUAS.$$
+       (echo $LANG; cat LINGUAS.$$) | sort > LINGUAS
+     fi)

   else
     echo "$0: getting translations into po..."
     (cd po &&
      rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'` &&
   else
     echo "$0: getting translations into po..."
     (cd po &&
      rm -f dummy `ls | sed -n '/\.gmo$/p; /\.po/p'` &&

-      wget -nv -nd -r -l 1 -A .po -C off $TP_URL &&
+      wget -nv -nd -r -l 1 -A .po --cache off $TP_URL &&

       rm -f index.html index.html.[0-9]*
       ls *.po | sed 's/\.po$//' >LINGUAS
     ) || exit
       rm -f index.html index.html.[0-9]*
       ls *.po | sed 's/\.po$//' >LINGUAS
     ) || exit


@@ -150,10 +156,8 @@ checkout() {
     trap exit 1 2 13 15
     trap 'rm -fr $1; exit 1' 0
 
     trap exit 1 2 13 15
     trap 'rm -fr $1; exit 1' 0
 

-    case "${CVS_AUTH--}" in
-    -)       build_cvs_prefix ext anoncvs
-             ;;
-    pserver) build_cvs_prefix $CVS_AUTH ${CVS_USER:-anoncvs}
+    case "${CVS_AUTH-pserver}" in
+    pserver) build_cvs_prefix pserver ${CVS_USER:-anonymous}

              ;;
     gserver|server)
             build_cvs_prefix $CVS_AUTH ${CVS_USER--}
              ;;
     gserver|server)
             build_cvs_prefix $CVS_AUTH ${CVS_USER--}


@@ -163,10 +167,7 @@ checkout() {
     *)       echo "$0: Unknown CVS access method" >&2
             exit 1;;
     esac
     *)       echo "$0: Unknown CVS access method" >&2
             exit 1;;
     esac

-    if [ "${CVS_AUTH--}" = "pserver" ]; then
-      cvs -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 login || exit
-    fi
-    cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 co $1 || exit
+    cvs -q -d ${CVS_PREFIX}cvs.sv.gnu.org:/cvsroot/$1 co $1 || exit

 
     trap - 0
   fi
 
     trap - 0
   fi


@@ -203,11 +204,11 @@ copy_files() {
     esac
     dst=`echo $file | sed 's^.*/^^'`
     if [ $# -eq 3 ]; then
     esac
     dst=`echo $file | sed 's^.*/^^'`
     if [ $# -eq 3 ]; then

-      case $dst in  
+      case $dst in

       ${3}*) ;;
       *) dst=${3}$dst;;
       esac
       ${3}*) ;;
       *) dst=${3}$dst;;
       esac

-    fi  
+    fi

     echo "$0: Copying file $1/$file to $2/$dst"
     cp -p $1/$file $2/$dst
   done
     echo "$0: Copying file $1/$file to $2/$dst"
     cp -p $1/$file $2/$dst
   done


@@ -242,6 +243,7 @@ case ${GNULIB_SRCDIR--} in
 esac
 
 <$GNULIB_SRCDIR/gnulib-tool || exit
 esac
 
 <$GNULIB_SRCDIR/gnulib-tool || exit

+gnulib_tool="$GNULIB_SRCDIR/gnulib-tool --assume-autoconf=latest-stable"

 
 get_modules gnulib.modules
 
 
 get_modules gnulib.modules
 


@@ -252,14 +254,14 @@ while [ "$gnulib_modules" != "$previous_gnulib_modules" ]; do
   gnulib_modules=`
     (echo "$gnulib_modules"
      for gnulib_module in $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
      done) | sort -u
   `
 done
 
 gnulib_files=`
   (for gnulib_module in $gnulib_modules; do

-     $GNULIB_SRCDIR/gnulib-tool --extract-filelist $gnulib_module
+     $gnulib_tool --extract-filelist $gnulib_module

    done) | sort -u
 `
 
    done) | sort -u
 `
 


@@ -295,17 +297,17 @@ echo "$0: Creating m4/gnulib.m4"
  echo "AC_DEFUN([tar_GNULIB],["
  for gnulib_module in $gnulib_modules; do
     echo "# $gnulib_module"
  echo "AC_DEFUN([tar_GNULIB],["
  for gnulib_module in $gnulib_modules; do
     echo "# $gnulib_module"

-    $GNULIB_SRCDIR/gnulib-tool --extract-autoconf-snippet $gnulib_module
+    $gnulib_tool --extract-autoconf-snippet $gnulib_module

  done | sed '/AM_GNU_GETTEXT/d'
  echo "])") > ./m4/gnulib.m4
 
 echo "$0: Creating lib/Makefile.am"
  done | sed '/AM_GNU_GETTEXT/d'
  echo "])") > ./m4/gnulib.m4
 
 echo "$0: Creating lib/Makefile.am"

-(echo "# This file is generated automatically from lib/Makefile.am. Do not edit!"
+(echo "# This file is generated automatically. Do not edit!"

  cat lib/Makefile.tmpl
 
  for gnulib_module in $gnulib_modules; do
     echo "# $gnulib_module"
  cat lib/Makefile.tmpl
 
  for gnulib_module in $gnulib_modules; do
     echo "# $gnulib_module"

-    $GNULIB_SRCDIR/gnulib-tool --extract-automake-snippet $gnulib_module
+    $gnulib_tool --extract-automake-snippet $gnulib_module

  done | sed 's/lib_SOURCES/libtar_a_SOURCES/g' ) > lib/Makefile.am
 
 # Get translations.
  done | sed 's/lib_SOURCES/libtar_a_SOURCES/g' ) > lib/Makefile.am
 
 # Get translations.