summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormihaylov <mihaylov@epfl.ch>2007-02-09 17:03:09 +0000
committermihaylov <mihaylov@epfl.ch>2007-02-09 17:03:09 +0000
commit3c8bde9170217c53a6bb1413fbc7d17679ebd4aa (patch)
tree48aff1f31cbebb4ff5ee36735071849cea735e0a /src
parent107e2e6a5b0f1e7426313a4fe7050c7b7587e804 (diff)
downloadscala-3c8bde9170217c53a6bb1413fbc7d17679ebd4aa.tar.gz
scala-3c8bde9170217c53a6bb1413fbc7d17679ebd4aa.tar.bz2
scala-3c8bde9170217c53a6bb1413fbc7d17679ebd4aa.zip
Made scalac ant task accept .NET-related settings
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/ant/Scalac.scala14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/ant/Scalac.scala b/src/compiler/scala/tools/ant/Scalac.scala
index c7ebae6d26..b16aacd2dd 100644
--- a/src/compiler/scala/tools/ant/Scalac.scala
+++ b/src/compiler/scala/tools/ant/Scalac.scala
@@ -146,6 +146,11 @@ class Scalac extends MatchingTask {
/** Instruct the compiler to generate unchecked information. */
private var unchecked: Boolean = false
+ // Name of the output assembly (only relevant with -target:msil)
+ private var assemname: String = ""
+ // List of assemblies referenced by the program (only relevant with -target:msil)
+ private var assemrefs: String = "."
+
/** Whether the compiler is being debuged. Prints more information in case
* in case of failure.
*/
@@ -378,6 +383,12 @@ class Scalac extends MatchingTask {
def setScalacdebugging(input: Boolean): Unit =
scalacDebugging = input
+ def setAssemname(input: String): Unit =
+ assemname = input
+
+ def setAssemrefs(input: String): Unit =
+ assemrefs = input
+
/*============================================================================*\
** Properties getters **
\*============================================================================*/
@@ -587,6 +598,9 @@ class Scalac extends MatchingTask {
settings.deprecation.value = deprecation
settings.unchecked.value = unchecked
+ settings.assemname.value = assemname
+ settings.assemrefs.value = assemrefs
+
log("Scalac params = '" + addParams + "'", Project.MSG_DEBUG)
var args =
if (addParams.trim() == "") Nil