diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2017-06-15 05:40:55 -0500 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2017-06-15 12:40:55 +0200 |
| commit | 41e4a034ffd89b6e31411a00ad765e7f936dc3ab (patch) | |
| tree | bd04ca776698a98ba313be30a23fc17f0f89ecd6 /var | |
| parent | dc911661ca1ea15d0e4f39ed530900dd615f2178 (diff) | |
| download | spack-41e4a034ffd89b6e31411a00ad765e7f936dc3ab.tar.gz spack-41e4a034ffd89b6e31411a00ad765e7f936dc3ab.tar.bz2 spack-41e4a034ffd89b6e31411a00ad765e7f936dc3ab.tar.xz spack-41e4a034ffd89b6e31411a00ad765e7f936dc3ab.zip | |
Add latest version of JDK (#4317)
* Add latest version of JDK
* Use a more specific URL to get curl to work
* Remove failing unit test
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/jdk/package.py | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/jdk/package.py b/var/spack/repos/builtin/packages/jdk/package.py index 02c44e9337..9939772f47 100644 --- a/var/spack/repos/builtin/packages/jdk/package.py +++ b/var/spack/repos/builtin/packages/jdk/package.py @@ -45,19 +45,24 @@ class Jdk(Package): '-H', # specify required License Agreement cookie 'Cookie: oraclelicense=accept-securebackup-cookie'] - version('8u92', '65a1cc17ea362453a6e0eb4f13be76e4', - url="http://download.oracle.com/otn-pub/java/jdk/8u92-b14/jdk-8u92-linux-x64.tar.gz", - curl_options=curl_options) - version('8u73', '1b0120970aa8bc182606a16bf848a686', - url="http://download.oracle.com/otn-pub/java/jdk/8u73-b02/jdk-8u73-linux-x64.tar.gz", - curl_options=curl_options) - version('8u66', '88f31f3d642c3287134297b8c10e61bf', - url="http://download.oracle.com/otn-pub/java/jdk/8u66-b17/jdk-8u66-linux-x64.tar.gz", - curl_options=curl_options) + # For instructions on how to find the magic URL, see: + # https://gist.github.com/P7h/9741922 + # https://linuxconfig.org/how-to-install-java-se-development-kit-on-debian-linux + version('8u131-b11', '75b2cb2249710d822a60f83e28860053', curl_options=curl_options, + url='http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz') + version('8u92-b14', '65a1cc17ea362453a6e0eb4f13be76e4', curl_options=curl_options) + version('8u73-b02', '1b0120970aa8bc182606a16bf848a686', curl_options=curl_options) + version('8u66-b17', '88f31f3d642c3287134297b8c10e61bf', curl_options=curl_options) # The 7u80 tarball is not readily available from Oracle. If you have # the tarball, add it to your mirror as mirror/jdk/jdk-7u80.tar.gz and # away you go. - version('7u80', '6152f8a7561acf795ca4701daa10a965') + version('7u80-b0', '6152f8a7561acf795ca4701daa10a965') + + def url_for_version(self, version): + url = "http://download.oracle.com/otn-pub/java/jdk/{0}/jdk-{1}-linux-x64.tar.gz" + version = str(version) + minor_version = version[:version.index('-')] + return url.format(version, minor_version) def install(self, spec, prefix): distutils.dir_util.copy_tree(".", prefix) |