From e148a050624cac13721fc2bd0a80a73f66987f2c Mon Sep 17 00:00:00 2001
From: jtalbert <jtalbert@vdi-1005-60.iastate.edu>
Date: Thu, 27 Sep 2018 23:22:33 -0500
Subject: [PATCH] Corrected project-creation script

---
 quad/vivado_workspace/PWM_Combined_Tests.tcl | 28 ++++----------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/quad/vivado_workspace/PWM_Combined_Tests.tcl b/quad/vivado_workspace/PWM_Combined_Tests.tcl
index 5b2a5f2b1..af470fa34 100644
--- a/quad/vivado_workspace/PWM_Combined_Tests.tcl
+++ b/quad/vivado_workspace/PWM_Combined_Tests.tcl
@@ -162,24 +162,6 @@ update_ip_catalog -rebuild
 # Set 'sources_1' fileset object
 set obj [get_filesets sources_1]
 # Import local files from the original project
-set files [list \
- [file normalize "${origin_dir}/../../PWM_Combined_Tests/PWM_Combined_Tests.srcs/sources_1/bd/design_1/hdl/design_1_wrapper.vhd" ]\
-]
-set imported_files [import_files -fileset sources_1 $files]
-
-# Set 'sources_1' fileset file properties for remote files
-# None
-
-# Set 'sources_1' fileset file properties for local files
-set file "hdl/design_1_wrapper.vhd"
-set file_obj [get_files -of_objects [get_filesets sources_1] [list "*$file"]]
-set_property -name "file_type" -value "VHDL" -objects $file_obj
-
-
-# Set 'sources_1' fileset properties
-set obj [get_filesets sources_1]
-set_property -name "top" -value "design_1_wrapper" -objects $obj
-set_property -name "top_auto_set" -value "0" -objects $obj
 
 # Create 'constrs_1' fileset (if not found)
 if {[string equal [get_filesets -quiet constrs_1] ""]} {
@@ -190,11 +172,7 @@ if {[string equal [get_filesets -quiet constrs_1] ""]} {
 set obj [get_filesets constrs_1]
 
 # Add/Import constrs file and set constrs file properties
-set file "[file normalize "$origin_dir/../../PWM_Combined_Tests/src/constrs/Zybo-Z7-Master.xdc"]"
-set file_imported [import_files -fileset constrs_1 [list $file]]
-set file "constrs/Zybo-Z7-Master.xdc"
-set file_obj [get_files -of_objects [get_filesets constrs_1] [list "*$file"]]
-set_property -name "file_type" -value "XDC" -objects $file_obj
+add_files -fileset constrs_1 -norecurse ${origin_dir}/${_xil_proj_name_}/src/constrs/Zybo-Z7-Master.xdc
 
 # Set 'constrs_1' fileset properties
 set obj [get_filesets constrs_1]
@@ -1094,3 +1072,7 @@ set_property -name "steps.write_bitstream.args.verbose" -value "0" -objects $obj
 current_run -implementation [get_runs impl_1]
 
 puts "INFO: Project created:${_xil_proj_name_}"
+
+make_wrapper -files [get_files ${origin_dir}/${_xil_proj_name_}/${_xil_proj_name_}.srcs/sources_1/bd/design_1/design_1.bd] -top
+add_files -norecurse ${origin_dir}/${_xil_proj_name_}/${_xil_proj_name_}.srcs/sources_1/bd/design_1/hdl/design_1_wrapper.vhd
+
-- 
GitLab