proper classpath for Java FX;
authorwenzelm
Sun, 02 Sep 2012 21:07:50 +0200
changeset 49067 4cb40eb2eac9
parent 49066 1067a639d42a
child 49068 0f21fae06a40
proper classpath for Java FX;
src/Pure/build-jars
--- a/src/Pure/build-jars	Sun Sep 02 21:01:11 2012 +0200
+++ b/src/Pure/build-jars	Sun Sep 02 21:07:50 2012 +0200
@@ -180,13 +180,15 @@
 
   SCALAC_OPTIONS="$ISABELLE_SCALA_BUILD_OPTIONS -d classes"
 
+  JFXRT="$ISABELLE_JDK_HOME/jre/lib/jfxrt.jar"
+
   if [ "$TEST_PIDE" = true ]; then
     isabelle_scala scalac $SCALAC_OPTIONS "${PIDE_SOURCES[@]}" || \
       fail "Failed to compile PIDE sources"
-    isabelle_scala scalac $SCALAC_OPTIONS -classpath classes "${PURE_SOURCES[@]}" || \
+    isabelle_scala scalac $SCALAC_OPTIONS -classpath "$JFXRT:classes" "${PURE_SOURCES[@]}" || \
       fail "Failed to compile Pure sources"
   else
-    isabelle_scala scalac $SCALAC_OPTIONS -classpath classes \
+    isabelle_scala scalac $SCALAC_OPTIONS -classpath "$JFXRT:classes" \
       "${PIDE_SOURCES[@]}" "${PURE_SOURCES[@]}" || \
       fail "Failed to compile sources"
   fi
@@ -202,7 +204,7 @@
   isabelle_jdk jar cfe "$(jvmpath "$TARGET")" isabelle.GUI_Setup META-INF isabelle || \
     fail "Failed to produce $TARGET"
 
-  cp "$ISABELLE_JDK_HOME/jre/lib/jfxrt.jar" \
+  cp "$JFXRT" \
     "$SCALA_HOME/lib/scala-compiler.jar" \
     "$SCALA_HOME/lib/scala-library.jar" \
     "$SCALA_HOME/lib/scala-swing.jar" "$TARGET_DIR/ext"