Clean up ant build files and Eclipse dev classpath. Public reviews at: http://gwt-code-reviews.appspot.com/1524804/ http://gwt-code-reviews.appspot.com/1523807/ Patch by: stephen.haberman Review by: jat,rdayal git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10763 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/build.xml b/dev/build.xml index f586b2a..2948aff 100755 --- a/dev/build.xml +++ b/dev/build.xml
@@ -110,8 +110,6 @@ <include name="xerces/xerces-2_9_1/xml-apis.jar" /> <include name="w3c/sac/sac-1.3.jar" /> <!-- htmlunit dependencies not already included: END --> - <include name="sun/swingworker/swing-worker-1.1.jar" /> - <include name="guava/guava-r06/guava-r06-rebased-2.jar" /> <include name="jscomp/sourcemap-rebased.jar" /> </fileset> <fileset file="build.xml"/> @@ -176,8 +174,6 @@ <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_9_1/xml-apis.jar" /> <zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar" /> <!-- htmlunit dependencies not already included: END --> - <zipfileset src="${gwt.tools.lib}/sun/swingworker/swing-worker-1.1.jar" /> - <zipfileset src="${gwt.tools.lib}/guava/guava-r06/guava-r06-rebased-2.jar" /> <zipfileset src="${gwt.tools.lib}/jscomp/sourcemap-rebased.jar" /> </gwt.jar> </sequential>
diff --git a/dev/common.ant.xml b/dev/common.ant.xml deleted file mode 100755 index 262d3ba..0000000 --- a/dev/common.ant.xml +++ /dev/null
@@ -1,60 +0,0 @@ -<project name="dev-common"> - <property name="gwt.root" location="../.." /> - <import file="${gwt.root}/common.ant.xml" /> - - <property.ensure name="gwt.core.root" location="../core" /> - <property.ensure name="gwt.core.build" location="${project.build}/../core" /> - - <target name="compile" description="Compile all java files"> - <mkdir dir="${javac.out}" /> - <gwt.javac> - <classpath> - <pathelement location="${gwt.core.build}/bin" /> - <pathelement location="${gwt.core.build}/alldeps.jar" /> - </classpath> - </gwt.javac> - </target> - - <target name="build" depends="compile" description="Build and package this project"> - <mkdir dir="${gwt.build.lib}" /> - <outofdate> - <sourcefiles> - <fileset dir="src" excludes="**/package.html"/> - <fileset dir="${gwt.core.root}/src"> - <exclude name="**/package.html"/> - <exclude name="**/*.properties"/> <!-- copied and/or filtered into bin --> - </fileset> - <fileset dir="${gwt.core.root}/super" excludes="**/package.html" /> - <fileset dir="${javac.out}" /> - <fileset dir="${gwt.core.build}/bin" /> - <fileset file="${gwt.core.build}/alldeps.jar" /> - </sourcefiles> - <targetfiles> - <fileset file="${project.lib}"/> - </targetfiles> - <sequential> - <gwt.jar> - <fileset dir="src" excludes="**/package.html"/> - <fileset dir="${gwt.core.root}/src"> - <exclude name="**/package.html"/> - <exclude name="**/*.properties"/> <!-- copied and/or filtered into bin --> - </fileset> - <fileset dir="${gwt.core.root}/super" excludes="**/package.html" /> - <fileset dir="${javac.out}" /> - <fileset dir="${gwt.core.build}/bin" /> - <zipfileset src="${gwt.core.build}/alldeps.jar" /> - - <manifest> - <attribute name="Main-Class" value="com.google.gwt.dev.GWTMain" /> - </manifest> - </gwt.jar> - </sequential> - </outofdate> - </target> - - <target name="clean" description="Cleans this project's intermediate and output files"> - <delete dir="${project.build}" failonerror="false" /> - <delete file="${project.lib}" failonerror="false" /> - </target> - -</project>
diff --git a/eclipse/dev/.classpath b/eclipse/dev/.classpath index 63c6c07..25d141d 100644 --- a/eclipse/dev/.classpath +++ b/eclipse/dev/.classpath
@@ -36,7 +36,6 @@ <classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/tomcat-http11-1.0.jar" sourcepath="/GWT_TOOLS/lib/tomcat/tomcat-http11-1.0.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/tomcat-jk2-2.1.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/tomcat/tomcat-util-5.1.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/sun/swingworker/swing-worker-1.1.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.9/htmlunit-core-js-2.9.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-2.9/htmlunit-core-js-2.9-sources.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.9/htmlunit-2.9.jar" sourcepath="/GWT_TOOLS/lib/htmlunit/htmlunit-2.9/htmlunit-2.9-sources.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/protobuf/protobuf-2.2.0/protobuf-java-rebased-2.2.0.jar"/>