more accurate classpath for "isabelle scala";
authorwenzelm
Sun May 24 20:35:24 2020 +0200 (5 weeks ago)
changeset 71882f92c7e2ba8da
parent 71881 71de0a253842
child 71883 44ba78056790
more accurate classpath for "isabelle scala";
lib/Tools/scala
src/Pure/System/scala.scala
     1.1 --- a/lib/Tools/scala	Sun May 24 19:45:42 2020 +0200
     1.2 +++ b/lib/Tools/scala	Sun May 24 20:35:24 2020 +0200
     1.3 @@ -13,5 +13,9 @@
     1.4    SCALA_ARGS["${#SCALA_ARGS[@]}"]="-J$ARG"
     1.5  done
     1.6  
     1.7 +[ -n "$CLASSPATH" ] && classpath "$CLASSPATH"
     1.8 +unset CLASSPATH
     1.9 +
    1.10  isabelle_scala scala "${SCALA_ARGS[@]}" \
    1.11 -  -classpath "$(platform_path "$ISABELLE_CLASSPATH")" "$@"
    1.12 +  -classpath "$(platform_path "$ISABELLE_CLASSPATH")" \
    1.13 +  -Disabelle.scala.classpath="$(platform_path "$ISABELLE_CLASSPATH")" "$@"
     2.1 --- a/src/Pure/System/scala.scala	Sun May 24 19:45:42 2020 +0200
     2.2 +++ b/src/Pure/System/scala.scala	Sun May 24 20:35:24 2020 +0200
     2.3 @@ -31,7 +31,7 @@
     2.4  
     2.5        val class_path =
     2.6          for {
     2.7 -          prop <- List("scala.boot.class.path", "java.class.path")
     2.8 +          prop <- List("isabelle.scala.classpath", "java.class.path")
     2.9            path = System.getProperty(prop, "") if path != "\"\""
    2.10            elem <- space_explode(JFile.pathSeparatorChar, path)
    2.11          } yield elem