JCF: Issue #129: have a variant, +dev/~dev, determine whether the sta…

…ck uses devtools (gdb, cmake, ninja) or not
DUNE-DAQ · Jul 29, 2023 · b2a32d3 · b2a32d3
1 parent b39d4df
commit b2a32d3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/scripts/spack/make-release-repo.py b/scripts/spack/make-release-repo.py
@@ -186,7 +186,8 @@ def generate_daq_umbrella_package(self, repo_path, template_dir):
         # now add additional deps:
         lines += '\n    for build_type in ["Debug", "RelWithDebInfo", "Release"]:'
         if self.rtype != "dunedaq":
-            lines += f'\n        depends_on(f"dunedaq@{self.rdict["base_release"]} build_type={{build_type}}", when=f"build_type={{build_type}}")'
+            lines += f'\n        depends_on(f"dunedaq@{self.rdict["base_release"]}+dev build_type={{build_type}}", when=f"+dev build_type={{build_type}}")'
+            lines += f'\n        depends_on(f"dunedaq@{self.rdict["base_release"]}~dev build_type={{build_type}}", when=f"~dev build_type={{build_type}}")'
         for idep in self.rdict[ipkg]:
             iname = idep["name"]
             iver = idep["version"]

diff --git a/spack-repos/dunedaq-repo-template/packages/dunedaq/package.py b/spack-repos/dunedaq-repo-template/packages/dunedaq/package.py
@@ -19,7 +19,10 @@ class Dunedaq(BundlePackage):
             values=('Debug', 'Release', 'RelWithDebInfo'),
             multi=True)
 
-    depends_on("externals@XRELEASEX", when="@XRELEASEX")
+    variant('dev', default=False, description='Load in tools used to develop DUNE DAQ packages')
+
+    depends_on("externals@XRELEASEX+dev", when="@XRELEASEX+dev")
+    depends_on("externals@XRELEASEX~dev", when="@XRELEASEX~dev")
 
     def setup_run_environment(self, env):
         env.set('DUNE_DAQ_BASE_RELEASE', "XRELEASEX")

diff --git a/spack-repos/dunedaq-repo-template/packages/externals/package.py b/spack-repos/dunedaq-repo-template/packages/externals/package.py
@@ -14,6 +14,9 @@ class Externals(BundlePackage):
 
     version("XRELEASEX")
 
+    variant('dev', default=False, description='Load in tools used to develop DUNE DAQ packages')
+
     # Generate from release YAML file
-    depends_on("devtools@XRELEASEX")
+    depends_on("devtools@XRELEASEX", when="+dev")
+    depends_on("systems@XRELEASEX", when="~dev")
     # Additional dependencies defined in YAML file to be filled below
diff --git a/spack-repos/fddaq-repo-template/packages/fddaq/package.py b/spack-repos/fddaq-repo-template/packages/fddaq/package.py
@@ -19,6 +19,8 @@ class Fddaq(BundlePackage):
             values=('Debug', 'Release', 'RelWithDebInfo'),
             multi=True)
 
+    variant('dev', default=False, description='Load in tools used to develop DUNE DAQ packages')
+
     def setup_run_environment(self, env):
         env.set('DUNE_DAQ_BASE_RELEASE', "XRELEASEX")
 
diff --git a/spack-repos/nddaq-repo-template/packages/nddaq/package.py b/spack-repos/nddaq-repo-template/packages/nddaq/package.py
@@ -19,6 +19,8 @@ class Nddaq(BundlePackage):
             values=('Debug', 'Release', 'RelWithDebInfo'),
             multi=True)
 
+    variant('dev', default=False, description='Load in tools used to develop DUNE DAQ packages')
+
     def setup_run_environment(self, env):
         env.set('DUNE_DAQ_BASE_RELEASE', "XRELEASEX")