commit 01e1e82b454eeb2b3ab856612d9b738e67d60444
author amitmanjhi@google.com <amitmanjhi@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Wed Nov 18 19:33:25 2009 +0000
committer amitmanjhi@google.com <amitmanjhi@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Wed Nov 18 19:33:25 2009 +0000
tree 19f86a2838b1a50a160b06f4f462ab5ed527fb8e
parent aa837577495f3e5ebf2081700a5407f644f1e691

Remove the now unnecessary reference to -XstartOnFirstThread argument.

Patch by: amitmanjhi
Review by: jat



git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@6993 8db76d5a-ed1c-0410-87a9-c151d255dfc7

user/src/com/google/gwt/user/tools/App.launchsrc

diff --git a/user/src/com/google/gwt/user/tools/App.launchsrc b/user/src/com/google/gwt/user/tools/App.launchsrc
index b5ea711..149e76d 100644
--- a/user/src/com/google/gwt/user/tools/App.launchsrc
+++ b/user/src/com/google/gwt/user/tools/App.launchsrc
@@ -7,7 +7,7 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@moduleShortName/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento project=&quot;@moduleShortName&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M@vmargs"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-startupUrl @startupUrl&#10;@moduleName"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@moduleShortName"/>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>

user/src/com/google/gwt/user/tools/WebAppCreator.java

diff --git a/user/src/com/google/gwt/user/tools/WebAppCreator.java b/user/src/com/google/gwt/user/tools/WebAppCreator.java
index 77e7ab2..0ff763f 100644
--- a/user/src/com/google/gwt/user/tools/WebAppCreator.java
+++ b/user/src/com/google/gwt/user/tools/WebAppCreator.java
@@ -228,10 +228,6 @@
           + About.getGwtVersionNum() + "/distro-source/core/src/gwt-module.dtd\">";
     }
 
-    // Figure out what platform we're on
-    boolean isMacOsX = gwtDevPath.substring(gwtDevPath.lastIndexOf('/') + 1).indexOf(
-        "mac") >= 0;
-
     // Compute module package and name.
     int pos = moduleName.lastIndexOf('.');
     String modulePackageName = moduleName.substring(0, pos);
@@ -262,9 +258,6 @@
     replacements.put("@shellClass", DevMode.class.getName());
     replacements.put("@compileClass", Compiler.class.getName());
     replacements.put("@startupUrl", moduleShortName + ".html");
-    replacements.put("@antVmargs", isMacOsX
-        ? "\n<jvmarg value=\"-XstartOnFirstThread\"/>" : "");
-    replacements.put("@vmargs", isMacOsX ? "&#10;-XstartOnFirstThread" : "");
     replacements.put("@renameTo", moduleShortName.toLowerCase());
 
     String antEclipseRule = "";

user/src/com/google/gwt/user/tools/project.ant.xmlsrc

diff --git a/user/src/com/google/gwt/user/tools/project.ant.xmlsrc b/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
index 70e2c54..27a224f 100644
--- a/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
+++ b/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
@@ -37,7 +37,7 @@
         <path refid="project.class.path"/>
       </classpath>
       <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError -->
-      <jvmarg value="-Xmx256M"/>@antVmargs
+      <jvmarg value="-Xmx256M"/>
       <!-- Additional arguments like -style PRETTY or -logLevel DEBUG -->
       <arg value="@moduleName"/>
     </java>
@@ -49,7 +49,7 @@
         <pathelement location="src"/>
         <path refid="project.class.path"/>
       </classpath>
-      <jvmarg value="-Xmx256M"/>@antVmargs
+      <jvmarg value="-Xmx256M"/>
       <arg value="-startupUrl"/>
       <arg value="@startupUrl"/>
       <!-- Additional arguments like -style PRETTY or -logLevel DEBUG -->