Changes in tools/xcw/bin/helenos-bld-config [b501de7:d548fc0] in mainline

File:

• tools/xcw/bin/helenos-bld-config (modified) (2 diffs)

tools/xcw/bin/helenos-bld-config

@@ -1 +1 @@
 #!/bin/bash
 #
-# Copyright (c) 2018 Jiri Svoboda
+# Copyright (c) 2019 Jiri Svoboda
 # All rights reserved.
 #
@@ -32 +32 @@
 #
 
-SRC_ROOT="$(dirname "$0")/../../.."
+XCW="$(dirname "$0")"
+BUILD_ROOT="$(dirname "$(dirname "$(dirname "$XCW")")")"
 if [ -z "$EXPORT_DIR" ]; then
-        EXPORT_DIR="$SRC_ROOT/uspace/export"
+        EXPORT_DIR="$BUILD_ROOT/export"
 fi
-MAKEFILE_COMMON="$EXPORT_DIR"/Makefile.common
-MAKEFILE_CONFIG="$EXPORT_DIR"/Makefile.config
-CONFIG_MK="$EXPORT_DIR"/config.mk
 
-# Extract simple 'name = value' variable definition from Makefile
-function extract_field
-{
-        field_name="$1"
-        file_name="$2"
+HELENOS_EXPORT_ROOT="$EXPORT_DIR"
 
-        sed -n "s/^$field_name \\{0,1\\}= \\{0,1\\}\\(.*\\)$/\\1/p" "$file_name" | \
-            sed "s/^\"//" | sed "s/\"$//"
-}
+source "${EXPORT_DIR}/config.sh"
 
 case ".$1" in
-(.--cc) extract_field "CC" "$MAKEFILE_COMMON";;
-(.--ld) extract_field "LD" "$MAKEFILE_COMMON";;
-(.--uarch) extract_field "UARCH" "$MAKEFILE_CONFIG";;
-(.--endian)
-        UARCH=`extract_field "UARCH" "$MAKEFILE_CONFIG"`
-        ENDIAN=`extract_field "ENDIANESS" "$SRC_ROOT/uspace/lib/c/arch/$UARCH/Makefile.common"`
-        echo "__${ENDIAN}__"
-        ;;
-*.--cflags) extract_field "HELENOS_CFLAGS" "$CONFIG_MK";;
-*.--ldflags) extract_field "HELENOS_LDFLAGS" "$CONFIG_MK";;
-*.--install-dir) echo "$(realpath "$SRC_ROOT/uspace/overlay")";;
+*.--install-dir) echo "$HELENOS_OVERLAY_PATH";;
 (*)
         echo "Unknown option $1" >&2
         echo "Usage: helenos-bld-config <option>" >&2
-        echo "        --cc" >&2
-        echo "        --ld" >&2
-        echo "        --uarch" >&2
-        echo "        --endian" >&2
-        echo "        --cflags" >&2
-        echo "        --ldflags" >&2
-        echo "        --install-dir" >&2
+        echo "        --install-dir Print directory where files should be installed" >&2
         exit 1;;
 esac