Revision: 6156 Author: [email protected] Date: Thu Sep 17 12:36:59 2009 Log: Add boilerplate to webAppCreator build.xml files to supply a -d32 arg when the runtime JVM is 64-bit. Currently this happens only on Mac.
Review by: jat, scottb http://code.google.com/p/google-web-toolkit/source/detail?r=6156 Modified: /releases/1.7/user/src/com/google/gwt/user/tools/WebAppCreator.java /releases/1.7/user/src/com/google/gwt/user/tools/project.ant.xmlsrc ======================================= --- /releases/1.7/user/src/com/google/gwt/user/tools/WebAppCreator.java Tue Mar 10 17:06:05 2009 +++ /releases/1.7/user/src/com/google/gwt/user/tools/WebAppCreator.java Thu Sep 17 12:36:59 2009 @@ -259,8 +259,15 @@ replacements.put("@shellClass", HostedMode.class.getName()); replacements.put("@compileClass", Compiler.class.getName()); replacements.put("@startupUrl", moduleShortName + ".html"); + replacements.put("@antSetUp32BitVmarg", isMacOsX + ? "\n <condition property=\"HostedMode32BitVmarg\" value=\"-d32\"" + + " else=\"-Dgwt.dummy.arg\">\n" + + " <equals arg1=\"${sun.arch.data.model}\" arg2=\"64\"/>\n" + + " </condition>\n" : ""); + replacements.put("@antUse32BitVmarg", isMacOsX + ? "\n <jvmarg value=\"${HostedMode32BitVmarg}\"/>" : ""); replacements.put("@antVmargs", isMacOsX - ? "\n<jvmarg value=\"-XstartOnFirstThread\"/>" : ""); + ? "\n <jvmarg value=\"-XstartOnFirstThread\"/>" : ""); replacements.put("@vmargs", isMacOsX ? " -XstartOnFirstThread" : ""); replacements.put("@renameTo", moduleShortName.toLowerCase()); ======================================= --- /releases/1.7/user/src/com/google/gwt/user/tools/project.ant.xmlsrc Fri Feb 13 13:17:55 2009 +++ /releases/1.7/user/src/com/google/gwt/user/tools/project.ant.xmlsrc Thu Sep 17 12:36:59 2009 @@ -43,13 +43,14 @@ </java> </target> + <!-- Note: hosted mode requires a 32-bit JVM -->@antSetUp32BitVmarg <target name="hosted" depends="javac" description="Run hosted mode"> <java failonerror="true" fork="true" classname="@shellClass"> <classpath> <pathelement location="src"/> <path refid="project.class.path"/> </classpath> - <jvmarg value="-Xmx256M"/>@antVmargs + <jvmarg value="-Xmx256M"/>@antuse32bitvm...@antvmargs <arg value="-startupUrl"/> <arg value="@startupUrl"/> <!-- Additional arguments like -style PRETTY or -logLevel DEBUG --> --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
