diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2008-08-22 06:17:58 +0000 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2008-08-22 06:17:58 +0000 |
| commit | 157ce5639bd6986c7090480680eef176cda337e7 (patch) | |
| tree | 534b86d9f010660aeda2d1e0bd7ca869e4a5e723 | |
| parent | 6988638b93d576678c8a2410617c175d6e9c7b95 (diff) | |
| download | scala-157ce5639bd6986c7090480680eef176cda337e7.tar.gz scala-157ce5639bd6986c7090480680eef176cda337e7.tar.bz2 scala-157ce5639bd6986c7090480680eef176cda337e7.zip | |
fixed #1257
| -rw-r--r-- | .classpath | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.classpath b/.classpath index bb255263fc..5ed4609fe7 100644 --- a/.classpath +++ b/.classpath @@ -6,5 +6,5 @@ <classpathentry kind="lib" path="lib/jline.jar"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="lib" path="lib/fjbg.jar"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="output" path="build/quick/classes/compiler"/> </classpath> diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl index 47de171e88..e639f8fa44 100644 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl @@ -28,6 +28,7 @@ while [ -h "$SOURCE" ]; do done; SCALA_HOME=`dirname "$SOURCE"`/..; SCALA_HOME=`cd "$SCALA_HOME"; pwd`; +# Remove spaces from SCALA_HOME on windows if $cygwin; then SCALA_HOME=`cygpath --windows --short-name "$SCALA_HOME"` SCALA_HOME=`cygpath --unix "$SCALA_HOME"` @@ -62,4 +63,4 @@ if [ -z "$JAVACMD" -a -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then JAVACMD="$JAVA_HOME/bin/java" fi -exec ${JAVACMD:=java} $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS" @properties@ @class@ @toolflags@ "$@@" +exec "${JAVACMD:=java}" $JAVA_OPTS -cp "$TOOL_CLASSPATH" -Dscala.home="$SCALA_HOME" -Denv.classpath="$CLASSPATH" -Denv.emacs="$EMACS" @properties@ @class@ @toolflags@ "$@@" |