summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2022-04-08 21:43:29 +0200
committerHarmen Stoppels <harmenstoppels@gmail.com>2022-04-11 11:42:45 +0200
commitc8f37797a4147704c1140fb4f068df3f598f2df7 (patch)
treecc3572ce4c1dcf9a23aa60ddbb1be2ea41b8d7c7
parent6bdd9db594444077996a8820782d5b3df1301864 (diff)
downloadspack-c8f37797a4147704c1140fb4f068df3f598f2df7.tar.gz
spack-c8f37797a4147704c1140fb4f068df3f598f2df7.tar.bz2
spack-c8f37797a4147704c1140fb4f068df3f598f2df7.tar.xz
spack-c8f37797a4147704c1140fb4f068df3f598f2df7.zip
matlab: remove custom phases
-rw-r--r--var/spack/repos/builtin/packages/matlab/package.py24
1 files changed, 7 insertions, 17 deletions
diff --git a/var/spack/repos/builtin/packages/matlab/package.py b/var/spack/repos/builtin/packages/matlab/package.py
index bad4c438e0..71b6f0659c 100644
--- a/var/spack/repos/builtin/packages/matlab/package.py
+++ b/var/spack/repos/builtin/packages/matlab/package.py
@@ -31,21 +31,12 @@ class Matlab(Package):
version('R2016b', sha256='a3121057b1905b132e5741de9f7f8350378592d84c5525faf3ec571620a336f2')
version('R2015b', sha256='dead402960f4ab8f22debe8b28a402069166cd967d9dcca443f6c2940b00a783')
- phases = ['configure', 'install']
-
- variant(
- 'mode',
- default='interactive',
- values=('interactive', 'silent', 'automated'),
- description='Installation mode (interactive, silent, or automated)'
- )
-
- variant(
- 'key',
- default='<installation-key-here>',
- values=lambda x: True, # Anything goes as a key
- description='The file installation key to use'
- )
+ variant('mode', default='interactive',
+ values=('interactive', 'silent', 'automated'),
+ description='Installation mode (interactive, silent, or automated)')
+
+ variant('key', default='<installation-key-here>',
+ description='The file installation key to use')
# Licensing
license_required = True
@@ -59,7 +50,7 @@ class Matlab(Package):
def url_for_version(self, version):
return "file://{0}/matlab_{1}_glnxa64.zip".format(os.getcwd(), version)
- def configure(self, spec, prefix):
+ def install(self, spec, prefix):
config = {
'destinationFolder': prefix,
'mode': spec.variants['mode'].value,
@@ -73,7 +64,6 @@ class Matlab(Package):
for key in config:
input_file.write('{0}={1}\n'.format(key, config[key]))
- def install(self, spec, prefix):
# Run silent installation script
# Full path required
input_file = join_path(