hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update for conduit 0.3.1 release (#7344)

Browse source
This commit is contained in:
Cyrus Harrison 2018-03-05 02:04:21 -08:00 committed by Massimiliano Culpo
parent 1a77884c07
commit d59ee8d07d
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
var/spack/repos/builtin/packages/conduit/package.py
View file

@ -48,6 +48,7 @@ class Conduit(Package):
homepage = "http://software.llnl.gov/conduit" homepage = "http://software.llnl.gov/conduit"
url = "https://github.com/LLNL/conduit/releases/download/v0.3.0/conduit-v0.3.0-src-with-blt.tar.gz" url = "https://github.com/LLNL/conduit/releases/download/v0.3.0/conduit-v0.3.0-src-with-blt.tar.gz"
version('0.3.1', 'b98d1476199a46bde197220cd9cde042')
version('0.3.0', '6396f1d1ca16594d7c66d4535d4f898e') version('0.3.0', '6396f1d1ca16594d7c66d4535d4f898e')
# note: checksums on github automatic release source tars changed ~9/17 # note: checksums on github automatic release source tars changed ~9/17
version('0.2.1', 'ed7358af3463ba03f07eddd6a6e626ff') version('0.2.1', 'ed7358af3463ba03f07eddd6a6e626ff')
@ -79,6 +80,9 @@ class Conduit(Package):
# variants for dev-tools (docs, etc) # variants for dev-tools (docs, etc)
variant("doc", default=False, description="Build Conduit's documentation") variant("doc", default=False, description="Build Conduit's documentation")
# doxygen support is wip, since doxygen has several dependencies
# we want folks to explicitly opt in to building doxygen
variant("doxygen", default=False, description="Build Conduit's Doxygen documentation")
########################################################################### ###########################################################################
# package dependencies # package dependencies
@ -124,7 +128,7 @@ class Conduit(Package):
# Documentation related # Documentation related
####################### #######################
depends_on("py-sphinx", when="+python+doc", type='build') depends_on("py-sphinx", when="+python+doc", type='build')
depends_on("doxygen", when="+doc") depends_on("doxygen", when="+doc+doxygen")
def url_for_version(self, version): def url_for_version(self, version):
""" """
@ -135,11 +139,12 @@ def url_for_version(self, version):
return "https://github.com/LLNL/conduit/archive/v0.2.0.tar.gz" return "https://github.com/LLNL/conduit/archive/v0.2.0.tar.gz"
elif v == "0.2.1": elif v == "0.2.1":
return "https://github.com/LLNL/conduit/archive/v0.2.1.tar.gz" return "https://github.com/LLNL/conduit/archive/v0.2.1.tar.gz"
elif v == "0.3.0": else:
# conduit uses BLT (https://github.com/llnl/blt) as a submodule, # starting with v 0.3.0, conduit uses BLT
# since github does not automatically package source from # (https://github.com/llnl/blt) as a submodule, since github does
# submodules, conduit provides a custom src tarball # not automatically package source from submodules, conduit
return "https://github.com/LLNL/conduit/releases/download/v0.3.0/conduit-v0.3.0-src-with-blt.tar.gz" # provides a custom src tarball
return "https://github.com/LLNL/conduit/releases/download/v{0}/conduit-v{1}-src-with-blt.tar.gz".format(v, v)
return url return url
def install(self, spec, prefix): def install(self, spec, prefix):
@ -287,10 +292,10 @@ def create_host_config(self, spec, prefix, py_site_pkgs_dir=None):
sphinx_build_exe = join_path(spec['py-sphinx'].prefix.bin, sphinx_build_exe = join_path(spec['py-sphinx'].prefix.bin,
"sphinx-build") "sphinx-build")
cfg.write(cmake_cache_entry("SPHINX_EXECUTABLE", sphinx_build_exe)) cfg.write(cmake_cache_entry("SPHINX_EXECUTABLE", sphinx_build_exe))
if "+doxygen" in spec:
cfg.write("# doxygen from uberenv\n") cfg.write("# doxygen from uberenv\n")
doxygen_exe = spec['doxygen'].command.path doxygen_exe = spec['doxygen'].command.path
cfg.write(cmake_cache_entry("DOXYGEN_EXECUTABLE", doxygen_exe)) cfg.write(cmake_cache_entry("DOXYGEN_EXECUTABLE", doxygen_exe))
else: else:
cfg.write(cmake_cache_entry("ENABLE_DOCS", "OFF")) cfg.write(cmake_cache_entry("ENABLE_DOCS", "OFF"))