From 559eb4176a76aa7d5a601b60093e90f3ba26f08a Mon Sep 17 00:00:00 2001 From: Rick Altherr Date: Wed, 15 Nov 2017 01:57:50 -0500 Subject: [PATCH] Export XRAY_* during environment setup Since some of the tools need to be found by make and other environments, build the paths when database//settings.sh is sourced and export them into the shell environment. Signed-off-by: Rick Altherr Signed-off-by: Tim 'mithro' Ansell --- database/artix7/settings.sh | 2 ++ utils/environment.sh | 17 +++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/database/artix7/settings.sh b/database/artix7/settings.sh index e0a153a5..d9dde9cd 100644 --- a/database/artix7/settings.sh +++ b/database/artix7/settings.sh @@ -1,3 +1,5 @@ +source $(dirname ${BASH_SOURCE[0]})/../../utils/environment.sh + export XRAY_DATABASE="artix7" export XRAY_PART="xc7a50tfgg484-1" export XRAY_ROI="SLICE_X12Y100:SLICE_X27Y149" diff --git a/utils/environment.sh b/utils/environment.sh index e6b3a0bc..c89225dc 100644 --- a/utils/environment.sh +++ b/utils/environment.sh @@ -4,13 +4,14 @@ while [ -h "$XRAY_ENV_PATH" ]; do # resolve $XRAY_ENV_PATH until the file is no XRAY_ENV_PATH="$(readlink "$XRAY_ENV_PATH")" [[ $XRAY_ENV_PATH != /* ]] && XRAY_ENV_PATH="$XRAY_UTILS_DIR/$XRAY_ENV_PATH" # if $XRAY_ENV_PATH was a relative symlink, we need to resolve it relative to the path where the symlink file was located done -XRAY_UTILS_DIR="$( cd -P "$( dirname "$XRAY_ENV_PATH" )" && pwd )" +export XRAY_UTILS_DIR="$( cd -P "$( dirname "$XRAY_ENV_PATH" )" && pwd )" -XRAY_DIR="$( dirname "$XRAY_UTILS_DIR" )" -XRAY_DATABASE_DIR="${XRAY_DIR}/database" -XRAY_TOOLS_DIR="${XRAY_DIR}/build/tools" +export XRAY_DIR="$( dirname "$XRAY_UTILS_DIR" )" +export XRAY_DATABASE_DIR="${XRAY_DIR}/database" +export XRAY_TOOLS_DIR="${XRAY_DIR}/build/tools" -XRAY_GENHEADER="${XRAY_UTILS_DIR}/genheader.sh" -XRAY_BITREAD="${XRAY_TOOLS_DIR}/bitread" -XRAY_SEGMATCH="${XRAY_TOOLS_DIR}/segmatch" -XRAY_SEGPRINT="python2 ${XRAY_UTILS_DIR}/segprint.py" +export XRAY_GENHEADER="${XRAY_UTILS_DIR}/genheader.sh" +export XRAY_BITREAD="${XRAY_TOOLS_DIR}/bitread" +export XRAY_MERGEDB="bash ${XRAY_UTILS_DIR}/mergedb.sh" +export XRAY_SEGMATCH="${XRAY_TOOLS_DIR}/segmatch" +export XRAY_SEGPRINT="python2 ${XRAY_UTILS_DIR}/segprint.py"