merged
authorwenzelm
Fri Apr 20 15:58:02 2018 +0200 (6 months ago)
changeset 680165eb4081e6bf6
parent 68011 fb6469cdf094
parent 68015 a39473b19ee1
child 68017 e99f9b3962bf
child 68018 3747fe57eb67
merged
     1.1 --- a/Admin/components/components.sha1	Fri Apr 20 07:36:59 2018 +0000
     1.2 +++ b/Admin/components/components.sha1	Fri Apr 20 15:58:02 2018 +0200
     1.3 @@ -177,6 +177,7 @@
     1.4  a619177143fea42a464f49bb864665407c07a16c  polyml-test-fb4f42af00fa.tar.gz
     1.5  53123dc011b2d4b4e8fe307f3c9fa355718ad01a  postgresql-42.1.1.tar.gz
     1.6  3a5d31377ec07a5069957f5477a4848cfc89a594  postgresql-42.1.4.tar.gz
     1.7 +e7cd5c7955e9eb5ce8cd07feb97230b23d2eec40  postgresql-42.2.2.tar.gz
     1.8  f132329ca1045858ef456cc08b197c9eeea6881b  postgresql-9.4.1212.tar.gz
     1.9  8ee375cfc38972f080dbc78f07b68dac03efe968  ProofGeneral-3.7.1.1.tar.gz
    1.10  847b52c0676b5eb0fbf0476f64fc08c2d72afd0c  ProofGeneral-4.1.tar.gz
     2.1 --- a/Admin/components/main	Fri Apr 20 07:36:59 2018 +0000
     2.2 +++ b/Admin/components/main	Fri Apr 20 15:58:02 2018 +0200
     2.3 @@ -12,7 +12,7 @@
     2.4  kodkodi-1.5.2
     2.5  nunchaku-0.5
     2.6  polyml-5.7.1-5
     2.7 -postgresql-42.1.4
     2.8 +postgresql-42.2.2
     2.9  scala-2.12.5
    2.10  smbc-0.4.1
    2.11  ssh-java-20161009
     3.1 --- a/lib/browser/build	Fri Apr 20 07:36:59 2018 +0000
     3.2 +++ b/lib/browser/build	Fri Apr 20 15:58:02 2018 +0200
     3.3 @@ -63,7 +63,7 @@
     3.4  
     3.5    rm -rf classes && mkdir classes
     3.6  
     3.7 -  isabelle_jdk javac -d classes -source 1.4 "${SOURCES[@]}" || \
     3.8 +  isabelle_jdk javac -d classes -source 1.6 "${SOURCES[@]}" || \
     3.9      fail "Failed to compile sources"
    3.10    isabelle_jdk jar cf "$(platform_path "$TARGET")" -C classes . ||
    3.11      fail "Failed to produce $TARGET"
     4.1 --- a/lib/scripts/getsettings	Fri Apr 20 07:36:59 2018 +0000
     4.2 +++ b/lib/scripts/getsettings	Fri Apr 20 15:58:02 2018 +0200
     4.3 @@ -102,7 +102,12 @@
     4.4  ISABELLE_OUTPUT="$ISABELLE_OUTPUT/$ML_IDENTIFIER"
     4.5  
     4.6  #enforce JAVA_HOME
     4.7 -export JAVA_HOME="$ISABELLE_JDK_HOME/jre"
     4.8 +if [ -d "$ISABELLE_JDK_HOME/jre" ]
     4.9 +then
    4.10 +  export JAVA_HOME="$ISABELLE_JDK_HOME/jre"
    4.11 +else
    4.12 +  export JAVA_HOME="$ISABELLE_JDK_HOME"
    4.13 +fi
    4.14  
    4.15  set +o allexport
    4.16  
     5.1 --- a/src/Pure/Admin/ci_profile.scala	Fri Apr 20 07:36:59 2018 +0000
     5.2 +++ b/src/Pure/Admin/ci_profile.scala	Fri Apr 20 15:58:02 2018 +0200
     5.3 @@ -9,7 +9,7 @@
     5.4  
     5.5  import java.time.{Instant, ZoneId}
     5.6  import java.time.format.DateTimeFormatter
     5.7 -import java.util.{Properties => JProperties}
     5.8 +import java.util.{Properties => JProperties, Map => JMap}
     5.9  
    5.10  
    5.11  abstract class CI_Profile extends Isabelle_Tool.Body
    5.12 @@ -88,7 +88,7 @@
    5.13      print_section("CONFIGURATION")
    5.14      println(Build_Log.Settings.show())
    5.15      val props = load_properties()
    5.16 -    System.getProperties().putAll(props)
    5.17 +    System.getProperties().asInstanceOf[JMap[AnyRef, AnyRef]].putAll(props)
    5.18  
    5.19      val options =
    5.20        with_documents(Options.init())