From c8f37797a4147704c1140fb4f068df3f598f2df7 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Fri, 8 Apr 2022 21:43:29 +0200 Subject: [PATCH] matlab: remove custom phases --- .../repos/builtin/packages/matlab/package.py | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/var/spack/repos/builtin/packages/matlab/package.py b/var/spack/repos/builtin/packages/matlab/package.py index bad4c438e0d..71b6f0659c6 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( - 'mode', - default='interactive', - values=('interactive', 'silent', 'automated'), - description='Installation mode (interactive, silent, or automated)' - ) - - variant( - 'key', - default='', - values=lambda x: True, # Anything goes as a key - description='The file installation key to use' - ) + variant('key', default='', + 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 @@ def configure(self, spec, prefix): 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(