Changes in tools/toolchain.sh [40c0483:c7c3508] in mainline

File:

• tools/toolchain.sh (modified) (10 diffs)

tools/toolchain.sh

@@ -1 @@
-#!/bin/sh
+#! /bin/bash
 
 #
@@ -103 +103 @@
         echo
         
-        if [ -z "$1" ] || [ "$1" = "all" ] ; then
-                PLATFORMS='amd64 arm32 arm64 ia32 ia64 mips32 mips32eb ppc32 riscv64 sparc64'
+        if [ -z "$1" ] || [ "$1" == "all" ] ; then
+                PLATFORMS=("amd64" "arm32" "arm64" "ia32" "ia64" "mips32" "mips32eb" "ppc32" "riscv64" "sparc64")
         else
-                PLATFORMS="$1"
+                PLATFORMS=("$1")
         fi
         
@@ -114 +114 @@
         fi
 
-        for i in $PLATFORMS
+        for i in "${PLATFORMS[@]}"
         do
                 PLATFORM="$i"
@@ -121 +121 @@
 
                 echo "== $PLATFORM =="
-                test_app_version "Binutils" "ld" "GNU ld (.*) \([.0-9]*\)" "$BINUTILS_VERSION"
-                test_app_version "GCC" "gcc" "gcc version \([.0-9]*\)" "$GCC_VERSION"
-                test_app_version "GDB" "gdb" "GNU gdb (.*)[[:space:]]\+\([.0-9]*\)" "$GDB_VERSION"
+                test_app_version "Binutils" "ld" "GNU\ ld\ \(GNU\ Binutils\)\ ((\.|[0-9])+)" "$BINUTILS_VERSION"
+                test_app_version "GCC" "gcc" "gcc\ version\ ((\.|[0-9])+)" "$GCC_VERSION"
+                test_app_version "GDB" "gdb" "GNU\ gdb\ \(GDB\)\s+((\.|[0-9])+)" "$GDB_VERSION"
         done
 
@@ -140 +140 @@
                 echo "- $PKGNAME is missing"
         else
-                VERSION=`${APP} -v 2>&1 | sed -n "s:^${REGEX}.*:\1:p"`
-
-                if [ -z "$VERSION" ]; then
-                        echo "- $PKGNAME Unexpected output"
-                        return 1
-                fi
-
-                if [ "$INS_VERSION" = "$VERSION" ]; then
-                        echo "+ $PKGNAME is uptodate ($INS_VERSION)"
-                else
-                        echo "- $PKGNAME ($VERSION) is outdated ($INS_VERSION)"
-                fi
+                {
+                        OUT=$(${APP} -v 2>&1)
+                } &> /dev/null
+
+                if [[ "$OUT" =~ $REGEX ]]; then
+                VERSION="${BASH_REMATCH[1]}"
+                if [ "$INS_VERSION" = "$VERSION" ]; then
+                        echo "+ $PKGNAME is uptodate ($INS_VERSION)"
+                else
+                        echo "- $PKGNAME ($VERSION) is outdated ($INS_VERSION)"
+                fi
+            else
+                echo "- $PKGNAME Unexpected output"
+            fi
         fi
 }
@@ -158 +160 @@
 
 change_title() {
-        printf "\e]0;$1\a"
+        echo -en "\e]0;$1\a"
 }
 
@@ -169 +171 @@
         fi
 
-        printf "${TM} "
+        echo -n "${TM} "
         change_title "${TM}"
         sleep 1
@@ -220 +222 @@
         OUTSIDE="$1"
         BASE="$2"
-        ORIGINAL="$PWD"
+        ORIGINAL="`pwd`"
+
+        mkdir -p "${OUTSIDE}"
+
+        cd "${OUTSIDE}"
+        check_error $? "Unable to change directory to ${OUTSIDE}."
+        ABS_OUTSIDE="`pwd`"
 
         cd "${BASE}"
         check_error $? "Unable to change directory to ${BASE}."
-        ABS_BASE="$PWD"
+        ABS_BASE="`pwd`"
+
         cd "${ORIGINAL}"
         check_error $? "Unable to change directory to ${ORIGINAL}."
 
-        mkdir -p "${OUTSIDE}"
-        cd "${OUTSIDE}"
-        check_error $? "Unable to change directory to ${OUTSIDE}."
-
-        while [ "${#PWD}" -gt "${#ABS_BASE}" ]; do
-                cd ..
-        done
-
-        if [ "$PWD" = "$ABS_BASE" ]; then
+        BASE_LEN="${#ABS_BASE}"
+        OUTSIDE_TRIM="${ABS_OUTSIDE:0:${BASE_LEN}}"
+
+        if [ "${OUTSIDE_TRIM}" == "${ABS_BASE}" ] ; then
                 echo
                 echo "CROSS_PREFIX cannot reside within the working directory."
@@ -242 +246 @@
                 exit 5
         fi
-
-        cd "${ORIGINAL}"
-        check_error $? "Unable to change directory to ${ORIGINAL}."
 }
 
@@ -344 +345 @@
                 mkdir -p "${WORKDIR}/sysroot/include"
                 mkdir "${WORKDIR}/sysroot/lib"
-                ARCH="$PLATFORM"
-                if [ "$ARCH" = "mips32eb" ]; then
-                        ARCH=mips32
-                fi
-
                 cp -r -L -t "${WORKDIR}/sysroot/include" \
                         ${SRCDIR}/../abi/include/* \
-                        ${SRCDIR}/../uspace/lib/c/arch/${ARCH}/include/* \
+                        ${SRCDIR}/../uspace/lib/c/arch/${PLATFORM}/include/* \
                         ${SRCDIR}/../uspace/lib/c/include/*
                 check_error $? "Failed to create build sysroot."