diff options
| -rw-r--r-- | sources/scala/tools/scala4ant/AntTask.java | 14 | ||||
| -rw-r--r-- | support/ant/src.java/scala/tools/scalac4ant/AntTask.java | 14 |
2 files changed, 26 insertions, 2 deletions
diff --git a/sources/scala/tools/scala4ant/AntTask.java b/sources/scala/tools/scala4ant/AntTask.java index 8ec8e363d5..e8e7020d8b 100644 --- a/sources/scala/tools/scala4ant/AntTask.java +++ b/sources/scala/tools/scala4ant/AntTask.java @@ -23,7 +23,6 @@ public class AntTask extends Javac { private String target = null; private FileUtils fileUtils = FileUtils.newFileUtils(); - public void execute() { String old = project.getProperty("build.compiler"); project.setProperty("build.compiler", "scala.tools.scalac4ant.AntAdaptor"); @@ -66,6 +65,19 @@ public class AntTask extends Javac { return suffixes; } + public void setScalaClasspath(String s) { + System.setProperty("scala.class.path",s); + } + public String getScalaClasspath() { + return System.getProperty("scala.class.path"); + } + public void setScalaBootClasspath(String s) { + System.setProperty("scala.boot.class.path",s); + } + public String getScalaBootClasspath() { + return System.getProperty("scala.boot.class.path"); + } + protected String[] parseSuffixes() { StringTokenizer st = new StringTokenizer(suffixes, " ,"); ArrayList al = new ArrayList(); diff --git a/support/ant/src.java/scala/tools/scalac4ant/AntTask.java b/support/ant/src.java/scala/tools/scalac4ant/AntTask.java index 8ec8e363d5..e8e7020d8b 100644 --- a/support/ant/src.java/scala/tools/scalac4ant/AntTask.java +++ b/support/ant/src.java/scala/tools/scalac4ant/AntTask.java @@ -23,7 +23,6 @@ public class AntTask extends Javac { private String target = null; private FileUtils fileUtils = FileUtils.newFileUtils(); - public void execute() { String old = project.getProperty("build.compiler"); project.setProperty("build.compiler", "scala.tools.scalac4ant.AntAdaptor"); @@ -66,6 +65,19 @@ public class AntTask extends Javac { return suffixes; } + public void setScalaClasspath(String s) { + System.setProperty("scala.class.path",s); + } + public String getScalaClasspath() { + return System.getProperty("scala.class.path"); + } + public void setScalaBootClasspath(String s) { + System.setProperty("scala.boot.class.path",s); + } + public String getScalaBootClasspath() { + return System.getProperty("scala.boot.class.path"); + } + protected String[] parseSuffixes() { StringTokenizer st = new StringTokenizer(suffixes, " ,"); ArrayList al = new ArrayList(); |