[gwt-contrib] On Mac, emit a -d32 arg for hosted mode when running on a 64-bit vm

[rice]

Reviewers: scottb, jat,



Please review this at http://gwt-code-reviews.appspot.com/68803

Affected files:
   user/src/com/google/gwt/user/tools/WebAppCreator.java
   user/src/com/google/gwt/user/tools/project.ant.xmlsrc


Index: user/src/com/google/gwt/user/tools/project.ant.xmlsrc
===================================================================
--- user/src/com/google/gwt/user/tools/project.ant.xmlsrc       (revision 6154)
+++ user/src/com/google/gwt/user/tools/project.ant.xmlsrc       (working copy)
@@ -43,13 +43,15 @@
      </java>
    </target>

+  @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 -->
Index: user/src/com/google/gwt/user/tools/WebAppCreator.java
===================================================================
--- user/src/com/google/gwt/user/tools/WebAppCreator.java       (revision 6154)
+++ user/src/com/google/gwt/user/tools/WebAppCreator.java       (working copy)
@@ -259,6 +259,13 @@
      replacements.put("@shellClass", HostedMode.class.getName());
      replacements.put("@compileClass", Compiler.class.getName());
      replacements.put("@startupUrl", moduleShortName + ".html");
+    replacements.put("@antSetUp32BitVmarg", isMacOsX
+        ? "<!-- Hosted mode requires a -d32 argument if the JDK defaults  
to 64-bit -->\n"
+            + "  <condition property=\"HostedMode32BitVmarg\"  
value=\"-d32\" else=\"-Dgwt.dummy.arg=\">\n"
+            + "    <equals arg1=\"${sun.arch.data.model}\" arg2=\"64\"/>\n"
+            + "  </condition>" : "");
+    replacements.put("@antUse32BitVmarg", isMacOsX
+        ? "\n<jvmarg value=\"${HostedMode32BitVmarg}\"/>" : "");
      replacements.put("@antVmargs", isMacOsX
          ? "\n<jvmarg value=\"-XstartOnFirstThread\"/>" : "");
      replacements.put("@vmargs",  
isMacOsX ? "&#10;-XstartOnFirstThread" : "");



--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---