From d7efa3bc8104f64ba35c7f145bd903c693decc6e Mon Sep 17 00:00:00 2001 From: John McMaster Date: Sun, 6 Jan 2019 17:21:42 +0100 Subject: [PATCH] vivado: assert expected version Signed-off-by: John McMaster --- utils/environment.sh | 11 +++++++++++ utils/vivado.sh | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/utils/environment.sh b/utils/environment.sh index 6706ed57..eb6ee049 100644 --- a/utils/environment.sh +++ b/utils/environment.sh @@ -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 diff --git a/utils/vivado.sh b/utils/vivado.sh index 810314e3..beb09e0c 100755 --- a/utils/vivado.sh +++ b/utils/vivado.sh @@ -1,5 +1,5 @@ #!/bin/bash -source "${XRAY_VIVADO_SETTINGS:-/opt/Xilinx/Vivado/2017.2/settings64.sh}" +source "${XRAY_VIVADO_SETTINGS}" vivado "$@"