Xilinx · dpefour · Jul 30, 2015 · Jul 29, 2015 · Jul 29, 2015 · Jul 29, 2015
diff --git a/tclapp/xilinx/ies/app.xml b/tclapp/xilinx/ies/app.xml
@@ -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>ies</name>
       <pkg_require>Vivado 2014.1</pkg_require>
       <company>xilinx</company>

diff --git a/tclapp/xilinx/ies/helpers.tcl b/tclapp/xilinx/ies/helpers.tcl
@@ -570,7 +570,15 @@ proc usf_get_include_file_dirs { global_files_str { ref_dir "true" } } {
     #set vh_file [extract_files -files [list "$vh_file"] -base_dir $launch_dir/ip_files]
     set vh_file [usf_xtract_file $vh_file]
     if { [get_param project.enableCentralSimRepo] } {
-      set vh_file [usf_fetch_ip_static_file $vh_file]
+      set used_in [get_property USED_IN $vh_file]
+      if { [lsearch $used_in "ipstatic"] != -1 } {
+        # static
+        set vh_file [usf_fetch_ip_static_file $vh_file]
+      } else {
+        # dynamic
+        set parent_ip [get_property PARENT_COMPOSITE_FILE $vh_file]
+        set vh_file [file join $dir [usf_get_ip_file_from_repo $parent_ip $vh_file $dir]]
+      }
     }
     set dir [file normalize [file dirname $vh_file]]
     if { $a_sim_vars(b_absolute_path) } {

diff --git a/tclapp/xilinx/ies/ies.tcl b/tclapp/xilinx/ies/ies.tcl
@@ -9,4 +9,4 @@ namespace eval ::tclapp::xilinx::ies {
     lappend ::auto_path $home
   }
 }
-package provide ::tclapp::xilinx::ies 2.36
+package provide ::tclapp::xilinx::ies 2.37
diff --git a/tclapp/xilinx/ies/pkgIndex.tcl b/tclapp/xilinx/ies/pkgIndex.tcl
@@ -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::ies 2.36 [list source [file join $dir ies.tcl]]
+package ifneeded ::tclapp::xilinx::ies 2.37 [list source [file join $dir ies.tcl]]
diff --git a/tclapp/xilinx/modelsim/app.xml b/tclapp/xilinx/modelsim/app.xml
@@ -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>modelsim</name>
       <pkg_require>Vivado 2014.1</pkg_require>
       <company>xilinx</company>

diff --git a/tclapp/xilinx/modelsim/helpers.tcl b/tclapp/xilinx/modelsim/helpers.tcl
@@ -1794,7 +1794,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]
     set file [usf_xtract_file $file]
     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 } {

diff --git a/tclapp/xilinx/modelsim/modelsim.tcl b/tclapp/xilinx/modelsim/modelsim.tcl
@@ -9,4 +9,4 @@ namespace eval ::tclapp::xilinx::modelsim {
     lappend ::auto_path $home
   }
 }
-package provide ::tclapp::xilinx::modelsim 2.44
+package provide ::tclapp::xilinx::modelsim 2.45
diff --git a/tclapp/xilinx/modelsim/pkgIndex.tcl b/tclapp/xilinx/modelsim/pkgIndex.tcl
@@ -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::modelsim 2.44 [list source [file join $dir modelsim.tcl]]
+package ifneeded ::tclapp::xilinx::modelsim 2.45 [list source [file join $dir modelsim.tcl]]
diff --git a/tclapp/xilinx/projutils/app.xml b/tclapp/xilinx/projutils/app.xml
@@ -2,7 +2,7 @@
 <catalog>
   <apps>
     <app>
-      <revision_history>populate_sim_repo now exports stub files</revision_history>
+      <revision_history>fixed header includes to work for dynamic files</revision_history>
       <name>projutils</name>
       <pkg_require>Vivado 2014.1</pkg_require>
       <company>xilinx</company>

