diff options
author | Artur Signell <artur.signell@itmill.com> | 2010-10-14 07:45:34 +0000 |
---|---|---|
committer | Artur Signell <artur.signell@itmill.com> | 2010-10-14 07:45:34 +0000 |
commit | a14876b352538cc63c023d4444db0cbdbfe848cc (patch) | |
tree | 5e3fac3ed36df8717d9cdbaf5bc9a324740c9c51 /build/build.xml | |
parent | da911a6550a0c9f45267244d54def8c93f298401 (diff) | |
download | vaadin-framework-a14876b352538cc63c023d4444db0cbdbfe848cc.tar.gz vaadin-framework-a14876b352538cc63c023d4444db0cbdbfe848cc.zip |
Merged multiple bug fixes and test updates from 6.4
svn changeset:15546/svn branch:6.5
Diffstat (limited to 'build/build.xml')
-rw-r--r-- | build/build.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index e7cad185aa..6bcaa2d2af 100644 --- a/build/build.xml +++ b/build/build.xml @@ -658,7 +658,7 @@ <target name="compile-widgetset" description="Compiles the widgetset given as the first parameter"> <fail unless="widgetset" message="No widgetset parameter set"/> <echo>Compiling widgetset ${widgetset}. Output directory: ${widgetsets-output-dir}</echo> - <java classname="com.google.gwt.dev.Compiler" failonerror="yes" fork="yes" maxmemory="128m"> + <java classname="com.google.gwt.dev.Compiler" failonerror="yes" fork="yes" maxmemory="512m"> <classpath refid="widgetset-compile-classpath"/> <arg value="-war" /> @@ -668,7 +668,8 @@ <arg value="${widgetset}" /> <jvmarg value="-Xss8M"/> - <jvmarg value="-Djava.awt.headless=true"/> + <jvmarg value="-XX:MaxPermSize=256M"/> + <jvmarg value="-Djava.awt.headless=true"/> </java> <antcall target="remove-widgetset-gwt-tmp"/> |