diff options
| author | michelou <michelou@epfl.ch> | 2005-09-16 11:23:10 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2005-09-16 11:23:10 +0000 |
| commit | 92c43defc4add3a23353b8a26cf12330741fee5a (patch) | |
| tree | 84a9e63b5701336a02183c5ea2c70dd5089c59cc | |
| parent | ae80c2257e0e2b943449d25af8b211ea382316d6 (diff) | |
| download | scala-92c43defc4add3a23353b8a26cf12330741fee5a.tar.gz scala-92c43defc4add3a23353b8a26cf12330741fee5a.tar.bz2 scala-92c43defc4add3a23353b8a26cf12330741fee5a.zip | |
- classpath must be handled differently on Cygwin.
| -rwxr-xr-x | ant-build-nsc.sh | 14 | ||||
| -rwxr-xr-x | ant-test-nsc.sh | 14 |
2 files changed, 26 insertions, 2 deletions
diff --git a/ant-build-nsc.sh b/ant-build-nsc.sh index ef273d6a9f..b0aeb854f6 100755 --- a/ant-build-nsc.sh +++ b/ant-build-nsc.sh @@ -10,11 +10,23 @@ # ant build CLASSPATH=$nsc_fjbg_jar:$nsc_scala_jar:$nsc_tools_jar:$nsc_jaco_jar +PLATFORM=unix + +# For Cygwin, switch paths to appropriate format before running ant +if $cygwin; then + if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then + format=mixed + else + format=windows + fi + CLASSPATH=`cygpath --path --$format "$CLASSPATH"` + PLATFORM=win +fi # for debugging your classpath #echo CLASSPATH=$CLASSPATH -CLASSPATH="$CLASSPATH" $ANT_CMD -Dplatform=unix -f "$ANT_BUILDFILE" $* +CLASSPATH="$CLASSPATH" $ANT_CMD -Dplatform=$PLATFORM -f "$ANT_BUILDFILE" $* $RM "$ANT_BUILDFILE" ############################################################################## diff --git a/ant-test-nsc.sh b/ant-test-nsc.sh index 66750f1724..3b131d3da1 100755 --- a/ant-test-nsc.sh +++ b/ant-test-nsc.sh @@ -10,11 +10,23 @@ # ant build CLASSPATH=$nsc_fjbg_jar:$nsc_scala_jar:$nsc_tools_jar:$nsc_nsc_jar:$nsc_nsc4ant_jar +PLATFORM=unix + +# For Cygwin, switch paths to appropriate format before running ant +if $cygwin; then + if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then + format=mixed + else + format=windows + fi + CLASSPATH=`cygpath --path --$format "$CLASSPATH"` + PLATFORM=win +fi # for debugging your classpath #echo CLASSPATH=$CLASSPATH -CLASSPATH="$CLASSPATH" $ANT_CMD -Dplatform=unix -f "$ANT_BUILDFILE" $* +CLASSPATH="$CLASSPATH" $ANT_CMD -Dplatform=$PLATFORM -f "$ANT_BUILDFILE" $* $RM "$ANT_BUILDFILE" ############################################################################## |