zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ampl: Add missing ampl_lic install and improve look of resources (#25205)

Browse Source 
* 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>
This commit is contained in:
robgics 2021-08-16 17:25:19 -04:00 committed by GitHub
parent bfb811b7d3
commit 437a272854
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
var/spack/repos/builtin/packages/ampl/package.py
View File

@ -17,6 +17,8 @@ class Ampl(Package):
homepage = "https://ampl.com/" homepage = "https://ampl.com/"
manual_download = True manual_download = True
maintainers = ['robgics']
# Use the version as you would expect the user to know it, not necessarily the # 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 as it appears in the file name. To get the checksum, use sha256sum.
version('20210226', sha256='d9ffaed591c0491e311a44c2b246d9d81785f6c0b2747a7e32a783e522e18450') version('20210226', sha256='d9ffaed591c0491e311a44c2b246d9d81785f6c0b2747a7e32a783e522e18450')
@ -28,21 +30,26 @@ class Ampl(Package):
license_files = ['ampl.lic'] license_files = ['ampl.lic']
license_url = 'https://ampl.com/resources/floating-licenses/installation/' license_url = 'https://ampl.com/resources/floating-licenses/installation/'
resourceList = [ resource(
# [version, name, destination, placement, url ,sha256sum] name='amplapi',
('20210226', 'amplapi', '', 'amplapi', 'file://{0}/amplapi-linux64.2.0.0.zip'.format(os.getcwd()), 'a4abe111f142b862f11fcd8700f964b688d5d2291e9e055f6e7adbd92b0e243a'), url='file://{0}/amplapi-linux64.2.0.0.zip'.format(os.getcwd()),
('20210226', 'amplide', '', 'amplide', 'file://{0}/amplide-linux64.3.5.tgz'.format(os.getcwd()), 'c2163896df672b71901d2e46cd5cf1c1c4f0451e478ef32d0971705aaf86d6ac'), sha256='a4abe111f142b862f11fcd8700f964b688d5d2291e9e055f6e7adbd92b0e243a',
('20190529', 'amplapi', '', 'amplapi', 'file://{0}/amplapi-linux64.2.0.0.zip'.format(os.getcwd()), 'a4abe111f142b862f11fcd8700f964b688d5d2291e9e055f6e7adbd92b0e243a'), destination='',
('20190529', 'amplide', '', 'amplide', 'file://{0}/amplide-linux64.3.5.tgz'.format(os.getcwd()), 'c2163896df672b71901d2e46cd5cf1c1c4f0451e478ef32d0971705aaf86d6ac'), placement='amplapi'
] )
resource(
for rsver, rsname, rsdest, rsplace, rsurl, rschecksum in resourceList: name='amplide',
resource(when='@{0}'.format(rsver), url='file://{0}/amplide-linux64.3.5.tgz'.format(os.getcwd()),
name=rsname, sha256='c2163896df672b71901d2e46cd5cf1c1c4f0451e478ef32d0971705aaf86d6ac',
url=rsurl, destination='',
sha256=rschecksum, placement='amplide'
destination=rsdest, )
placement=rsplace 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): def url_for_version(self, version):
@ -54,5 +61,9 @@ def setup_run_environment(self, env):
def install(self, spec, prefix): def install(self, spec, prefix):
install_tree('.', 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)