Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed header includes to work for dynamic files
  • Loading branch information
ncimino committed Jul 29, 2015
commit b4cb9e08a42b0855e5bee659d36b8de162a43f32
2 changes: 1 addition & 1 deletion tclapp/xilinx/xsim/app.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<catalog>
<apps>
<app>
<revision_history>do not filter txt file type</revision_history>
<revision_history>fixed header includes to work for dynamic files</revision_history>
<name>xsim</name>
<pkg_require>Vivado 2014.1</pkg_require>
<company>xilinx</company>
Expand Down
10 changes: 9 additions & 1 deletion tclapp/xilinx/xsim/helpers.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -1679,7 +1679,15 @@ proc usf_add_unique_incl_paths { fs_obj unique_paths_arg incl_header_paths_arg }
}
#set file [extract_files -files [list "$file"] -base_dir $dir/ip_files]
if { [get_param project.enableCentralSimRepo] } {
set file [usf_fetch_ip_static_file $file]
set used_in [get_property USED_IN $file]
if { [lsearch $used_in "ipstatic"] != -1 } {
# static
set file [usf_fetch_ip_static_file $file]
} else {
# dynamic
set parent_ip [get_property PARENT_COMPOSITE_FILE $file]
set file [file join $dir [usf_get_ip_file_from_repo $parent_ip $file $dir]]
}
}
set file_path [file normalize [string map {\\ /} [file dirname $file]]]
if { [lsearch -exact $unique_paths $file_path] == -1 } {
Expand Down
2 changes: 1 addition & 1 deletion tclapp/xilinx/xsim/pkgIndex.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
# script is sourced, the variable $dir must contain the
# full path name of this file's directory.

package ifneeded ::tclapp::xilinx::xsim 2.40 [list source [file join $dir xsim.tcl]]
package ifneeded ::tclapp::xilinx::xsim 2.41 [list source [file join $dir xsim.tcl]]
2 changes: 1 addition & 1 deletion tclapp/xilinx/xsim/xsim.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ namespace eval ::tclapp::xilinx::xsim {
lappend ::auto_path $home
}
}
package provide ::tclapp::xilinx::xsim 2.40
package provide ::tclapp::xilinx::xsim 2.41