summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dubochet <gilles.dubochet@epfl.ch>2006-04-24 09:26:44 +0000
committerGilles Dubochet <gilles.dubochet@epfl.ch>2006-04-24 09:26:44 +0000
commitd8cb3b071dbb13487944e79578e6077f5b9b5bf8 (patch)
tree79e2d95b4b3b04107d43ae39556f21289d29513d
parenta13de6568b5aa5031dd38a0eb51d34eae1c300bf (diff)
downloadscala-d8cb3b071dbb13487944e79578e6077f5b9b5bf8.tar.gz
scala-d8cb3b071dbb13487944e79578e6077f5b9b5bf8.tar.bz2
scala-d8cb3b071dbb13487944e79578e6077f5b9b5bf8.zip
Corrected bug #569.
-rw-r--r--src/compiler/scala/tools/ant/ScalaTool.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/ant/ScalaTool.scala b/src/compiler/scala/tools/ant/ScalaTool.scala
index caadcaf688..64277636ce 100644
--- a/src/compiler/scala/tools/ant/ScalaTool.scala
+++ b/src/compiler/scala/tools/ant/ScalaTool.scala
@@ -314,6 +314,7 @@ package scala.tools.ant {
update("javaflags", javaFlags)
pipeTemplate("generic", patches)
} else {
+ if (name.isEmpty) name = Some(file.get.getName)
val patches = ListMap.Empty.
update("name", name.get).
update("class", mainClass.get).
@@ -322,7 +323,6 @@ package scala.tools.ant {
update("properties", getProperties).
update("javaflags", javaFlags).
update("toolflags", toolFlags)
- if (name.isEmpty) name = Some(file.get.getName())
pipeTemplate("tool", patches)
}
}