luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Export XRAY_* during environment setup 

Since some of the tools need to be found by make and other environments,
build the paths when database/<database>/settings.sh is sourced and
export them into the shell environment.

Signed-off-by: Rick Altherr <kc8apf@kc8apf.net>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
This commit is contained in:
Rick Altherr 2017-11-15 01:57:50 -05:00 committed by Tim 'mithro' Ansell
parent 4ffc0e20ab
commit 559eb4176a
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database/artix7/settings.sh
View File

@ -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"

17
utils/environment.sh
View File

@ -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"