X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=inline;f=bootstrap;h=e45007503e052de757313fff3533cba00a5ff24e;hb=322114744f56ed23688077e33dc459efcf529f41;hp=e7c2edf3c1df72fdcdd93eb8bb4ab157f7854117;hpb=d81b5d6f1e7e72c34b2b8698dcb607a51a182311;p=chaz%2Ftar

diff --git a/bootstrap b/bootstrap
index e7c2edf..e450075 100755
--- a/bootstrap
+++ b/bootstrap
@@ -19,15 +19,25 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
-# Written by Paul Eggert.
+# Written by Paul Eggert and Sergey Poznyakoff.
 
 # URL of our text domain page in Translation Project
 TP_URL="http://www2.iro.umontreal.ca/~gnutra/po/maint/tar/"
 
+# Ensure file names are sorted consistently across platforms;
+# e.g., m4/ulonglong_gl.m4 should follow m4/ulonglong.m4.
+LC_ALL=C
+export LC_ALL
+
 usage() {
  cat <<EOF
- usage: $0 [--gnulib-srcdir=DIR][--cvs-auth=AUTH-METHOD][--cvs-user=USERNAME][--no-po]
+ usage: $0 [--gnulib-srcdir=DIR][--paxutils-srcdir=DIR][--cvs-auth=AUTH-METHOD][--cvs-user=USERNAME][--no-po]
  Options are:
+ --paxutils-srcdir=DIRNAME    Specify the local directory where paxutils
+                              sources reside. Use this if you already
+                              have paxutils sources on your machine, and
+                              do not want to waste your bandwidth dowloading
+                              them again.
  --gnulib-srcdir=DIRNAME      Specify the local directory where gnulib
                               sources reside. Use this if you already
                               have gnulib sources on your machine, and
@@ -40,7 +50,7 @@ usage() {
  --cvs-user=USERNAME          Set the CVS username to be used when accessing
                               the gnulib repository.
  --no-po                      Do not download po files.
- --update-po                  Update po files and exit.
+ --update-po[=LANG]           Update po file(s) and exit.
  
 Running without arguments will suffice in most cases. It is equivalent
 to
@@ -51,12 +61,21 @@ EOF
 }
 
 update_po() {
-  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 &&
-    ls *.po | sed 's/\.po$//' >LINGUAS
-  ) || exit
+  if [ $# = 1 ]; then
+    case $1 in
+    *.po)  POFILE=$1;;
+    *)     POFILE=${1}.po;;
+    esac	
+    echo "$0: getting translation for $1..."
+    wget -C off $TP_URL/$POFILE
+  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 &&
+      ls *.po | sed 's/\.po$//' >LINGUAS
+    ) || exit
+  fi
 }
 
 # Parse options.
@@ -70,12 +89,16 @@ do
     exit;;
   --gnulib-srcdir=*)
     GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;
+  --paxutils-srcdir=*)
+    PAXUTILS_SRCDIR=`expr "$option" : '--paxutils-srcdir=\(.*\)'`;;
   --cvs-auth=*)
     CVS_AUTH=`expr "$option" : '--cvs-auth=\(.*\)'`;;
   --cvs-user=*)
     CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;;
   --no-po)
     DOWNLOAD_PO=no;;
+  --update-po=*)
+    DOWNLOAD_PO=`expr "$option" : '--update-po=\(.*\)'`;;
   --update-po)
     DOWNLOAD_PO=only;;
   *)
@@ -84,10 +107,14 @@ do
   esac
 done
 
-if [ "$DOWNLOAD_PO" = "only" ]; then
-    update_po
-    exit 0
-fi	
+case $DOWNLOAD_PO in
+only)	update_po
+	exit 0
+	;;
+no|yes) ;;
+*)	update_po $DOWNLOAD_PO 
+	exit 0
+esac
 
 echo "$0: Bootstrapping CVS tar..."
 
@@ -104,33 +131,41 @@ build_cvs_prefix() {
   fi
 }
 
