Xilinx · dpefour · Sep 7, 2016 · Sep 1, 2016
diff --git a/tclapp/aldec/activehdl/activehdl.tcl b/tclapp/aldec/activehdl/activehdl.tcl
@@ -12,4 +12,4 @@ namespace eval ::tclapp::aldec::activehdl {
     lappend ::auto_path $home
   }
 }
-package provide ::tclapp::aldec::activehdl 1.6
+package provide ::tclapp::aldec::activehdl 1.7
diff --git a/tclapp/aldec/activehdl/app.xml b/tclapp/aldec/activehdl/app.xml
@@ -2,7 +2,7 @@
 <catalog>
   <apps>
     <app>
-      <revision_history>Update 1.6: Coverage options.</revision_history>
+      <revision_history>Update 1.7: Add mappings for libraries from compiled library location.</revision_history>
       <name>activehdl</name>
       <pkg_require>Vivado 2014.1</pkg_require>
       <company>aldec</company>

diff --git a/tclapp/aldec/activehdl/common/helpers.tcl b/tclapp/aldec/activehdl/common/helpers.tcl
@@ -8,7 +8,7 @@
 
 package require Vivado 1.2014.1
 
-package provide ::tclapp::aldec::common::helpers 1.6
+package provide ::tclapp::aldec::common::helpers 1.7
 
 namespace eval ::tclapp::aldec::common {
 

diff --git a/tclapp/aldec/activehdl/common/pkgIndex.tcl b/tclapp/aldec/activehdl/common/pkgIndex.tcl
@@ -8,5 +8,5 @@
 # script is sourced, the variable $dir must contain the
 # full path name of this file's directory.
 
-package ifneeded ::tclapp::aldec::common::helpers 1.6 [list source [file join $dir helpers.tcl]]
-package ifneeded ::tclapp::aldec::common::sim 1.6 [list source [file join $dir sim.tcl]]
+package ifneeded ::tclapp::aldec::common::helpers 1.7 [list source [file join $dir helpers.tcl]]
+package ifneeded ::tclapp::aldec::common::sim 1.7 [list source [file join $dir sim.tcl]]
diff --git a/tclapp/aldec/activehdl/common/sim.tcl b/tclapp/aldec/activehdl/common/sim.tcl
@@ -8,9 +8,9 @@
 
 package require Vivado 1.2014.1
 
-package require ::tclapp::aldec::common::helpers 1.6
+package require ::tclapp::aldec::common::helpers 1.7
 
-package provide ::tclapp::aldec::common::sim 1.6
+package provide ::tclapp::aldec::common::sim 1.7
 
 namespace eval ::tclapp::aldec::common {
 
@@ -266,6 +266,54 @@ proc usf_create_udo_file { file } {
   close $fh
 }
 
+proc usf_aldec_mapLibraryCfg { fh } {
+  # Summary:
+  # Argument Usage:
+  # Return Value:
+
+  set librariesLocation ""
+
+  set product [get_property target_simulator [current_project]]
+
+  switch -- $product {
+    Riviera { set librariesLocation [get_property COMPXLIB.RIVIERA_COMPILED_LIBRARY_DIR [current_project]] }
+    ActiveHDL { set librariesLocation [get_property COMPXLIB.ACTIVEHDL_COMPILED_LIBRARY_DIR [current_project]] }
+  }
+
+  if { $librariesLocation == "" } {
+    return
+  }
+
+  set libraryCfg [file join $librariesLocation library.cfg]
+  if { ![file isfile $libraryCfg] } {
+    return
+  }
+
+  set f [open $libraryCfg r]
+
+  while { ![eof $f] } {
+    gets $f line
+    if { [regexp {\s*([^\s]+)\s*=\s*\"?([^\s\"]+).*} $line tmp mapName mapPath] } {
+
+      if { [file pathtype $mapPath] != "absolute" } {
+        set mapPath [file join $librariesLocation $mapPath]      
+      }
+
+      set mapPath [file normalize $mapPath]
+
+      if { ![file isfile $mapPath] } {
+        continue
+      }
+
+      puts $fh "vmap $mapName \{$mapPath\}"
+    }
+  }
+
+  close $f
+
+  puts $fh ""
+}
+
 proc usf_aldec_create_do_file_for_compilation { do_file } {
   # Summary:
   # Argument Usage:
@@ -295,6 +343,8 @@ proc usf_aldec_create_do_file_for_compilation { do_file } {
 
   puts $fh "vlib work\n"
 
+  usf_aldec_mapLibraryCfg $fh
+
   set design_libs [usf_aldec_get_design_libs $::tclapp::aldec::common::helpers::a_sim_vars(l_design_files)]
 
   # TODO:

diff --git a/tclapp/aldec/activehdl/common/tclIndex b/tclapp/aldec/activehdl/common/tclIndex
@@ -113,6 +113,7 @@ set auto_index(::tclapp::aldec::common::sim::usf_aldec_write_setup_files) [list
 set auto_index(::tclapp::aldec::common::sim::usf_aldec_write_compile_script) [list source [file join $dir sim.tcl]]
 set auto_index(::tclapp::aldec::common::sim::usf_write_simulate_script) [list source [file join $dir sim.tcl]]
 set auto_index(::tclapp::aldec::common::sim::usf_create_udo_file) [list source [file join $dir sim.tcl]]
+set auto_index(::tclapp::aldec::common::sim::usf_aldec_mapLibraryCfg) [list source [file join $dir sim.tcl]]
 set auto_index(::tclapp::aldec::common::sim::usf_aldec_create_do_file_for_compilation) [list source [file join $dir sim.tcl]]
 set auto_index(::tclapp::aldec::common::sim::usf_aldec_get_elaboration_cmdline) [list source [file join $dir sim.tcl]]
 set auto_index(::tclapp::aldec::common::sim::usf_aldec_get_simulation_cmdline) [list source [file join $dir sim.tcl]]

diff --git a/tclapp/aldec/activehdl/pkgIndex.tcl b/tclapp/aldec/activehdl/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::aldec::activehdl 1.6 [list source [file join $dir activehdl.tcl]]
+package ifneeded ::tclapp::aldec::activehdl 1.7 [list source [file join $dir activehdl.tcl]]
diff --git a/tclapp/aldec/activehdl/register_options.tcl b/tclapp/aldec/activehdl/register_options.tcl
@@ -8,7 +8,7 @@
 
 package require Vivado 1.2014.1
 
-package require ::tclapp::aldec::common::helpers 1.6
+package require ::tclapp::aldec::common::helpers 1.7
 
 namespace eval ::tclapp::aldec::activehdl {
   namespace export register_options

diff --git a/tclapp/aldec/activehdl/revision_history.txt b/tclapp/aldec/activehdl/revision_history.txt
@@ -1 +1,2 @@
+1.7 Update 1.7: Add mappings for libraries from compiled library location.
 1.6 Update 1.6: Coverage options.
diff --git a/tclapp/aldec/activehdl/sim.tcl b/tclapp/aldec/activehdl/sim.tcl
@@ -8,8 +8,8 @@
 
 package require Vivado 1.2014.1
 
-package require ::tclapp::aldec::common::sim 1.6
-package require ::tclapp::aldec::common::helpers 1.6
+package require ::tclapp::aldec::common::sim 1.7
+package require ::tclapp::aldec::common::helpers 1.7
 
 namespace eval ::tclapp::aldec::activehdl {
 

diff --git a/tclapp/aldec/riviera/app.xml b/tclapp/aldec/riviera/app.xml
@@ -2,7 +2,7 @@
 <catalog>
   <apps>
     <app>
-      <revision_history>Update 1.6: Coverage options.</revision_history>
+      <revision_history>Update 1.7: Add mappings for libraries from compiled library location.</revision_history>
       <name>riviera</name>
       <pkg_require>Vivado 2014.1</pkg_require>
       <company>aldec</company>

diff --git a/tclapp/aldec/riviera/common/helpers.tcl b/tclapp/aldec/riviera/common/helpers.tcl
@@ -8,7 +8,7 @@
 
 package require Vivado 1.2014.1
 
-package provide ::tclapp::aldec::common::helpers 1.6
+package provide ::tclapp::aldec::common::helpers 1.7
 
 namespace eval ::tclapp::aldec::common {
 

diff --git a/tclapp/aldec/riviera/common/pkgIndex.tcl b/tclapp/aldec/riviera/common/pkgIndex.tcl
@@ -8,5 +8,5 @@
 # script is sourced, the variable $dir must contain the
 # full path name of this file's directory.
 
-package ifneeded ::tclapp::aldec::common::helpers 1.6 [list source [file join $dir helpers.tcl]]
-package ifneeded ::tclapp::aldec::common::sim 1.6 [list source [file join $dir sim.tcl]]
+package ifneeded ::tclapp::aldec::common::helpers 1.7 [list source [file join $dir helpers.tcl]]
+package ifneeded ::tclapp::aldec::common::sim 1.7 [list source [file join $dir sim.tcl]]
diff --git a/tclapp/aldec/riviera/common/sim.tcl b/tclapp/aldec/riviera/common/sim.tcl
@@ -8,9 +8,9 @@
 
 package require Vivado 1.2014.1
 
-package require ::tclapp::aldec::common::helpers 1.6
+package require ::tclapp::aldec::common::helpers 1.7
 
-package provide ::tclapp::aldec::common::sim 1.6
+package provide ::tclapp::aldec::common::sim 1.7
 
 namespace eval ::tclapp::aldec::common {
 
@@ -266,6 +266,54 @@ proc usf_create_udo_file { file } {
   close $fh
 }
 
+proc usf_aldec_mapLibraryCfg { fh } {
+  # Summary:
+  # Argument Usage:
+  # Return Value:
+
+  set librariesLocation ""
+
+  set product [get_property target_simulator [current_project]]
+
+  switch -- $product {
+    Riviera { set librariesLocation [get_property COMPXLIB.RIVIERA_COMPILED_LIBRARY_DIR [current_project]] }
+    ActiveHDL { set librariesLocation [get_property COMPXLIB.ACTIVEHDL_COMPILED_LIBRARY_DIR [current_project]] }
+  }
+
+  if { $librariesLocation == "" } {
+    return
+  }
+
+  set libraryCfg [file join $librariesLocation library.cfg]
+  if { ![file isfile $libraryCfg] } {
+    return
+  }
+
+  set f [open $libraryCfg r]
+
+  while { ![eof $f] } {
+    gets $f line
+    if { [regexp {\s*([^\s]+)\s*=\s*\"?([^\s\"]+).*} $line tmp mapName mapPath] } {
+
+      if { [file pathtype $mapPath] != "absolute" } {
+        set mapPath [file join $librariesLocation $mapPath]      
+      }
+
+      set mapPath [file normalize $mapPath]
+
+      if { ![file isfile $mapPath] } {
+        continue
+      }
+
+      puts $fh "vmap $mapName \{$mapPath\}"
+    }
+  }
+
+  close $f
+
+  puts $fh ""
+}
+
 proc usf_aldec_create_do_file_for_compilation { do_file } {
   # Summary:
   # Argument Usage:
@@ -295,6 +343,8 @@ proc usf_aldec_create_do_file_for_compilation { do_file } {
 
   puts $fh "vlib work\n"
 
+  usf_aldec_mapLibraryCfg $fh
+
   set design_libs [usf_aldec_get_design_libs $::tclapp::aldec::common::helpers::a_sim_vars(l_design_files)]
 
   # TODO:

diff --git a/tclapp/aldec/riviera/common/tclIndex b/tclapp/aldec/riviera/common/tclIndex
@@ -113,6 +113,7 @@ set auto_index(::tclapp::aldec::common::sim::usf_aldec_write_setup_files) [list
 set auto_index(::tclapp::aldec::common::sim::usf_aldec_write_compile_script) [list source [file join $dir sim.tcl]]
 set auto_index(::tclapp::aldec::common::sim::usf_write_simulate_script) [list source [file join $dir sim.tcl]]
 set auto_index(::tclapp::aldec::common::sim::usf_create_udo_file) [list source [file join $dir sim.tcl]]
+set auto_index(::tclapp::aldec::common::sim::usf_aldec_mapLibraryCfg) [list source [file join $dir sim.tcl]]
 set auto_index(::tclapp::aldec::common::sim::usf_aldec_create_do_file_for_compilation) [list source [file join $dir sim.tcl]]
 set auto_index(::tclapp::aldec::common::sim::usf_aldec_get_elaboration_cmdline) [list source [file join $dir sim.tcl]]
 set auto_index(::tclapp::aldec::common::sim::usf_aldec_get_simulation_cmdline) [list source [file join $dir sim.tcl]]

diff --git a/tclapp/aldec/riviera/pkgIndex.tcl b/tclapp/aldec/riviera/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::aldec::riviera 1.6 [list source [file join $dir riviera.tcl]]
+package ifneeded ::tclapp::aldec::riviera 1.7 [list source [file join $dir riviera.tcl]]
diff --git a/tclapp/aldec/riviera/register_options.tcl b/tclapp/aldec/riviera/register_options.tcl
@@ -8,7 +8,7 @@
 
 package require Vivado 1.2014.1
 
-package require ::tclapp::aldec::common::helpers 1.6
+package require ::tclapp::aldec::common::helpers 1.7
 
 namespace eval ::tclapp::aldec::riviera {
   namespace export register_options

diff --git a/tclapp/aldec/riviera/revision_history.txt b/tclapp/aldec/riviera/revision_history.txt
@@ -1 +1,2 @@
+1.7 Update 1.7: Add mappings for libraries from compiled library location.
 1.6 Update 1.6: Coverage options.
diff --git a/tclapp/aldec/riviera/riviera.tcl b/tclapp/aldec/riviera/riviera.tcl
@@ -12,4 +12,4 @@ namespace eval ::tclapp::aldec::riviera {
     lappend ::auto_path $home
   }
 }
-package provide ::tclapp::aldec::riviera 1.6
+package provide ::tclapp::aldec::riviera 1.7
diff --git a/tclapp/aldec/riviera/sim.tcl b/tclapp/aldec/riviera/sim.tcl
@@ -8,8 +8,8 @@
 
 package require Vivado 1.2014.1
 
-package require ::tclapp::aldec::common::sim 1.6
-package require ::tclapp::aldec::common::helpers 1.6
+package require ::tclapp::aldec::common::sim 1.7
+package require ::tclapp::aldec::common::helpers 1.7
 
 namespace eval ::tclapp::aldec::riviera {
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		1.7 Update 1.7: Add mappings for libraries from compiled library location.
		1.6 Update 1.6: Coverage options.