Revision: 6295 Author: [email protected] Date: Fri Oct 2 18:34:46 2009 Log: svn merge --ignore-ancestry \ https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt -r6292:6294 .
The above merge from farewellSwt contains multiple fixes to the distribution samples's ant and README files. Patch by: amitmanjhi Review by: rjrjr (TBR) http://code.google.com/p/google-web-toolkit/source/detail?r=6295 Modified: /releases/2.0/branch-info.txt /releases/2.0/samples/common.ant.xml /releases/2.0/user/src/com/google/gwt/user/tools/README.txtsrc /releases/2.0/user/src/com/google/gwt/user/tools/project.ant.xmlsrc ======================================= --- /releases/2.0/branch-info.txt Wed Sep 30 21:52:49 2009 +++ /releases/2.0/branch-info.txt Fri Oct 2 18:34:46 2009 @@ -7,3 +7,6 @@ ======================== svn merge --ignore-ancestry \ https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt -c6276 . + +svn merge --ignore-ancestry \ + https://google-web-toolkit.googlecode.com/svn/branches/farewellSwt -r6292:6294 . ======================================= --- /releases/2.0/samples/common.ant.xml Sun Sep 20 12:33:31 2009 +++ /releases/2.0/samples/common.ant.xml Fri Oct 2 18:34:46 2009 @@ -79,17 +79,17 @@ <outofdate> <sourcefiles /> <targetfiles> - <pathelement location="${samples.scripts}/@{platform}/${sample.upper}/build.xml" /> + <pathelement location="${samples.scripts}/${sample.upper}/build.xml" /> </targetfiles> <sequential> - <mkdir dir="${samples.scripts}/@{platform}/${sample.upper}" /> + <mkdir dir="${samples.scripts}/${sample.upper}" /> <java classname="com.google.gwt.user.tools.WebAppCreator" classpath="${gwt.user.jar}:${gwt.dev.jar}" failonerror="true"> <!-- Relative path is important! Paths will be relative in final distro --> - <sysproperty key="gwt.devjar" value="../../gwt-d...@{platform}.jar" /> + <sysproperty key="gwt.devjar" value="../../gwt-dev.jar" /> <arg value="-XnoEclipse" /> <arg value="-overwrite" /> <arg value="-out" /> - <arg file="${samples.scripts}/@{platform}/${sample.upper}" /> + <arg file="${samples.scripts}/${sample.upper}" /> <arg value="com.google.gwt.sample.${sample.lower}.${sample.upper}" /> </java> </sequential> ======================================= --- /releases/2.0/user/src/com/google/gwt/user/tools/README.txtsrc Fri Mar 20 11:33:42 2009 +++ /releases/2.0/user/src/com/google/gwt/user/tools/README.txtsrc Fri Oct 2 18:34:46 2009 @@ -8,6 +8,9 @@ We've tested against Eclipse 3.3 and 3.4. Later versions will likely also work, earlier versions may not. +If the directory containing this file does not have a .classpath or .project +file, generate them by running 'ant eclipse.generate' + In Eclipse, go to the File menu and choose: File -> Import... -> Existing Projects into Workspace ======================================= --- /releases/2.0/user/src/com/google/gwt/user/tools/project.ant.xmlsrc Mon Aug 24 15:15:54 2009 +++ /releases/2.0/user/src/com/google/gwt/user/tools/project.ant.xmlsrc Fri Oct 2 18:34:46 2009 @@ -55,21 +55,6 @@ <!-- Additional arguments like -style PRETTY or -logLevel DEBUG --> <arg value="@moduleName"/> </java> - </target> - - <target name="oophm" depends="javac" description="Run OOPHM hosted mode"> - <java failonerror="true" fork="true" classname="@shellClass"> - <classpath> - <pathelement location="${gwt.sdk}/gwt-dev-oophm.jar"/> - <pathelement location="src"/> - <path refid="project.class.path"/> - </classpath> - <jvmarg value="-Xmx256M"/> - <arg value="-startupUrl"/> - <arg value="@startupUrl"/> - <!-- Additional arguments like -style PRETTY or -logLevel DEBUG --> - <arg value="@moduleName"/> - </java> </target>@antEclipseRule <target name="build" depends="gwtc" description="Build this project" /> --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
