diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2016-10-29 16:30:00 -0500 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-10-29 14:30:00 -0700 |
| commit | 893b2e4f621a4ae23ad1fdae34a46c454073d4e2 (patch) | |
| tree | d660cac352f4f28b6b68125c7203e729a05a08dd /var | |
| parent | 23683c65de5c0f2cf4a899c5ee1109cc5a078bd1 (diff) | |
| download | spack-893b2e4f621a4ae23ad1fdae34a46c454073d4e2.tar.gz spack-893b2e4f621a4ae23ad1fdae34a46c454073d4e2.tar.bz2 spack-893b2e4f621a4ae23ad1fdae34a46c454073d4e2.tar.xz spack-893b2e4f621a4ae23ad1fdae34a46c454073d4e2.zip | |
Update license directory for intel-paralel-studio (#2163)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/intel-parallel-studio/package.py | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index 0270c051fe..e03c9fab3f 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -184,15 +184,24 @@ class IntelParallelStudio(IntelInstaller): "license.lic")) if spec.satisfies('+tools') and (spec.satisfies('@cluster') or spec.satisfies('@professional')): - os.mkdir(os.path.join(self.prefix, "inspector_xe/licenses")) + inspector_dir = "inspector_xe/licenses" + advisor_dir = "advisor_xe/licenses" + vtune_amplifier_dir = "vtune_amplifier_xe/licenses" + + year = int(str(self.version).split('.')[1]) + if year >= 2017: + inspector_dir = "inspector/licenses" + advisor_dir = "advisor/licenses" + + os.mkdir(os.path.join(self.prefix, inspector_dir)) os.symlink(self.global_license_file, os.path.join( - self.prefix, "inspector_xe/licenses", "license.lic")) - os.mkdir(os.path.join(self.prefix, "advisor_xe/licenses")) + self.prefix, inspector_dir, "license.lic")) + os.mkdir(os.path.join(self.prefix, advisor_dir)) os.symlink(self.global_license_file, os.path.join( - self.prefix, "advisor_xe/licenses", "license.lic")) - os.mkdir(os.path.join(self.prefix, "vtune_amplifier_xe/licenses")) + self.prefix, advisor_dir, "license.lic")) + os.mkdir(os.path.join(self.prefix, vtune_amplifier_dir)) os.symlink(self.global_license_file, os.path.join( - self.prefix, "vtune_amplifier_xe/licenses", "license.lic")) + self.prefix, vtune_amplifier_dir, "license.lic")) if (spec.satisfies('+all') or spec.satisfies('+mpi')) and \ spec.satisfies('@cluster'): |