1 |
Author: haubi |
2 |
Date: 2009-07-01 20:25:32 +0000 (Wed, 01 Jul 2009) |
3 |
New Revision: 1653 |
4 |
|
5 |
Modified: |
6 |
trunk/toolchain-prefix-wrapper/bootstrap |
7 |
Log: |
8 |
added support for bootstrapping with subversion-1.6 client. |
9 |
|
10 |
|
11 |
Modified: trunk/toolchain-prefix-wrapper/bootstrap |
12 |
=================================================================== |
13 |
--- trunk/toolchain-prefix-wrapper/bootstrap 2009-07-01 20:14:40 UTC (rev 1652) |
14 |
+++ trunk/toolchain-prefix-wrapper/bootstrap 2009-07-01 20:25:32 UTC (rev 1653) |
15 |
@@ -23,13 +23,19 @@ |
16 |
if [ "x${mainversion}" != x ]; then |
17 |
# configure.ac indicates to define the package-version automagically |
18 |
if [ "x${versioning_done}" != xyes ] && [ -d .svn ] ; then |
19 |
+ svnversion=`svn --version 2>/dev/null | head -n 1` |
20 |
+ case ${svnversion} in |
21 |
+ *" version 1."[6-6]"."*) revisionrange="20-27" ;; |
22 |
+ *" version 1."[0-5]"."*) revisionrange="19-26" ;; |
23 |
+ *) echo "don't know how to work with ${svnversion}" >&2; exit 1 ;; |
24 |
+ esac |
25 |
# we are in an svn sandbox: |
26 |
# then we need to determine the version out of svn keyword 'HeadURL'. |
27 |
case "${svnurl}" in |
28 |
*'/trunk/'*) |
29 |
# is snapshot from trunk: |
30 |
# version is mainversion + '.' + [last-committed] svn revision |
31 |
- svn status -v | cut -c19-26 | sort -rn | { read v ; echo "${mainversion}.${v}" ;} > version |
32 |
+ svn status -v | cut -c${revisionrange} | sort -rn | { read v ; echo "${mainversion}.${v}" ;} > version |
33 |
versioning_done=yes |
34 |
;; |
35 |
*'/branches/'*) |
36 |
@@ -37,7 +43,7 @@ |
37 |
# version is branch-number + '.' + [last-committed] svn revision |
38 |
( echo -n "${svnurl}" \ |
39 |
| sed -e "s,-branch/bootstrap \\\$,,; s,.*/,," -e "s,^.*-,," |
40 |
- svn status -v | cut -c19-26 | sort -rn | { read v ; echo ".${v}" ;} |
41 |
+ svn status -v | cut -c${revisionrange} | sort -rn | { read v ; echo ".${v}" ;} |
42 |
) > version |
43 |
versioning_done=yes |
44 |
;; |