include scala-compiler.jar in basic Isabelle/Scala environment, to make Isabelle/jEdit console work with scala-2.10.0-M3;
--- a/src/Pure/build-jars Thu May 24 22:41:27 2012 +0200
+++ b/src/Pure/build-jars Thu May 24 22:49:39 2012 +0200
@@ -199,7 +199,10 @@
isabelle_jdk jar cfe "$(jvmpath "$TARGET")" isabelle.GUI_Setup META-INF isabelle || \
fail "Failed to produce $TARGET"
- cp "$SCALA_HOME/lib/scala-swing.jar" "$SCALA_HOME/lib/scala-library.jar" "$TARGET_DIR/ext"
+ cp "$SCALA_HOME/lib/scala-compiler.jar" \
+ "$SCALA_HOME/lib/scala-library.jar" \
+ "$SCALA_HOME/lib/scala-swing.jar" "$TARGET_DIR/ext"
+
[ -e "$SCALA_HOME/lib/scala-actors.jar" ] && \
cp "$SCALA_HOME/lib/scala-actors.jar" "$TARGET_DIR/ext"
--- a/src/Tools/jEdit/lib/Tools/jedit Thu May 24 22:41:27 2012 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit Thu May 24 22:49:39 2012 +0200
@@ -233,7 +233,7 @@
print qq,<MODE NAME="scala" FILE="scala.xml" FILE_NAME_GLOB="*.scala" />\n\n,; }
print; }' dist/modes/catalog
- cp -p -R -f "${JEDIT_JARS[@]}" "$SCALA_HOME/lib/scala-compiler.jar" dist/jars/. || failed
+ cp -p -R -f "${JEDIT_JARS[@]}" dist/jars/. || failed
(
for JAR in "$JEDIT_JAR" "${JEDIT_JARS[@]}" "$PURE_JAR" "$SCALA_HOME/lib/scala-compiler.jar"
do