# HG changeset patch
# User wenzelm
# Date 1378986497 -7200
# Node ID d033bc00b76210128237b865448d4aca76322bd4
# Parent  793a429c63e7ceeb63beeccfb0850a3440f3139c
clarified directory structure;

diff -r 793a429c63e7 -r d033bc00b762 etc/settings
--- a/etc/settings	Thu Sep 12 13:23:54 2013 +0200
+++ b/etc/settings	Thu Sep 12 13:48:17 2013 +0200
@@ -15,12 +15,12 @@
 
 ISABELLE_JAVA_SYSTEM_OPTIONS="-Dfile.encoding=UTF-8 -server"
 
-classpath "$ISABELLE_HOME/lib/classes/ext/Pure.jar"
-classpath "$ISABELLE_HOME/lib/classes/ext/scala-library.jar"
-classpath "$ISABELLE_HOME/lib/classes/ext/scala-swing.jar"
-classpath "$ISABELLE_HOME/lib/classes/ext/scala-actors.jar"
-classpath "$ISABELLE_HOME/lib/classes/ext/scala-compiler.jar"
-classpath "$ISABELLE_HOME/lib/classes/ext/scala-reflect.jar"
+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"
 
 
 ###
diff -r 793a429c63e7 -r d033bc00b762 src/Pure/build-jars
--- a/src/Pure/build-jars	Thu Sep 12 13:23:54 2013 +0200
+++ b/src/Pure/build-jars	Thu Sep 12 13:48:17 2013 +0200
@@ -143,7 +143,7 @@
 ## build
 
 TARGET_DIR="$ISABELLE_HOME/lib/classes"
-TARGET="$TARGET_DIR/ext/Pure.jar"
+TARGET="$TARGET_DIR/Pure.jar"
 
 declare -a PIDE_SOURCES=()
 declare -a PURE_SOURCES=()
@@ -210,7 +210,7 @@
     fi
   ) || exit "$?"
 
-  mkdir -p "$TARGET_DIR/ext" || fail "Failed to create directory $TARGET_DIR/ext"
+  mkdir -p "$TARGET_DIR" || fail "Failed to create directory $TARGET_DIR"
 
   pushd classes >/dev/null
 
@@ -225,13 +225,10 @@
 
   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"
-
-  [ -e "$SCALA_HOME/lib/scala-reflect.jar" ] && \
-    cp "$SCALA_HOME/lib/scala-reflect.jar" "$TARGET_DIR/ext"
+    "$SCALA_HOME/lib/scala-swing.jar" \
+    "$SCALA_HOME/lib/scala-actors.jar" \
+    "$SCALA_HOME/lib/scala-reflect.jar" \
+    "$TARGET_DIR"
 
   popd >/dev/null
 
diff -r 793a429c63e7 -r d033bc00b762 src/Tools/Graphview/lib/Tools/graphview
--- a/src/Tools/Graphview/lib/Tools/graphview	Thu Sep 12 13:23:54 2013 +0200
+++ b/src/Tools/Graphview/lib/Tools/graphview	Thu Sep 12 13:48:17 2013 +0200
@@ -94,10 +94,10 @@
 
 pushd "$GRAPHVIEW_HOME" >/dev/null || failed
 
-PURE_JAR="$ISABELLE_HOME/lib/classes/ext/Pure.jar"
+PURE_JAR="$ISABELLE_HOME/lib/classes/Pure.jar"
 
 TARGET_DIR="$ISABELLE_HOME/lib/classes"
-TARGET="$TARGET_DIR/ext/Graphview.jar"
+TARGET="$TARGET_DIR/Graphview.jar"
 
 declare -a UPDATED=()
 
diff -r 793a429c63e7 -r d033bc00b762 src/Tools/jEdit/lib/Tools/jedit
--- a/src/Tools/jEdit/lib/Tools/jedit	Thu Sep 12 13:23:54 2013 +0200
+++ b/src/Tools/jEdit/lib/Tools/jedit	Thu Sep 12 13:48:17 2013 +0200
@@ -198,8 +198,8 @@
   fi
 fi
 
-PURE_JAR="$ISABELLE_HOME/lib/classes/ext/Pure.jar"
-GRAPHVIEW_JAR="$ISABELLE_HOME/lib/classes/ext/Graphview.jar"
+PURE_JAR="$ISABELLE_HOME/lib/classes/Pure.jar"
+GRAPHVIEW_JAR="$ISABELLE_HOME/lib/classes/Graphview.jar"
 
 pushd "$JEDIT_HOME" >/dev/null || failed