diff options
| -rw-r--r-- | sources/scala/tools/scala4ant/AntAdaptor.scala | 11 | ||||
| -rw-r--r-- | sources/scala/tools/scala4ant/AntTask.scala | 1 | ||||
| -rw-r--r-- | sources/scalac/CompilerCommand.java | 2 | ||||
| -rw-r--r-- | sources/scalac/Global.java | 2 |
4 files changed, 2 insertions, 14 deletions
diff --git a/sources/scala/tools/scala4ant/AntAdaptor.scala b/sources/scala/tools/scala4ant/AntAdaptor.scala index 96f743e9a8..c19f319873 100644 --- a/sources/scala/tools/scala4ant/AntAdaptor.scala +++ b/sources/scala/tools/scala4ant/AntAdaptor.scala @@ -88,9 +88,6 @@ package scala.tools.scala4ant { //Console.println("setupScalaCommand"); val cmd = new Commandline(); val cp = new Path( this.project ); - if( attributes.asInstanceOf[AntTask].getXmarkup() ) { - cmd.createArgument().setValue("-Xmarkup"); - } if( destDir != null ) { cmd.createArgument().setValue( "-d" ); @@ -108,14 +105,6 @@ package scala.tools.scala4ant { cmd.createArgument().setValue("-classpath"); cmd.createArgument().setPath( cp ); - /* - var bcp = inferScalaPath(Path.systemClasspath.list()); - val bcps:String = (bcp./: ("") { (x:String,y:String) => x+":"+y }) - + ":" + System.getProperty("sun.boot.class.path"); - + { val z = System.getProperty("scala.boot.class.path"); - if( z != null ) z else "" }; - */ - var bcp = inferScalaPath(Path.systemClasspath.list()); val bcps = (bcp./: (PSEP) { (x:String,y:String) => x+PSEP+y }); diff --git a/sources/scala/tools/scala4ant/AntTask.scala b/sources/scala/tools/scala4ant/AntTask.scala index 78a150fac7..13457c84d4 100644 --- a/sources/scala/tools/scala4ant/AntTask.scala +++ b/sources/scala/tools/scala4ant/AntTask.scala @@ -51,6 +51,7 @@ class AntTask extends Javac { def setForce( b:boolean ) = this.force = b; def getForce() = force; + /** only for compatibility, has no effect */ def setXmarkup( b:boolean ) = this.xmarkup = b; def getXmarkup() = xmarkup; diff --git a/sources/scalac/CompilerCommand.java b/sources/scalac/CompilerCommand.java index eaa0c76b7c..343fec3202 100644 --- a/sources/scalac/CompilerCommand.java +++ b/sources/scalac/CompilerCommand.java @@ -238,7 +238,7 @@ public class CompilerCommand extends CommandParser { false), this.Xmarkup = new BooleanOptionParser(this, - "Xmarkup", "Allow XML markup in expressions and patterns", + "Xmarkup", "no effect, only for compatibility", false), this.Xnewmatch = new BooleanOptionParser(this, diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java index 59f4b251b7..74c8dd58a7 100644 --- a/sources/scalac/Global.java +++ b/sources/scalac/Global.java @@ -60,7 +60,6 @@ public abstract class Global { public final boolean debug; public final boolean explaintypes; public final boolean uniqid; - public final boolean xmlMarkup; public final boolean newMatch; public final boolean printtypes; @@ -215,7 +214,6 @@ public abstract class Global { //this.optimize = args.optimize.optimize; this.debug = args.debug.value; this.uniqid = args.uniqid.value; - this.xmlMarkup = args.Xmarkup.value; this.newMatch = args.Xnewmatch.value; this.explaintypes = args.explaintypes.value; this.printtypes = args.types.value; |