# HG changeset patch
# User wenzelm
# Date 1485041410 -3600
# Node ID 3b4e5fad4dc23c599d8da23eaedcd02c2b78f388
# Parent  a5a09855e4246bfd3d8ccd5b1d80f01479130d75
build_jdk in Scala;

diff -r a5a09855e424 -r 3b4e5fad4dc2 Admin/java/build
--- a/Admin/java/build	Fri Jan 20 21:05:11 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-#!/usr/bin/env bash
-
-THIS="$(cd "$(dirname "$0")"; pwd)"
-
-
-## diagnostics
-
-function fail()
-{
-  echo "$1" >&2
-  exit 2
-}
-
-
-## parameters
-
-VERSION="8u112"
-FULL_VERSION="1.8.0_112"
-
-ARCHIVE_LINUX32="jdk-${VERSION}-linux-i586.tar.gz"
-ARCHIVE_LINUX64="jdk-${VERSION}-linux-x64.tar.gz"
-ARCHIVE_WINDOWS32="jdk${FULL_VERSION}-w32.tar.gz"
-ARCHIVE_WINDOWS64="jdk${FULL_VERSION}-w64.tar.gz"
-ARCHIVE_DARWIN="jdk${FULL_VERSION}.jdk.tar.gz"
-
-
-## main
-
-DIR="jdk-${VERSION}"
-mkdir "$DIR" || fail "Cannot create fresh directory: \"$DIR\""
-
-
-# README
-
-cat >> "$DIR/README" << EOF
-This is JDK/JRE $FULL_VERSION as required for Isabelle.
-
-See http://www.oracle.com/technetwork/java/javase/downloads/index.html
-for the original downloads, which are covered by the Oracle Binary
-Code License Agreement for Java SE.
-
-Linux, Windows, Mac OS X all work uniformly, depending on certain
-platform-specific subdirectories.
-EOF
-
-
-# settings
-
-mkdir "$DIR/etc"
-cp "$THIS/settings" "$DIR/etc/settings"
-
-
-# content
-
-#GNU tar (notably on Mac OS X)
-type -p gnutar >/dev/null && function tar() { gnutar "$@"; }
-
-mkdir "$DIR/x86-linux" "$DIR/x86_64-linux" "$DIR/x86-windows" "$DIR/x86_64-windows" "$DIR/x86_64-darwin"
-
-tar -C "$DIR/x86-linux" -xf "$ARCHIVE_LINUX32"
-tar -C "$DIR/x86_64-linux" -xf "$ARCHIVE_LINUX64"
-tar -C "$DIR/x86-windows" -xf "$ARCHIVE_WINDOWS32"
-tar -C "$DIR/x86_64-windows" -xf "$ARCHIVE_WINDOWS64"
-tar -C "$DIR/x86_64-darwin" -xf "$ARCHIVE_DARWIN"
-
-(
-  cd "$DIR"
-  for PLATFORM in x86-linux x86_64-linux x86-windows x86_64-windows
-  do
-    mv "$PLATFORM/jdk${FULL_VERSION}"/* "$PLATFORM"/.
-    rmdir "$PLATFORM/jdk${FULL_VERSION}"
-  done
-  PLATFORM=x86_64-darwin
-  mv "$PLATFORM/jdk${FULL_VERSION}.jdk"/* "$PLATFORM"/.
-  rmdir "$PLATFORM/jdk${FULL_VERSION}.jdk"
-)
-
-chgrp -R isabelle "$DIR"
-chmod -R a+r "$DIR"
-chmod -R a+X "$DIR"
-
-find "$DIR/x86_64-darwin" -name "._*" -exec rm -f {} ";"
-
-echo "Sharing ..."
-(
-  cd "$DIR/x86-linux"
-  for FILE in $(find . -type f)
-  do
-    for OTHER in \
-      "../x86_64-linux/$FILE" \
-      "../x86-windows/$FILE" \
-      "../x86_64-windows/$FILE" \
-      "../x86_64-darwin/Contents/Home/$FILE"
-    do
-      if cmp -s "$FILE" "$OTHER"
-      then
-        echo -n "*"
-        ln -f "$FILE" "$OTHER"
-      fi
-    done
-  done
-)
-echo
-
-
-# create archive
-
-echo "Archiving ..."
-tar -c -z -f "${DIR}.tar.gz" "$DIR" && echo "${DIR}.tar.gz"
diff -r a5a09855e424 -r 3b4e5fad4dc2 Admin/java/settings
--- a/Admin/java/settings	Fri Jan 20 21:05:11 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-# -*- shell-script -*- :mode=shellscript:
-
-case "$ISABELLE_PLATFORM_FAMILY" in
-  linux)
-    ISABELLE_JAVA_PLATFORM="${ISABELLE_PLATFORM64:-$ISABELLE_PLATFORM32}"
-    ISABELLE_JDK_HOME="$COMPONENT/$ISABELLE_JAVA_PLATFORM"
-    ;;
-  windows)
-    if [ ! -e "$COMPONENT/x86_64-windows" ]; then
-      ISABELLE_JAVA_PLATFORM="x86-windows"
-    elif "$COMPONENT/x86_64-windows/jre/bin/java" -version > /dev/null 2> /dev/null; then
-      ISABELLE_JAVA_PLATFORM="x86_64-windows"
-    else
-      ISABELLE_JAVA_PLATFORM="x86-windows"
-    fi
-    ISABELLE_JDK_HOME="$COMPONENT/$ISABELLE_JAVA_PLATFORM"
-    ;;
-  macos)
-    if [ -z "$ISABELLE_PLATFORM64" ]; then
-      echo "### Java unavailable on 32bit Mac OS X" >&2
-    else
-      ISABELLE_JAVA_PLATFORM="$ISABELLE_PLATFORM64"
-      ISABELLE_JDK_HOME="$COMPONENT/$ISABELLE_JAVA_PLATFORM/Contents/Home"
-    fi
-    ;;
-esac
diff -r a5a09855e424 -r 3b4e5fad4dc2 src/Pure/Admin/build_jdk.scala
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Pure/Admin/build_jdk.scala	Sun Jan 22 00:30:10 2017 +0100
@@ -0,0 +1,233 @@
+/*  Title:      Pure/Admin/build_jdk.scala
+    Author:     Makarius
+
+Build Isabelle jdk component from original platform installations.
+*/
+
+package isabelle
+
+
+import scala.util.matching.Regex
+
+
+object Build_JDK
+{
+  /* version */
+
+  sealed case class Version(short: String, full: String)
+
+  def detect_version(s: String): Version =
+  {
+    val Version_Dir_Entry = """^jdk1\.(\d+)\.0_(\d+)(?:\.jdk)?$""".r
+    s match {
+      case Version_Dir_Entry(a, b) => Version(a + "u" + b, "1." + a + ".0_" + b)
+      case _ => error("Cannot detect JDK version from " + quote(s))
+    }
+  }
+
+
+  /* platform */
+
+  sealed case class JDK_Platform(name: String, exe: String, regex: Regex)
+  {
+    override def toString: String = name
+
+    def detect(jdk_dir: Path): Boolean =
+    {
+      val path = jdk_dir + Path.explode(exe)
+      if (path.is_file) {
+        val file_descr = Isabelle_System.bash("file -b " + File.bash_path(path)).check.out
+        regex.pattern.matcher(file_descr).matches
+      }
+      else false
+    }
+  }
+  val jdk_platforms =
+    List(JDK_Platform("x86-linux", "bin/java", """.*ELF 32-bit.*80386.*""".r),
+      JDK_Platform("x86_64-linux", "bin/java", """.*ELF 64-bit.*x86[-_]64.*""".r),
+      JDK_Platform("x86-windows", "bin/java.exe", """.*PE32 executable.*80386.*""".r),
+      JDK_Platform("x86_64-windows", "bin/java.exe", """.*PE32\+ executable.*x86[-_]64.*""".r),
+      JDK_Platform("x86_64-darwin", "Contents/Home/bin/java", """.*Mach-O 64-bit.*x86[-_]64.*""".r))
+
+
+  /* README */
+
+  def readme(version: Version): String =
+"""This is JDK/JRE """ + version.full + """ as required for Isabelle.
+
+See http://www.oracle.com/technetwork/java/javase/downloads/index.html
+for the original downloads, which are covered by the Oracle Binary
+Code License Agreement for Java SE.
+
+Linux, Windows, Mac OS X all work uniformly, depending on certain
+platform-specific subdirectories.
+"""
+
+
+  /* settings */
+
+  val settings =
+"""# -*- shell-script -*- :mode=shellscript:
+
+case "$ISABELLE_PLATFORM_FAMILY" in
+  linux)
+    ISABELLE_JAVA_PLATFORM="${ISABELLE_PLATFORM64:-$ISABELLE_PLATFORM32}"
+    ISABELLE_JDK_HOME="$COMPONENT/$ISABELLE_JAVA_PLATFORM"
+    ;;
+  windows)
+    if [ ! -e "$COMPONENT/x86_64-windows" ]; then
+      ISABELLE_JAVA_PLATFORM="x86-windows"
+    elif "$COMPONENT/x86_64-windows/jre/bin/java" -version > /dev/null 2> /dev/null; then
+      ISABELLE_JAVA_PLATFORM="x86_64-windows"
+    else
+      ISABELLE_JAVA_PLATFORM="x86-windows"
+    fi
+    ISABELLE_JDK_HOME="$COMPONENT/$ISABELLE_JAVA_PLATFORM"
+    ;;
+  macos)
+    if [ -z "$ISABELLE_PLATFORM64" ]; then
+      echo "### Java unavailable on 32bit Mac OS X" >&2
+    else
+      ISABELLE_JAVA_PLATFORM="$ISABELLE_PLATFORM64"
+      ISABELLE_JDK_HOME="$COMPONENT/$ISABELLE_JAVA_PLATFORM/Contents/Home"
+    fi
+    ;;
+esac
+"""
+
+
+  /* extract archive */
+
+  def extract_archive(dir: Path, archive: Path): (Version, JDK_Platform) =
+  {
+    try {
+      val tmp_dir = dir + Path.explode("tmp")
+      Isabelle_System.mkdirs(tmp_dir)
+      Isabelle_System.bash(
+        "tar -C " + File.bash_path(tmp_dir) + " -xzf " + File.bash_path(archive)).check
+      val dir_entry =
+        File.read_dir(tmp_dir) match {
+          case List(s) => s
+          case _ => error("Archive contains multiple directories")
+        }
+      val version = detect_version(dir_entry)
+
+      val jdk_dir = tmp_dir + Path.explode(dir_entry)
+      val platform =
+        jdk_platforms.find(_.detect(jdk_dir)) getOrElse error("Failed to detect JDK platform")
+
+      val platform_dir = dir + Path.explode(platform.name)
+      if (platform_dir.is_dir) error("Directory already exists: " + platform_dir)
+      Isabelle_System.bash(
+        "mv " + File.bash_path(jdk_dir) + " " + File.bash_path(platform_dir)).check
+
+      (version, platform)
+    }
+    catch { case ERROR(msg) => cat_error(msg, "The error(s) above occurred for " + archive) }
+  }
+
+
+  /* build jdk */
+
+  def build_jdk(
+    archives: List[Path],
+    progress: Progress = No_Progress,
+    target_dir: Path = Path.current)
+  {
+    if (Platform.is_windows) error("Cannot build jdk on Windows")
+
+    Isabelle_System.with_tmp_dir("jdk")(dir =>
+      {
+        progress.echo("Extracting ...")
+        val extracted = archives.map(extract_archive(dir, _))
+
+        val version =
+          extracted.map(_._1).toSet.toList match {
+            case List(version) => version
+            case Nil => error("No archives")
+            case versions =>
+              error("Archives contain multiple JDK versions: " +
+                commas_quote(versions.map(_.short)))
+          }
+
+        val missing_platforms =
+          jdk_platforms.filterNot(p1 => extracted.exists({ case (_, p2) => p1.name == p2.name }))
+        if (missing_platforms.nonEmpty)
+          error("Missing platforms: " + commas_quote(missing_platforms.map(_.name)))
+
+        val jdk_name = "jdk-" + version.short
+        val jdk_path = Path.explode(jdk_name)
+        val component_dir = dir + jdk_path
+
+        Isabelle_System.mkdirs(component_dir + Path.explode("etc"))
+        File.write(component_dir + Path.explode("etc/settings"), settings)
+        File.write(component_dir + Path.explode("README"), readme(version))
+
+        for ((_, platform) <- extracted) {
+          Isabelle_System.bash("mv " +
+            File.bash_path(dir + Path.explode(platform.name)) + " " +
+            File.bash_path(component_dir)).check
+        }
+
+        Isabelle_System.bash(cwd = component_dir.file,
+          script = """
+            chmod -R a+r . &&
+            chmod -R a+X . &&
+            find x86_64-darwin -name "._*" -exec rm -f {} ";"
+          """).check
+
+        progress.echo("Sharing ...")
+        Isabelle_System.bash(cwd = component_dir.file,
+          script = """
+            cd x86-linux
+            for FILE in $(find . -type f)
+            do
+              for OTHER in \
+                "../x86_64-linux/$FILE" \
+                "../x86-windows/$FILE" \
+                "../x86_64-windows/$FILE" \
+                "../x86_64-darwin/Contents/Home/$FILE"
+              do
+                if cmp -s "$FILE" "$OTHER"
+                then
+                  ln -f "$FILE" "$OTHER"
+                fi
+              done
+            done
+          """).check
+
+        progress.echo("Archiving ...")
+        Isabelle_System.bash("tar -C " + File.bash_path(dir) + " -czf " +
+          File.bash_path(target_dir + jdk_path.ext("tar.gz")) + " " + jdk_name).check
+      })
+  }
+
+
+  /* Isabelle tool wrapper */
+
+  val isabelle_tool =
+    Isabelle_Tool("build_jdk", "build Isabelle jdk component from original platform installations",
+    args =>
+    {
+      var target_dir = Path.current
+
+      val getopts = Getopts("""
+Usage: Admin/build_jdk [OPTIONS] ARCHIVES...
+
+  Options are:
+    -D DIR       target directory (default ".")
+
+  Build jdk component from tar.gz archives, with original jdk installations
+  for Linux (x86, x86_64), Windows (x86, x86_64), Mac OS X (x86_64).
+""",
+        "D:" -> (arg => target_dir = Path.explode(arg)))
+
+      val more_args = getopts(args)
+      if (more_args.isEmpty) getopts.usage()
+
+      val archives = more_args.map(Path.explode(_))
+      val progress = new Console_Progress()
+
+      build_jdk(archives = archives, progress = progress, target_dir = target_dir)
+    }, admin = true)
+}
diff -r a5a09855e424 -r 3b4e5fad4dc2 src/Pure/System/isabelle_tool.scala
--- a/src/Pure/System/isabelle_tool.scala	Fri Jan 20 21:05:11 2017 +0100
+++ b/src/Pure/System/isabelle_tool.scala	Sun Jan 22 00:30:10 2017 +0100
@@ -102,6 +102,7 @@
       Build.isabelle_tool,
       Build_Doc.isabelle_tool,
       Build_Docker.isabelle_tool,
+      Build_JDK.isabelle_tool,
       Build_PolyML.isabelle_tool,
       Build_Stats.isabelle_tool,
       Check_Sources.isabelle_tool,
diff -r a5a09855e424 -r 3b4e5fad4dc2 src/Pure/build-jars
--- a/src/Pure/build-jars	Fri Jan 20 21:05:11 2017 +0100
+++ b/src/Pure/build-jars	Sun Jan 22 00:30:10 2017 +0100
@@ -12,6 +12,7 @@
   Admin/build_doc.scala
   Admin/build_docker.scala
   Admin/build_history.scala
+  Admin/build_jdk.scala
   Admin/build_log.scala
   Admin/build_polyml.scala
   Admin/build_release.scala