Minor cleanup.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@41 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/common.ant.xml b/dev/common.ant.xml
index a16792b..e8ceb46 100755
--- a/dev/common.ant.xml
+++ b/dev/common.ant.xml
@@ -1,47 +1,43 @@
<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="unjar.deps"
- description="Unzips all dependency jars into the output folder">
- <gwt.unjar toollib="eclipse/${gwt.dev.swt.jar}"/>
- </target>
-
- <target name="build" depends="unjar.deps"
- description="Compiles all class files">
- <mkdir dir="${javac.out}"/>
- <gwt.javac>
- <classpath>
- <pathelement location="${gwt.core.build}/bin"/>
- <pathelement location="${gwt.core.build}/unjar"/>
- </classpath>
- </gwt.javac>
- </target>
-
- <target name="package" depends="build" description="Packages this project into a jar">
- <mkdir dir="${gwt.build.lib}"/>
- <gwt.jar>
- <fileset dir="src"/>
- <fileset dir="${gwt.core.root}/src"/>
- <fileset dir="${gwt.core.root}/super"/>
- <fileset dir="${javac.out}"/>
- <fileset dir="${gwt.core.build}/bin"/>
- <fileset dir="${unjar.out}"/>
- <fileset dir="${gwt.core.build}/unjar"/>
- <manifest>
- <attribute name="Main-Class" value="com.google.gwt.dev.GWTMain"/>
- </manifest>
- </gwt.jar>
- </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>
-
- <target name="all" depends="package" description="Builds and packages this project"/>
-
+ <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="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">
+ <mkdir dir="${javac.out}" />
+ <gwt.javac>
+ <classpath>
+ <pathelement location="${gwt.core.build}/bin" />
+ <pathelement location="${gwt.core.build}/unjar" />
+ </classpath>
+ </gwt.javac>
+ </target>
+
+ <target name="build" depends="compile" description="Build and package this project">
+ <mkdir dir="${gwt.build.lib}" />
+ <gwt.jar>
+ <fileset dir="src" />
+ <fileset dir="${gwt.core.root}/src" />
+ <fileset dir="${gwt.core.root}/super" />
+ <fileset dir="${javac.out}" />
+ <fileset dir="${gwt.core.build}/bin" />
+ <fileset dir="${unjar.out}" />
+ <fileset dir="${gwt.core.build}/unjar" />
+ <manifest>
+ <attribute name="Main-Class" value="com.google.gwt.dev.GWTMain" />
+ </manifest>
+ </gwt.jar>
+ </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/user/build.xml b/user/build.xml
index 0e0b490..3f30c65 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -3,23 +3,20 @@
<property name="project.tail" value="user" />
<import file="${gwt.root}/common.ant.xml" />
- <property.ensure name="gwt.core.root" location="${gwt.root}/dev/core" />
- <property.ensure name="gwt.core.build" location="${gwt.build.out}/dev/core" />
+ <!-- Platform shouldn't matter here, just picking one -->
+ <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-linux.jar" />
- <target name="build" description="Compiles this project">
+ <target name="compile" description="Compile all class files">
<mkdir dir="${javac.out}" />
<gwt.javac>
<classpath>
<pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- <pathelement location="${gwt.core.build}/bin" />
- <pathelement location="${gwt.core.build}/unjar" />
- <!-- Must build against a version of SWT; just pick one -->
- <pathelement location="${gwt.tools.lib}/eclipse/org.eclipse.swt.gtk-linux-3.2.1.jar" />
+ <pathelement location="${gwt.dev.jar}" />
</classpath>
</gwt.javac>
</target>
- <target name="package" depends="build" description="Packages this project into a jar">
+ <target name="build" depends="compile" description="Build and package this project">
<mkdir dir="${gwt.build.lib}" />
<gwt.jar>
<fileset dir="src" />
@@ -30,11 +27,11 @@
<target name="checkstyle" description="Static analysis of source">
<gwt.checkstyle>
- <fileset dir="super/com/google/gwt/emul"/>
- <fileset dir="super/com/google/gwt/junit/translatable"/>
+ <fileset dir="super/com/google/gwt/emul" />
+ <fileset dir="super/com/google/gwt/junit/translatable" />
</gwt.checkstyle>
</target>
-
+
<target name="clean" description="Cleans this project's intermediate and output files">
<delete dir="${project.build}" />
<delete file="${project.lib}" />
