diff options
| author | Burak Emir <emir@epfl.ch> | 2006-03-09 16:36:24 +0000 |
|---|---|---|
| committer | Burak Emir <emir@epfl.ch> | 2006-03-09 16:36:24 +0000 |
| commit | ff46b04fc9c2f68c807cea563b2008e36ff2f260 (patch) | |
| tree | 99464e2af799f0cfb0f9f60f8f1db34a2b87b02f /src | |
| parent | 1aa3839d75a7b4c6d1f080ce2fc38401beaa3357 (diff) | |
| download | scala-ff46b04fc9c2f68c807cea563b2008e36ff2f260.tar.gz scala-ff46b04fc9c2f68c807cea563b2008e36ff2f260.tar.bz2 scala-ff46b04fc9c2f68c807cea563b2008e36ff2f260.zip | |
fixed handling of classpath again, adds "." if ...
fixed handling of classpath again, adds "." if nothing is specified
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/generic-unix.tmpl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/ant/templates/generic-unix.tmpl b/src/compiler/scala/tools/ant/templates/generic-unix.tmpl index c8ec80cee2..b33f1e697b 100644 --- a/src/compiler/scala/tools/ant/templates/generic-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/generic-unix.tmpl @@ -46,7 +46,7 @@ if [ "$MYCLASSPATH" == "" ] ; then done fi -QQ_USERCLASSPATH="" +QQ_USERCLASSPATH="." QQ_USERARGS="" QQ_NEXT=0 for i in $@@ @@ -55,7 +55,7 @@ do then QQ_USERCLASSPATH=$i; QQ_NEXT=0 - else if [ $i = "-cp" ] + else if [ $i = "-cp" || $i = "-classpath" ] then QQ_NEXT=1 else @@ -84,12 +84,14 @@ fi ## Lex suggested the userclasspath come before our stuff, since it gets ## preferred. -if [ "$QQ_USERCLASSPATH" != "" ] +if [ "$QQ_USERCLASSPATH" != "." ] then MYCLASSPATH="$QQ_USERCLASSPATH:$MYCLASSPATH" else if [ "$CLASSPATH" != "" ] then MYCLASSPATH="$CLASSPATH:$MYCLASSPATH" + else + MYCLASSPATH=".:$MYCLASSPATH" fi fi |