Skip to content

cr:947449 - add block fileset while checking for ip files to fix an issue with critical warning #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dbmccrohan merged 2 commits into from
Mar 18, 2016
Merged

cr:947449 - add block fileset while checking for ip files to fix an issue with critical warning #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58c6ce4
cr:947449 - add block fileset while checking for ip files to fix an i…
rajklair Mar 18, 2016
e4c8d93
- updated revision
rajklair Mar 18, 2016
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
2 changes: 1 addition & 1 deletion tclapp/xilinx/projutils/app.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<catalog>
<apps>
<app>
<revision_history>set absolute path for xpm files</revision_history>
<revision_history>add block fileset to check for ip files to fix a critical warning</revision_history>
<name>projutils</name>
<pkg_require>Vivado 2014.1</pkg_require>
<company>xilinx</company>
Expand Down
4 changes: 2 additions & 2 deletions tclapp/xilinx/projutils/export_ip_user_files.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,13 @@ proc xif_export_simulation { ip_file } {
set ip_user_files_dir [get_property ip.user_files_dir [current_project]]
if { [string length $ip_user_files_dir] > 0 } {
lappend opt_args "-ip_user_files_dir"
lappend opt_args "\"$ip_user_files_dir\""
lappend opt_args "$ip_user_files_dir"
}

set ipstatic_source_dir [get_property sim.ipstatic.source_dir [current_project]]
if { [string length $ipstatic_source_dir] > 0 } {
lappend opt_args -ipstatic_source_dir
lappend opt_args "\"$ipstatic_source_dir\""
lappend opt_args "$ipstatic_source_dir"
}
# TODO: speedup
eval export_simulation -of_objects [get_files -all -quiet $ip_file] -directory $a_vars(scripts_dir) -force $opt_args
Expand Down
11 changes: 7 additions & 4 deletions tclapp/xilinx/projutils/export_simulation.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5111,10 +5111,13 @@ proc xps_fileset_contain_ips {} {
# Argument Usage:
# Return Value:

set filter "FILE_TYPE == \"IP\" || FILE_TYPE == \"IPX\" || FILE_TYPE == \"DSP Design Sources\" || FILE_TYPE == \"Block Designs\""
set ip_files [get_files -quiet -all -of_objects [current_fileset] -filter $filter]
if { [llength $ip_files] > 0 } {
return true
set fs_filter "FILESET_TYPE == \"SimulationSrcs\" || FILESET_TYPE == \"DesignSrcs\" || FILESET_TYPE == \"BlockSrcs\""
set file_filter "FILE_TYPE == \"IP\" || FILE_TYPE == \"IPX\" || FILE_TYPE == \"DSP Design Sources\" || FILE_TYPE == \"Block Designs\""
foreach fs_obj [get_filesets -quiet -filter $fs_filter] {
set ip_files [get_files -quiet -all -of_objects $fs_obj -filter $file_filter]
if { [llength $ip_files] > 0 } {
return true
}
}
return false
}
Expand Down
2 changes: 1 addition & 1 deletion tclapp/xilinx/projutils/pkgIndex.tcl
View file
Open in desktop
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::projutils 3.152 [list source [file join $dir projutils.tcl]]
package ifneeded ::tclapp::xilinx::projutils 3.153 [list source [file join $dir projutils.tcl]]
2 changes: 1 addition & 1 deletion tclapp/xilinx/projutils/projutils.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ namespace eval ::tclapp::xilinx::projutils {
lappend ::auto_path $home
}
}
package provide ::tclapp::xilinx::projutils 3.152
package provide ::tclapp::xilinx::projutils 3.153
1 change: 1 addition & 0 deletions tclapp/xilinx/projutils/revision_history.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
3.153 add block fileset to check for ip files to fix a critical warning
3.152 set absolute path for xpm files
3.151 pass clibs directory while checking for compiled libraries
3.150 added deprecation message for single step help
Expand Down