--- a/src/Pure/build-jars Wed Jan 02 19:23:18 2013 +0100
+++ b/src/Pure/build-jars Wed Jan 02 21:02:47 2013 +0100
@@ -126,6 +126,15 @@
[ "$#" -ne 0 ] && usage
+## dependencies
+
+declare -a JFREECHART_JARS=()
+for NAME in $JFREECHART_JAR_NAMES
+do
+ JFREECHART_JARS["${#JFREECHART_JARS[@]}"]="$JFREECHART_HOME/lib/$NAME"
+done
+
+
## build
TARGET_DIR="$ISABELLE_HOME/lib/classes"
@@ -182,18 +191,23 @@
JFXRT="$ISABELLE_JDK_HOME/jre/lib/jfxrt.jar"
- if [ "$TEST_PIDE" = true ]; then
- isabelle_scala scalac $SCALAC_OPTIONS \
- -classpath "$(jvmpath "$JFXRT:classes")" "${PIDE_SOURCES[@]}" || \
- fail "Failed to compile PIDE sources"
- isabelle_scala scalac $SCALAC_OPTIONS \
- -classpath "$(jvmpath "$JFXRT:classes")" "${PURE_SOURCES[@]}" || \
- fail "Failed to compile Pure sources"
- else
- isabelle_scala scalac $SCALAC_OPTIONS \
- -classpath "$(jvmpath "$JFXRT:classes")" "${PIDE_SOURCES[@]}" "${PURE_SOURCES[@]}" || \
- fail "Failed to compile sources"
- fi
+ (
+ for X in "$JFXRT" "${JFREECHART_JARS[@]}" classes
+ do
+ CLASSPATH="$CLASSPATH:$X"
+ done
+ CLASSPATH="$(jvmpath "$CLASSPATH")"
+
+ if [ "$TEST_PIDE" = true ]; then
+ isabelle_scala scalac $SCALAC_OPTIONS "${PIDE_SOURCES[@]}" || \
+ fail "Failed to compile PIDE sources"
+ isabelle_scala scalac $SCALAC_OPTIONS "${PURE_SOURCES[@]}" || \
+ fail "Failed to compile Pure sources"
+ else
+ isabelle_scala scalac $SCALAC_OPTIONS "${PIDE_SOURCES[@]}" "${PURE_SOURCES[@]}" || \
+ fail "Failed to compile sources"
+ fi
+ )
mkdir -p "$TARGET_DIR/ext" || fail "Failed to create directory $TARGET_DIR/ext"