diff options
| author | michelou <michelou@epfl.ch> | 2006-03-20 16:45:18 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2006-03-20 16:45:18 +0000 |
| commit | 5c15a9a9d57409632582a6ffae350c636eaa720a (patch) | |
| tree | b186bac5db12d1b969de76a056cf689d4d2eca8c /src | |
| parent | 1ef57837fb0a1dc6660bed25097f8cbc9db69d46 (diff) | |
| download | scala-5c15a9a9d57409632582a6ffae350c636eaa720a.tar.gz scala-5c15a9a9d57409632582a6ffae350c636eaa720a.tar.bz2 scala-5c15a9a9d57409632582a6ffae350c636eaa720a.zip | |
removed duplicated test 'if $cygwin ; ..' in fi...
removed duplicated test 'if $cygwin ; ..' in file tool-unix.tmpl
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/generic-unix.tmpl | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/src/compiler/scala/tools/ant/templates/generic-unix.tmpl b/src/compiler/scala/tools/ant/templates/generic-unix.tmpl index e2c899682e..b4271fc929 100644 --- a/src/compiler/scala/tools/ant/templates/generic-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/generic-unix.tmpl @@ -47,7 +47,7 @@ if [ "$CLASSPATH" != "" ] ; then fi QQ_CP_ARGUMENT=0 -for i in $@@ ; do +for i in "$@@" ; do if [ "$QQ_CP_ARGUMENT" -eq 1 ] ; then USER_CLASSPATH=$i QQ_CP_ARGUMENT=0 diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl index 3777c9bf89..bc86f3ea03 100644 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl @@ -44,16 +44,6 @@ fi MYCLASSPATH="$EXTENSION_CLASSPATH" -if $cygwin; then - if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then - format=mixed - else - format=windows - fi - MYCLASSPATH=`cygpath --path --$format "$MYCLASSPATH"` - SCALA_HOME=`cygpath --$format "$SCALA_HOME"` -fi - for flag in "$@@" ; do if [ "$flag" == '-version' ] ; then echo "@name@ version @version@ -- @copyright@" |