From feaaf09417c90db4a2f8258bc375ff6fb11e6695 Mon Sep 17 00:00:00 2001 From: Ricardo Barbedo Date: Wed, 4 Jul 2018 18:59:40 +0200 Subject: [PATCH] Align write_project_tcl_git with Vivado 2018.2 --- README.md | 2 +- scripts/write_project_tcl_git.tcl | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 6e0c38f..9d122dc 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Trying to make Vivado more git-friendly. ### Requirements -- Tested on Vivado 2018.1 +- Tested on Vivado 2018.2 #### Windows - [Git for Windows](https://git-scm.com/download/win) diff --git a/scripts/write_project_tcl_git.tcl b/scripts/write_project_tcl_git.tcl index 12027ff..eb1f68f 100644 --- a/scripts/write_project_tcl_git.tcl +++ b/scripts/write_project_tcl_git.tcl @@ -368,7 +368,7 @@ proc write_project_tcl_script {} { path that was specified with this switch. The 'origin_dir' variable is set to '$a_global_vars(s_origin_dir_override)' in the generated script." } } else { - send_msg_id Vivado-projutils-015 INFO "The file path for the project source files were set relative to the location of the generated script.\n" + send_msg_id Vivado-projutils-015 INFO "The file paths for the project source files were set relative to the location of the generated script.\n" } } @@ -2558,11 +2558,14 @@ proc wr_reconfigModules { proj_dir proj_name } { # write reconfigurations modules set reconfigModules [get_reconfig_modules] + variable a_global_vars foreach rm $reconfigModules { - set rm_bds [get_files -quiet -of_objects [get_reconfig_modules $rm] *.bd] - foreach rm_bd $rm_bds { - write_bd_as_proc $rm_bd + if { !$a_global_vars(b_arg_use_bd_files) } { + set rm_bds [get_files -norecurse -quiet -of_objects [get_reconfig_modules $rm] *.bd] + foreach rm_bd $rm_bds { + write_bd_as_proc $rm_bd + } } write_specified_reconfig_module $proj_dir $proj_name $rm