diff options
Diffstat (limited to 'src/compiler/scala/tools/ant/sabbus/Settings.scala')
| -rw-r--r-- | src/compiler/scala/tools/ant/sabbus/Settings.scala | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/compiler/scala/tools/ant/sabbus/Settings.scala b/src/compiler/scala/tools/ant/sabbus/Settings.scala index 4d4e3cdb08..c62ea172ed 100644 --- a/src/compiler/scala/tools/ant/sabbus/Settings.scala +++ b/src/compiler/scala/tools/ant/sabbus/Settings.scala @@ -58,16 +58,14 @@ class Settings { def optimise = optimiseBf def optimise_=(b: Boolean) { optimiseBf = b } - private var moreBf: Option[String] = None - def more = moreBf.get - def more_=(s: String): this.type = { moreBf = Some(s); this } - - private def q(o: AnyRef) = "\"" + o.toString.replace("""\""", """\\""") + "\"" + private var extraParamsBf: Seq[String] = Seq() + def extraParams = extraParamsBf + def extraParams_=(s: Seq[String]): this.type = { extraParamsBf = s; this } def toArgs: List[String] = (if (!gBf.isEmpty) "-g:"+g :: Nil else Nil) ::: (if (uncheckedBf) "-unchecked" :: Nil else Nil) ::: - (if (!classpathBf.isEmpty) "-classpath" :: q(classpath) :: Nil else Nil) ::: + (if (!classpathBf.isEmpty) "-classpath" :: classpath.toString :: Nil else Nil) ::: (if (!sourcepathBf.isEmpty) "-sourcepath" :: sourcepath.toString :: Nil else Nil) ::: (if (!sourcedirBf.isEmpty) "-Xsourcedir" :: sourcedir.toString :: Nil else Nil) ::: (if (!bootclasspathBf.isEmpty) "-bootclasspath" :: bootclasspath.toString :: Nil else Nil) ::: @@ -76,7 +74,7 @@ class Settings { (if (!encodingBf.isEmpty) "-encoding" :: encoding :: Nil else Nil) ::: (if (!targetBf.isEmpty) "-target:"+target :: Nil else Nil) ::: (if (optimiseBf) "-optimise" :: Nil else Nil) ::: - (if (!moreBf.isEmpty) (more split ' ').toList else Nil) + extraParamsBf.toList override def equals(that: Any): Boolean = that match { case cs: Settings => @@ -91,7 +89,7 @@ class Settings { this.encodingBf == cs.encodingBf && this.targetBf == cs.targetBf && this.optimiseBf == cs.optimiseBf && - this.moreBf == cs.moreBf + this.extraParamsBf == cs.extraParamsBf case _ => false } |