summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2006-07-19 17:26:36 +0000
committermichelou <michelou@epfl.ch>2006-07-19 17:26:36 +0000
commitd0bc4a20d2563997f673c1afd02ec3059db02f94 (patch)
tree73c26521e072b5cb05012b687f3c25b5eb4e8bb6 /src/compiler/scala/tools/ant/templates/tool-unix.tmpl
parent3fc6cbcbfb56485763887c0f04658e678a506c4f (diff)
downloadscala-d0bc4a20d2563997f673c1afd02ec3059db02f94.tar.gz
scala-d0bc4a20d2563997f673c1afd02ec3059db02f94.tar.bz2
scala-d0bc4a20d2563997f673c1afd02ec3059db02f94.zip
added support for paths containing blanks on Cy...
added support for paths containing blanks on Cygwin
Diffstat (limited to 'src/compiler/scala/tools/ant/templates/tool-unix.tmpl')
-rw-r--r--src/compiler/scala/tools/ant/templates/tool-unix.tmpl5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
index 041a0dd5da..d708dc71b6 100644
--- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
+++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
@@ -31,6 +31,10 @@ while [ -h "$SOURCE" ]; do
done;
SCALA_HOME=`dirname "$SOURCE"`/..;
SCALA_HOME=`cd "$SCALA_HOME"; pwd`;
+if $cygwin; then
+ SCALA_HOME=`cygpath --windows --short-name "$SCALA_HOME"`
+ SCALA_HOME=`cygpath --unix "$SCALA_HOME"`
+fi
# Constructing the extension classpath
EXTENSION_CLASSPATH="@extclasspath@"
@@ -60,7 +64,6 @@ if $cygwin; then
else
format=windows
fi
- SCALA_HOME=`cygpath --$format "$SCALA_HOME"`
EXTENSION_CLASSPATH=`cygpath --path --$format "$EXTENSION_CLASSPATH"`
BOOT_CLASSPATH=`cygpath --path --$format "$BOOT_CLASSPATH"`
fi