From 89f6db21f10ebe95c66b7015c14a69052619d26d Mon Sep 17 00:00:00 2001 From: Peter Scheibel Date: Wed, 13 Apr 2022 20:05:14 -0700 Subject: Ad-hoc Git commit versions: support submodules (#30037) * Allow packages to add a 'submodules' property that determines when ad-hoc Git-commit-based versions should initialize submodules * add support for ad-hoc git-commit-based versions to instantiate submodules if the associated package has a 'submodules' property and it indicates this should happen for the associated spec * allow Package-level submodule request to influence all explicitly-defined version() in the Package * skip test on windows which fails because of long paths --- var/spack/repos/builtin.mock/packages/git-test/package.py | 2 ++ var/spack/repos/builtin/packages/axom/package.py | 5 +++++ 2 files changed, 7 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin.mock/packages/git-test/package.py b/var/spack/repos/builtin.mock/packages/git-test/package.py index 3e9b259106..ab72e5921e 100644 --- a/var/spack/repos/builtin.mock/packages/git-test/package.py +++ b/var/spack/repos/builtin.mock/packages/git-test/package.py @@ -10,4 +10,6 @@ class GitTest(Package): """Mock package that uses git for fetching.""" homepage = "http://www.git-fetch-example.com" + submodules = True + version('git', git='to-be-filled-in-by-test') diff --git a/var/spack/repos/builtin/packages/axom/package.py b/var/spack/repos/builtin/packages/axom/package.py index 3719459be3..7b02b25c56 100644 --- a/var/spack/repos/builtin/packages/axom/package.py +++ b/var/spack/repos/builtin/packages/axom/package.py @@ -50,6 +50,11 @@ class Axom(CachedCMakePackage, CudaPackage): version('0.3.0', tag='v0.3.0', submodules=True) version('0.2.9', tag='v0.2.9', submodules=True) + @property + def submodules(self): + # All git checkouts should also initialize submodules + return True + patch('scr_examples_gtest.patch', when='@0.6.0:0.6.1') root_cmakelists_dir = 'src' -- cgit v1.2.3-70-g09d2