src/Pure/build-jars
changeset 47115 1a05adae1cc9
parent 47113 b5a5662528fb
child 47408 63c05991882e
     1.1 --- a/src/Pure/build-jars	Mon Mar 26 15:38:09 2012 +0200
     1.2 +++ b/src/Pure/build-jars	Mon Mar 26 16:25:08 2012 +0200
     1.3 @@ -88,7 +88,6 @@
     1.4  }
     1.5  
     1.6  [ -z "$ISABELLE_HOME" ] && fail "Missing Isabelle settings environment"
     1.7 -[ -z "$SCALA_HOME" ] && fail "Unknown SCALA_HOME -- Scala unavailable"
     1.8  
     1.9  
    1.10  ## process command line
    1.11 @@ -172,10 +171,10 @@
    1.12  
    1.13    SCALAC_OPTIONS="$ISABELLE_SCALA_BUILD_OPTIONS -d classes"
    1.14  
    1.15 -  "$SCALA_HOME/bin/scalac" $SCALAC_OPTIONS "${PIDE_SOURCES[@]}" || \
    1.16 +  isabelle_scala scalac $SCALAC_OPTIONS "${PIDE_SOURCES[@]}" || \
    1.17      fail "Failed to compile PIDE sources"
    1.18  
    1.19 -  "$SCALA_HOME/bin/scalac" $SCALAC_OPTIONS -classpath classes "${PURE_SOURCES[@]}" || \
    1.20 +  isabelle_scala scalac $SCALAC_OPTIONS -classpath classes "${PURE_SOURCES[@]}" || \
    1.21      fail "Failed to compile Pure sources"
    1.22  
    1.23    mkdir -p "$TARGET_DIR/ext" || fail "Failed to create directory $TARGET_DIR/ext"
    1.24 @@ -186,7 +185,7 @@
    1.25    mkdir -p "$(dirname "$CHARSET_SERVICE")"
    1.26    echo isabelle.Isabelle_Charset_Provider > "$CHARSET_SERVICE"
    1.27  
    1.28 -  "$ISABELLE_JDK_HOME/bin/jar" cfe "$(jvmpath "$TARGET")" isabelle.GUI_Setup META-INF isabelle || \
    1.29 +  isabelle_jdk jar cfe "$(jvmpath "$TARGET")" isabelle.GUI_Setup META-INF isabelle || \
    1.30      fail "Failed to produce $TARGET"
    1.31  
    1.32    cp "$SCALA_HOME/lib/scala-swing.jar" "$SCALA_HOME/lib/scala-library.jar" "$TARGET_DIR/ext"