[cassandra] branch trunk updated: Don't fork jvms in the build

[mc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 6cc730d  Don't fork jvms in the build
6cc730d is described below

commit 6cc730d689a7625554054e558238042bea502c46
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Fri Apr 9 13:03:36 2021 +0200

    Don't fork jvms in the build
    
    On build machines with less than 1GB ram, use ANT_OPTS="-Xmx512m"
    
     patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-16583
---
 build.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index 7550f3a..192abc1 100644
--- a/build.xml
+++ b/build.xml
@@ -398,9 +398,7 @@
       <echo>Building Grammar ${build.src.antlr}/Cql.g  ...</echo>
       <java classname="org.antlr.Tool"
             classpathref="cql3-grammar.classpath"
-            fork="true"
             failonerror="true">
-         <jvmarg value="-Xmx512M" />
          <arg value="-Xconversiontimeout" />
          <arg value="10000" />
          <arg value="${build.src.antlr}/Cql.g" />
@@ -873,10 +871,9 @@
         <!-- Note: we cannot use javac's 'release' option, as that does not allow accessing sun.misc.Unsafe nor
         Nashorn's ClassFilter class as any javac modules option is invalid for relase 8. -->
         <echo message="Compiling for Java ${target.version}..."/>
-        <javac fork="true"
+        <javac
                debug="true" debuglevel="${debuglevel}" encoding="utf-8"
-               destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}"
-               memorymaximumsize="512M">
+               destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}">
             <src path="${build.src.java}"/>
             <src path="${build.src.gen-java}"/>
             <compilerarg value="-XDignore.symbol.file"/>
@@ -1282,7 +1279,6 @@
 
   <target name="_build-test">
     <javac
-     fork="true"
      compiler="modern"
      debug="true"
      debuglevel="${debuglevel}"

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org