diff options
author | michelou <michelou@epfl.ch> | 2006-07-19 17:26:36 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2006-07-19 17:26:36 +0000 |
commit | d0bc4a20d2563997f673c1afd02ec3059db02f94 (patch) | |
tree | 73c26521e072b5cb05012b687f3c25b5eb4e8bb6 | |
parent | 3fc6cbcbfb56485763887c0f04658e678a506c4f (diff) | |
download | scala-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
-rw-r--r-- | src/compiler/scala/tools/ant/templates/generic-unix.tmpl | 5 | ||||
-rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 5 |
2 files changed, 8 insertions, 2 deletions
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 |