From ecfa15bfced03a82723ec0f4dc8056858963446b Mon Sep 17 00:00:00 2001 From: Rejeesh Kutty Date: Fri, 12 May 2017 09:51:48 -0400 Subject: [PATCH] version check- change to critical warning --- library/scripts/adi_ip.tcl | 7 +++++-- projects/scripts/adi_project.tcl | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/library/scripts/adi_ip.tcl b/library/scripts/adi_ip.tcl index 7fd459fdf..16822a9bd 100644 --- a/library/scripts/adi_ip.tcl +++ b/library/scripts/adi_ip.tcl @@ -132,8 +132,11 @@ proc adi_ip_create {ip_name} { global REQUIRED_VIVADO_VERSION global IGNORE_VERSION_CHECK - if {!$IGNORE_VERSION_CHECK && [string compare [version -short] $REQUIRED_VIVADO_VERSION] != 0} { - return -code error [format "ERROR: This library requires Vivado %s." $REQUIRED_VIVADO_VERSION] + set VIVADO_VERSION [version -short] + if {[string compare $VIVADO_VERSION $REQUIRED_VIVADO_VERSION] != 0} { + puts -nonewline "CRITICAL WARNING: vivado version mismatch; " + puts -nonewline "expected $REQUIRED_VIVADO_VERSION, " + puts -nonewline "got $VIVADO_VERSION.\n" } create_project $ip_name . -force diff --git a/projects/scripts/adi_project.tcl b/projects/scripts/adi_project.tcl index 1a57d8db9..cd22bc2b4 100644 --- a/projects/scripts/adi_project.tcl +++ b/projects/scripts/adi_project.tcl @@ -82,8 +82,11 @@ proc adi_project_create {project_name {mode 0}} { set sys_zynq 2 } - if {!$IGNORE_VERSION_CHECK && [string compare [version -short] $REQUIRED_VIVADO_VERSION] != 0} { - return -code error [format "ERROR: This project requires Vivado %s." $REQUIRED_VIVADO_VERSION] + set VIVADO_VERSION [version -short] + if {[string compare $VIVADO_VERSION $REQUIRED_VIVADO_VERSION] != 0} { + puts -nonewline "CRITICAL WARNING: vivado version mismatch; " + puts -nonewline "expected $REQUIRED_VIVADO_VERSION, " + puts -nonewline "got $VIVADO_VERSION.\n" } if {$mode == 0} {