diff options
| author | michelou <michelou@epfl.ch> | 2006-07-19 18:26:10 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2006-07-19 18:26:10 +0000 |
| commit | 045652a12b4cd8ac744ca0a2ff2fb70a7b6b7e8f (patch) | |
| tree | 6b4f3847d4ceb45870f3674ad39f2231a6626b3a | |
| parent | 1d6f2ff511579107b243b7c21bf06c93450627a5 (diff) | |
| download | scala-045652a12b4cd8ac744ca0a2ff2fb70a7b6b7e8f.tar.gz scala-045652a12b4cd8ac744ca0a2ff2fb70a7b6b7e8f.tar.bz2 scala-045652a12b4cd8ac744ca0a2ff2fb70a7b6b7e8f.zip | |
reintroduced SCALA_HOME assignment in 2nd cygwi...
reintroduced SCALA_HOME assignment in 2nd cygwin test
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/generic-unix.tmpl | 1 | ||||
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/ant/templates/generic-unix.tmpl b/src/compiler/scala/tools/ant/templates/generic-unix.tmpl index 6548ca1138..ad9fbf2f40 100644 --- a/src/compiler/scala/tools/ant/templates/generic-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/generic-unix.tmpl @@ -103,6 +103,7 @@ 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 d708dc71b6..ca76eaf8e1 100644 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl @@ -64,6 +64,7 @@ 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 |