From d0bc4a20d2563997f673c1afd02ec3059db02f94 Mon Sep 17 00:00:00 2001
From: michelou <michelou@epfl.ch>
Date: Wed, 19 Jul 2006 17:26:36 +0000
Subject: added support for paths containing blanks on Cy...

added support for paths containing blanks on Cygwin
---
 src/compiler/scala/tools/ant/templates/generic-unix.tmpl | 5 ++++-
 src/compiler/scala/tools/ant/templates/tool-unix.tmpl    | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/compiler/scala/tools/ant/templates/generic-unix.tmpl b/src/compiler/scala/tools/ant/templates/generic-unix.tmpl
index bfc51c94a6..6548ca1138 100644
--- a/src/compiler/scala/tools/ant/templates/generic-unix.tmpl
+++ b/src/compiler/scala/tools/ant/templates/generic-unix.tmpl
@@ -41,6 +41,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
 
 # Will contain (at the end of the script) all arguments that weren't explicitly handled
 USER_ARGS=""
@@ -99,7 +103,6 @@ if $cygwin; then
     else
         format=windows
     fi
-    SCALA_HOME=`cygpath --$format "$SCALA_HOME"`
     MERGED_CLASSPATH=`cygpath --path --$format "$MERGED_CLASSPATH"`
     BOOT_CLASSPATH=`cygpath --path --$format "$BOOT_CLASSPATH"`
 fi
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
-- 
cgit v1.2.3