Fix scripting project name overwrite for modem reference design

tfcollins · tfcollins · commit 36ee8aef25df · 2018-07-30T18:54:59.000-04:00
Signed-off-by: Travis Collins &lt;travis.collins@analog.com&gt;
diff --git a/hdl_wa_bsp/vendor/AnalogDevices/vivado/projects/scripts/adi_project.tcl b/hdl_wa_bsp/vendor/AnalogDevices/vivado/projects/scripts/adi_project.tcl
@@ -83,6 +83,7 @@ proc adi_project_xilinx {project_name project_dir update_tcl {mode 0}} {
   }
 
   #Added
+  set project_name_org $project_name
   set project_name vivado_prj
   
   set VIVADO_VERSION [version -short]
@@ -132,7 +133,7 @@ proc adi_project_xilinx {project_name project_dir update_tcl {mode 0}} {
   #Added
   create_bd_design "system"
   source $project_dir/system_bd.tcl
-  if {$project_name != "adrv9361z7035_ccbox_lvds_modem"} {
+  if {$project_name_org != "adrv9361z7035_ccbox_lvds_modem"} {
     source $project_dir/$update_tcl
   }
 

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ proc adi_project_xilinx {project_name project_dir update_tcl {mode 0}} {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`#Added`
	`86`	`+ set project_name_org $project_name`
`86`	`87`	`set project_name vivado_prj`
`87`	`88`
`88`	`89`	`set VIVADO_VERSION [version -short]`
`@@ -132,7 +133,7 @@ proc adi_project_xilinx {project_name project_dir update_tcl {mode 0}} {`
`132`	`133`	`#Added`
`133`	`134`	`create_bd_design "system"`
`134`	`135`	`source $project_dir/system_bd.tcl`
`135`		`- if {$project_name != "adrv9361z7035_ccbox_lvds_modem"} {`
	`136`	`+ if {$project_name_org != "adrv9361z7035_ccbox_lvds_modem"} {`
`136`	`137`	`source $project_dir/$update_tcl`
`137`	`138`	`}`
`138`	`139`