diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/adlbx/package.py | 15 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/exmcutils/package.py | 15 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/stc/package.py | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/turbine/package.py | 18 |
4 files changed, 52 insertions, 8 deletions
diff --git a/var/spack/repos/builtin/packages/adlbx/package.py b/var/spack/repos/builtin/packages/adlbx/package.py index fb01a1ffed..3df61b2a1c 100644 --- a/var/spack/repos/builtin/packages/adlbx/package.py +++ b/var/spack/repos/builtin/packages/adlbx/package.py @@ -12,12 +12,20 @@ class Adlbx(AutotoolsPackage): homepage = 'http://swift-lang.org/Swift-T' url = 'http://swift-lang.github.io/swift-t-downloads/spack/adlbx-0.0.0.tar.gz' + git = "https://github.com/swift-lang/swift-t.git" + version('master', branch='master') + version('0.9.2', 'a7d9e208eb3b49b8bb857562f6bb61bb') version('0.9.1', '07151ddef5fb83d8f4b40700013d9daf') version('0.8.0', '34ade59ce3be5bc296955231d47a27dd') + depends_on('exmcutils@master', when='@master') depends_on('exmcutils@:0.5.3', when='@:0.8.0') depends_on('exmcutils', when='@0.9.1:') + depends_on('autoconf', type='build', when='@master') + depends_on('automake', type='build', when='@master') + depends_on('libtool', type='build', when='@master') + depends_on('m4', type='build', when='@master') depends_on('mpi') def setup_environment(self, spack_env, run_env): @@ -26,6 +34,13 @@ class Adlbx(AutotoolsPackage): spack_env.set('CXX', spec['mpi'].mpicxx) spack_env.set('CXXLD', spec['mpi'].mpicxx) + @property + def configure_directory(self): + if self.version == Version('master'): + return 'lb/code' + else: + return '.' + def configure_args(self): args = ['--with-c-utils=' + self.spec['exmcutils'].prefix] return args diff --git a/var/spack/repos/builtin/packages/exmcutils/package.py b/var/spack/repos/builtin/packages/exmcutils/package.py index 0ffe91a187..0d1b9f94b5 100644 --- a/var/spack/repos/builtin/packages/exmcutils/package.py +++ b/var/spack/repos/builtin/packages/exmcutils/package.py @@ -12,7 +12,20 @@ class Exmcutils(AutotoolsPackage): homepage = 'http://swift-lang.org/Swift-T' url = 'http://swift-lang.github.io/swift-t-downloads/spack/exmcutils-0.0.0.tar.gz' + git = "https://github.com/swift-lang/swift-t.git" + version('master', branch='master') + version('0.5.7', '69bb32f364e93e8a60865c05efbf4f52') version('0.5.6', 'b12a8dc163e3369492ec7c1403fe86e4') - # This package has no dependencies. + @property + def configure_directory(self): + if self.version == Version('master'): + return 'c-utils/code' + else: + return '.' + + depends_on('m4', when='@master') + depends_on('autoconf', when='@master') + depends_on('automake', when='@master') + depends_on('libtool', when='@master') diff --git a/var/spack/repos/builtin/packages/stc/package.py b/var/spack/repos/builtin/packages/stc/package.py index 1263f794a3..77d2bde13d 100644 --- a/var/spack/repos/builtin/packages/stc/package.py +++ b/var/spack/repos/builtin/packages/stc/package.py @@ -13,19 +13,27 @@ class Stc(AutotoolsPackage): homepage = 'http://swift-lang.org/Swift-T' url = 'http://swift-lang.github.io/swift-t-downloads/spack/stc-0.0.0.tar.gz' git = "https://github.com/swift-lang/swift-t.git" - configure_directory = 'stc/code' - version('develop', branch='master') + version('master', branch='master') + version('0.8.3', '1d7eee78d3531b7c1901c5aec5703721') version('0.8.2', '883b0657f1aac9b81158ef0a8989be4c') depends_on('java', type=('build', 'run')) depends_on('ant', type='build') depends_on('turbine', type=('build', 'run')) + depends_on('turbine@master', type=('build', 'run'), when='@master') depends_on('zsh', type=('build', 'run')) depends_on('autoconf', type='build') depends_on('automake', type='build') depends_on('libtool', type='build') + @property + def configure_directory(self): + if self.version == Version('master'): + return 'stc/code' + else: + return '.' + def configure_args(self): args = ['--with-turbine=' + self.spec['turbine'].prefix] return args diff --git a/var/spack/repos/builtin/packages/turbine/package.py b/var/spack/repos/builtin/packages/turbine/package.py index 5a302e637f..636f3cec48 100644 --- a/var/spack/repos/builtin/packages/turbine/package.py +++ b/var/spack/repos/builtin/packages/turbine/package.py @@ -15,8 +15,8 @@ class Turbine(AutotoolsPackage): git = "https://github.com/swift-lang/swift-t.git" configure_directory = 'turbine/code' - version('develop', branch='master') - version('1.2.3', 'f2e393c292c4248b4e77a19f8272ae88') + version('master', branch='master') + version('1.2.3', '028f6f4f5041e5ffbbf3ab8008e3b781') version('1.2.1', 'c8976b22849aafe02a8fb4259dfed434') version('1.1.0', '9a347cf16df02707cb529f96c265a082') @@ -26,6 +26,7 @@ class Turbine(AutotoolsPackage): description='Enable calling R') variant('hdf5', default=False, description='Enable HDF5 support') + depends_on('adlbx@master', when='@master') depends_on('adlbx@:0.8.0', when='@:1.1.0') depends_on('adlbx', when='@1.2.1:') depends_on('adlbx') @@ -37,9 +38,9 @@ class Turbine(AutotoolsPackage): depends_on('r-rinside', when='+r') depends_on('hdf5', when='+hdf5') depends_on('mpi') - depends_on('autoconf', type='build') - depends_on('automake', type='build') - depends_on('libtool', type='build') + depends_on('autoconf', type='build', when='@master') + depends_on('automake', type='build', when='@master') + depends_on('libtool', type='build', when='@master') depends_on('m4', type=('build', 'run')) def setup_environment(self, spack_env, run_env): @@ -49,6 +50,13 @@ class Turbine(AutotoolsPackage): spack_env.set('CXX', spec['mpi'].mpicxx) spack_env.set('CXXLD', spec['mpi'].mpicxx) + @property + def configure_directory(self): + if self.version == Version('master'): + return 'turbine/code' + else: + return '.' + def configure_args(self): args = ['--with-c-utils=' + self.spec['exmcutils'].prefix, '--with-adlb=' + self.spec['adlbx'].prefix, |