Optimized build; removed crazy unjar stuff.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@175 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/common.ant.xml b/dev/common.ant.xml
index 4827623..3556aff 100755
--- a/dev/common.ant.xml
+++ b/dev/common.ant.xml
@@ -5,16 +5,13 @@
<property.ensure name="gwt.core.root" location="../core" />
<property.ensure name="gwt.core.build" location="${project.build}/../core" />
- <target name="unjar.deps" description="Unzips all dependency jars into the output folder">
- <gwt.unjar toollib="eclipse/${gwt.dev.swt.jar}" />
- </target>
-
- <target name="compile" depends="unjar.deps" description="Compile all java files">
+ <target name="compile" description="Compile all java files">
<mkdir dir="${javac.out}" />
<gwt.javac>
<classpath>
+ <pathelement location="${gwt.tools.lib}/eclipse/${gwt.dev.swt.jar}" />
<pathelement location="${gwt.core.build}/bin" />
- <pathelement location="${gwt.core.build}/unjar" />
+ <pathelement location="${gwt.core.build}/alldeps.jar" />
</classpath>
</gwt.javac>
</target>
@@ -27,8 +24,8 @@
<fileset dir="${gwt.core.root}/super" excludes="**/package.html" />
<fileset dir="${javac.out}" />
<fileset dir="${gwt.core.build}/bin" />
- <fileset dir="${unjar.out}" />
- <fileset dir="${gwt.core.build}/unjar" />
+ <zipfileset src="${gwt.tools.lib}/eclipse/${gwt.dev.swt.jar}" />
+ <zipfileset src="${gwt.core.build}/alldeps.jar" />
<manifest>
<attribute name="Main-Class" value="com.google.gwt.dev.GWTMain" />
</manifest>
