more uniform isabelle_scala;
authorwenzelm
Fri Apr 21 13:51:43 2017 +0200 (2017-04-21 ago)
changeset 6553124544e3f183d
parent 65530 09c00a304c00
child 65532 febfd9f78bd4
more uniform isabelle_scala;
more uniform ISABELLE_SCALAC_OPTIONS with heap options;
etc/settings
src/HOL/Library/code_test.ML
src/Tools/Code/code_scala.ML
src/Tools/jEdit/lib/Tools/jedit
     1.1 --- a/etc/settings	Fri Apr 21 11:38:45 2017 +0200
     1.2 +++ b/etc/settings	Fri Apr 21 13:51:43 2017 +0200
     1.3 @@ -12,7 +12,7 @@
     1.4  ### Isabelle/Scala
     1.5  ###
     1.6  
     1.7 -ISABELLE_SCALAC_OPTIONS="-encoding UTF-8 -nowarn -target:jvm-1.8 -Xmax-classfile-name 130"
     1.8 +ISABELLE_SCALAC_OPTIONS="-encoding UTF-8 -nowarn -target:jvm-1.8 -Xmax-classfile-name 130 -J-Xms128m -J-Xmx1024m -J-Xss2m"
     1.9  
    1.10  ISABELLE_JAVA_SYSTEM_OPTIONS="-server -Dfile.encoding=UTF-8 -Disabelle.threads=0"
    1.11  
     2.1 --- a/src/HOL/Library/code_test.ML	Fri Apr 21 11:38:45 2017 +0200
     2.2 +++ b/src/HOL/Library/code_test.ML	Fri Apr 21 13:51:43 2017 +0200
     2.3 @@ -551,11 +551,11 @@
     2.4        "}\n"
     2.5  
     2.6      val compile_cmd =
     2.7 -      "\"$SCALA_HOME/bin/scalac\" $ISABELLE_SCALAC_OPTIONS -d " ^ File.bash_path path ^
     2.8 +      "isabelle_scala scalac $ISABELLE_SCALAC_OPTIONS -d " ^ File.bash_path path ^
     2.9        " -classpath " ^ File.bash_path path ^ " " ^
    2.10        File.bash_path code_path ^ " " ^ File.bash_path driver_path
    2.11  
    2.12 -    val run_cmd = "\"$SCALA_HOME/bin/scala\" -cp " ^ File.bash_path path ^ " Test"
    2.13 +    val run_cmd = "isabelle_scala scala -cp " ^ File.bash_path path ^ " Test"
    2.14    in
    2.15      {files = [(driver_path, driver)],
    2.16       compile_cmd = SOME compile_cmd, run_cmd = run_cmd, mk_code_file = K code_path}
     3.1 --- a/src/Tools/Code/code_scala.ML	Fri Apr 21 11:38:45 2017 +0200
     3.2 +++ b/src/Tools/Code/code_scala.ML	Fri Apr 21 13:51:43 2017 +0200
     3.3 @@ -465,7 +465,7 @@
     3.4        check = { env_var = "SCALA_HOME",
     3.5          make_destination = fn p => Path.append p (Path.explode "ROOT.scala"),
     3.6          make_command = fn _ =>
     3.7 -          "env JAVA_OPTS='-Xms128m -Xmx512m -Xss2m' \"$SCALA_HOME/bin/scalac\" $ISABELLE_SCALAC_OPTIONS ROOT.scala" } })
     3.8 +          "isabelle_scala scalac $ISABELLE_SCALAC_OPTIONS ROOT.scala" } })
     3.9    #> Code_Target.set_printings (Type_Constructor ("fun",
    3.10      [(target, SOME (2, fn print_typ => fn fxy => fn [ty1, ty2] =>
    3.11        brackify_infix (1, R) fxy (
     4.1 --- a/src/Tools/jEdit/lib/Tools/jedit	Fri Apr 21 11:38:45 2017 +0200
     4.2 +++ b/src/Tools/jEdit/lib/Tools/jedit	Fri Apr 21 13:51:43 2017 +0200
     4.3 @@ -350,7 +350,7 @@
     4.4        classpath "$JAR"
     4.5      done
     4.6      export CLASSPATH="$(platform_path "$ISABELLE_CLASSPATH")"
     4.7 -    exec "$SCALA_HOME/bin/scalac" $ISABELLE_SCALAC_OPTIONS -d dist/classes "${SOURCES[@]}"
     4.8 +    isabelle_scala scalac $ISABELLE_SCALAC_OPTIONS -d dist/classes "${SOURCES[@]}"
     4.9    ) || fail "Failed to compile sources"
    4.10  
    4.11    cd dist/classes