[gwt-contrib] [google-web-toolkit commit] r4226 - releases/1.6/user/src/com/google/gwt/user/tools

[codesite-noreply]

Author: [EMAIL PROTECTED]
Date: Tue Dec  2 11:00:01 2008
New Revision: 4226

Modified:
    releases/1.6/user/src/com/google/gwt/user/tools/App.launchsrc
    releases/1.6/user/src/com/google/gwt/user/tools/ApplicationCreator.java
    releases/1.6/user/src/com/google/gwt/user/tools/project.ant.xmlsrc

Log:
Minor changes in r4222 that John suggested.

Patch by: amitmanjhi
Review by: jat (desk review)



Modified: releases/1.6/user/src/com/google/gwt/user/tools/App.launchsrc
==============================================================================
--- releases/1.6/user/src/com/google/gwt/user/tools/App.launchsrc       
(original)
+++ releases/1.6/user/src/com/google/gwt/user/tools/App.launchsrc       Tue Dec 
  
2 11:00:01 2008
@@ -9,7 +9,7 @@
  <listEntry value="&lt;?xml version=&quot;1.0&quot;  
encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry  
externalArchive=&quot;@gwtDevPath&quot; path=&quot;3&quot;  
type=&quot;2&quot;/&gt;&#13;&#10;"/>
  @eclipseExtraLaunchPaths
  </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"  
value="@eclipseVmargs -Xmx256M"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS"  
value="@vmargs -Xmx256M"/>
  <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"  
value="-out
    war -startupUrl @startupUrl @moduleName"/>
  <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"  
value="@projectName"/>

Modified:  
releases/1.6/user/src/com/google/gwt/user/tools/ApplicationCreator.java
==============================================================================
--- releases/1.6/user/src/com/google/gwt/user/tools/ApplicationCreator.java     
 
(original)
+++ releases/1.6/user/src/com/google/gwt/user/tools/ApplicationCreator.java     
 
Tue Dec  2 11:00:01 2008
@@ -307,9 +307,9 @@
      replacements.put("@shellClass", "com.google.gwt.dev.GWTHosted");
      replacements.put("@compileClass", "com.google.gwt.dev.GWTCompiler");
      replacements.put("@startupUrl", startupUrl);
-    replacements.put("@vmargs", isMacOsX
+    replacements.put("@antVmargs", isMacOsX
          ? "<jvmarg value=\"-XstartOnFirstThread\"/>" : "");
-    replacements.put("@eclipseVmargs",  
isMacOsX ? "-XstartOnFirstThread" : "");
+    replacements.put("@vmargs", isMacOsX ? "-XstartOnFirstThread" : "");
      replacements.put("@eclipseExtraLaunchPaths",
          CreatorUtilities.createEclipseExtraLaunchPaths(extraClassPaths));
      replacements.put("@extraModuleInherits",

Modified: releases/1.6/user/src/com/google/gwt/user/tools/project.ant.xmlsrc
==============================================================================
--- releases/1.6/user/src/com/google/gwt/user/tools/project.ant.xmlsrc   
(original)
+++ releases/1.6/user/src/com/google/gwt/user/tools/project.ant.xmlsrc  Tue  
Dec  2 11:00:01 2008
@@ -50,8 +50,9 @@
          <pathelement path="${java.class.path}/"/>
          <pathelement path="@gwtUserPath"/>
        </classpath>
+     <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError -->
        <jvmarg value="-Xmx256M"/>
-      @vmargs
+      @antVmargs
        <arg value="-out"/>
        <arg file="${outdir}"/>
        <arg value="-extra"/>
@@ -71,7 +72,7 @@
          <pathelement path="@gwtUserPath"/>
        </classpath>
        <jvmarg value="-Xmx256M"/>
-      @vmargs
+      @antVmargs
        <arg value="-out"/>
        <arg file="${outdir}"/>
        <arg value="-startupUrl"/>

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