From c5dafcfc7d6a5c9cb529cb06be851faa73846809 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Thu, 1 Dec 2022 21:39:23 +0000
Subject: [PATCH] Bump OSVVM version to 2022.10

---
 NEWS.md                   |  1 +
 contrib/install-osvvm.sh  |  3 +--
 contrib/install-osvvm.tcl | 38 +++-----------------------------------
 test/test-osvvm.tcl       |  6 +-----
 4 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index a88ae8c3..e932fd0f 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -21,6 +21,7 @@
 - `libffi` is now a build-time dependency.
 - Negation of the smallest negative value of a type such as
   `-integer'left` now produces an error.
+- Default OSVVM version updated to 2022.10.
 
 ## Version 1.7.2 - 2022-10-16
 - Fixed build on FreeBSD/arm (#534).
diff --git a/contrib/install-osvvm.sh b/contrib/install-osvvm.sh
index 667fe635..6abc4318 100755
--- a/contrib/install-osvvm.sh
+++ b/contrib/install-osvvm.sh
@@ -13,8 +13,7 @@ if ! command -v tclsh &>/dev/null; then
   exit 1
 fi
 
-git_wrapper https://github.com/osvvm/OsvvmLibraries 2022.05d
-
+git_wrapper https://github.com/osvvm/OsvvmLibraries 2022.10
 
 [ -d $NVC_INSTALL_DEST ] || mkdir -p $NVC_INSTALL_DEST
 
diff --git a/contrib/install-osvvm.tcl b/contrib/install-osvvm.tcl
index aba59e59..1b657b13 100644
--- a/contrib/install-osvvm.tcl
+++ b/contrib/install-osvvm.tcl
@@ -1,36 +1,4 @@
-variable _dest ${::env(NVC_INSTALL_DEST)}
-variable _lib ""
-
-proc DirectoryExists {Directory} {
-    return [file exists $Directory]
-}
-
-proc include {PathAndFile} {
-    set calling_dir [pwd]
-    cd [file dirname $PathAndFile]
-    puts "Working in [pwd]:"
-    source [file tail $PathAndFile]
-    cd $calling_dir
-}
-
-proc library {LibName} {
-    variable _lib
-    set _lib $LibName
-}
-
-proc analyze {PathAndFile} {
-    variable _dest
-    variable _lib
-    puts "nvc --std=2008 --work=${_lib}:${_dest}/${_lib} -a ${PathAndFile}"
-    if {[catch {exec nvc --std=2008 --work=${_lib}:$_dest/$_lib -a $PathAndFile >@ stdout 2>@ stdout} result]} {
-        puts stderr "ERROR\n$result"
-        exit 1
-    }
-}
-
-namespace eval osvvm {
-    variable ToolVendor NVC
-    variable ToolSupportsGenericPackages "true"
-}
-
+source "Scripts/StartNVC.tcl"
+set ::osvvm::VhdlLibraryDirectory "${::env(NVC_INSTALL_DEST)}"
+set ::osvvm::VhdlLibrarySubdirectory "."
 source "OsvvmLibraries.pro"
diff --git a/test/test-osvvm.tcl b/test/test-osvvm.tcl
index 90690e23..64989550 100644
--- a/test/test-osvvm.tcl
+++ b/test/test-osvvm.tcl
@@ -4,13 +4,9 @@
 # Note: tcllib is required for OSVVM
 
 # known good snapshot
-set OsvvmLibraries_tag "2022.09"
-set OsvvmScripts_tag "e425576fbc481bd6528d3e7bfea3e2bf5800e199"; # added NVC
+set OsvvmLibraries_tag "2022.10"
 
 exec git clone --branch $OsvvmLibraries_tag --recurse-submodules -j8 https://github.com/OSVVM/OsvvmLibraries.git >@ stdout 2>@ stdout
-cd OsvvmLibraries/Scripts
-exec git checkout $OsvvmScripts_tag >@ stdout 2>@ stdout
-cd ../..
 source OsvvmLibraries/Scripts/StartNVC.tcl
 build OsvvmLibraries/OsvvmLibraries
 build OsvvmLibraries/RunAllTests
-- 
2.39.2