diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2016-04-05 11:00:55 -0500 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2016-05-11 11:32:08 -0500 |
| commit | 6906911e85f5df504ef0a039ac510822eafc3643 (patch) | |
| tree | 6de12e45f007a7002bec71e04ecfd691e445b032 /var | |
| parent | b63d11d5b0dece2c4e063b3ac5dc4658ab585fd9 (diff) | |
| download | spack-6906911e85f5df504ef0a039ac510822eafc3643.tar.gz spack-6906911e85f5df504ef0a039ac510822eafc3643.tar.bz2 spack-6906911e85f5df504ef0a039ac510822eafc3643.tar.xz spack-6906911e85f5df504ef0a039ac510822eafc3643.zip | |
Allow license files to use different symbols for comments
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/nag/package.py | 13 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/pgi/package.py | 1 |
2 files changed, 12 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/nag/package.py b/var/spack/repos/builtin/packages/nag/package.py index 840b79c66b..c6c33ecad5 100644 --- a/var/spack/repos/builtin/packages/nag/package.py +++ b/var/spack/repos/builtin/packages/nag/package.py @@ -5,17 +5,26 @@ class Nag(Package): """The NAG Fortran Compiler.""" homepage = "http://www.nag.com/nagware/np.asp" - version('6.1', '1e29d9d435b7ccc2842a320150b28ba4', - url='http://www.nag.com/downloads/impl/npl6a61na_amd64.tgz') + version('6.1', '1e29d9d435b7ccc2842a320150b28ba4') + version('6.0', '3fa1e7f7b51ef8a23e6c687cdcad9f96') # Licensing license_required = True + license_comment = '!' license_files = ['lib/nag.key', 'lib/nag.licence', 'lib/nagware.licence'] license_vars = ['NAG_KUSARI_FILE'] license_url = 'http://www.nag.com/doc/inun/np61/lin-mac/klicence.txt' + + def url_for_version(self, version): + # TODO: url and checksum are architecture dependent + # TODO: We currently only support x86_64 + return 'http://www.nag.com/downloads/impl/npl6a%sna_amd64.tgz' % \ + str(version).replace('.', '') + + def install(self, spec, prefix): # Set installation directories os.environ['INSTALL_TO_BINDIR'] = prefix.bin diff --git a/var/spack/repos/builtin/packages/pgi/package.py b/var/spack/repos/builtin/packages/pgi/package.py index 649c7dbee2..095569a2a9 100644 --- a/var/spack/repos/builtin/packages/pgi/package.py +++ b/var/spack/repos/builtin/packages/pgi/package.py @@ -27,6 +27,7 @@ class Pgi(Package): # Licensing license_required = True + license_comment = '#' license_files = ['license.dat'] license_vars = ['PGROUPD_LICENSE_FILE', 'LM_LICENSE_FILE'] license_url = 'http://www.pgroup.com/doc/pgiinstall.pdf' |