more jvmpath wrapping for Cygwin;
authorwenzelm
Wed, 08 Jun 2011 16:19:22 +0200
changeset 43279 6af741899bf6
parent 43278 1fbdcebb364b
child 43280 e5dd0ae1b054
more jvmpath wrapping for Cygwin;
src/Tools/jEdit/jedit_build/Tools/jedit
--- a/src/Tools/jEdit/jedit_build/Tools/jedit	Wed Jun 08 15:56:57 2011 +0200
+++ b/src/Tools/jEdit/jedit_build/Tools/jedit	Wed Jun 08 16:19:22 2011 +0200
@@ -120,9 +120,16 @@
     cp -a "${JEDIT_JARS[@]}" "${SCALA_JARS[@]}" "$ISABELLE_HOME/lib/classes/Pure.jar" \
       "$TARGET_DIR/jars/." || failed
 
+    declare -a JVM_SOURCES=()
+    for SOURCE in "${SOURCES[@]}"
+    do
+      JVM_SOURCES["${#JVM_SOURCES[@]}"]="$(jvmpath "$SOURCE")"
+    done
+
     CLASSPATH="$(jvmpath "$CLASSPATH")"
+
     "$SCALA_HOME/bin/scalac" -unchecked -deprecation \
-      -d "$TARGET_DIR/classes" -target:jvm-1.5 "${SOURCES[@]}" || \
+      -d "$(jvmpath "$TARGET_DIR/classes")" -target:jvm-1.5 "${JVM_SOURCES[@]}" || \
       fail "Failed to compile sources"
 
     cd "$TARGET_DIR/classes"