Skip to content

Commit

Permalink
Merge pull request #442 from mcmasterg/vivado_check
Browse files Browse the repository at this point in the history
vivado: assert expected version
  • Loading branch information
JohnDMcMaster authored Jan 6, 2019
2 parents dd26fac + d7efa3b commit 0eed449
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
11 changes: 11 additions & 0 deletions utils/environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,14 @@ export XRAY_BLOCKWIDTH="python3 ${XRAY_UTILS_DIR}/blockwidth.py"
export XRAY_PARSEDB="python3 ${XRAY_UTILS_DIR}/parsedb.py"
export XRAY_TCL_REFORMAT="${XRAY_UTILS_DIR}/tcl-reformat.sh"
export XRAY_VIVADO="${XRAY_UTILS_DIR}/vivado.sh"

# Verify an approved version is in use
export XRAY_VIVADO_SETTINGS="${XRAY_VIVADO_SETTINGS:-/opt/Xilinx/Vivado/2017.2/settings64.sh}"
# Vivado v2017.2 (64-bit)
if [ $(${XRAY_VIVADO} -h |grep Vivado |cut -d\ -f 2) != "v2017.2" ] ; then
echo "Requires Vivado 2017.2. See https://github.com/SymbiFlow/prjxray/issues/14"
# Can't exit since sourced script
# Trash a key environment variable to preclude use
export XRAY_DIR="/bad/vivado/version"
return
fi
2 changes: 1 addition & 1 deletion utils/vivado.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash

source "${XRAY_VIVADO_SETTINGS:-/opt/Xilinx/Vivado/2017.2/settings64.sh}"
source "${XRAY_VIVADO_SETTINGS}"

vivado "$@"

0 comments on commit 0eed449

Please sign in to comment.