ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1055418 - in /ant/core/trunk: ./ docs/manual/Tasks/ src/main/org/apache/tools/ant/taskdefs/optional/javacc/
Date Wed, 05 Jan 2011 11:18:27 GMT
Author: bodewig
Date: Wed Jan  5 11:18:26 2011
New Revision: 1055418

URL: http://svn.apache.org/viewvc?rev=1055418&view=rev
Log:
add maxmemory attribute to javacc and friends.  PR 50513

Modified:
    ant/core/trunk/NOTICE
    ant/core/trunk/WHATSNEW
    ant/core/trunk/docs/manual/Tasks/javacc.html
    ant/core/trunk/docs/manual/Tasks/jjdoc.html
    ant/core/trunk/docs/manual/Tasks/jjtree.html
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java

Modified: ant/core/trunk/NOTICE
URL: http://svn.apache.org/viewvc/ant/core/trunk/NOTICE?rev=1055418&r1=1055417&r2=1055418&view=diff
==============================================================================
--- ant/core/trunk/NOTICE (original)
+++ ant/core/trunk/NOTICE Wed Jan  5 11:18:26 2011
@@ -1,5 +1,5 @@
    Apache Ant
-   Copyright 1999-2010 The Apache Software Foundation
+   Copyright 1999-2011 The Apache Software Foundation
 
    The <sync> task is based on code Copyright (c) 2002, Landmark
    Graphics Corp that has been kindly donated to the Apache Software

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=1055418&r1=1055417&r2=1055418&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Wed Jan  5 11:18:26 2011
@@ -10,6 +10,10 @@ Fixed bugs:
 Other changes:
 --------------
 
+ * The <javacc>, <jjtree> and <jjdoc> now support a new maxmemory
+   attribute.
+   Bugzilla Report 50513.
+
 Changes from Ant 1.8.1 TO Ant 1.8.2
 ===================================
 

Modified: ant/core/trunk/docs/manual/Tasks/javacc.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/javacc.html?rev=1055418&r1=1055417&r2=1055418&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/javacc.html (original)
+++ ant/core/trunk/docs/manual/Tasks/javacc.html Wed Jan  5 11:18:26 2011
@@ -181,6 +181,12 @@
     <td valign="top">Sets the USER_TOKEN_MANAGER grammar option.  This is a boolean
option.</td>
     <td valign="top" align="center">No</td>
   </tr>
+  <tr>
+    <td valign="top">maxmemory</td>
+    <td valign="top">Max amount of memory to allocate to the forked
+      VM.  <em>since Ant 1.8.3</em></td>
+    <td align="center" valign="top">No</td>
+  </tr>
 </table>
 <h3>Example</h3>
 <blockquote><pre>

Modified: ant/core/trunk/docs/manual/Tasks/jjdoc.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/jjdoc.html?rev=1055418&r1=1055417&r2=1055418&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/jjdoc.html (original)
+++ ant/core/trunk/docs/manual/Tasks/jjdoc.html Wed Jan  5 11:18:26 2011
@@ -95,6 +95,13 @@ option.</td>
 
 <td ALIGN=CENTER VALIGN=TOP>No</td>
 </tr>
+
+  <tr>
+    <td valign="top">maxmemory</td>
+    <td valign="top">Max amount of memory to allocate to the forked
+      VM.  <em>since Ant 1.8.3</em></td>
+    <td align="center" valign="top">No</td>
+  </tr>
 </table>
 
 <h3>

Modified: ant/core/trunk/docs/manual/Tasks/jjtree.html
URL: http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/Tasks/jjtree.html?rev=1055418&r1=1055417&r2=1055418&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/Tasks/jjtree.html (original)
+++ ant/core/trunk/docs/manual/Tasks/jjtree.html Wed Jan  5 11:18:26 2011
@@ -187,6 +187,13 @@ option.</td>
 
 <td ALIGN=CENTER VALIGN=TOP>No</td>
 </tr>
