updated to jdk-11+28 from https://adoptopenjdk.net -- with proper font rendering on Linux;
--- a/Admin/components/components.sha1 Thu Oct 25 15:41:40 2018 +0200
+++ b/Admin/components/components.sha1 Thu Oct 25 17:08:04 2018 +0200
@@ -70,6 +70,7 @@
b70690c85c05d0ca5bc29287abd20142f6ddcfb0 isabelle_fonts-20171222.tar.gz
c17c482e411bbaf992498041a3e1dea80336aaa6 isabelle_fonts-20171230.tar.gz
3affbb306baff37c360319b21cbaa2cc96ebb282 isabelle_fonts-20180113.tar.gz
+0b2206f914336dec4923dd0479d8cee4b904f544 jdk-11+28.tar.gz
71d19df63816e9be1c4c5eb44aea7a44cfadb319 jdk-11.tar.gz
8d83e433c1419e0c0cc5fd1762903d11b4a5752c jdk-6u31.tar.gz
38d2d2a91c66714c18430e136e7e5191af3996e6 jdk-7u11.tar.gz
--- a/src/Pure/Admin/build_jdk.scala Thu Oct 25 15:41:40 2018 +0200
+++ b/src/Pure/Admin/build_jdk.scala Thu Oct 25 17:08:04 2018 +0200
@@ -7,6 +7,7 @@
package isabelle
+import java.io.{File => JFile}
import java.nio.file.Files
import java.nio.file.attribute.PosixFilePermission
@@ -19,7 +20,7 @@
def detect_version(s: String): String =
{
- val Version_Dir_Entry = """^jdk-(\d+)(?:\.jdk)?$""".r
+ val Version_Dir_Entry = """^jdk-(\d+\+\d+)$""".r
s match {
case Version_Dir_Entry(version) => version
case _ => error("Cannot detect JDK version from " + quote(s))
@@ -56,7 +57,7 @@
def readme(version: String): String =
"""This is OpenJDK """ + version + """ as required for Isabelle.
-See http://jdk.java.net for the original downloads, which are covered
+See https://adoptopenjdk.net for the original downloads, which are covered
the GPL2 (with various liberal exceptions, see legal/*).
Linux, Windows, Mac OS X all work uniformly, depending on certain
@@ -88,6 +89,8 @@
/* extract archive */
+ private def suppress_name(name: String): Boolean = name.startsWith("._")
+
def extract_archive(dir: Path, archive: Path): (String, JDK_Platform) =
{
try {
@@ -104,7 +107,7 @@
}
val dir_entry =
- File.read_dir(tmp_dir) match {
+ File.read_dir(tmp_dir).filterNot(suppress_name(_)) match {
case List(s) => s
case _ => error("Archive contains multiple directories")
}
@@ -183,7 +186,7 @@
}
File.find_files((component_dir + Path.explode("x86_64-darwin")).file,
- file => file.getName.startsWith("._")).foreach(_.delete)
+ file => suppress_name(file.getName)).foreach(_.delete)
progress.echo("Sharing ...")
val main_dir :: other_dirs =