diff options
author | Lukas Rytz <lukas.rytz@epfl.ch> | 2008-10-30 15:04:59 +0000 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2008-10-30 15:04:59 +0000 |
commit | eae38f8340adfb5a125dd2f4459488ca394437d3 (patch) | |
tree | e3c9f5477bcbb4042060414d1502901abad26a3b | |
parent | 219412ebb7c8c7d574c4953983c317cf7a62e92d (diff) | |
download | scala-eae38f8340adfb5a125dd2f4459488ca394437d3.tar.gz scala-eae38f8340adfb5a125dd2f4459488ca394437d3.tar.bz2 scala-eae38f8340adfb5a125dd2f4459488ca394437d3.zip |
updated ScalacFork ant task to accept arbitry a...
updated ScalacFork ant task to accept arbitry arguments forwarded to the
forked jvm.
-rw-r--r-- | build.xml | 36 | ||||
-rw-r--r-- | lib/scala-compiler.jar.desired.sha1 | 2 | ||||
-rw-r--r-- | lib/scala-library-src.jar.desired.sha1 | 2 | ||||
-rw-r--r-- | lib/scala-library.jar.desired.sha1 | 2 | ||||
-rw-r--r-- | src/compiler/scala/tools/ant/sabbus/ScalacFork.scala | 9 |
5 files changed, 27 insertions, 24 deletions
@@ -135,7 +135,9 @@ PROPERTIES into the script runners created with scala.tools.ant.ScalaTool --> <property name="java.flags" value="-Xmx256M -Xms32M"/> - <property name="scalacfork.maxmemory" value="512m"/> + <property + name="scalacfork.jvmargs" + value="-Xms512M -Xmx512M -Xss1M -XX:MaxPermSize=128M"/> <property name="javac.cmd" value="${env.JAVA_HOME}/bin/javac"/> @@ -216,7 +218,7 @@ LOCAL REFERENCE BUILD (LOCKER) srcpath="${src.dir}/library" params="${scalac.args}" srcdir="${src.dir}/library" - maxmemory="${scalacfork.maxmemory}"> + jvmargs="${scalacfork.jvmargs}"> <include name="scala/Predef.scala"/> <compilationpath> <pathelement location="${build-locker.dir}/classes/library"/> @@ -228,7 +230,7 @@ LOCAL REFERENCE BUILD (LOCKER) srcpath="${src.dir}/library" params="${scalac.args}" srcdir="${src.dir}/library" - maxmemory="${scalacfork.maxmemory}"> + jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <exclude name="scala/Predef.scala"/> <compilationpath> @@ -266,7 +268,7 @@ LOCAL REFERENCE BUILD (LOCKER) srcpath="${src.dir}/compiler" params="${scalac.args}" srcdir="${src.dir}/compiler" - maxmemory="${scalacfork.maxmemory}"> + jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-locker.dir}/classes/library"/> @@ -354,7 +356,7 @@ QUICK BUILD (QUICK) srcpath="${src.dir}/library" params="${scalac.args}" srcdir="${src.dir}/library" - maxmemory="${scalacfork.maxmemory}"> + jvmargs="${scalacfork.jvmargs}"> <include name="scala/Predef.scala"/> <compilationpath> <pathelement location="${build-quick.dir}/classes/library"/> @@ -366,7 +368,7 @@ QUICK BUILD (QUICK) srcpath="${src.dir}/library" params="${scalac.args}" srcdir="${src.dir}/library" - maxmemory="${scalacfork.maxmemory}"> + jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <exclude name="scala/Predef.scala"/> <compilationpath> @@ -379,7 +381,7 @@ QUICK BUILD (QUICK) srcpath="${src.dir}/library" params="${scalac.args}" srcdir="${src.dir}/actors" - maxmemory="${scalacfork.maxmemory}"> + jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-quick.dir}/classes/library"/> @@ -391,7 +393,7 @@ QUICK BUILD (QUICK) srcpath="${src.dir}/library" params="${scalac.args}" srcdir="${src.dir}/dbc" - maxmemory="${scalacfork.maxmemory}"> + jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-quick.dir}/classes/library"/> @@ -403,7 +405,7 @@ QUICK BUILD (QUICK) srcpath="${src.dir}/library" params="${scalac.args}" srcdir="${src.dir}/swing" - maxmemory="${scalacfork.maxmemory}"> + jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-quick.dir}/classes/library"/> @@ -440,7 +442,7 @@ QUICK BUILD (QUICK) srcpath="${src.dir}/compiler" params="${scalac.args}" srcdir="${src.dir}/compiler" - maxmemory="${scalacfork.maxmemory}"> + jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-quick.dir}/classes/library"/> @@ -494,7 +496,7 @@ QUICK BUILD (QUICK) srcpath="${src.dir}/partest" params="${scalac.args}" srcdir="${src.dir}/partest" - maxmemory="${scalacfork.maxmemory}"> + jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-quick.dir}/classes/library"/> @@ -918,7 +920,7 @@ OPTIMISED COMPILER srcpath="${src.dir}/library" params="-optimise ${scalac.args}" srcdir="${src.dir}/library" - maxmemory="${scalacfork.maxmemory}"> + jvmargs="${scalacfork.jvmargs}"> <include name="scala/Predef.scala"/> <compilationpath> <pathelement location="${build-optimised.dir}/classes/library"/> @@ -930,7 +932,7 @@ OPTIMISED COMPILER srcpath="${src.dir}/library" params="-optimise ${scalac.args}" srcdir="${src.dir}/library" - maxmemory="${scalacfork.maxmemory}"> + jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <exclude name="scala/Predef.scala"/> <compilationpath> @@ -943,7 +945,7 @@ OPTIMISED COMPILER srcpath="${src.dir}/library" params="-optimise ${scalac.args}" srcdir="${src.dir}/actors" - maxmemory="${scalacfork.maxmemory}"> + jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-optimised.dir}/classes/library"/> @@ -955,7 +957,7 @@ OPTIMISED COMPILER srcpath="${src.dir}/library" params="-optimise ${scalac.args}" srcdir="${src.dir}/dbc" - maxmemory="${scalacfork.maxmemory}"> + jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-optimised.dir}/classes/library"/> @@ -967,7 +969,7 @@ OPTIMISED COMPILER srcpath="${src.dir}/library" params="-optimise ${scalac.args}" srcdir="${src.dir}/swing" - maxmemory="${scalacfork.maxmemory}"> + jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-optimised.dir}/classes/library"/> @@ -1004,7 +1006,7 @@ OPTIMISED COMPILER srcpath="${src.dir}/compiler" params="-optimise ${scalac.args}" srcdir="${src.dir}/compiler" - maxmemory="${scalacfork.maxmemory}"> + jvmargs="${scalacfork.jvmargs}"> <include name="**/*.scala"/> <compilationpath> <pathelement location="${build-optimised.dir}/classes/library"/> diff --git a/lib/scala-compiler.jar.desired.sha1 b/lib/scala-compiler.jar.desired.sha1 index 85ecf23f90..d1c49839a3 100644 --- a/lib/scala-compiler.jar.desired.sha1 +++ b/lib/scala-compiler.jar.desired.sha1 @@ -1 +1 @@ -0a1f188dc3c851fd45c902a3e1135f643ef5b191 ?scala-compiler.jar +55fe93090277240e5760ffcc566e75842b07bacf ?scala-compiler.jar diff --git a/lib/scala-library-src.jar.desired.sha1 b/lib/scala-library-src.jar.desired.sha1 index 28a05d2de6..4054bc8f3c 100644 --- a/lib/scala-library-src.jar.desired.sha1 +++ b/lib/scala-library-src.jar.desired.sha1 @@ -1 +1 @@ -7e58669423cc0af0fed52fbf375630ed10102dba ?scala-library-src.jar +bcc43a477a3f496180e48c659b7ef2b9f7d70770 ?scala-library-src.jar diff --git a/lib/scala-library.jar.desired.sha1 b/lib/scala-library.jar.desired.sha1 index 47c9b93a97..81363e6d34 100644 --- a/lib/scala-library.jar.desired.sha1 +++ b/lib/scala-library.jar.desired.sha1 @@ -1 +1 @@ -efa15a398d98642373fec50a7a866574e12a3d65 ?scala-library.jar +26a6cc690b3e4ad908636fc8c29f3b0dda8fd249 ?scala-library.jar diff --git a/src/compiler/scala/tools/ant/sabbus/ScalacFork.scala b/src/compiler/scala/tools/ant/sabbus/ScalacFork.scala index 74928ec7ce..e973672bf3 100644 --- a/src/compiler/scala/tools/ant/sabbus/ScalacFork.scala +++ b/src/compiler/scala/tools/ant/sabbus/ScalacFork.scala @@ -18,14 +18,14 @@ class ScalacFork extends MatchingTask with TaskArgs { timeout = Some(input) } - def setMaxMemory(input: String): Unit = { - maxmemory = Some(input) + def setJvmArgs(input: String): Unit = { + jvmArgs = Some(input) } private var sourceDir: Option[File] = None private var failOnError: Boolean = true private var timeout: Option[Long] = None - private var maxmemory: Option[String] = None + private var jvmArgs: Option[String] = None override def execute() { if (compilerPath.isEmpty) error("Mandatory attribute 'compilerpath' is not set.") @@ -57,10 +57,11 @@ class ScalacFork extends MatchingTask with TaskArgs { val java = new Java(this) // set this as owner java.setFork(true) + // using 'setLine' creates multiple arguments out of a space-separated string + if (!jvmArgs.isEmpty) java.createJvmarg().setLine(jvmArgs.get) java.setClasspath(compilerPath.get) java.setClassname("scala.tools.nsc.Main") if (!timeout.isEmpty) java.setTimeout(timeout.get) - if (!maxmemory.isEmpty) java.setMaxmemory(maxmemory.get) for (arg <- settings.toArgs) java.createArg().setValue(arg) for (file <- includedFiles) |