vtd: Add vtd-setups to conan package

Author: tobifalk

plugins/vtd/bin/vtd-launch

@@ -6,6 +6,7 @@ import shlex
 import shutil
 import subprocess
 import sys
+import tarfile
 from pathlib import Path
 from typing import Dict, List, Optional
 
@@ -159,7 +160,16 @@ def teardown_runtime(runtime_dir: Path) -> None:
     "-s",
     "--vtd-setup",
     type=click.Path(exists=True, file_okay=True, dir_okay=True),
-    help="VTD setup to use, default to currently symlinked.",
+    help="Path to VTD setup to use, default to currently symlinked.",
+)
+@click.option(
+    "-S",
+    "--vtd-setup-cloe",
+    type=click.Choice(
+        [Path(s).stem for s in os.listdir(os.getenv("VTD_SETUP_DIR"))],
+        case_sensitive=False,
+    ),
+    help="VTD setup to use from (env: $VTD_SETUP_DIR). Default from VTD.",
 )
 @click.option(
     "-p",
@@ -195,6 +205,7 @@ def start(
     opt,
     skip_setup: bool,
     vtd_setup: str,
+    vtd_setup_cloe: str,
     vtd_project: str,
     vtd_external_models: List[str],
     no_start: bool,
@@ -228,6 +239,17 @@ def start(
             os.remove(dst)
         shutil.copytree(vtd_setup, dst, symlinks=True)
 
+    elif vtd_setup_cloe is not None:
+        vtd_setup_cloe = Path(os.getenv("VTD_SETUP_DIR")) / f"{vtd_setup_cloe}.tgz"
+        logging.info(f"Use setup: {vtd_setup_cloe}")
+        with tarfile.open(vtd_setup_cloe, "r:gz") as tar:
+            dst = opt.runtime_dir / "Data" / "Setups" / "Current"
+            if dst.exists():
+                os.remove(dst)
+            if not Path(vtd_setup_cloe.stem).exists():
+                tar.extractall(path=dst.parent)
+            os.symlink(vtd_setup_cloe.stem, dst)
+
     if vtd_project is not None:
         logging.info(f"Select project: {vtd_project}")
         if Path(vtd_project).exists():

plugins/vtd/conanfile.py

@@ -1,4 +1,7 @@
 from pathlib import Path
+import os
+from shutil import rmtree
+import tarfile
 from conans import CMake, ConanFile, tools
 
 
@@ -30,6 +33,7 @@ class CloeSimulatorVTD(ConanFile):
         "vtd-api/2.2.0@cloe/stable",
     ]
 
+    _setup_folder = "contrib/setups"
     _cmake = None
 
     def requirements(self):
@@ -40,6 +44,25 @@ def build_requirements(self):
         if self.options.test:
             self.build_requires("gtest/[~1.10]")
 
+    def _compress_and_remove(self, dir):
+        if not dir.is_dir():
+            return
+        with tarfile.open(f"{dir.name}.tgz", "w:gz") as tar:
+            tar.add(dir.path, arcname=os.path.basename(dir.path))
+            rmtree(dir.path)
+
+    def _compress_setups(self):
+        cwd = os.getcwd()
+        os.chdir(f"{self.export_sources_folder}/{self._setup_folder}")
+        with os.scandir() as scan:
+            for dir in scan:
+                self._compress_and_remove(dir)
+        os.chdir(cwd)
+
+    def export_sources(self):
+        self.copy("*", dst=self._setup_folder, src=self._setup_folder, symlinks=True)
+        self._compress_setups()
+
     def _configure_cmake(self):
         if self._cmake:
             return self._cmake
@@ -64,6 +87,11 @@ def package(self):
         cmake = self._configure_cmake()
         cmake.install()
         self.copy("vtd-launch", dst="bin", src=f"{self.source_folder}/bin")
+        self.copy(
+            "*.tgz",
+            dst=self._setup_folder,
+            src=f"{self.source_folder}/{self._setup_folder}",
+        )
 
     def package_id(self):
         # Changes in a dependency's package_id need to be accounted for since
@@ -75,3 +103,4 @@ def package_id(self):
 
     def package_info(self):
         self.env_info.VTD_LAUNCH = f"{self.package_folder}/bin/vtd-launch"
+        self.env_info.VTD_SETUP_DIR = f"{self.package_folder}/{self._setup_folder}"

tests/bootstrap_vtd.json

@@ -14,7 +14,7 @@
           "args": [
             "-l", "/tmp/vtd.log",
             "start",
-            "--vtd-setup", "${THIS_STACKFILE_DIR}/../plugins/vtd/contrib/setups/Cloe.noGUInoIG",
+            "--vtd-setup-cloe", "Cloe.noGUInoIG",
             "--vtd-project", "${THIS_STACKFILE_DIR}/../plugins/vtd/contrib/projects/cloe_tests"
           ]
         }