summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorrobgics <32717310+robgics@users.noreply.github.com>2021-08-16 17:25:19 -0400
committerGitHub <noreply@github.com>2021-08-16 14:25:19 -0700
commit437a272854f5de3148a738128203003f3a8a068d (patch)
tree17c904084671c5f58573fa9c075e2c19c37f20b0 /var
parentbfb811b7d382c609cf31a81ef8fbee6ec07bac69 (diff)
downloadspack-437a272854f5de3148a738128203003f3a8a068d.tar.gz
spack-437a272854f5de3148a738128203003f3a8a068d.tar.bz2
spack-437a272854f5de3148a738128203003f3a8a068d.tar.xz
spack-437a272854f5de3148a738128203003f3a8a068d.zip
ampl: Add missing ampl_lic install and improve look of resources (#25205)
* ampl: Add missing ampl_lic install and improve look of resources * ampl: Add myself as maintainer * ampl: Remove unused variable and delete extra lines Co-authored-by: Rob Groner <rug262@psu.edu>
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/ampl/package.py47
1 files changed, 29 insertions, 18 deletions
diff --git a/var/spack/repos/builtin/packages/ampl/package.py b/var/spack/repos/builtin/packages/ampl/package.py
index 6672dc04c1..be3b55405b 100644
--- a/var/spack/repos/builtin/packages/ampl/package.py
+++ b/var/spack/repos/builtin/packages/ampl/package.py
@@ -17,6 +17,8 @@ class Ampl(Package):
homepage = "https://ampl.com/"
manual_download = True
+ maintainers = ['robgics']
+
# Use the version as you would expect the user to know it, not necessarily the
# version as it appears in the file name. To get the checksum, use sha256sum.
version('20210226', sha256='d9ffaed591c0491e311a44c2b246d9d81785f6c0b2747a7e32a783e522e18450')
@@ -28,22 +30,27 @@ class Ampl(Package):
license_files = ['ampl.lic']
license_url = 'https://ampl.com/resources/floating-licenses/installation/'
- resourceList = [
- # [version, name, destination, placement, url ,sha256sum]
- ('20210226', 'amplapi', '', 'amplapi', 'file://{0}/amplapi-linux64.2.0.0.zip'.format(os.getcwd()), 'a4abe111f142b862f11fcd8700f964b688d5d2291e9e055f6e7adbd92b0e243a'),
- ('20210226', 'amplide', '', 'amplide', 'file://{0}/amplide-linux64.3.5.tgz'.format(os.getcwd()), 'c2163896df672b71901d2e46cd5cf1c1c4f0451e478ef32d0971705aaf86d6ac'),
- ('20190529', 'amplapi', '', 'amplapi', 'file://{0}/amplapi-linux64.2.0.0.zip'.format(os.getcwd()), 'a4abe111f142b862f11fcd8700f964b688d5d2291e9e055f6e7adbd92b0e243a'),
- ('20190529', 'amplide', '', 'amplide', 'file://{0}/amplide-linux64.3.5.tgz'.format(os.getcwd()), 'c2163896df672b71901d2e46cd5cf1c1c4f0451e478ef32d0971705aaf86d6ac'),
- ]
-
- for rsver, rsname, rsdest, rsplace, rsurl, rschecksum in resourceList:
- resource(when='@{0}'.format(rsver),
- name=rsname,
- url=rsurl,
- sha256=rschecksum,
- destination=rsdest,
- placement=rsplace
- )
+ resource(
+ name='amplapi',
+ url='file://{0}/amplapi-linux64.2.0.0.zip'.format(os.getcwd()),
+ sha256='a4abe111f142b862f11fcd8700f964b688d5d2291e9e055f6e7adbd92b0e243a',
+ destination='',
+ placement='amplapi'
+ )
+ resource(
+ name='amplide',
+ url='file://{0}/amplide-linux64.3.5.tgz'.format(os.getcwd()),
+ sha256='c2163896df672b71901d2e46cd5cf1c1c4f0451e478ef32d0971705aaf86d6ac',
+ destination='',
+ placement='amplide'
+ )
+ resource(
+ name='ampl_lic',
+ url='file://{0}/ampl_lic.linux-intel64.20210618.tgz'.format(os.getcwd()),
+ sha256='f5c38638d6cc99c85e0d6de001722b64a03e2adeaf5aed9ed622401654d9ff33',
+ destination='',
+ placement=''
+ )
def url_for_version(self, version):
return "file://{0}/ampl.linux-intel64.{1}.tgz".format(os.getcwd(), version)
@@ -54,5 +61,9 @@ class Ampl(Package):
def install(self, spec, prefix):
install_tree('.', prefix)
- install_tree('amplapi', prefix)
- install_tree('amplide', prefix)
+
+ for key in self.resources:
+ for res in self.resources[key]:
+ if res.name == 'ampl_lic':
+ res_path = join_path(res.fetcher.stage.source_path, res.name)
+ install(res_path, prefix)