From c06117b767fb83d42a96c9b952bb6e47964e1e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20TH=C3=89BAUDEAU=22?=
 <benoit.thebaudeau@advansee.com>
Date: Tue, 31 May 2011 17:20:52 +0200
Subject: scripts/addToolVersion.sh: add a function to extract fields from
 versions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch adds a function to extract major, minor, revision, etc. from version
numbers.

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>

diff --git a/scripts/addToolVersion.sh b/scripts/addToolVersion.sh
index ffea750..e5f083d 100755
--- a/scripts/addToolVersion.sh
+++ b/scripts/addToolVersion.sh
@@ -46,6 +46,15 @@ doHelp() {
 		EOF
 }
 
+# Extract field $3 from version $1 with separator $2
+getVersionField() {
+    local version="$1"
+    local sep="$2"
+    local field="$3"
+
+    echo "${version}${sep}${sep}${sep}${sep}" |cut -d ${sep} -f ${field}
+}
+
 # Effectively add a version to the specified tool
 # $cat          : tool category
 # $tool         : tool name
@@ -100,8 +109,8 @@ addToolVersion() {
     case "${tool}" in
         gcc)
             # Extract 'M'ajor and 'm'inor from version string
-            ver_M=$(echo "${version}...." |cut -d . -f 1)
-            ver_m=$(echo "${version}...." |cut -d . -f 2)
+            ver_M=$(getVersionField "${version}" . 1)
+            ver_m=$(getVersionField "${version}" . 2)
             if [   \( ${ver_M} -eq 4 -a ${ver_m} -eq 6 \)  ]; then
                 SedExpr1="${SedExpr1}\n    select CC_GCC_4_6"
             elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 5 \)  ]; then
@@ -116,9 +125,9 @@ addToolVersion() {
             ;;
         uClibc)
             # uClibc-0.9.30 and above need some love
-            ver_M=$(echo "${version}...." |cut -d . -f 1)
-            ver_m=$(echo "${version}...." |cut -d . -f 2)
-            ver_p=$(echo "${version}...." |cut -d . -f 3)
+            ver_M=$(getVersionField "${version}" . 1)
+            ver_m=$(getVersionField "${version}" . 2)
+            ver_p=$(getVersionField "${version}" . 3)
             if [    ${ver_M} -ge 1                                      \
                  -o ${ver_M} -eq 0 -a ${ver_m} -ge 10                   \
                  -o ${ver_M} -eq 0 -a ${ver_m} -eq 9 -a ${ver_p} -ge 30 ]; then
@@ -127,7 +136,7 @@ addToolVersion() {
             ;;
         gdb)
             # gdb-7.0 and above have special handling
-            ver_M=$(echo "${version}...." |cut -d . -f 1)
+            ver_M=$(getVersionField "${version}" . 1)
             if [ ${ver_M} -ge 7 ]; then
                 SedExpr1="${SedExpr1}\n    select GDB_7_0_or_later"
             fi
-- 
cgit v0.10.2-6-g49f6