From c093dca1c036349c8a7a511ada4c5b3379e7c282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Mon, 16 Apr 2007 11:14:24 +0000 Subject: [PATCH] switch to svn git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20357 ec53bebd-3082-4978-b11e-865c3cabbd6b --- tools/heimdal-build.sh | 46 +++++++++++------------------------------- 1 file changed, 12 insertions(+), 34 deletions(-) diff --git a/tools/heimdal-build.sh b/tools/heimdal-build.sh index 363919a88..90fc23fb0 100644 --- a/tools/heimdal-build.sh +++ b/tools/heimdal-build.sh @@ -21,7 +21,7 @@ PATH="${PATH}:/usr/local/bin:/usr/local/sbin" # no more user configurabled part below (hopefully) -usage="[--current] [--release version] [--cvs SourceRepository] [--cvs-flags] [--result-directory dir] [--fetch-method wget|ftp|curl|cvs|fetch|afs] --keep-tree] [--autotools] [--passhrase string] [--no-email] [--build-dir dir] [--cputime] [--distcheck] [--test-environment env] [--configure-flags flags]" +usage="[--current] [--svn SourceRepository] [--cvs-flags] [--result-directory dir] [--fetch-method wget|ftp|curl|cvs|fetch|afs] --keep-tree] [--autotools] [--passhrase string] [--no-email] [--build-dir dir] [--cputime] [--distcheck] [--test-environment env] [--configure-flags flags]" date=`date +%Y%m%d` if [ "$?" != 0 ]; then @@ -66,6 +66,10 @@ do hversion="heimdal-${date}" shift ;; + --release) + hversion="heimdal-$2" + shift 2 + ;; --cputime) cputimelimit="$2" shift 2 @@ -74,28 +78,10 @@ do ccachedir="$2" shift 2 ;; - --cvs) - hversion="heimdal-cvs-${date}" - cvsroot=$2 - fetchmethod=cvs - shift 2 - ;; - --cvs-flags) - cvsflags="$2" - shift 2 - ;; - --cvs-branch) - if [ "X$cvsroot" == "X" ] ; then - echo "option --cvs must be given before --cvs-branch" - exit 1 - fi - cvsbranch="-r $2" - branch="-$2" - hversion="$2-${date}" - shift 2 - ;; - --release) - hversion="heimdal-$2" + --svn) + hversion="heimdal-svn-${date}" + svnroot=$2 + fetchmethod=svn shift 2 ;; --distcheck) @@ -197,9 +183,8 @@ afs) cp ${afsfile} ${hfile} res=$? ;; -cvs) - cvs -Qq ${cvsflags} -d "${cvsroot}" \ - co -P ${cvsbranch} -d ${hversion} heimdal +svn) + svn co $svnroot ${hversion} res=$? unpack=no autotools=yes @@ -214,13 +199,6 @@ if [ "X$res" != X0 ]; then exit 1 fi -case "${hversion}" in - 0.7*) - #true for Mac OS X, but how about the rest? - confflags="${confflags} --enable-shared --disable-static" - ;; -esac - if [ X"$unpack" = Xyes ]; then echo Unpacking source (gzip -dc ${hfile} | tar xf -) || exit 1 @@ -228,7 +206,7 @@ fi if [ X"$autotools" = Xyes ]; then echo "Autotooling (via fix-export)" - env DATEDVERSION="cvs${branch}-${date}" ${hversion}/fix-export ${hversion} + env DATEDVERSION="svn${branch}-${date}" ${hversion}/fix-export ${hversion} fi if [ X"$ccachedir" != X ]; then