+
+  <tr>
+    <td valign="top">maxmemory</td>
+    <td valign="top">Max amount of memory to allocate to the forked
+      VM.  <em>since Ant 1.8.3</em></td>
+    <td align="center" valign="top">No</td>
+  </tr>
 </table>
 
 <h3>

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java?rev=1055418&r1=1055417&r2=1055418&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJDoc.java Wed Jan
 5 11:18:26 2011
@@ -58,6 +58,7 @@ public class JJDoc extends Task {
 
     private CommandlineJava cmdl = new CommandlineJava();
 
+    private String maxMemory = null;
 
     /**
      * Sets the TEXT BNF documentation option.
@@ -103,6 +104,16 @@ public class JJDoc extends Task {
     }
 
     /**
+     * Corresponds -Xmx.
+     *
+     * @param max max memory parameter.
+     * @since Ant 1.8.3
+     */
+    public void setMaxmemory(String max) {
+        maxMemory = max;
+    }
+
+    /**
      * Constructor
      */
     public JJDoc() {
@@ -154,8 +165,8 @@ public class JJDoc extends Task {
         cmdl.setClassname(JavaCC.getMainClass(classpath,
                                               JavaCC.TASKDEF_TYPE_JJDOC));
 
+        cmdl.setMaxmemory(maxMemory);
         final Commandline.Argument arg = cmdl.createVmArgument();
-        arg.setValue("-mx140M");
         arg.setValue("-Dinstall.root=" + javaccHome.getAbsolutePath());
 
         final Execute process =

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java?rev=1055418&r1=1055417&r2=1055418&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java Wed
Jan  5 11:18:26 2011
@@ -67,6 +67,7 @@ public class JJTree extends Task {
 
     private CommandlineJava cmdl = new CommandlineJava();
 
+    private String maxMemory = null;
 
     /**
      * Sets the BUILD_NODE_FILES grammar option.
@@ -193,6 +194,16 @@ public class JJTree extends Task {
     }
 
     /**
+     * Corresponds -Xmx.
+     *
+     * @param max max memory parameter.
+     * @since Ant 1.8.3
+     */
+    public void setMaxmemory(String max) {
+        maxMemory = max;
+    }
+
+    /**
      * Constructor
      */
     public JJTree() {
@@ -267,8 +278,8 @@ public class JJTree extends Task {
         cmdl.setClassname(JavaCC.getMainClass(classpath,
                                               JavaCC.TASKDEF_TYPE_JJTREE));
 
+        cmdl.setMaxmemory(maxMemory);
         final Commandline.Argument arg = cmdl.createVmArgument();
-        arg.setValue("-mx140M");
         arg.setValue("-Dinstall.root=" + javaccHome.getAbsolutePath());
 
         final Execute process =

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java?rev=1055418&r1=1055417&r2=1055418&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java Wed
Jan  5 11:18:26 2011
@@ -104,6 +104,8 @@ public class JavaCC extends Task {
     protected static final String ORG_JJTREE_CLASS = COM_JJTREE_CLASS;
     protected static final String ORG_JJDOC_CLASS = COM_JJDOC_CLASS;
 
+    private String maxMemory = null;
+
     /**
      * Sets the LOOKAHEAD grammar option.
      * @param lookahead an <code>int</code> value.
@@ -309,6 +311,16 @@ public class JavaCC extends Task {
     }
 
     /**
+     * Corresponds -Xmx.
+     *
+     * @param max max memory parameter.
+     * @since Ant 1.8.3
+     */
+    public void setMaxmemory(String max) {
+        maxMemory = max;
+    }
+
+    /**
      * Constructor
      */
     public JavaCC() {
@@ -361,8 +373,8 @@ public class JavaCC extends Task {
         cmdl.setClassname(JavaCC.getMainClass(classpath,
                                               JavaCC.TASKDEF_TYPE_JAVACC));
 
+        cmdl.setMaxmemory(maxMemory);
         final Commandline.Argument arg = cmdl.createVmArgument();
-        arg.setValue("-mx140M");
         arg.setValue("-Dinstall.root=" + javaccHome.getAbsolutePath());
 
         Execute.runCommand(this, cmdl.getCommandline());



Mime
View raw message