Update rivierapro and activehdl toolchain discovery. VUnit#148

ehliar · Mar 12, 2016 · 4f71334 · 4f71334
1 parent 0b0c314
commit 4f71334
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/vunit/activehdl_interface.py b/vunit/activehdl_interface.py
@@ -47,7 +47,7 @@ def from_args(cls, output_path, args):
     @classmethod
     def _find_prefix(cls):
         return cls.find_toolchain(["vsim",
-                                   "VSimSA"])
+                                   "avhdl"])
 
     @classmethod
     def is_available(cls):

diff --git a/vunit/rivierapro_interface.py b/vunit/rivierapro_interface.py
@@ -52,8 +52,16 @@ def from_args(cls, output_path, args):
 
     @classmethod
     def _find_prefix(cls):
+        """
+        Find RivieraPro toolchain.
+
+        Must have vsim and vsimsa binaries but no avhdl.exe
+        """
+        def no_avhdl(path):
+            return not file_exists(join(path, "avhdl.exe"))
         return cls.find_toolchain(["vsim",
-                                   "vsimsa"])
+                                   "vsimsa"],
+                                  constraints=[no_avhdl])
 
     @classmethod
     def is_available(cls):