Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add Java 1.8 easyconfig that can be updated in-place to more recent JDK 1.8.x #6712

Merged
merged 13 commits into from
Sep 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ checksums = [
]

builddependencies = [('binutils', '2.30')]
dependencies = [('Java', '1.8.0_172', '', True)]
dependencies = [('Java', '1.8', '', True)]

moduleclass = 'devel'
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ checksums = ['e4bb082d8c8826d4f8bc8c2f83811d0e81e5088b99099d3396d284f82fbf28c9']

dependencies = [
('Python', '2.7.15'),
('Java', '1.8.0_181', '', True),
('Java', '1.8', '', True),
]

modextrapaths = {'PATH': ''}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ checksums = ['e4bb082d8c8826d4f8bc8c2f83811d0e81e5088b99099d3396d284f82fbf28c9']

dependencies = [
('Python', '3.6.6'),
('Java', '1.8.0_181', '', True),
('Java', '1.8', '', True),
]

modextrapaths = {'PATH': ''}
Expand Down
14 changes: 14 additions & 0 deletions easybuild/easyconfigs/j/Java/Java-1.8.eb
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
easyblock = 'ModuleRC'

name = 'Java'
version = '1.8'

homepage = 'http://java.com/'
description = """Java Platform, Standard Edition (Java SE) lets you develop and deploy
Java applications on desktops and servers."""

toolchain = {'name': 'dummy', 'version': 'dummy'}

dependencies = [('Java', '%(version)s.0_181')]

moduleclass = 'lang'
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/r/R/R-3.5.1-foss-2018b.eb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies = [
('libpng', '1.6.34'), # for plotting in R
('libjpeg-turbo', '2.0.0'), # for plottting in R
('LibTIFF', '4.0.9'),
('Java', '1.8.0_181', '', True),
('Java', '1.8', '', True),
('Tk', '8.6.8'), # for tcltk
('cURL', '7.60.0'), # for RCurl
('libxml2', '2.9.8'), # for XML
Expand Down
10 changes: 10 additions & 0 deletions test/easyconfigs/easyconfigs.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,16 @@ def check_dep_vars(dep, dep_vars):
if len(dep_vars) == 1:
break

# filter out Java 'wrapper'
# i.e. if the version of one is a prefix of the version of the other one (e.g. 1.8 & 1.8.0_181)
elif dep == 'Java' and len(dep_vars) == 2:
key1, key2 = sorted(dep_vars.keys())
ver1, ver2 = [k.split(';')[0] for k in [key1, key2]]
if ver1.startswith(ver2):
dep_vars.pop(key2)
elif ver2.startswith(ver1):
dep_vars.pop(key1)

# filter out variants that are specific to a particular version of CUDA
cuda_dep_vars = [v for v in dep_vars.keys() if '-CUDA' in v]
if len(dep_vars) > len(cuda_dep_vars):
Expand Down