-# Get gnulib files.
-
-case ${GNULIB_SRCDIR--} in
--)
-  if [ ! -d gnulib ]; then
-    echo "$0: getting gnulib files..."
+# checkout package
+checkout() {
+  if [ ! -d $1 ]; then
+    echo "$0: getting $1 files..."
 
     trap exit 1 2 13 15
-    trap 'rm -fr gnulib; exit 1' 0
+    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};;
+    -)       build_cvs_prefix ext anoncvs
+             ;;
+    pserver) build_cvs_prefix $CVS_AUTH ${CVS_USER:-anoncvs}
+             ;;
     gserver|server)
-	     build_cvs_prefix $CVS_AUTH ${CVS_USER--};;
-    ext)     build_cvs_prefix $CVS_AUTH ${CVS_USER--};;
+	     build_cvs_prefix $CVS_AUTH ${CVS_USER--}
+	     ;;
+    ext)     build_cvs_prefix $CVS_AUTH ${CVS_USER--}
+             ;;
     *)       echo "$0: Unknown CVS access method" >&2
 	     exit 1;;
     esac
     if [ "${CVS_AUTH--}" = "pserver" ]; then
-      cvs -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib login || exit
+      cvs -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 login || exit
     fi
-    cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/gnulib co gnulib || exit
+    cvs -q -d ${CVS_PREFIX}subversions.gnu.org:/cvsroot/$1 co $1 || exit
 
     trap 0
   fi
-  GNULIB_SRCDIR=gnulib
+}
+
+# Get gnulib files.
+
+case ${GNULIB_SRCDIR--} in
+-) checkout gnulib
+   GNULIB_SRCDIR=gnulib
 esac
 
 <$GNULIB_SRCDIR/gnulib-tool || exit
@@ -156,6 +191,7 @@ gettime
 hash
 human
 lchown
+localcharset
 memset
 modechange
 obstack
@@ -173,6 +209,7 @@ timespec
 unlocked-io
 utime
 xalloc
+xalloc-die
 xgetcwd
 xstrtoumax
 '
@@ -209,10 +246,10 @@ for gnulib_file in $gnulib_files; do
   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/ulonglong.m4) dest=m4/ulonglong_gl.m4;;
-  m4/inttypes_h.m4) dest=m4/inttypes_h_gl.m4;;
-  m4/stdint_h.m4) dest=m4/stdint_h_gl.m4;;
-  m4/uintmax_t.m4) dest=m4/uintmax_t_gl.m4;;
+  m4/gettext.m4 | 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 &&
@@ -220,14 +257,6 @@ for gnulib_file in $gnulib_files; do
   cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit
 done
 
-if [ -d patches ]; then
-    echo "$0: Patching gnulib"
-    for file in patches/*.diff
-    do
-      patch -p0 < $file
-    done
-fi
-
 echo "$0: Creating m4/gnulib.m4"
 (echo "# This file is generated automatically. Please, do not edit."
  echo "#"
@@ -246,6 +275,38 @@ echo "$0: Creating lib/Makefile.am"
     $GNULIB_SRCDIR/gnulib-tool --extract-automake-snippet $gnulib_module
  done | sed 's/lib_SOURCES/libtar_a_SOURCES/g' ) > lib/Makefile.am
 
+# Get paxutils files 
+case ${PAXUTILS_SRCDIR--} in
+-) checkout paxutils
+   PAXUTILS_SRCDIR=paxutils
+esac
+
+# copy_files srcdir dstdir
+copy_files() {
+  for file in `cat $1/DISTFILES`
+  do
+    case $file in
+    "#*")  continue;;
+    esac
+    echo "$0: Copying file $1/$file" 
+    cp -p $1/$file $2/`expr $file : '.*/\(.*\)'`
+  done
+}
+
+copy_files ${PAXUTILS_SRCDIR}/m4 m4 
+
+if [ -d rmt ]; then
+   :
+else
+   mkdir rmt
+fi
+
+copy_files ${PAXUTILS_SRCDIR}/rmt rmt 
+
+copy_files ${PAXUTILS_SRCDIR}/lib lib
+
+copy_files ${PAXUTILS_SRCDIR}/tests tests
+
 # Get translations.
 if test "$DOWNLOAD_PO" = "yes"; then
   update_po