Updates to support CreateDryRunDict CreateVhdlLsToml

Author: JimLewis

OsvvmScriptsCore.tcl

@@ -450,8 +450,7 @@ proc build {{Path_Or_File "."} args} {
       } 
       # Fail on Test Case Errors
       if {($::osvvm::BuildStatus ne "PASSED") && ($::osvvm::FailOnTestCaseErrors)} {
-          puts "Test finished with Test Case Errors. Return -code 1"
-          return -code 1
+        error "Test finished with Test Case Errors."
       }
       # Fail on Report / Script Errors?
       if {($ReportYamlErrorCode != 0) || ($ReportErrorCode != 0) || ($Log2ErrorCode != 0) || ($ScriptErrorCount != 0)} {  
@@ -774,18 +773,20 @@ proc StopTranscript {{FileBaseName ""}} {
   # if {[llength [info procs vendor_StopTranscript]] > 0} {}
   if {[info procs vendor_StopTranscript] ne ""} {
     vendor_StopTranscript $TempTranscriptName
-#    file rename -force ${TempTranscriptName} ${TranscriptFileName}
-    file copy   -force ${TempTranscriptName} ${TranscriptFileName}
-    file delete -force ${TempTranscriptName} 
-
-  } else {
-    DefaultVendor_StopTranscript $TempTranscriptName
-    if {$::osvvm::GotTee} {
-#       file rename -force ${TempTranscriptName} ${TranscriptFileName}
+    if {[file exists $TempTranscriptName]} {
       file copy   -force ${TempTranscriptName} ${TranscriptFileName}
       file delete -force ${TempTranscriptName} 
-    } else {
-      file copy   -force ${TempTranscriptName} ${TranscriptFileName}
+    }
+  } else {
+    DefaultVendor_StopTranscript $TempTranscriptName
+    if {[file exists $TempTranscriptName]} {
+      if {$::osvvm::GotTee} {
+  #       file rename -force ${TempTranscriptName} ${TranscriptFileName}
+        file copy   -force ${TempTranscriptName} ${TranscriptFileName}
+        file delete -force ${TempTranscriptName} 
+      } else {
+        file copy   -force ${TempTranscriptName} ${TranscriptFileName}
+      }
     }
   }
 }

StartUp.tcl

@@ -114,7 +114,7 @@ namespace eval ::osvvm {
   } elseif {[string match -nocase $ToolExecutableName "vivado"]} {
     variable ScriptBaseName "Vivado"
 
-  } elseif {[info exist nvc_dataDir]} {
+  } elseif {[info exist ::nvc_dataDir]} {
     variable ScriptBaseName "NVC"
 
   } else {

StartUpShared.tcl

@@ -80,6 +80,7 @@ source ${::osvvm::OsvvmScriptDirectory}/OsvvmScriptsCreateYamlReports.tcl   ;#
 source ${::osvvm::OsvvmScriptDirectory}/OsvvmScriptsCore.tcl                ;#  OSVVM Core API
 source ${::osvvm::OsvvmScriptDirectory}/OsvvmScriptsSimulateSupport.tcl     ;#  OSVVM Simulate Support Scripts - should this be called by OsvvmScriptsCore after proc simulate?
 source ${::osvvm::OsvvmScriptDirectory}/OsvvmScriptsFileCreate.tcl          ;#  OSVVM API for file creation
+source ${::osvvm::OsvvmScriptDirectory}/OsvvmScriptsTranslate.tcl           ;#  OSVVM Create Project files for other tools
 
 # --------------------------------
 # Load Vendor Script Default settings

VendorScripts_CompileList.tcl

@@ -105,6 +105,11 @@ proc vendor_analyze_vhdl {LibraryName FileName args} {
   set ListOfLibraryFiles  [open ${LibraryName}_${::osvvm::ToolName}.files a]
   puts $ListOfLibraryFiles $FileName
   close $ListOfLibraryFiles
+  
+  set  AllFiles  [open OneList.files a]
+  puts $AllFiles [file normalize $FileName] 
+  close $AllFiles
+
 }
 
 proc vendor_analyze_verilog {LibraryName FileName args} {

VendorScripts_Questa.tcl

@@ -81,7 +81,7 @@ package require fileutil
   if {![catch {batch_mode} msg]} {
     if {[batch_mode]} {
       variable NoGui "true"
-      if {[regexp {\-batch} $argv]} {
+      if {[regexp {\-batch} $::argv]} {
         variable EnableTranscriptInBatchMode "false"
 #        variable SiemensSimulateOptions -batch  
         variable SiemensSimulateOptions -c  

VendorScripts_RivieraPro.tcl

@@ -61,7 +61,10 @@
   variable ToolName    "RivieraPRO"
   variable simulator   $ToolName ; # Variable simulator is deprecated.  Use ToolName instead 
   #  Could differentiate between RivieraPRO and VSimSA
-  variable ToolVersion [asimVersion]
+  variable ToolVersion 
+  if {[catch {regexp {\d([\d\.]+)} [exec vsim -version] ToolVersion}]} {
+    variable ToolVersion [asimVersion]
+  }
   variable ToolNameVersion ${ToolName}-${ToolVersion}
 #   puts $ToolNameVersion
 
@@ -79,7 +82,10 @@
 
   variable FunctionalCoverageIntegratedInSimulator "Aldec"
 
-  if {[batch_mode]} {
+  if {[catch {batch_mode}]} {
+    # batch_mode command not exist = running from shell = in batch_mode
+    variable NoGui "true"
+  } elseif {[batch_mode]} {
     variable NoGui "true"
   } else {
     variable NoGui "false"

VendorScripts_Siemens.tcl

@@ -95,7 +95,7 @@ package require fileutil
   if {![catch {batch_mode} msg]} {
     if {[batch_mode]} {
       variable NoGui "true"
-      if {[regexp {\-batch} $argv]} {
+      if {[regexp {\-batch} $::argv]} {
         variable EnableTranscriptInBatchMode "false"
 #        variable SiemensSimulateOptions -batch  
         variable SiemensSimulateOptions -c  

VendorScripts_VSim.tcl

@@ -83,7 +83,7 @@ package require fileutil
     variable shell ""
     variable SiemensSimulateOptions ""
     if {[batch_mode]} {
-      variable ToolArgs $argv
+      variable ToolArgs $::argv
       variable NoGui "true"
       variable SiemensSimulateOptions "-batch"
       variable DebugOptions "-debug"

VendorScripts_Visualizer.tcl

@@ -65,7 +65,7 @@ package require fileutil
     variable shell ""
     variable SiemensSimulateOptions ""
     if {[batch_mode]} {
-      variable ToolArgs $argv
+      variable ToolArgs $::argv
       variable NoGui "true"
       variable SiemensSimulateOptions "-batch"
       variable DebugOptions "-debug"