From c968733af4112c3e050609f87702f744b86b7c5a Mon Sep 17 00:00:00 2001
From: YannMagnin <yann.magnin@protonmail.com>
Date: Sun, 3 Dec 2023 11:21:48 +0100
Subject: [PATCH] vxOpenLibm - v1.0.0-dev2 : drop Vhex env support + fix
 verbose and prefix handling

*update*
> [scripts]
  | [_utils] drop Vhex env handling
  | [_utils] move TAG information here
  | [_utils] use common `VERBOSE` env var to check verbose mode
  | [install] drop Vhex env handling
  | [install] update help message
  | [install] abort operation if no sysroot prefix specified
  | [install] use common `VERBOSE` en var to enable verbose mode
  | [install] add steps information (buidl, config, install)

*fix*
> [scripts]
  | [install] fix default verbose value
  | [install] fix default prefix value
---
 scripts/_utils.sh  | 15 +++------------
 scripts/install.sh | 46 ++++++++++++++++++++++------------------------
 2 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/scripts/_utils.sh b/scripts/_utils.sh
index f47a663..3d1799b 100644
--- a/scripts/_utils.sh
+++ b/scripts/_utils.sh
@@ -14,9 +14,11 @@ export TOP_PID=$$
 # Public
 #---
 
+export TAG='<vxOpenLibm>'
+
 # abstract the verbose mode
 function callcmd() {
-  if [[ -v 'VHEX_VERBOSE' ]]
+  if [[ -v 'VERBOSE' ]]
     then
       echo "$@"
       if ! "$@"; then
@@ -33,14 +35,3 @@ function callcmd() {
     rm -f "$out"
   fi
 }
-
-# check env information
-function utils_get_env() {
-  if [ ! -v "$1" ]
-  then
-    echo 'error: are you sure to use the bootstrap script ?' >&2
-    echo " Missing $2 information, abord" >&2
-    kill -s TERM $TOP_PID
-  fi
-  echo "${!1/#\~/$HOME}"
-}
diff --git a/scripts/install.sh b/scripts/install.sh
index 0e297f7..1bcf80e 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -18,8 +18,7 @@ Options:
 
 Notes:
     This project is mainly automatically installed as a dependency of the
-  sh-elf-vhex (Vhex's compiler) project. So, the verbose option can also be
-  trigger using the env var VHEX_VERBOSE.
+  sh-elf-vhex (Vhex's compiler) project.
 EOF
   exit 0
 }
@@ -28,9 +27,9 @@ EOF
 # Parse arguments
 #---
 
-verbose=true
+verbose=false
 skip_input=false
-prefix='None'
+prefix=''
 for arg; do
   case "$arg" in
     -h | --help)                help;;
@@ -47,9 +46,11 @@ done
 # Preliminary check
 #---
 
-_src=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-cd "$_src" || exit 1
-source ./_utils.sh
+if test -z "$prefix"
+then
+  echo 'You need to specify the sysroot prefix, abord' >&2
+  exit 1
+fi
 
 if [[ ! $(sh-elf-vhex-gcc --version) ]]
 then
@@ -61,25 +62,21 @@ then
   exit 1
 fi
 
+_src=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+cd "$_src" || exit 1
+source ./_utils.sh
+
 if [[ -d '../openlibm' ]]
 then
   echo 'OpenLibm already exists, abord' >&2
   exit 1
 fi
 
-[[ "$verbose" == 'true' ]] && VHEX_VERBOSE='true'
-[[ "$prefix" != 'None' ]] && VHEX_PREFIX_SYSROOT="$prefix"
-export VHEX_VERBOSE
-export VHEX_PREFIX_SYSROOT
-
-SYSROOT=$(utils_get_env 'VHEX_PREFIX_SYSROOT' 'sysroot')
-VERBOSE=$(utils_get_env 'VHEX_VERBOSE' 'verbose')
-
 if [[ "$skip_input" != 'true' ]]
 then
   echo 'This script will compile and install the vxOpenLibm project'
-  echo "  - prefix  = $SYSROOT"
-  echo "  - verbose = $VERBOSE"
+  echo "  - prefix  = $prefix"
+  echo "  - verbose = $verbose"
   read -p 'Perform operations [Yn] ? ' -r valid
   if [[ "$valid" == 'n' ]]; then
     echo 'Operation aborted' >&2
@@ -87,14 +84,12 @@ then
   fi
 fi
 
+[[ "$verbose" == 'true' ]] && export VERBOSE=1
+
 #---
 # Build / install operations
 #---
 
-source ./_utils.sh
-
-TAG='<vxOpenLibm>'
-
 echo "$TAG clone openlibm..."
 callcmd \
   git clone https://github.com/JuliaMath/openlibm.git --depth 1 ../openlibm
@@ -102,13 +97,16 @@ callcmd \
 echo "$TAG patch openlibm sources..."
 cp -r ../patches/* ../openlibm
 
-echo "$TAG building..."
-callcmd cmake \
-  -DCMAKE_INSTALL_PREFIX="$SYSROOT" \
+echo "$TAG configure..."
+callcmd \
+  cmake \
+  -DCMAKE_INSTALL_PREFIX="$prefix" \
   -DCMAKE_TOOLCHAIN_FILE=../patches/toolchain.cmake \
   -B ../openlibm/_build-vhex/ \
   -S ../openlibm/
 
+echo "$TAG build..."
 callcmd cmake --build ../openlibm/_build-vhex/
 
+echo "$TAG install..."
 callcmd cmake --install ../openlibm/_build-vhex/