diff --git a/tclapp/xilinx/projutils/export_simulation.tcl b/tclapp/xilinx/projutils/export_simulation.tcl
@@ -5212,13 +5212,17 @@ proc xps_get_incl_files_from_ip { launch_dir tcl_obj } {
   set filter "FILE_TYPE == \"Verilog Header\""
   set vh_files [get_files -quiet -of_objects [get_files -quiet *$ip_name] -filter $filter]
   foreach file $vh_files {
-    if { $a_sim_vars(b_absolute_path) } {
-      set file "[xps_resolve_file_path $file $launch_dir]"
+    if { [get_param project.enableCentralSimRepo] } {
+      set file [file join $launch_dir [xps_get_ip_file_from_repo $tcl_obj $file $launch_dir]]
     } else {
-      if { $a_sim_vars(b_xport_src_files) } {
-        set file "\$ref_dir/incl"
+      if { $a_sim_vars(b_absolute_path) } {
+        set file "[xps_resolve_file_path $file $launch_dir]"
       } else {
-        set file "\$ref_dir/[xps_get_relative_file_path $file $launch_dir]"
+        if { $a_sim_vars(b_xport_src_files) } {
+          set file "\$ref_dir/incl"
+        } else {
+          set file "\$ref_dir/[xps_get_relative_file_path $file $launch_dir]"
+        }
       }
     }
     lappend incl_files $file
@@ -5299,8 +5303,7 @@ proc xps_get_verilog_incl_dirs { simulator launch_dir } {
   set incl_dir_str {}
 
   if { [xps_is_ip $tcl_obj] } {
-    set incl_dir_str [xps_get_incl_dirs_from_ip $launch_dir $tcl_obj]
-    set incl_dirs [split $incl_dir_str " "]
+    set incl_dirs [xps_get_incl_dirs_from_ip $launch_dir $tcl_obj]
   } else {
     set incl_dir_str [xps_resolve_incldir [get_property "INCLUDE_DIRS" [get_filesets $tcl_obj]]]
     set incl_dirs [split $incl_dir_str "#"]
@@ -5371,13 +5374,18 @@ proc xps_get_incl_dirs_from_ip { launch_dir tcl_obj } {
     # set file [extract_files -files [list "[file tail $file]"] -base_dir $launch_dir/ip_files]
     set file [xps_xtract_file $file]
     set dir [file dirname $file]
-    if { $a_sim_vars(b_absolute_path) } {
-      set dir "[xps_resolve_file_path $dir $launch_dir]"
+    if { [get_param project.enableCentralSimRepo] } {
+      set file [file join $launch_dir [xps_get_ip_file_from_repo $tcl_obj $file $launch_dir]]
+      set dir [file dirname $file]
     } else {
-      if { $a_sim_vars(b_xport_src_files) } {
-        set dir "\$ref_dir/incl"
+      if { $a_sim_vars(b_absolute_path) } {
+        set dir "[xps_resolve_file_path $dir $launch_dir]"
       } else {
-        set dir "\$ref_dir/[xps_get_relative_file_path $dir $launch_dir]"
+        if { $a_sim_vars(b_xport_src_files) } {
+          set dir "\$ref_dir/incl"
+        } else {
+          set dir "\$ref_dir/[xps_get_relative_file_path $dir $launch_dir]"
+        }
       }
     }
     lappend incl_dirs $dir

diff --git a/tclapp/xilinx/projutils/pkgIndex.tcl b/tclapp/xilinx/projutils/pkgIndex.tcl
@@ -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.47 [list source [file join $dir projutils.tcl]]
+package ifneeded ::tclapp::xilinx::projutils 3.48 [list source [file join $dir projutils.tcl]]
diff --git a/tclapp/xilinx/projutils/projutils.tcl b/tclapp/xilinx/projutils/projutils.tcl
@@ -9,4 +9,4 @@ namespace eval ::tclapp::xilinx::projutils {
     lappend ::auto_path $home
   }
 }
-package provide ::tclapp::xilinx::projutils 3.47
+package provide ::tclapp::xilinx::projutils 3.48
diff --git a/tclapp/xilinx/questa/app.xml b/tclapp/xilinx/questa/app.xml
@@ -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>questa</name>
       <pkg_require>Vivado 2014.1</pkg_require>
       <company>xilinx</company>

diff --git a/tclapp/xilinx/questa/helpers.tcl b/tclapp/xilinx/questa/helpers.tcl
@@ -1789,7 +1789,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]
     set file [usf_xtract_file $file]
     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 } {

diff --git a/tclapp/xilinx/questa/pkgIndex.tcl b/tclapp/xilinx/questa/pkgIndex.tcl
@@ -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::questa 1.34 [list source [file join $dir questa.tcl]]
+package ifneeded ::tclapp::xilinx::questa 1.35 [list source [file join $dir questa.tcl]]
diff --git a/tclapp/xilinx/questa/questa.tcl b/tclapp/xilinx/questa/questa.tcl
@@ -9,4 +9,4 @@ namespace eval ::tclapp::xilinx::questa {
     lappend ::auto_path $home
   }
 }
-package provide ::tclapp::xilinx::questa 1.34
+package provide ::tclapp::xilinx::questa 1.35
diff --git a/tclapp/xilinx/vcs/app.xml b/tclapp/xilinx/vcs/app.xml
@@ -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>vcs</name>
       <pkg_require>Vivado 2014.1</pkg_require>
       <company>xilinx</company>

diff --git a/tclapp/xilinx/vcs/helpers.tcl b/tclapp/xilinx/vcs/helpers.tcl
@@ -573,7 +573,15 @@ proc usf_get_include_file_dirs { global_files_str { ref_dir "true" } } {
     # set vh_file [extract_files -files [list "$vh_file"] -base_dir $launch_dir/ip_files]
     set vh_file [usf_xtract_file $vh_file]
     if { [get_param project.enableCentralSimRepo] } {
-      set vh_file [usf_fetch_ip_static_file $vh_file]
+      set used_in [get_property USED_IN $vh_file]
+      if { [lsearch $used_in "ipstatic"] != -1 } {
+        # static
+        set vh_file [usf_fetch_ip_static_file $vh_file]
+      } else {
+        # dynamic
+        set parent_ip [get_property PARENT_COMPOSITE_FILE $vh_file]
+        set vh_file [file join $dir [usf_get_ip_file_from_repo $parent_ip $vh_file $dir]]
+      }
     }
     set dir [file normalize [file dirname $vh_file]]
     if { $a_sim_vars(b_absolute_path) } {

diff --git a/tclapp/xilinx/vcs/pkgIndex.tcl b/tclapp/xilinx/vcs/pkgIndex.tcl
@@ -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::vcs 2.36 [list source [file join $dir vcs.tcl]]
+package ifneeded ::tclapp::xilinx::vcs 2.37 [list source [file join $dir vcs.tcl]]
diff --git a/tclapp/xilinx/vcs/vcs.tcl b/tclapp/xilinx/vcs/vcs.tcl
@@ -9,4 +9,4 @@ namespace eval ::tclapp::xilinx::vcs {
     lappend ::auto_path $home
   }
 }
-package provide ::tclapp::xilinx::vcs 2.36
+package provide ::tclapp::xilinx::vcs 2.37
diff --git a/tclapp/xilinx/xsim/app.xml b/tclapp/xilinx/xsim/app.xml
@@ -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>

diff --git a/tclapp/xilinx/xsim/helpers.tcl b/tclapp/xilinx/xsim/helpers.tcl
@@ -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 } {

diff --git a/tclapp/xilinx/xsim/pkgIndex.tcl b/tclapp/xilinx/xsim/pkgIndex.tcl
@@ -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]]
diff --git a/tclapp/xilinx/xsim/xsim.tcl b/tclapp/xilinx/xsim/xsim.tcl
@@ -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