prefer Isabelle/Scala over bash;
authorwenzelm
Fri, 06 Sep 2013 17:26:58 +0200
changeset 53441 63958e9e0073
parent 53440 b99d006afbfe
child 53442 f41ab5a7df97
prefer Isabelle/Scala over bash; actual platform_path (in contrast to eb8806a2e348);
src/Tools/jEdit/lib/Tools/jedit
src/Tools/jEdit/src/jedit_main.scala
--- a/src/Tools/jEdit/lib/Tools/jedit	Fri Sep 06 17:20:48 2013 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit	Fri Sep 06 17:26:58 2013 +0200
@@ -171,7 +171,6 @@
 }
 
 declare -a JAVA_ARGS; eval "JAVA_ARGS=($JEDIT_JAVA_OPTIONS $JEDIT_SYSTEM_OPTIONS)"
-[ -n "$SCALA_HOME" ] && JAVA_ARGS["${#JAVA_ARGS[@]}"]="-Dscala.home=$SCALA_HOME"
 
 declare -a ARGS; eval "ARGS=($JEDIT_OPTIONS)"
 
--- a/src/Tools/jEdit/src/jedit_main.scala	Fri Sep 06 17:20:48 2013 +0200
+++ b/src/Tools/jEdit/src/jedit_main.scala	Fri Sep 06 17:26:58 2013 +0200
@@ -59,6 +59,9 @@
     System.setProperty("jedit.home",
       Isabelle_System.platform_path(Path.explode("$JEDIT_HOME/dist")))
 
+    System.setProperty("scala.home",
+      Isabelle_System.platform_path(Path.explode("$SCALA_HOME")))
+
     jEdit.main(jedit_options ++ jedit_settings ++ more_args)
   }
 }