Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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 @@ -12,6 +12,6 @@ sources = ['%(namelower)s-%(version)s-dist.zip']
checksums = ['c730593916ef0ba62f3d113cc3a268e45f7e8039daf7b767c8641b6999bd49b1']

builddependencies = [('binutils', '2.30')]
dependencies = [('Java', '1.8.0_162', '', True)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that this might not merge if the currently pending TensorFlow 1.10 gets merged first, since it uses _172

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm aware of that, I'm hoping #6677 gets merged first, and then I'll resolve the conflict here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@boegel Doesn't look like #6677 will merge before this one.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it doesn't, that's fine, then @akesandgren just need to update #6677 accordingly, the change will be trivial.

dependencies = [('Java', '8', '', True)]

moduleclass = 'devel'
24 changes: 24 additions & 0 deletions easybuild/easyconfigs/j/JDK/JDK-1.8.0_181.eb
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Authors:: Jack Perdue <[email protected]> - TAMU HPRC - http://hprc.tamu.edu

easyblock = 'EB_Java'

name = 'JDK'
version = '1.8.0_181'

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
(vp, vs) = version.split('_')
altver = '%su%s' % (vp.split('.')[1], vs)
sources = ['jdk-%s-linux-x64.tar.gz' % altver]
checksums = ['1845567095bfbfebd42ed0d09397939796d05456290fb20a83c476ba09f991d3']

moduleclass = 'lang'
23 changes: 23 additions & 0 deletions easybuild/easyconfigs/j/Java/Java-8.eb
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Authors:: Jack Perdue <[email protected]> - TAMU HPRC - http://hprc.tamu.edu

easyblock = 'Bundle'

name = 'Java'
version = '8'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes quite a lot of changes all in one go - I feel this should be made more prominent somehow.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you clarify? All we're changing here is using a wrapper for Java...

This change in policy will be clearly mentioned in the EasyBuild release notes, and maybe we should also highlight it with a separate post on the mailing list...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just meant that we're going to change the way the Java version is reported at the same time. I would agree with the mailing list post.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I just think it's good to start using this versioning scheme now with a switch to the wrapper... I've always found the 1.8.x versioning a bit awkward since it was Java (SE) 8.

Also, the JDK will still be versioned according to how the sources are versioned.

That said, I'm happy to roll this back to Java/1.8 if people think that makes more sense.

In any case, for Java 10.x it'll likely be Java/10...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't disagree, just noting that we're making lots of simultaneous changes, so we should communicate this as widely as possible.


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

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

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

altroot = 'JDK'
altversion = 'JDK'

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', '8', '', True),
('Tk', '8.6.8'), # for tcltk
('cURL', '7.60.0'), # for RCurl
('libxml2', '2.9.8'), # for XML
Expand Down