[gentoo-commits] gentoo-alt r1653 - trunk/toolchain-prefix-wrapper

[gentoo-commits] gentoo-alt r1653 - trunk/toolchain-prefix-wrapper

[Michael Haubenwallner (haubi)]

Author: haubi
Date: 2009-07-01 20:25:32 +0000 (Wed, 01 Jul 2009)
New Revision: 1653

Modified:
   trunk/toolchain-prefix-wrapper/bootstrap
Log:
added support for bootstrapping with subversion-1.6 client.


Modified: trunk/toolchain-prefix-wrapper/bootstrap
===================================================================
--- trunk/toolchain-prefix-wrapper/bootstrap	2009-07-01 20:14:40 UTC (rev 1652)
+++ trunk/toolchain-prefix-wrapper/bootstrap	2009-07-01 20:25:32 UTC (rev 1653)
@@ -23,13 +23,19 @@
 if [ "x${mainversion}" != x ]; then
 	# configure.ac indicates to define the package-version automagically
 	if [ "x${versioning_done}" != xyes ] && [ -d .svn ] ; then
+		svnversion=`svn --version 2>/dev/null | head -n 1`
+		case ${svnversion} in
+		*" version 1."[6-6]"."*) revisionrange="20-27" ;;
+		*" version 1."[0-5]"."*) revisionrange="19-26" ;;
+		*) echo "don't know how to work with ${svnversion}" >&2; exit 1 ;;
+	   esac
 		# we are in an svn sandbox:
 		# then we need to determine the version out of svn keyword 'HeadURL'.
 		case "${svnurl}" in
 		*'/trunk/'*)
 			# is snapshot from trunk:
 			# version is mainversion + '.' + [last-committed] svn revision
-			svn status -v | cut -c19-26 | sort -rn | { read v ; echo "${mainversion}.${v}" ;} > version
+			svn status -v | cut -c${revisionrange} | sort -rn | { read v ; echo "${mainversion}.${v}" ;} > version
 			versioning_done=yes
 			;;
 		*'/branches/'*)
@@ -37,7 +43,7 @@
 			# version is branch-number + '.' + [last-committed] svn revision
 			(	echo -n "${svnurl}" \
 				| sed -e "s,-branch/bootstrap \\\$,,; s,.*/,," -e "s,^.*-,,"
-				svn status -v | cut -c19-26 | sort -rn | { read v ; echo ".${v}" ;}
+				svn status -v | cut -c${revisionrange} | sort -rn | { read v ; echo ".${v}" ;}
 			) > version
 			versioning_done=yes
 			;;