Revision: 6994 Author: amitman...@google.com Date: Wed Nov 18 11:37:52 2009 Log: Merged tr...@6993 into this branch
Patch by: amitmanjhi http://code.google.com/p/google-web-toolkit/source/detail?r=6994 Modified: /releases/2.0/branch-info.txt /releases/2.0/user/src/com/google/gwt/user/tools/App.launchsrc /releases/2.0/user/src/com/google/gwt/user/tools/WebAppCreator.java /releases/2.0/user/src/com/google/gwt/user/tools/project.ant.xmlsrc ======================================= --- /releases/2.0/branch-info.txt Wed Nov 18 09:09:47 2009 +++ /releases/2.0/branch-info.txt Wed Nov 18 11:37:52 2009 @@ -774,3 +774,7 @@ Make Development Mode UI integrate with OS X UI better. svn merge --ignore-ancestry -c6987 https://google-web-toolkit.googlecode.com/svn/trunk . +tr...@6993 was merged into this branch + Remove the now unnecessary -XstartOnFirstThread argument. + svn merge --ignore-ancestry -c6993 https://google-web-toolkit.googlecode.com/svn/trunk . + ======================================= --- /releases/2.0/user/src/com/google/gwt/user/tools/App.launchsrc Fri Feb 6 13:06:24 2009 +++ /releases/2.0/user/src/com/google/gwt/user/tools/App.launchsrc Wed Nov 18 11:37:52 2009 @@ -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"/> ======================================= --- /releases/2.0/user/src/com/google/gwt/user/tools/WebAppCreator.java Tue Nov 3 13:06:00 2009 +++ /releases/2.0/user/src/com/google/gwt/user/tools/WebAppCreator.java Wed Nov 18 11:37:52 2009 @@ -227,10 +227,6 @@ + "//EN\" \"http://google-web-toolkit.googlecode.com/svn/tags/" + 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('.'); @@ -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 ? " -XstartOnFirstThread" : ""); replacements.put("@renameTo", moduleShortName.toLowerCase()); String antEclipseRule = ""; ======================================= --- /releases/2.0/user/src/com/google/gwt/user/tools/project.ant.xmlsrc Tue Nov 10 10:15:57 2009 +++ /releases/2.0/user/src/com/google/gwt/user/tools/project.ant.xmlsrc Wed Nov 18 11:37:52 2009 @@ -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