diff -r 5839e34ef0bd -r 14d70378f1c7 src/Tools/jEdit/makedist --- a/src/Tools/jEdit/makedist Sun Feb 01 12:21:07 2009 +0100 +++ b/src/Tools/jEdit/makedist Sun Feb 01 12:50:21 2009 +0100 @@ -12,7 +12,6 @@ ## diagnostics JEDIT_HOME="/home/isajedit/jedit-orig/4.3pre16" -SCALA_HOME="/home/scala/current" function usage() { @@ -22,8 +21,6 @@ echo " Options are:" echo " -j DIR specify original jEdit distribution" echo " (default: $JEDIT_HOME)" - echo " -s DIR specify Scala distribution" - echo " (default: $SCALA_HOME)" echo echo " Produce Isabelle/jEdit distribution from Netbeans build" echo " in $THIS/dist" @@ -48,9 +45,6 @@ j) JEDIT_HOME="$OPTARG" ;; - s) - SCALA_HOME="$OPTARG" - ;; \?) usage ;; @@ -86,10 +80,7 @@ cp -R "$JEDIT_HOME/." "$JEDIT/." rm -rf "$JEDIT/jEdit" "$JEDIT/build-support" -mkdir -p "$JEDIT/jars" - -[ "$SCALA_HOME/lib/scala-library.jar" ] || fail "Bad Scala directory: $SCALA_HOME" -cp "$SCALA_HOME/lib/scala-library.jar" "$JEDIT/jars/" +cp -R jars "$JEDIT/jars" cp -R "$THIS/dist-template/." "$JEDIT/." @@ -97,13 +88,6 @@ print qq,\n\n,; } print; }' "$JEDIT/modes/catalog" -cp jars/Isabelle-jEdit.jar "$JEDIT/jars/isabelle.jar" -cp jars/lib/Pure.jar "$JEDIT/jars/isabelle-Pure.jar" -cp jars/lib/core-renderer.jar "$JEDIT/jars/" -cp jars/lib/ErrorList.jar "$JEDIT/jars/" -cp jars/lib/SideKick.jar "$JEDIT/jars/" - - # build archive echo "${JEDIT}.tar.gz"