From 61a3043fe087d1caaeede6d01ac603de3473e3a2 Mon Sep 17 00:00:00 2001
From: Seth R Johnson <johnsonsr@ornl.gov>
Date: Tue, 11 Feb 2025 17:34:23 -0500
Subject: [PATCH] celeritas: add develop version

---
 .../repos/builtin/packages/celeritas/package.py | 17 +++++++++++++++++
 .../repos/builtin/packages/g4vg/package.py      |  9 +++++++++
 2 files changed, 26 insertions(+)

diff --git a/var/spack/repos/builtin/packages/celeritas/package.py b/var/spack/repos/builtin/packages/celeritas/package.py
index 0aa485b296d..4a7a42b2002 100644
--- a/var/spack/repos/builtin/packages/celeritas/package.py
+++ b/var/spack/repos/builtin/packages/celeritas/package.py
@@ -4,6 +4,7 @@
 
 from spack.build_systems.cmake import CMakeBuilder
 from spack.package import *
+from spack.version import GitVersion
 
 
 class Celeritas(CMakePackage, CudaPackage, ROCmPackage):
@@ -13,12 +14,16 @@ class Celeritas(CMakePackage, CudaPackage, ROCmPackage):
     """
 
     homepage = "https://github.com/celeritas-project/celeritas"
+    git = "https://github.com/celeritas-project/celeritas.git"
     url = "https://github.com/celeritas-project/celeritas/releases/download/v0.1.0/celeritas-0.1.0.tar.gz"
 
     maintainers("sethrj")
 
     license("Apache-2.0")
 
+    version("develop", branch="develop")
+    next_develop_version = "0.6.0"
+
     version("0.5.1", sha256="182d5466fbd98ba9400b343b55f6a06e03b77daed4de1dd16f632ac0a3620249")
     version("0.5.0", sha256="4a8834224d96fd01897e5872ac109f60d91ef0bd7b63fac05a73dcdb61a5530e")
     version("0.4.4", sha256="8b5ae63aa2d50c2ecf48d752424e4a33c50c07d9f0f5ca5448246de3286fd836")
@@ -72,6 +77,7 @@ class Celeritas(CMakePackage, CudaPackage, ROCmPackage):
     depends_on("nlohmann-json")
     depends_on("geant4@10.5:", when="@0.4.2: +geant4")
     depends_on("geant4@10.5:11.1", when="@0.3.1:0.4.1 +geant4")
+    depends_on("g4vg@develop", when="@develop +geant4 +vecgeom")
     depends_on("hepmc3", when="+hepmc3")
     depends_on("root", when="+root")
     depends_on("swig@4.1:", when="+swig")
@@ -149,4 +155,15 @@ def cmake_args(self):
             # JSON is required for 0.5 and later
             args.append(define("CELERITAS_USE_JSON", True))
 
+        if self.version >= Version("0.6"):
+            args.extend((
+                define(f"CELERITAS_BUILTIN_{pkg}", False)
+                for pkg in ["GTest", "nlohmann_json", "G4VG"]))
+
+        if self.version == Version("develop"):
+            args.append(define("Celeritas_GIT_DESCRIBE",
+                               [self.next_develop_version,
+                                "-dev",
+                                "spack"]))
+
         return args
diff --git a/var/spack/repos/builtin/packages/g4vg/package.py b/var/spack/repos/builtin/packages/g4vg/package.py
index 7f50a2aae38..528ce4eff09 100644
--- a/var/spack/repos/builtin/packages/g4vg/package.py
+++ b/var/spack/repos/builtin/packages/g4vg/package.py
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 from spack.package import *
+from spack.version import GitVersion
 
 
 class G4vg(CMakePackage):
@@ -17,6 +18,8 @@ class G4vg(CMakePackage):
     license("Apache-2.0", checked_by="sethrj")
 
     version("develop", branch="main")
+    next_develop_version = "1.1.0"
+
     version("1.0.1", sha256="add7ce4bc37889cac2101323a997cea8574b18da6cbeffdab44a2b714d134e99")
 
     variant("debug", default=False, description="Enable runtime debug assertions")
@@ -35,4 +38,10 @@ def cmake_args(self):
             define("G4VG_BUILD_TESTS", False),
         ]
 
+        if self.version == Version("develop"):
+            args.append(define("G4VG_GIT_DESCRIBE",
+                               [self.next_develop_version,
+                                "-dev",
+                                "spack"]))
+
         return args