diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-10-26 16:28:00 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-10-26 16:28:00 +0000 |
commit | 178d3290792a55fd96d6ba5d36f94a97ee2f5fb1 (patch) | |
tree | 34189f294cb37a35c7d46a54b7c4c53911f27f04 | |
parent | 75e0007dca3fad8080c26b55ea5f125fe9179a77 (diff) | |
download | wyslij-po-178d3290792a55fd96d6ba5d36f94a97ee2f5fb1.tar.gz wyslij-po-178d3290792a55fd96d6ba5d36f94a97ee2f5fb1.tar.bz2 |
* bootstrap: Use Git to clone gnulib sources. Fallback to
CVS if it fails.
* README-hacking: Reflect this.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | README-hacking | 3 | ||||
-rwxr-xr-x | bootstrap | 27 |
3 files changed, 16 insertions, 20 deletions
@@ -1,3 +1,9 @@ +2007-10-26 Sergey Poznyakoff <gray@gnu.org.ua> + + * bootstrap: Use Git to clone gnulib sources. Fallback to + CVS if it fails. + * README-hacking: Reflect this. + 2007-10-24 Sergey Poznyakoff <gray@gnu.org.ua> * configure.ac: Take into account mailutils version. diff --git a/README-hacking b/README-hacking index 1c0c4ac..18b1f90 100644 --- a/README-hacking +++ b/README-hacking @@ -12,7 +12,8 @@ sure that you have the latest stable version. - Gnulib <http://www.gnu.org/software/gnulib/> - M4 <http://www.gnu.org/software/m4/> - Texinfo <http://www.gnu.org/software/texinfo> -- Wget <http://www.gnu.org/software/wget/> +- Wget <http://www.gnu.org/software/wget> +- Git <http://git.or.cz> or CVS <http://www.nongnu.org/cvs> * Bootstrapping @@ -49,8 +49,6 @@ Options: --force Attempt to bootstrap even if the sources seem not to have been checked out. --skip-po Do not download po files. - --cvs-user=USERNAME Set the username to use when checking out - sources from the gnulib repository. If the file bootstrap.conf exists in the current working directory, its contents are read as shell variables to configure the bootstrap. @@ -146,8 +144,6 @@ do exit;; --gnulib-srcdir=*) GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;; - --cvs-user=*) - CVS_USER=`expr "$option" : '--cvs-user=\(.*\)'`;; --skip-po) SKIP_PO=t;; --force) @@ -206,28 +202,21 @@ cleanup_gnulib() { # Get gnulib files. +cvsco() { + echo "$0: git clone failed, trying cvs..." >&2 + cvs -d :pserver:anonymous@pserver.git.sv.gnu.org:/gnulib.git co \ + -d gnulib HEAD +} + case ${GNULIB_SRCDIR--} in -) if [ ! -d gnulib ]; then echo "$0: getting gnulib files..." - case ${CVS_AUTH-pserver} in - pserver) - CVS_PREFIX=':pserver:anonymous@';; - ssh) - CVS_PREFIX="$CVS_USER${CVS_USER+@}";; - *) - echo "$0: $CVS_AUTH: Unknown CVS access method" >&2 - exit 1;; - esac - - case $CVS_RSH in - '') CVS_RSH=ssh; export CVS_RSH;; - esac - trap cleanup_gnulib 1 2 13 15 - cvs -z3 -q -d ${CVS_PREFIX}cvs.savannah.gnu.org:/cvsroot/gnulib co gnulib || + git clone --depth 1 git://git.sv.gnu.org/gnulib || + cvsco || cleanup_gnulib trap - 1 2 13 15 |