Reviewers: jat, Description: Remove the no longer necessary startOnFirstThread hacks for mac.
Please review this at http://gwt-code-reviews.appspot.com/103808 Affected files: user/src/com/google/gwt/user/tools/App.launchsrc 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/App.launchsrc --- user/src/com/google/gwt/user/tools/App.launchsrc (revision 4659) +++ user/src/com/google/gwt/user/tools/App.launchsrc (working copy) @@ -7,7 +7,7 @@ <listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry internalArchive="/@moduleShortName/src" path="3" type="2"/> "/> <listEntry value="<?xml version="1.0" encoding="UTF-8"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento project="@moduleShortName"/> </runtimeClasspathEntry> "/> </listAttribute> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-xmx2...@vmargs"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-startupUrl @startupUrl @moduleName"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@moduleShortName"/> <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> Index: user/src/com/google/gwt/user/tools/WebAppCreator.java --- user/src/com/google/gwt/user/tools/WebAppCreator.java (revision 6618) +++ user/src/com/google/gwt/user/tools/WebAppCreator.java (working copy) @@ -228,10 +228,6 @@ public final class WebAppCreator { + 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 @@ public final class WebAppCreator { 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 ? " -XstartOnFirstThread" : ""); replacements.put("@renameTo", moduleShortName.toLowerCase()); String antEclipseRule = ""; Index: user/src/com/google/gwt/user/tools/project.ant.xmlsrc --- user/src/com/google/gwt/user/tools/project.ant.xmlsrc (revision 6901) +++ user/src/com/google/gwt/user/tools/project.ant.xmlsrc (working copy) @@ -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 --> -- http://groups.google.com/group/Google-Web-Toolkit-Contributors
