no need to copy jars, after regular use of classpath in 793a429c63e7;
authorwenzelm
Tue, 22 Apr 2014 22:27:29 +0200
changeset 56659 f3d34969a29e
parent 56658 86f9c6912965
child 56660 5d629da46f04
no need to copy jars, after regular use of classpath in 793a429c63e7;
etc/settings
src/Pure/build-jars
--- a/etc/settings	Tue Apr 22 22:15:44 2014 +0200
+++ b/etc/settings	Tue Apr 22 22:27:29 2014 +0200
@@ -17,11 +17,11 @@
 ISABELLE_JAVA_SYSTEM_OPTIONS="-Dfile.encoding=UTF-8 -server"
 
 classpath "$ISABELLE_HOME/lib/classes/Pure.jar"
-classpath "$ISABELLE_HOME/lib/classes/scala-library.jar"
-classpath "$ISABELLE_HOME/lib/classes/scala-swing.jar"
-classpath "$ISABELLE_HOME/lib/classes/scala-actors.jar"
-classpath "$ISABELLE_HOME/lib/classes/scala-compiler.jar"
-classpath "$ISABELLE_HOME/lib/classes/scala-reflect.jar"
+classpath "$SCALA_HOME/lib/scala-library.jar"
+classpath "$SCALA_HOME/lib/scala-swing.jar"
+classpath "$SCALA_HOME/lib/scala-actors.jar"
+classpath "$SCALA_HOME/lib/scala-compiler.jar"
+classpath "$SCALA_HOME/lib/scala-reflect.jar"
 
 #paranoia setting -- avoid problems of Java/Swing versus XIM/IBus etc.
 unset XMODIFIERS
--- a/src/Pure/build-jars	Tue Apr 22 22:15:44 2014 +0200
+++ b/src/Pure/build-jars	Tue Apr 22 22:27:29 2014 +0200
@@ -232,13 +232,6 @@
   isabelle_jdk jar cfe "$(jvmpath "$TARGET")" isabelle.Main META-INF isabelle || \
     fail "Failed to produce $TARGET"
 
-  cp "$SCALA_HOME/lib/scala-compiler.jar" \
-    "$SCALA_HOME/lib/scala-library.jar" \
-    "$SCALA_HOME/lib/scala-swing.jar" \
-    "$SCALA_HOME/lib/scala-actors.jar" \
-    "$SCALA_HOME/lib/scala-reflect.jar" \
-    "$TARGET_DIR"
-
   popd >/dev/null
 
   rm -rf classes