use ModulesRC easyblock to make Java/1.8 a wrapper for Java/1.8.0_181

easybuilders · Sep 14, 2018 · cfdc6f3 · cfdc6f3
1 parent 34da312
commit cfdc6f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/easybuild/easyconfigs/b/Bazel/Bazel-0.16.0-GCCcore-7.3.0.eb b/easybuild/easyconfigs/b/Bazel/Bazel-0.16.0-GCCcore-7.3.0.eb
@@ -16,6 +16,6 @@ checksums = [
 ]
 
 builddependencies = [('binutils', '2.30')]
-dependencies = [('Java', '8', '', True)]
+dependencies = [('Java', '1.8', '', True)]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/j/Java/Java-8.eb → easybuild/easyconfigs/j/Java/Java-1.8.eb b/easybuild/easyconfigs/j/Java/Java-8.eb → easybuild/easyconfigs/j/Java/Java-1.8.eb
@@ -1,15 +1,14 @@
+easyblock = 'ModuleRC'
+
 name = 'Java'
-version = '8'
+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'}
 
-# download the tar.gz directly from
-# http://www.oracle.com/technetwork/java/javase/downloads/index.html
-sources = ['jdk-%(version)su181-linux-x64.tar.gz']
-checksums = ['1845567095bfbfebd42ed0d09397939796d05456290fb20a83c476ba09f991d3']
+dependencies = [('Java', '%(version)s.0_181')]
 
 moduleclass = 'lang'
diff --git a/easybuild/easyconfigs/r/R/R-3.5.1-foss-2018b.eb b/easybuild/easyconfigs/r/R/R-3.5.1-foss-2018b.eb
@@ -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', '8', '', True),
+    ('Java', '1.8', '', True),
     ('Tk', '8.6.8'),  # for tcltk
     ('cURL', '7.60.0'),  # for RCurl
     ('libxml2', '2.9.8'),  # for XML