# HG changeset patch
# User wenzelm
# Date 1556908519 -7200
# Node ID 8feae28e5c449b43a4c0131d1aca8386b788779b
# Parent  7e9269c188d63edcc429b80d4b72a81decab4a4a# Parent  2ca87b48107777f16e332b35f619b588e3112334
merged

diff -r 7e9269c188d6 -r 8feae28e5c44 .hgtags
--- a/.hgtags	Fri May 03 20:04:42 2019 +0200
+++ b/.hgtags	Fri May 03 20:35:19 2019 +0200
@@ -36,3 +36,4 @@
 64b47495676d5d6bdec02032a7a90fe6e1ff6c50 Isabelle2017
 91162dd89571fb9ddfa36844fdb1a16aea13adcf Isabelle2018
 6f2ab7f150f6bb27d9e59229035324ce1f94e4ac Isabelle2019-RC0
+9c60fcfdf495375cf1c886d7eb75583f63707950 Isabelle2019-RC1
diff -r 7e9269c188d6 -r 8feae28e5c44 Admin/components/components.sha1
--- a/Admin/components/components.sha1	Fri May 03 20:04:42 2019 +0200
+++ b/Admin/components/components.sha1	Fri May 03 20:35:19 2019 +0200
@@ -86,6 +86,7 @@
 dabcf5085d67c99159007007ff0e9bf775e423d1  isabelle_fonts-20190409.tar.gz
 0b2206f914336dec4923dd0479d8cee4b904f544  jdk-11+28.tar.gz
 3e05213cad47dbef52804fe329395db9b4e57f39  jdk-11.0.2+9.tar.gz
+06ac8993b5bebd02c70f1bd18ce13075f01115f3  jdk-11.0.3+7.tar.gz
 71d19df63816e9be1c4c5eb44aea7a44cfadb319  jdk-11.tar.gz
 8d83e433c1419e0c0cc5fd1762903d11b4a5752c  jdk-6u31.tar.gz
 38d2d2a91c66714c18430e136e7e5191af3996e6  jdk-7u11.tar.gz
diff -r 7e9269c188d6 -r 8feae28e5c44 Admin/components/main
--- a/Admin/components/main	Fri May 03 20:04:42 2019 +0200
+++ b/Admin/components/main	Fri May 03 20:35:19 2019 +0200
@@ -5,7 +5,7 @@
 cvc4-1.5-4
 e-2.0-2
 isabelle_fonts-20190409
-jdk-11.0.2+9
+jdk-11.0.3+7
 jedit_build-20190224
 jfreechart-1.5.0
 jortho-1.0-2
diff -r 7e9269c188d6 -r 8feae28e5c44 etc/settings
--- a/etc/settings	Fri May 03 20:04:42 2019 +0200
+++ b/etc/settings	Fri May 03 20:35:19 2019 +0200
@@ -153,7 +153,7 @@
 
 ISABELLE_STACK_ROOT="$USER_HOME/.stack"
 
-ISABELLE_STACK_RESOLVER="lts-12.25"
+ISABELLE_STACK_RESOLVER="lts-12.26"
 
 ISABELLE_GHC_VERSION="ghc-8.4.4"
 
diff -r 7e9269c188d6 -r 8feae28e5c44 src/Pure/Admin/build_release.scala
--- a/src/Pure/Admin/build_release.scala	Fri May 03 20:04:42 2019 +0200
+++ b/src/Pure/Admin/build_release.scala	Fri May 03 20:35:19 2019 +0200
@@ -525,8 +525,8 @@
             val archive_name = isabelle_name + "_linux.tar.xz"
             progress.echo("Packaging " + archive_name + " ...")
             execute_tar(tmp_dir,
-              "-cf- " + Bash.string(isabelle_name) +
-              " | xz > " + File.bash_path(release.dist_dir + Path.explode(archive_name)))
+              "-cJf " + File.bash_path(release.dist_dir + Path.explode(archive_name)) + " " +
+              Bash.string(isabelle_name))
 
 
           case Platform.Family.macos =>
@@ -582,11 +582,11 @@
 
             // application archive
 
-            val archive_name = isabelle_name + "_macos.tar.xz"
+            val archive_name = isabelle_name + "_macos.tar.gz"
             progress.echo("Packaging " + archive_name + " ...")
             execute_tar(tmp_dir,
-              "-cf- " + File.bash_path(isabelle_app) +
-              " | xz > " + File.bash_path(release.dist_dir + Path.explode(archive_name)))
+              "-czf " + File.bash_path(release.dist_dir + Path.explode(archive_name)) + " " +
+              File.bash_path(isabelle_app))
 
 
           case Platform.Family.windows =>
@@ -725,16 +725,18 @@
       else {
         Isabelle_System.with_tmp_dir("build_release")(tmp_dir =>
           {
+            if (!Platform.is_linux) error("Linux platform required for library archive")
+
             val bundle =
-              release.dist_dir + Path.explode(release.dist_name + "_" + Platform.family + ".tar.gz")
-            execute_tar(tmp_dir, "-xzf " + File.bash_path(bundle))
+              release.dist_dir + Path.explode(release.dist_name + "_linux.tar.xz")
+            execute_tar(tmp_dir, "-xJf " + File.bash_path(bundle))
 
             val other_isabelle = release.other_isabelle(tmp_dir)
 
             Isabelle_System.mkdirs(other_isabelle.etc)
             File.write(other_isabelle.etc_preferences, "ML_system_64 = true\n")
 
-            other_isabelle.bash("bin/isabelle build -j " + parallel_jobs +
+            other_isabelle.bash("bin/isabelle build -f -j " + parallel_jobs +
               " -o browser_info -o document=pdf -o document_variants=document:outline=/proof,/ML" +
               " -o system_heaps -c -a -d '~~/src/Benchmarks'", echo = true).check
             other_isabelle.isabelle_home_user.file.delete
diff -r 7e9269c188d6 -r 8feae28e5c44 src/Pure/Admin/isabelle_cronjob.scala
--- a/src/Pure/Admin/isabelle_cronjob.scala	Fri May 03 20:04:42 2019 +0200
+++ b/src/Pure/Admin/isabelle_cronjob.scala	Fri May 03 20:35:19 2019 +0200
@@ -271,7 +271,7 @@
             " -e ISABELLE_GHC=ghc -e ISABELLE_MLTON=mlton -e ISABELLE_OCAML=ocaml" +
             " -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAML_SETUP=true" +
             " -e ISABELLE_OPAM_ROOT=\"$ISABELLE_HOME/opam\"" +
-            " -e ISABELLE_SMLNJ=/mnt/nfsbroy/home/isabelle/smlnj/bin/sml",
+            " -e ISABELLE_SMLNJ=/home/isabelle/smlnj/110.85/bin/sml",
           args = "-a",
           detect = Build_Log.Prop.build_tags.undefined,
           history_base = "2c0f24e927dd"),
@@ -317,7 +317,7 @@
             " -e ISABELLE_GHC=ghc" +
             " -e ISABELLE_MLTON=mlton" +
             " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAMLFIND=ocamlfind" +
-            " -e ISABELLE_SMLNJ=/home/isabelle/smlnj/bin/sml",
+            " -e ISABELLE_SMLNJ=sml",
           args = "-N -X large -X slow",
           afp = true,
           detect = Build_Log.Prop.build_tags + " = " + SQL.string("AFP")))