xfygogo
/
dune-spack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a 2.6 release for the Dorie people

This commit is contained in:
Dominic Kempf 2020-06-23 10:38:38 +02:00
parent 3eda19a5e8
commit 4602670ff3
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/dune/package.py
View File

@ -38,6 +38,7 @@ class Dune(CMakePackage):
# the default version) in Python3. # the default version) in Python3.
dune_versions_to_branch = [ dune_versions_to_branch = [
("2.7", "releases/2.7"), ("2.7", "releases/2.7"),
("2.6", "releases/2.6"),
("master" , "master"), ("master" , "master"),
] ]
@ -258,6 +259,13 @@ class Dune(CMakePackage):
when='@2.7+python', when='@2.7+python',
) )
resource(
name='dune-python',
git='https://gitlab.dune-project.org/staging/dune-python.git',
branch='releases/2.6',
when='@2.6+python',
)
# The dune-codegen package does not yet have a 2.7-compatible release # The dune-codegen package does not yet have a 2.7-compatible release
resource( resource(
name='dune-codegen', name='dune-codegen',
@ -266,6 +274,7 @@ class Dune(CMakePackage):
when='@master+codegen', when='@master+codegen',
submodules=True, submodules=True,
) )
conflicts('dune@2.6', when='+codegen')
conflicts('dune@2.7', when='+codegen') conflicts('dune@2.7', when='+codegen')
# Make sure that Python components integrate well into Spack # Make sure that Python components integrate well into Spack
@ -382,7 +391,13 @@ class Dune(CMakePackage):
installer = Executable('bin/dunecontrol') installer = Executable('bin/dunecontrol')
options_file = join_path(self.stage.source_path, "..", "dune.opts") options_file = join_path(self.stage.source_path, "..", "dune.opts")
installer('--builddir=%s'%self.build_directory , '--opts=%s' % options_file, 'cmake')
# The 'cmake' command of dunecontrol was added in 2.7
commandname = 'cmake'
if '@2.6' in self.spec:
commandname = 'configure'
installer('--builddir=%s'%self.build_directory , '--opts=%s' % options_file, commandname)
def install(self, spec, prefix): def install(self, spec, prefix):
installer = Executable('bin/dunecontrol') installer = Executable('bin/dunecontrol')