merged
authorwenzelm
Fri May 03 20:35:19 2019 +0200 (6 months ago)
changeset 702458feae28e5c44
parent 70237 7e9269c188d6
parent 70244 2ca87b481077
child 70246 7c55ea37fbf7
merged
     1.1 --- a/.hgtags	Fri May 03 20:04:42 2019 +0200
     1.2 +++ b/.hgtags	Fri May 03 20:35:19 2019 +0200
     1.3 @@ -36,3 +36,4 @@
     1.4  64b47495676d5d6bdec02032a7a90fe6e1ff6c50 Isabelle2017
     1.5  91162dd89571fb9ddfa36844fdb1a16aea13adcf Isabelle2018
     1.6  6f2ab7f150f6bb27d9e59229035324ce1f94e4ac Isabelle2019-RC0
     1.7 +9c60fcfdf495375cf1c886d7eb75583f63707950 Isabelle2019-RC1
     2.1 --- a/Admin/components/components.sha1	Fri May 03 20:04:42 2019 +0200
     2.2 +++ b/Admin/components/components.sha1	Fri May 03 20:35:19 2019 +0200
     2.3 @@ -86,6 +86,7 @@
     2.4  dabcf5085d67c99159007007ff0e9bf775e423d1  isabelle_fonts-20190409.tar.gz
     2.5  0b2206f914336dec4923dd0479d8cee4b904f544  jdk-11+28.tar.gz
     2.6  3e05213cad47dbef52804fe329395db9b4e57f39  jdk-11.0.2+9.tar.gz
     2.7 +06ac8993b5bebd02c70f1bd18ce13075f01115f3  jdk-11.0.3+7.tar.gz
     2.8  71d19df63816e9be1c4c5eb44aea7a44cfadb319  jdk-11.tar.gz
     2.9  8d83e433c1419e0c0cc5fd1762903d11b4a5752c  jdk-6u31.tar.gz
    2.10  38d2d2a91c66714c18430e136e7e5191af3996e6  jdk-7u11.tar.gz
     3.1 --- a/Admin/components/main	Fri May 03 20:04:42 2019 +0200
     3.2 +++ b/Admin/components/main	Fri May 03 20:35:19 2019 +0200
     3.3 @@ -5,7 +5,7 @@
     3.4  cvc4-1.5-4
     3.5  e-2.0-2
     3.6  isabelle_fonts-20190409
     3.7 -jdk-11.0.2+9
     3.8 +jdk-11.0.3+7
     3.9  jedit_build-20190224
    3.10  jfreechart-1.5.0
    3.11  jortho-1.0-2
     4.1 --- a/etc/settings	Fri May 03 20:04:42 2019 +0200
     4.2 +++ b/etc/settings	Fri May 03 20:35:19 2019 +0200
     4.3 @@ -153,7 +153,7 @@
     4.4  
     4.5  ISABELLE_STACK_ROOT="$USER_HOME/.stack"
     4.6  
     4.7 -ISABELLE_STACK_RESOLVER="lts-12.25"
     4.8 +ISABELLE_STACK_RESOLVER="lts-12.26"
     4.9  
    4.10  ISABELLE_GHC_VERSION="ghc-8.4.4"
    4.11  
     5.1 --- a/src/Pure/Admin/build_release.scala	Fri May 03 20:04:42 2019 +0200
     5.2 +++ b/src/Pure/Admin/build_release.scala	Fri May 03 20:35:19 2019 +0200
     5.3 @@ -525,8 +525,8 @@
     5.4              val archive_name = isabelle_name + "_linux.tar.xz"
     5.5              progress.echo("Packaging " + archive_name + " ...")
     5.6              execute_tar(tmp_dir,
     5.7 -              "-cf- " + Bash.string(isabelle_name) +
     5.8 -              " | xz > " + File.bash_path(release.dist_dir + Path.explode(archive_name)))
     5.9 +              "-cJf " + File.bash_path(release.dist_dir + Path.explode(archive_name)) + " " +
    5.10 +              Bash.string(isabelle_name))
    5.11  
    5.12  
    5.13            case Platform.Family.macos =>
    5.14 @@ -582,11 +582,11 @@
    5.15  
    5.16              // application archive
    5.17  
    5.18 -            val archive_name = isabelle_name + "_macos.tar.xz"
    5.19 +            val archive_name = isabelle_name + "_macos.tar.gz"
    5.20              progress.echo("Packaging " + archive_name + " ...")
    5.21              execute_tar(tmp_dir,
    5.22 -              "-cf- " + File.bash_path(isabelle_app) +
    5.23 -              " | xz > " + File.bash_path(release.dist_dir + Path.explode(archive_name)))
    5.24 +              "-czf " + File.bash_path(release.dist_dir + Path.explode(archive_name)) + " " +
    5.25 +              File.bash_path(isabelle_app))
    5.26  
    5.27  
    5.28            case Platform.Family.windows =>
    5.29 @@ -725,16 +725,18 @@
    5.30        else {
    5.31          Isabelle_System.with_tmp_dir("build_release")(tmp_dir =>
    5.32            {
    5.33 +            if (!Platform.is_linux) error("Linux platform required for library archive")
    5.34 +
    5.35              val bundle =
    5.36 -              release.dist_dir + Path.explode(release.dist_name + "_" + Platform.family + ".tar.gz")
    5.37 -            execute_tar(tmp_dir, "-xzf " + File.bash_path(bundle))
    5.38 +              release.dist_dir + Path.explode(release.dist_name + "_linux.tar.xz")
    5.39 +            execute_tar(tmp_dir, "-xJf " + File.bash_path(bundle))
    5.40  
    5.41              val other_isabelle = release.other_isabelle(tmp_dir)
    5.42  
    5.43              Isabelle_System.mkdirs(other_isabelle.etc)
    5.44              File.write(other_isabelle.etc_preferences, "ML_system_64 = true\n")
    5.45  
    5.46 -            other_isabelle.bash("bin/isabelle build -j " + parallel_jobs +
    5.47 +            other_isabelle.bash("bin/isabelle build -f -j " + parallel_jobs +
    5.48                " -o browser_info -o document=pdf -o document_variants=document:outline=/proof,/ML" +
    5.49                " -o system_heaps -c -a -d '~~/src/Benchmarks'", echo = true).check
    5.50              other_isabelle.isabelle_home_user.file.delete
     6.1 --- a/src/Pure/Admin/isabelle_cronjob.scala	Fri May 03 20:04:42 2019 +0200
     6.2 +++ b/src/Pure/Admin/isabelle_cronjob.scala	Fri May 03 20:35:19 2019 +0200
     6.3 @@ -271,7 +271,7 @@
     6.4              " -e ISABELLE_GHC=ghc -e ISABELLE_MLTON=mlton -e ISABELLE_OCAML=ocaml" +
     6.5              " -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAML_SETUP=true" +
     6.6              " -e ISABELLE_OPAM_ROOT=\"$ISABELLE_HOME/opam\"" +
     6.7 -            " -e ISABELLE_SMLNJ=/mnt/nfsbroy/home/isabelle/smlnj/bin/sml",
     6.8 +            " -e ISABELLE_SMLNJ=/home/isabelle/smlnj/110.85/bin/sml",
     6.9            args = "-a",
    6.10            detect = Build_Log.Prop.build_tags.undefined,
    6.11            history_base = "2c0f24e927dd"),
    6.12 @@ -317,7 +317,7 @@
    6.13              " -e ISABELLE_GHC=ghc" +
    6.14              " -e ISABELLE_MLTON=mlton" +
    6.15              " -e ISABELLE_OCAML=ocaml -e ISABELLE_OCAMLC=ocamlc -e ISABELLE_OCAMLFIND=ocamlfind" +
    6.16 -            " -e ISABELLE_SMLNJ=/home/isabelle/smlnj/bin/sml",
    6.17 +            " -e ISABELLE_SMLNJ=sml",
    6.18            args = "-N -X large -X slow",
    6.19            afp = true,
    6.20            detect = Build_Log.Prop.build_tags + " = " + SQL.string("AFP")))