added variable JAVA_OPTS to the generated Unix ...

added variable JAVA_OPTS to the generated Unix tools

1 files changed, 211 insertions, 200 deletions

diff --git a/src/compiler/scala/tools/ant/ScalaTool.scala b/src/compiler/scala/tools/ant/ScalaTool.scala
index b024a62527..0a18098b74 100644
--- a/src/compiler/scala/tools/ant/ScalaTool.scala
+++ b/src/compiler/scala/tools/ant/ScalaTool.scala
@@ -1,205 +1,218 @@
-/*    __  ______________                                                      *\
-**   /  |/ / ____/ ____/                                                      **
-**  / | | /___  / /___                                                        **
-** /_/|__/_____/_____/ Copyright 2005-2007 LAMP/EPFL                          **
-**                                                                            **
-\*                                                                            */
+/*                     __                                               *\
+**     ________ ___   / /  ___     Scala Ant Tasks                      **
+**    / __/ __// _ | / /  / _ |    (c) 2005-2007, LAMP/EPFL             **
+**  __\ \/ /__/ __ |/ /__/ __ |    http://scala-lang.org/               **
+** /____/\___/_/ |_/____/_/ | |                                         **
+**                          |/                                          **
+\*                                                                      */
 
 // $Id$
 
-package scala.tools.ant {
-
-  import compat.StringBuilder
-
-  import scala.collection.immutable.{Map, ListMap}
-
-  import java.io.{File, InputStream, FileWriter}
-  import java.net.{URL, URLClassLoader}
-  import java.util.{ArrayList, Vector}
-
-  import org.apache.tools.ant.{AntClassLoader, BuildException,
-                               DirectoryScanner, Project}
-  import org.apache.tools.ant.taskdefs.MatchingTask
-  import org.apache.tools.ant.types.Path
-  import org.apache.tools.ant.util.{FileUtils, GlobPatternMapper,
-                                    SourceFileScanner}
-  import org.apache.tools.ant.types.{EnumeratedAttribute, Reference}
-
-  /** <p>
-   *    An Ant task that generates a shell or batch script to execute a
-   *    <a href="http://scala-lang.org/" target="_top">Scala</a> program.
-   *    This task can take the following parameters as attributes:
-   *  </p><ul>
-   *  <li>file (mandatory),</li>
-   *  <li>name,</li>
-   *  <li>class (mandatory),</li>
-   *  <li>platforms,</li>
-   *  <li>version,</li>
-   *  <li>copyright,</li>
-   *  <li>bootclasspath,</li>
-   *  <li>extclasspath,</li>
-   *  <li>properties,</li>
-   *  <li>javaflags,</li>
-   *  <li>toolflags.</li></ul>
-   *
-   * @author  Gilles Dubochet
-   * @version 1.0
-   */
-  class ScalaTool extends MatchingTask {
-
-    /** The unique Ant file utilities instance to use in this task. */
-    private val fileUtils = FileUtils.newFileUtils()
+package scala.tools.ant
+
+import scala.collection.immutable.{Map, ListMap}
+
+import java.io.{File, InputStream, FileWriter}
+
+import org.apache.tools.ant.BuildException
+import org.apache.tools.ant.taskdefs.MatchingTask
+import org.apache.tools.ant.types.Path
+import org.apache.tools.ant.util.FileUtils
+
+/** <p>
+ *    An Ant task that generates a shell or batch script to execute a
+ *    <a href="http://scala-lang.org/" target="_top">Scala</a> program.
+ *    This task can take the following parameters as attributes:
+ *  </p><ul>
+ *  <li>file (mandatory),</li>
+ *  <li>name,</li>
+ *  <li>class (mandatory),</li>
+ *  <li>platforms,</li>
+ *  <li>version,</li>
+ *  <li>copyright,</li>
+ *  <li>bootclasspath,</li>
+ *  <li>extclasspath,</li>
+ *  <li>properties,</li>
+ *  <li>javaflags,</li>
+ *  <li>toolflags.</li></ul>
+ *
+ * @author  Gilles Dubochet
+ * @version 1.0
+ */
+class ScalaTool extends MatchingTask {
+
+  /** The unique Ant file utilities instance to use in this task. */
+  private val fileUtils = FileUtils.newFileUtils()
 
 /*============================================================================*\
 **                             Ant user-properties                            **
 \*============================================================================*/
 
-    abstract class PermissibleValue {
-      val values: List[String]
-      def isPermissible(value: String): Boolean =
-        (value == "") || values.exists(.startsWith(value))
-    }
+  abstract class PermissibleValue {
+    val values: List[String]
+    def isPermissible(value: String): Boolean =
+      (value == "") || values.exists(.startsWith(value))
+  }
 
-    /** Defines valid values for the platforms property. */
-    object Platforms extends PermissibleValue {
-      val values = List("unix", "windows")
-    }
+  /** Defines valid values for the platforms property. */
+  object Platforms extends PermissibleValue {
+    val values = List("unix", "windows")
+  }
+
+  /** The path to the exec script file. ".bat" will be appended for the
+   *  Windows BAT file, if generated.
+   */
+  private var file: Option[File] = None
+
+  /** The main class to run. */
+  private var mainClass: Option[String] = None
+
+  /** The name of this tool. Can only be set when a main class is defined,
+   *  default this is equal to the file name.
+   */
+  private var name: Option[String] = None
+
+  /** Supported platforms for the script. Either "unix" or "windows".
+   *  Defaults to both.
+   */
+  private var platforms: List[String] = Nil
+
+  /** The optional version number. If set, when "-version" is passed to the
+   *  script, this value will be printed.
+   */
+  private var version: String = ""
+
+  /** The optional copyright notice, that will be printed in the script. */
+  private var copyright: String = "This file is copyrighted by its owner"
+
+  /** The optional boot classpath */
+  private var bootclasspath: List[String] = Nil
+
+  /** An (optional) path to all JARs that this script depend on. Paths must be
+   *  relative to the scala home directory. If not set, all JAR archives in
+   *  "lib/" are automatically added.
+   */
+  private var extclasspath: List[String] = Nil
+
+  /** Comma-separated Java system properties to pass to the JRE. Properties
+   *  are formated as name=value. Properties scala.home, scala.tool.name and
+   *  scala.tool.version are always set.
+  */
+  private var properties: List[Pair[String,String]] = Nil
 
-    /** The path to the exec script file. ".bat" will be appended for the
-      * Windows BAT file, if generated. */
-    private var file: Option[File] = None
-    /** The main class to run. */
-    private var mainClass: Option[String] = None
-    /** The name of this tool. Can only be set when a main class is defined,
-      * default this is equal to the file name. */
-    private var name: Option[String] = None
-    /** Supported platforms for the script. Either "unix" or "windows". Defaults
-      * to both. */
-    private var platforms: List[String] = Nil
-    /** The optional version number. If set, when "-version" is passed to the
-      * script, this value will be printed.  */
-    private var version: String = ""
-    /** The optional copyright notice, that will be printed in the script. */
-    private var copyright: String = "This file is copyrighted by its owner"
-    /** The optional boot classpath */
-    private var bootclasspath: List[String] = Nil
-    /** An (optional) path to all JARs that this script depend on. Paths must be
-      * relative to the scala home directory. If not set, all JAR archives in
-      * "lib/" are automatically added. */
-    private var extclasspath: List[String] = Nil
-    /** Comma-separated Java system properties to pass to the JRE. Properties
-      * are formated as name=value. Properties scala.home, scala.tool.name and
-      * scala.tool.version are always set. */
-    private var properties: List[Pair[String,String]] = Nil
-    /** Additional flags passed to the JRE ("java [javaFlags] class"). */
-    private var javaFlags: String = ""
-    /** Additional flags passed to the tool ("java class [toolFlags]"). Can only
-      * be set when a main class is defined */
-    private var toolFlags: String = ""
+  /** Additional flags passed to the JRE ("java [javaFlags] class"). */
+  private var javaFlags: String = ""
+
+  /** Additional flags passed to the tool ("java class [toolFlags]"). Can only
+   *  be set when a main class is defined.
+   */
+  private var toolFlags: String = ""
 
 /*============================================================================*\
 **                             Properties setters                             **
 \*============================================================================*/
 
-    /** Sets the file attribute.
-     *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
-     *
-     *  @param input The value of <code>file</code>.
-     */
-    def setFile(input: File) =
-      file = Some(input)
-
-    /** Sets the file attribute.
-     *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
-     *
-     *  @param input The value of <code>file</code>.
-     */
-    def setName(input: String) =
-      name = Some(input)
-
-    /** Sets the main class attribute.
-     *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
-     *
-     *  @param input The value of <code>mainClass</code>.
-     */
-    def setClass(input: String) =
-      mainClass = Some(input)
-
-    /** Sets the platforms attribute. Used by Ant.
-      * @param input The value for <code>platforms</code>. */
-    def setPlatforms(input: String) = {
-      platforms = List.fromArray(input.split(",")).flatMap { s: String =>
-        val st = s.trim()
-        if (Platforms.isPermissible(st))
-          (if (input != "") List(st) else Nil)
-        else {
-          error("Platform " + st + " does not exist.")
-          Nil
-        }
+  /** Sets the file attribute.
+   *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
+   *
+   *  @param input The value of <code>file</code>.
+   */
+  def setFile(input: File) =
+    file = Some(input)
+
+  /** Sets the file attribute.
+   *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
+   *
+   *  @param input The value of <code>file</code>.
+   */
+  def setName(input: String) =
+    name = Some(input)
+
+  /** Sets the main class attribute.
+   *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
+   *
+   *  @param input The value of <code>mainClass</code>.
+   */
+  def setClass(input: String) =
+    mainClass = Some(input)
+
+  /** Sets the platforms attribute. Used by Ant.
+   *
+   * @param input The value for <code>platforms</code>.
+   */
+  def setPlatforms(input: String) = {
+    platforms = List.fromArray(input.split(",")).flatMap { s: String =>
+      val st = s.trim()
+      if (Platforms.isPermissible(st))
+        (if (input != "") List(st) else Nil)
+      else {
+        error("Platform " + st + " does not exist.")
+        Nil
       }
     }
+  }
 
-    /** Sets the version attribute.
-     *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
-     *
-     *  @param input The value of <code>version</code>.
-     */
-    def setVersion(input: String) =
-      version = input
-
-    /** Sets the copyright attribute.
-     *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
-     *
-     *  @param input The value of <code>copyright</code>.
-     */
-    def setCopyright(input: String) =
-      copyright = input
-
-    /** Sets the boot classpath attribute.
-     *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
-     *
-     *  @param input The value of <code>bootclasspath</code>.
-     */
-    def setBootclasspath(input: String) =
-      bootclasspath = bootclasspath ::: List.fromArray(input.split(":"))
-
-    /** Sets the extension classpath attribute.
-     *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
-     *
-     *  @param input The value of <code>extclasspath</code>.
-     */
-    def setExtclasspath(input: String) =
-      extclasspath = extclasspath ::: List.fromArray(input.split(":"))
-
-    /** Sets the properties attribute.
-     *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
-     *
-     *  @param input The value for <code>properties</code>.
-     */
-    def setProperties(input: String) = {
-      properties = List.fromArray(input.split(",")).flatMap { s: String =>
-        val st = s.trim(); val stArray = st.split("=", 2)
-        if (stArray.length == 2) {
-          if (input != "") List(Pair(stArray(0), stArray(1))) else Nil
-        } else error("Property " + st + " does not conform to specification.")
-      }
+  /** Sets the version attribute.
+   *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
+   *
+   *  @param input The value of <code>version</code>.
+   */
+  def setVersion(input: String) =
+    version = input
+
+  /** Sets the copyright attribute.
+   *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
+   *
+   *  @param input The value of <code>copyright</code>.
+   */
+  def setCopyright(input: String) =
+    copyright = input
+
+  /** Sets the boot classpath attribute.
+   *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
+   *
+   *  @param input The value of <code>bootclasspath</code>.
+   */
+  def setBootclasspath(input: String) =
+    bootclasspath = bootclasspath ::: List.fromArray(input.split(":"))
+
+  /** Sets the extension classpath attribute.
+   *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
+   *
+   *  @param input The value of <code>extclasspath</code>.
+   */
+  def setExtclasspath(input: String) =
+    extclasspath = extclasspath ::: List.fromArray(input.split(":"))
+
+  /** Sets the properties attribute.
+   *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
+   *
+   *  @param input The value for <code>properties</code>.
+   */
+  def setProperties(input: String) = {
+    properties = List.fromArray(input.split(",")).flatMap { s: String =>
+      val st = s.trim(); val stArray = st.split("=", 2)
+      if (stArray.length == 2) {
+        if (input != "") List(Pair(stArray(0), stArray(1))) else Nil
+      } else error("Property " + st + " does not conform to specification.")
     }
+  }
 
-    /** Sets the version attribute.
-     *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
-     *
-     *  @param input The value of <code>version</code>.
-     */
-    def setJavaflags(input: String) =
-      javaFlags = input
-
-    /** Sets the version attribute.
-     *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
-     *
-     *  @param input The value of <code>version</code>.
-     */
-    def setToolflags(input: String) =
-      toolFlags = input
+  /** Sets the version attribute.
+   *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
+   *
+   *  @param input The value of <code>version</code>.
+   */
+  def setJavaflags(input: String) =
+    javaFlags = input
+
+  /** Sets the version attribute.
+   *  Used by <a href="http://ant.apache.org/" target="_top">Ant</a>.
+   *
+   *  @param input The value of <code>version</code>.
+   */
+  def setToolflags(input: String) =
+    toolFlags = input
 
 /*============================================================================*\
 **                             Properties getters                             **
@@ -327,24 +340,22 @@ package scala.tools.ant {
 **                           The big execute method                           **
 \*============================================================================*/
 
-    /** Performs the compilation. */
-    override def execute() = {
-      // Tests if all mandatory attributes are set and valid.
-      if (file.isEmpty) error("Attribute 'file' is not set.")
-      if (mainClass.isEmpty) error("Main class must be set.")
-      if (platforms.isEmpty) platforms = Platforms.values
-      if (name.isEmpty) name = Some(file.get.getName)
-      val patches = ListMap.empty.
-        update("name", name.get).
-        update("class", mainClass.get).
-        update("version", version).
-        update("copyright", copyright).
-        update("properties", getProperties).
-        update("javaflags", javaFlags).
-        update("toolflags", toolFlags)
-      pipeTemplate("tool", patches)
-    }
-
+  /** Performs the compilation. */
+  override def execute() = {
+    // Tests if all mandatory attributes are set and valid.
+    if (file.isEmpty) error("Attribute 'file' is not set.")
+    if (mainClass.isEmpty) error("Main class must be set.")
+    if (platforms.isEmpty) platforms = Platforms.values
+    if (name.isEmpty) name = Some(file.get.getName)
+    val patches = ListMap.empty.
+      update("name", name.get).
+      update("class", mainClass.get).
+      update("version", version).
+      update("copyright", copyright).
+      update("properties", getProperties).
+      update("javaflags", javaFlags).
+      update("toolflags", toolFlags)
+    pipeTemplate("tool", patches)
   }
 
 }