Skip to content
Snippets Groups Projects
Unverified Commit 9bdf4564 authored by Nick Booher's avatar Nick Booher Committed by GitHub
Browse files

revbayes: update for 1.1.0 (#16603)

* revbayes: update for 1.1.0

* revbayes: Fix flake8
parent 0307111d
Branches
Tags
No related merge requests found
...@@ -11,10 +11,11 @@ class Revbayes(CMakePackage): ...@@ -11,10 +11,11 @@ class Revbayes(CMakePackage):
and an interpreted language.""" and an interpreted language."""
homepage = "https://revbayes.github.io" homepage = "https://revbayes.github.io"
url = "https://github.com/revbayes/revbayes/archive/v1.0.11.tar.gz" url = "https://github.com/revbayes/revbayes/archive/1.1.0.tar.gz"
git = "https://github.com/revbayes/revbayes.git" git = "https://github.com/revbayes/revbayes.git"
version('develop', branch='development') version('develop', branch='development')
version('1.1.0', sha256='6adede8148cb10e4e75dba8da28cf5c747ea8de71a5aa24990ab9ae17e43b0b1')
version('1.0.13', sha256='e85e2e1fe182fe9f504900150d936a06d252a362c591b9d3d8272dd085aa85d9') version('1.0.13', sha256='e85e2e1fe182fe9f504900150d936a06d252a362c591b9d3d8272dd085aa85d9')
version('1.0.12', sha256='80c926bb6b37288d02e36e07b44e4663841cd1fe541e2cc0b0e44c89ca929759') version('1.0.12', sha256='80c926bb6b37288d02e36e07b44e4663841cd1fe541e2cc0b0e44c89ca929759')
version('1.0.11', sha256='03052194baa220dde7e622a739f09f34393f67ea00a0b163b409d313d7fc7c02') version('1.0.11', sha256='03052194baa220dde7e622a739f09f34393f67ea00a0b163b409d313d7fc7c02')
...@@ -29,17 +30,27 @@ class Revbayes(CMakePackage): ...@@ -29,17 +30,27 @@ class Revbayes(CMakePackage):
def url_for_version(self, version): def url_for_version(self, version):
if version > Version('1.0.13'): if version > Version('1.0.13'):
return 'https://github.com/revbayes/revbayes/archive/v{0}.tar.gz'.format(version) return 'https://github.com/revbayes/revbayes/archive/{0}.tar.gz'.format(version)
else: else:
return 'https://github.com/revbayes/revbayes.archive/archive/v{0}.tar.gz'.format(version) return 'https://github.com/revbayes/revbayes.archive/archive/v{0}.tar.gz'.format(version)
@property @property
def root_cmakelists_dir(self): def root_cmakelists_dir(self):
if self.spec.version > Version('1.0.13') and '+mpi' in self.spec: if self.spec.version > Version('1.0.13'):
return 'projects/cmake/build-mpi' return 'src'
else: else:
return 'projects/cmake/build' return 'projects/cmake/build'
@when('@1.1.0:')
def cmake_args(self):
args = []
if '+mpi' in self.spec:
args.extend([
self.define('MPI', 'ON'),
self.define('RB_EXEC_NAME', 'rb-mpi'),
])
return args
@run_before('cmake') @run_before('cmake')
def regenerate(self): def regenerate(self):
with working_dir(join_path('projects', 'cmake')): with working_dir(join_path('projects', 'cmake')):
...@@ -49,10 +60,11 @@ def regenerate(self): ...@@ -49,10 +60,11 @@ def regenerate(self):
generate_version() generate_version()
dest = join_path('..', '..', 'src', 'revlanguage', 'utils') dest = join_path('..', '..', 'src', 'revlanguage', 'utils')
install('GitVersion.cpp', dest) install('GitVersion.cpp', dest)
edit = FileFilter('regenerate.sh') else:
edit.filter('boost="true"', 'boost="false"') edit = FileFilter('regenerate.sh')
if '+mpi' in self.spec: edit.filter('boost="true"', 'boost="false"')
edit.filter('mpi="false"', 'mpi="true"') if '+mpi' in self.spec:
edit.filter('mpi="false"', 'mpi="true"')
regenerate = Executable('./regenerate.sh') regenerate = Executable('./regenerate.sh')
regenerate() regenerate()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment