Whitespace changes, to untabify Ant files.
No review (per Scottb), but svn diff -x -w shows no non-whitespace
differences.
Identical scripting used here and in gwt1.5, so the merge shouldn't be
painful. If it is, I'm sure it will find its way to me, which is fine and
as it should be. ;-)
--This line, and those below, will be ignored--
M jni/linux/build.xml
M jni/mac/build.xml
M jni/windows/build.xml
M jni/build.xml
M tools/benchmark-viewer/build.xml
M tools/api-checker/build.xml
M tools/build.xml
M distro-source/linux/build.xml
M distro-source/mac/build.xml
M distro-source/common.ant.xml
M distro-source/windows/build.xml
M distro-source/build.xml
M samples/i18n/build.xml
M samples/mail/build.xml
M samples/dynatable/build.xml
M samples/hello/build.xml
M samples/common.ant.xml
M samples/json/build.xml
M samples/simplexml/build.xml
M samples/showcase/build.xml
M samples/simplerpc/build.xml
M samples/build.xml
M servlet/build.xml
M doc/build.xml
M platforms.ant.xml
M common.ant.xml
M build-tools/ant-gwt/build.xml
M build-tools/doctool/build.xml
M build-tools/customchecks/build.xml
M build-tools/build.xml
M dev/linux/build.xml
M dev/mac/build.xml
M dev/core/build.xml
M dev/common.ant.xml
M dev/windows/build.xml
M dev/build.xml
M user/build.xml
M build.xml
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@3558 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/build-tools/ant-gwt/build.xml b/build-tools/ant-gwt/build.xml
index 43c0f27..e4c986d 100644
--- a/build-tools/ant-gwt/build.xml
+++ b/build-tools/ant-gwt/build.xml
@@ -1,34 +1,34 @@
<project name="ant-gwt" default="build" basedir=".">
- <property name="gwt.root" location="../.." />
- <property name="project.tail" value="build-tools/ant-gwt" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location="../.." />
+ <property name="project.tail" value="build-tools/ant-gwt" />
+ <import file="${gwt.root}/common.ant.xml" />
- <target name="compile" description="Compiles this project">
- <mkdir dir="${javac.out}" />
- <gwt.javac>
- <classpath>
- <pathelement location="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
- </classpath>
- </gwt.javac>
- </target>
+ <target name="compile" description="Compiles this project">
+ <mkdir dir="${javac.out}" />
+ <gwt.javac>
+ <classpath>
+ <pathelement location="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
+ </classpath>
+ </gwt.javac>
+ </target>
- <target name="build" depends="compile" description="Packages this project into a jar">
- <mkdir dir="${gwt.build.lib}" />
- <gwt.jar destfile="${gwt.build.lib}/${ant.project.name}.jar">
- <fileset dir="src" />
- <fileset dir="${javac.out}" />
- </gwt.jar>
- </target>
+ <target name="build" depends="compile" description="Packages this project into a jar">
+ <mkdir dir="${gwt.build.lib}" />
+ <gwt.jar destfile="${gwt.build.lib}/${ant.project.name}.jar">
+ <fileset dir="src" />
+ <fileset dir="${javac.out}" />
+ </gwt.jar>
+ </target>
- <target name="checkstyle" description="Static analysis of source">
- <gwt.checkstyle>
- <fileset dir="src" />
- </gwt.checkstyle>
- </target>
+ <target name="checkstyle" description="Static analysis of source">
+ <gwt.checkstyle>
+ <fileset dir="src" />
+ </gwt.checkstyle>
+ </target>
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${project.build}" />
- <delete file="${project.lib}" />
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete dir="${project.build}" />
+ <delete file="${project.lib}" />
+ </target>
</project>
diff --git a/build-tools/build.xml b/build-tools/build.xml
index e16d42c..f81b120 100644
--- a/build-tools/build.xml
+++ b/build-tools/build.xml
@@ -1,40 +1,40 @@
<project name="buildtools" default="build" basedir=".">
- <property name="gwt.root" location=".." />
- <property name="project.tail" value="build-tools" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location=".." />
+ <property name="project.tail" value="build-tools" />
+ <import file="${gwt.root}/common.ant.xml" />
- <!-- "build" is the default when subprojects are directly targetted -->
- <property name="target" value="build" />
+ <!-- "build" is the default when subprojects are directly targetted -->
+ <property name="target" value="build" />
- <target name="ant-gwt" description="Builds GWT specific Ant extensions">
- <gwt.ant dir="ant-gwt" />
- </target>
+ <target name="ant-gwt" description="Builds GWT specific Ant extensions">
+ <gwt.ant dir="ant-gwt" />
+ </target>
- <target name="customchecks" description="Build the checkstyle extensions">
- <gwt.ant dir="customchecks" />
- </target>
-
- <target name="doctool" description="Build the doctool">
- <gwt.ant dir="doctool" />
- </target>
+ <target name="customchecks" description="Build the checkstyle extensions">
+ <gwt.ant dir="customchecks" />
+ </target>
+
+ <target name="doctool" description="Build the doctool">
+ <gwt.ant dir="doctool" />
+ </target>
- <target name="-do" depends="ant-gwt, customchecks, doctool" description="Run all subprojects"/>
-
- <target name="build" description="Builds GWT">
- <antcall target="-do">
- <param name="target" value="build" />
- </antcall>
- </target>
+ <target name="-do" depends="ant-gwt, customchecks, doctool" description="Run all subprojects"/>
+
+ <target name="build" description="Builds GWT">
+ <antcall target="-do">
+ <param name="target" value="build" />
+ </antcall>
+ </target>
- <target name="checkstyle" depends="build" description="Static analysis of GWT source">
- <antcall target="-do">
- <param name="target" value="checkstyle" />
- </antcall>
- </target>
+ <target name="checkstyle" depends="build" description="Static analysis of GWT source">
+ <antcall target="-do">
+ <param name="target" value="checkstyle" />
+ </antcall>
+ </target>
- <target name="test" depends="build" description="Test GWT">
- <antcall target="-do">
- <param name="target" value="test" />
- </antcall>
- </target>
+ <target name="test" depends="build" description="Test GWT">
+ <antcall target="-do">
+ <param name="target" value="test" />
+ </antcall>
+ </target>
</project>
diff --git a/build-tools/customchecks/build.xml b/build-tools/customchecks/build.xml
index 0e3a2f4..f929b2d 100644
--- a/build-tools/customchecks/build.xml
+++ b/build-tools/customchecks/build.xml
@@ -1,32 +1,32 @@
<project name="customchecks" default="build" basedir=".">
- <property name="gwt.root" location="../.." />
- <property name="project.tail" value="build-tools/customchecks" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location="../.." />
+ <property name="project.tail" value="build-tools/customchecks" />
+ <import file="${gwt.root}/common.ant.xml" />
- <target name="compile" description="Compiles this project">
- <mkdir dir="${javac.out}" />
- <gwt.javac>
- <classpath>
- <pathelement location="${gwt.tools.antlib}/checkstyle-all-4.2.jar" />
- </classpath>
- </gwt.javac>
- </target>
+ <target name="compile" description="Compiles this project">
+ <mkdir dir="${javac.out}" />
+ <gwt.javac>
+ <classpath>
+ <pathelement location="${gwt.tools.antlib}/checkstyle-all-4.2.jar" />
+ </classpath>
+ </gwt.javac>
+ </target>
- <target name="build" depends="compile" description="Packages this project into a jar">
- <mkdir dir="${gwt.build.lib}" />
- <gwt.jar>
- <fileset dir="src" />
- <fileset dir="${javac.out}" />
- </gwt.jar>
- </target>
+ <target name="build" depends="compile" description="Packages this project into a jar">
+ <mkdir dir="${gwt.build.lib}" />
+ <gwt.jar>
+ <fileset dir="src" />
+ <fileset dir="${javac.out}" />
+ </gwt.jar>
+ </target>
- <target name="checkstyle">
- <!-- NOTE: This project doesn't have the checkstyle rule since it participates in bootstrapping. -->
- </target>
+ <target name="checkstyle">
+ <!-- NOTE: This project doesn't have the checkstyle rule since it participates in bootstrapping. -->
+ </target>
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${project.build}" />
- <delete file="${project.lib}" />
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete dir="${project.build}" />
+ <delete file="${project.lib}" />
+ </target>
</project>
diff --git a/build-tools/doctool/build.xml b/build-tools/doctool/build.xml
index e256c30..bc9cbbd 100644
--- a/build-tools/doctool/build.xml
+++ b/build-tools/doctool/build.xml
@@ -1,36 +1,36 @@
<project name="doctool" default="build" basedir=".">
- <property name="gwt.root" location="../.." />
- <property name="project.tail" value="build-tools/doctool" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location="../.." />
+ <property name="project.tail" value="build-tools/doctool" />
+ <import file="${gwt.root}/common.ant.xml" />
- <property.ensure name="java.tools.path" location="${java.home}/../lib/tools.jar" unless="build.host.ismac" message="Cannot find ${java.home}/../lib/tools.jar; please use a JDK when building doc rather than a JRE." />
+ <property.ensure name="java.tools.path" location="${java.home}/../lib/tools.jar" unless="build.host.ismac" message="Cannot find ${java.home}/../lib/tools.jar; please use a JDK when building doc rather than a JRE." />
- <target name="compile" description="Compiles this project">
- <mkdir dir="${javac.out}" />
- <gwt.javac>
- <classpath>
- <pathelement location="${java.tools.path}" />
- </classpath>
- </gwt.javac>
- </target>
+ <target name="compile" description="Compiles this project">
+ <mkdir dir="${javac.out}" />
+ <gwt.javac>
+ <classpath>
+ <pathelement location="${java.tools.path}" />
+ </classpath>
+ </gwt.javac>
+ </target>
- <target name="build" depends="compile" description="Packages this project into a jar">
- <mkdir dir="${gwt.build.lib}" />
- <gwt.jar>
- <fileset dir="src" />
- <fileset dir="${javac.out}" />
- </gwt.jar>
- </target>
+ <target name="build" depends="compile" description="Packages this project into a jar">
+ <mkdir dir="${gwt.build.lib}" />
+ <gwt.jar>
+ <fileset dir="src" />
+ <fileset dir="${javac.out}" />
+ </gwt.jar>
+ </target>
- <target name="checkstyle" description="Static analysis of source">
- <gwt.checkstyle>
- <fileset dir="src" />
- </gwt.checkstyle>
- </target>
+ <target name="checkstyle" description="Static analysis of source">
+ <gwt.checkstyle>
+ <fileset dir="src" />
+ </gwt.checkstyle>
+ </target>
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${project.build}" />
- <delete file="${project.lib}" />
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete dir="${project.build}" />
+ <delete file="${project.lib}" />
+ </target>
</project>
diff --git a/build.xml b/build.xml
index 2bdfb83..4efa2f8 100755
--- a/build.xml
+++ b/build.xml
@@ -1,97 +1,97 @@
<project name="GWT" default="build" basedir=".">
- <property name="gwt.root" location="." />
- <property name="project.tail" value="" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location="." />
+ <property name="project.tail" value="" />
+ <import file="${gwt.root}/common.ant.xml" />
- <!-- "build" is the default when subprojects are directly targetted -->
- <property name="target" value="build" />
+ <!-- "build" is the default when subprojects are directly targetted -->
+ <property name="target" value="build" />
- <property name="gwt.apicheck.config"
- location="tools/api-checker/config/gwt14_15userApi.conf"/>
- <property name="gwt.apicheck.oldroot"
- location="../gwt-1.4"/>
+ <property name="gwt.apicheck.config"
+ location="tools/api-checker/config/gwt14_15userApi.conf"/>
+ <property name="gwt.apicheck.oldroot"
+ location="../gwt-1.4"/>
- <target name="dist" depends="dev, user, servlet, tools, jni, doc, samples" description="Run the distributions">
- <gwt.ant dir="distro-source" />
- </target>
+ <target name="dist" depends="dev, user, servlet, tools, jni, doc, samples" description="Run the distributions">
+ <gwt.ant dir="distro-source" />
+ </target>
- <target name="dev" depends="buildtools" description="Run dev">
- <gwt.ant dir="dev" />
- </target>
+ <target name="dev" depends="buildtools" description="Run dev">
+ <gwt.ant dir="dev" />
+ </target>
- <target name="user" depends="buildtools, dev" description="Run user">
- <gwt.ant dir="user" />
- </target>
+ <target name="user" depends="buildtools, dev" description="Run user">
+ <gwt.ant dir="user" />
+ </target>
- <target name="tools" depends="buildtools, user" description="Run tools">
- <gwt.ant dir="tools" />
- </target>
+ <target name="tools" depends="buildtools, user" description="Run tools">
+ <gwt.ant dir="tools" />
+ </target>
- <target name="servlet" depends="buildtools, user" description="Run servlet">
- <gwt.ant dir="servlet" />
- </target>
+ <target name="servlet" depends="buildtools, user" description="Run servlet">
+ <gwt.ant dir="servlet" />
+ </target>
- <target name="jni" description="Run jni">
- <gwt.ant dir="jni" />
- </target>
+ <target name="jni" description="Run jni">
+ <gwt.ant dir="jni" />
+ </target>
- <target name="doc" depends="buildtools, user" description="Build doc">
- <gwt.ant dir="doc" />
- </target>
+ <target name="doc" depends="buildtools, user" description="Build doc">
+ <gwt.ant dir="doc" />
+ </target>
- <target name="samples" depends="dev, user" description="Build samples">
- <gwt.ant dir="samples" />
- </target>
+ <target name="samples" depends="dev, user" description="Build samples">
+ <gwt.ant dir="samples" />
+ </target>
- <target name="buildtools" description="Build the build tools">
- <gwt.ant dir="build-tools" />
- </target>
+ <target name="buildtools" description="Build the build tools">
+ <gwt.ant dir="build-tools" />
+ </target>
- <target name="-do" depends="dist" description="Run all subprojects" />
+ <target name="-do" depends="dist" description="Run all subprojects" />
- <target name="build" description="Builds GWT">
- <antcall target="-do">
- <param name="target" value="build" />
- </antcall>
- </target>
+ <target name="build" description="Builds GWT">
+ <antcall target="-do">
+ <param name="target" value="build" />
+ </antcall>
+ </target>
- <target name="checkstyle" description="Static analysis of GWT source">
- <antcall target="-do">
- <param name="target" value="checkstyle" />
- </antcall>
- </target>
+ <target name="checkstyle" description="Static analysis of GWT source">
+ <antcall target="-do">
+ <param name="target" value="checkstyle" />
+ </antcall>
+ </target>
- <target name="test" depends="build" description="Test GWT">
- <antcall target="-do">
- <param name="target" value="test" />
- </antcall>
- </target>
+ <target name="test" depends="build" description="Test GWT">
+ <antcall target="-do">
+ <param name="target" value="test" />
+ </antcall>
+ </target>
- <target name="clean" description="Cleans the entire GWT build">
- <delete dir="${gwt.build}" />
- </target>
+ <target name="clean" description="Cleans the entire GWT build">
+ <delete dir="${gwt.build}" />
+ </target>
- <target name="apicheck" depends="build"
- description="Checks API compatibility to prior GWT revision">
- <copy tofile="${gwt.build.out}/userApi.conf" filtering="false"
- file="${gwt.apicheck.config}"
- overwrite="true">
- <filterset>
- <filter token="OLDROOT"
- value="${gwt.apicheck.oldroot}"/>
- </filterset>
- </copy>
- <java failonerror="true" fork="true"
- classname="com.google.gwt.tools.apichecker.ApiCompatibilityChecker">
- <classpath>
- <pathelement location="${gwt.build.out}/tools/api-checker/bin"/>
- <pathelement location="${gwt.build.out}/dev/core/bin"/>
- <pathelement location="${gwt.build.out}/user/bin"/>
- <pathelement location="${gwt.tools.lib}/eclipse/jdt-3.3.1.jar"/>
- <pathelement path="${java.class.path}"/>
- </classpath>
- <arg file="${gwt.build.out}/userApi.conf"/>
- </java>
- </target>
+ <target name="apicheck" depends="build"
+ description="Checks API compatibility to prior GWT revision">
+ <copy tofile="${gwt.build.out}/userApi.conf" filtering="false"
+ file="${gwt.apicheck.config}"
+ overwrite="true">
+ <filterset>
+ <filter token="OLDROOT"
+ value="${gwt.apicheck.oldroot}"/>
+ </filterset>
+ </copy>
+ <java failonerror="true" fork="true"
+ classname="com.google.gwt.tools.apichecker.ApiCompatibilityChecker">
+ <classpath>
+ <pathelement location="${gwt.build.out}/tools/api-checker/bin"/>
+ <pathelement location="${gwt.build.out}/dev/core/bin"/>
+ <pathelement location="${gwt.build.out}/user/bin"/>
+ <pathelement location="${gwt.tools.lib}/eclipse/jdt-3.3.1.jar"/>
+ <pathelement path="${java.class.path}"/>
+ </classpath>
+ <arg file="${gwt.build.out}/userApi.conf"/>
+ </java>
+ </target>
</project>
diff --git a/common.ant.xml b/common.ant.xml
index b183d80..c8ab767 100755
--- a/common.ant.xml
+++ b/common.ant.xml
@@ -1,296 +1,296 @@
<project name="common">
- <!-- gwt.build.iscasesensitivefs is true if the filesystem of the
- build machine is case-sensitive, false otherwise. Update with
- new lines for any supported platforms with case-insensitive
- filesystems
- -->
- <condition property="gwt.build.iscasesensitivefs" else="false">
- <not>
- <or>
- <os family="windows"/>
- </or>
- </not>
- </condition>
+ <!-- gwt.build.iscasesensitivefs is true if the filesystem of the
+ build machine is case-sensitive, false otherwise. Update with
+ new lines for any supported platforms with case-insensitive
+ filesystems
+ -->
+ <condition property="gwt.build.iscasesensitivefs" else="false">
+ <not>
+ <or>
+ <os family="windows"/>
+ </or>
+ </not>
+ </condition>
- <property name="test.ant.file" location="${gwt.root}/${project.tail}/build.xml" />
- <condition property="project.valid">
- <equals arg1="${ant.file}" arg2="${test.ant.file}"
- casesensitive="${gwt.build.iscasesensitivefs}"/>
- </condition>
- <fail unless="project.valid" message="This build file is in an inconsistent state (${ant.file} != ${test.ant.file})." />
+ <property name="test.ant.file" location="${gwt.root}/${project.tail}/build.xml" />
+ <condition property="project.valid">
+ <equals arg1="${ant.file}" arg2="${test.ant.file}"
+ casesensitive="${gwt.build.iscasesensitivefs}"/>
+ </condition>
+ <fail unless="project.valid" message="This build file is in an inconsistent state (${ant.file} != ${test.ant.file})." />
- <!-- Global Properties -->
- <property environment="env" />
- <condition property="gwt.version" value="${env.GWT_VERSION}" else="0.0.0">
- <isset property="env.GWT_VERSION" />
- </condition>
- <condition property="gwt.tools.check" value="${env.GWT_TOOLS}" else="${gwt.root}/../tools">
- <isset property="env.GWT_TOOLS" />
- </condition>
- <property name="gwt.tools" location="${gwt.tools.check}" />
- <property name="gwt.tools.lib" location="${gwt.tools}/lib" />
- <property name="gwt.tools.antlib" location="${gwt.tools}/antlib" />
- <property name="gwt.tools.redist" location="${gwt.tools}/redist" />
- <property name="gwt.build" location="${gwt.root}/build" />
- <property name="gwt.build.out" location="${gwt.build}/out" />
- <property name="gwt.build.lib" location="${gwt.build}/lib" />
- <property name="gwt.build.jni" location="${gwt.build}/jni" />
- <property name="gwt.build.staging" location="${gwt.build}/staging" />
- <property name="gwt.build.dist" location="${gwt.build}/dist" />
- <property name="project.build" location="${gwt.build.out}/${project.tail}" />
- <property name="project.lib" location="${gwt.build.lib}/gwt-${ant.project.name}.jar" />
- <property name="project.jni" location="${gwt.build}/${project.tail}" />
- <property name="javac.out" location="${project.build}/bin" />
- <property name="javac.junit.out" location="${project.build}/bin-test" />
- <property name="javac.debug" value="true" />
- <property name="javac.debuglevel" value="lines,vars,source" />
- <property name="javac.encoding" value="utf-8" />
- <property name="javac.source" value="1.5" />
- <property name="javac.target" value="1.5" />
- <property name="javac.nowarn" value="true" />
- <property name="junit.out" location="${project.build}/test" />
-
- <!-- Sanity check -->
- <available file="${gwt.tools}" type="dir" property="gwt.tools.exists" />
- <fail unless="gwt.tools.exists" message="Cannot find '${gwt.tools}' tools directory; perhaps you should define the GWT_TOOLS environment variable" />
+ <!-- Global Properties -->
+ <property environment="env" />
+ <condition property="gwt.version" value="${env.GWT_VERSION}" else="0.0.0">
+ <isset property="env.GWT_VERSION" />
+ </condition>
+ <condition property="gwt.tools.check" value="${env.GWT_TOOLS}" else="${gwt.root}/../tools">
+ <isset property="env.GWT_TOOLS" />
+ </condition>
+ <property name="gwt.tools" location="${gwt.tools.check}" />
+ <property name="gwt.tools.lib" location="${gwt.tools}/lib" />
+ <property name="gwt.tools.antlib" location="${gwt.tools}/antlib" />
+ <property name="gwt.tools.redist" location="${gwt.tools}/redist" />
+ <property name="gwt.build" location="${gwt.root}/build" />
+ <property name="gwt.build.out" location="${gwt.build}/out" />
+ <property name="gwt.build.lib" location="${gwt.build}/lib" />
+ <property name="gwt.build.jni" location="${gwt.build}/jni" />
+ <property name="gwt.build.staging" location="${gwt.build}/staging" />
+ <property name="gwt.build.dist" location="${gwt.build}/dist" />
+ <property name="project.build" location="${gwt.build.out}/${project.tail}" />
+ <property name="project.lib" location="${gwt.build.lib}/gwt-${ant.project.name}.jar" />
+ <property name="project.jni" location="${gwt.build}/${project.tail}" />
+ <property name="javac.out" location="${project.build}/bin" />
+ <property name="javac.junit.out" location="${project.build}/bin-test" />
+ <property name="javac.debug" value="true" />
+ <property name="javac.debuglevel" value="lines,vars,source" />
+ <property name="javac.encoding" value="utf-8" />
+ <property name="javac.source" value="1.5" />
+ <property name="javac.target" value="1.5" />
+ <property name="javac.nowarn" value="true" />
+ <property name="junit.out" location="${project.build}/test" />
+
+ <!-- Sanity check -->
+ <available file="${gwt.tools}" type="dir" property="gwt.tools.exists" />
+ <fail unless="gwt.tools.exists" message="Cannot find '${gwt.tools}' tools directory; perhaps you should define the GWT_TOOLS environment variable" />
- <!-- Platform identification -->
- <condition property="build.host.islinux">
- <and>
- <os family="unix" />
- <not>
- <contains string="${os.name}" substring="mac" casesensitive="false" />
- </not>
- </and>
- </condition>
- <condition property="build.host.platform" value="linux">
- <isset property="build.host.islinux" />
- </condition>
+ <!-- Platform identification -->
+ <condition property="build.host.islinux">
+ <and>
+ <os family="unix" />
+ <not>
+ <contains string="${os.name}" substring="mac" casesensitive="false" />
+ </not>
+ </and>
+ </condition>
+ <condition property="build.host.platform" value="linux">
+ <isset property="build.host.islinux" />
+ </condition>
- <condition property="build.host.ismac">
- <and>
- <os family="unix" />
- <contains string="${os.name}" substring="mac" casesensitive="false" />
- </and>
- </condition>
- <condition property="build.host.platform" value="mac">
- <isset property="build.host.ismac" />
- </condition>
+ <condition property="build.host.ismac">
+ <and>
+ <os family="unix" />
+ <contains string="${os.name}" substring="mac" casesensitive="false" />
+ </and>
+ </condition>
+ <condition property="build.host.platform" value="mac">
+ <isset property="build.host.ismac" />
+ </condition>
- <condition property="build.host.iswindows">
- <os family="windows" />
- </condition>
- <condition property="build.host.platform" value="windows">
- <isset property="build.host.iswindows" />
- </condition>
- <fail unless="build.host.platform" message="Building on ${os.name} is not supported" />
+ <condition property="build.host.iswindows">
+ <os family="windows" />
+ </condition>
+ <condition property="build.host.platform" value="windows">
+ <isset property="build.host.iswindows" />
+ </condition>
+ <fail unless="build.host.platform" message="Building on ${os.name} is not supported" />
- <condition property="junit.platform.args" value="-XstartOnFirstThread" else="">
- <isset property="build.host.ismac" />
- </condition>
+ <condition property="junit.platform.args" value="-XstartOnFirstThread" else="">
+ <isset property="build.host.ismac" />
+ </condition>
- <!-- JUnit support -->
- <property name="gwt.dev.staging.jar" location="${gwt.build.staging}/gwt-${build.host.platform}-${gwt.version}/gwt-dev-${build.host.platform}.jar" />
- <property name="gwt.junit.port" value="8888" />
- <property name="gwt.junit.testcase.includes" value="**/*Suite.class"/>
+ <!-- JUnit support -->
+ <property name="gwt.dev.staging.jar" location="${gwt.build.staging}/gwt-${build.host.platform}-${gwt.version}/gwt-dev-${build.host.platform}.jar" />
+ <property name="gwt.junit.port" value="8888" />
+ <property name="gwt.junit.testcase.includes" value="**/*Suite.class"/>
- <!-- Headless mode keeps the hosted mode browser and log window
- from popping up during a unit test run. This is usually desirable,
- but the WebKit layout engine performs some optimizations in
- headless mode that causes some GWT unit tests to break. The
- solution for the time being is to turn off headless mode on
- the mac.
- -->
- <condition property="junit.headless">
- <not>
- <isset property="build.host.ismac" />
- </not>
- </condition>
- <condition property="junit.notheadless.arg" value="-notHeadless" else="">
- <not>
- <isset property="junit.headless" />
- </not>
- </condition>
+ <!-- Headless mode keeps the hosted mode browser and log window
+ from popping up during a unit test run. This is usually desirable,
+ but the WebKit layout engine performs some optimizations in
+ headless mode that causes some GWT unit tests to break. The
+ solution for the time being is to turn off headless mode on
+ the mac.
+ -->
+ <condition property="junit.headless">
+ <not>
+ <isset property="build.host.ismac" />
+ </not>
+ </condition>
+ <condition property="junit.notheadless.arg" value="-notHeadless" else="">
+ <not>
+ <isset property="junit.headless" />
+ </not>
+ </condition>
- <!-- Pulls in tasks defined in ant-contrib, i.e. foreach -->
- <taskdef resource="net/sf/antcontrib/antlib.xml">
- <classpath>
- <pathelement location="${gwt.tools.antlib}/ant-contrib-1.0b3.jar" />
- </classpath>
- </taskdef>
+ <!-- Pulls in tasks defined in ant-contrib, i.e. foreach -->
+ <taskdef resource="net/sf/antcontrib/antlib.xml">
+ <classpath>
+ <pathelement location="${gwt.tools.antlib}/ant-contrib-1.0b3.jar" />
+ </classpath>
+ </taskdef>
- <!-- Global Custom Tasks -->
- <presetdef name="gwt.ant">
- <ant inheritall="false" target="${target}">
- <propertyset>
- <propertyref name="gwt.version" />
- <propertyref name="gwt.junit.port" />
- <propertyref name="gwt.remote.browsers" />
- </propertyset>
- </ant>
- </presetdef>
+ <!-- Global Custom Tasks -->
+ <presetdef name="gwt.ant">
+ <ant inheritall="false" target="${target}">
+ <propertyset>
+ <propertyref name="gwt.version" />
+ <propertyref name="gwt.junit.port" />
+ <propertyref name="gwt.remote.browsers" />
+ </propertyset>
+ </ant>
+ </presetdef>
- <presetdef name="gwt.javac">
- <javac srcdir="src" destdir="${javac.out}" debug="${javac.debug}" debuglevel="${javac.debuglevel}" source="${javac.source}" target="${javac.target}" nowarn="${javac.nowarn}" encoding="${javac.encoding}" />
- </presetdef>
+ <presetdef name="gwt.javac">
+ <javac srcdir="src" destdir="${javac.out}" debug="${javac.debug}" debuglevel="${javac.debuglevel}" source="${javac.source}" target="${javac.target}" nowarn="${javac.nowarn}" encoding="${javac.encoding}" />
+ </presetdef>
- <presetdef name="gwt.jar">
- <jar destfile="${project.lib}" update="true" duplicate="preserve" index="true" />
- </presetdef>
+ <presetdef name="gwt.jar">
+ <jar destfile="${project.lib}" update="true" duplicate="preserve" index="true" />
+ </presetdef>
- <macrodef name="gwt.junit">
- <!-- TODO: make this more generic / refactor so it can be used from dev/core -->
- <attribute name="test.args" default="" />
- <attribute name="test.out" default="" />
- <attribute name="test.reports" default="@{test.out}/reports" />
- <attribute name="test.cases" default="" />
- <element name="extraclasspaths" optional="true" />
- <sequential>
- <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
- <classpath>
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- <pathelement location="${gwt.tools.antlib}/ant-junit-1.6.5.jar" />
- <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
- </classpath>
- </taskdef>
+ <macrodef name="gwt.junit">
+ <!-- TODO: make this more generic / refactor so it can be used from dev/core -->
+ <attribute name="test.args" default="" />
+ <attribute name="test.out" default="" />
+ <attribute name="test.reports" default="@{test.out}/reports" />
+ <attribute name="test.cases" default="" />
+ <element name="extraclasspaths" optional="true" />
+ <sequential>
+ <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
+ <classpath>
+ <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ <pathelement location="${gwt.tools.antlib}/ant-junit-1.6.5.jar" />
+ <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
+ </classpath>
+ </taskdef>
- <echo message="Writing test results to @{test.reports} for @{test.cases}" />
- <mkdir dir="@{test.reports}" />
+ <echo message="Writing test results to @{test.reports} for @{test.cases}" />
+ <mkdir dir="@{test.reports}" />
- <echo message="${javac.out} ${javac.junit.out}" />
- <junit dir="@{test.out}" fork="yes" printsummary="yes" failureproperty="junit.failure" >
- <jvmarg line="${junit.platform.args}" />
- <jvmarg line="-Xmx512m" />
- <sysproperty key="gwt.args" value="${junit.notheadless.arg} @{test.args}" />
- <sysproperty key="java.awt.headless" value="${junit.headless}" />
- <sysproperty key="gwt.devjar" value="${gwt.dev.staging.jar}" />
- <classpath>
- <pathelement location="${gwt.root}/${project.tail}/src" />
- <pathelement location="${gwt.root}/${project.tail}/super" />
- <pathelement location="${gwt.root}/${project.tail}/test" />
- <pathelement location="${javac.junit.out}" />
- <pathelement location="${javac.out}" />
- <pathelement location="${gwt.dev.staging.jar}" />
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
- <extraclasspaths />
- </classpath>
+ <echo message="${javac.out} ${javac.junit.out}" />
+ <junit dir="@{test.out}" fork="yes" printsummary="yes" failureproperty="junit.failure" >
+ <jvmarg line="${junit.platform.args}" />
+ <jvmarg line="-Xmx512m" />
+ <sysproperty key="gwt.args" value="${junit.notheadless.arg} @{test.args}" />
+ <sysproperty key="java.awt.headless" value="${junit.headless}" />
+ <sysproperty key="gwt.devjar" value="${gwt.dev.staging.jar}" />
+ <classpath>
+ <pathelement location="${gwt.root}/${project.tail}/src" />
+ <pathelement location="${gwt.root}/${project.tail}/super" />
+ <pathelement location="${gwt.root}/${project.tail}/test" />
+ <pathelement location="${javac.junit.out}" />
+ <pathelement location="${javac.out}" />
+ <pathelement location="${gwt.dev.staging.jar}" />
+ <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
+ <extraclasspaths />
+ </classpath>
- <formatter type="plain" />
- <formatter type="xml" />
+ <formatter type="plain" />
+ <formatter type="xml" />
- <batchtest todir="@{test.reports}">
- <fileset refid="@{test.cases}" />
- </batchtest>
- </junit>
- <fail message="One or more junit tests failed" if="junit.failure" />
- </sequential>
- </macrodef>
+ <batchtest todir="@{test.reports}">
+ <fileset refid="@{test.cases}" />
+ </batchtest>
+ </junit>
+ <fail message="One or more junit tests failed" if="junit.failure" />
+ </sequential>
+ </macrodef>
- <macrodef name="gwt.tgz.cat">
- <attribute name="destfile" />
- <attribute name="compression" default="gzip" />
- <element name="tar.elements" implicit="true" optional="true" />
- <sequential>
- <taskdef name="tar.cat" classname="com.google.gwt.ant.taskdefs.TarCat" classpath="${gwt.build.lib}/ant-gwt.jar" />
- <tar.cat destfile="@{destfile}" compression="@{compression}" longfile="gnu">
- <tar.elements />
- </tar.cat>
- </sequential>
- </macrodef>
+ <macrodef name="gwt.tgz.cat">
+ <attribute name="destfile" />
+ <attribute name="compression" default="gzip" />
+ <element name="tar.elements" implicit="true" optional="true" />
+ <sequential>
+ <taskdef name="tar.cat" classname="com.google.gwt.ant.taskdefs.TarCat" classpath="${gwt.build.lib}/ant-gwt.jar" />
+ <tar.cat destfile="@{destfile}" compression="@{compression}" longfile="gnu">
+ <tar.elements />
+ </tar.cat>
+ </sequential>
+ </macrodef>
- <macrodef name="gwt.revfilter" description="Filters files for versioning">
- <attribute name="todir" description="Destination for the filtered copy"/>
- <element name="src.fileset" implicit="true"
- description="Source for the filtered copy"/>
- <sequential>
- <exec outputproperty="svn.info" executable="svn"
- failifexecutionfails="false" logError="true">
- <arg value="info"/>
- <arg value="${gwt.root}"/>
- </exec>
- <propertyregex property="gwt.svn.branch"
- input="${svn.info}"
- regexp="URL: https?://google-web-toolkit.googlecode.com/svn/([^\r\n]+)"
- select="\1"
- defaultValue="unknown"
- casesensitive="false" />
- <exec outputproperty="svn.version" executable="svnversion"
- failifexecutionfails="false" logError="true">
- <arg value="${gwt.root}"/>
- </exec>
- <propertyregex property="gwt.svn.version"
- input="${svn.version}"
- regexp="^(\d+(:\d+)?[MSP]*)$"
- replace="\1"
- defaultValue="unknown"
- casesensitive="false" />
- <property name="gwt.svnrev"
- value="${gwt.svn.branch}@${gwt.svn.version}"/>
- <!-- These files must be filtered for versioning -->
- <mkdir dir="@{todir}" />
- <copy todir="@{todir}" overwrite="true">
- <src.fileset/>
- <filterset>
- <filter token="GWT_VERSION" value="${gwt.version}" />
- <filter token="GWT_SVNREV" value="${gwt.svnrev}" />
- </filterset>
- </copy>
- <echo message="Branding as GWT version ${gwt.version}, SVN rev ${gwt.svnrev}"/>
- </sequential>
- </macrodef>
+ <macrodef name="gwt.revfilter" description="Filters files for versioning">
+ <attribute name="todir" description="Destination for the filtered copy"/>
+ <element name="src.fileset" implicit="true"
+ description="Source for the filtered copy"/>
+ <sequential>
+ <exec outputproperty="svn.info" executable="svn"
+ failifexecutionfails="false" logError="true">
+ <arg value="info"/>
+ <arg value="${gwt.root}"/>
+ </exec>
+ <propertyregex property="gwt.svn.branch"
+ input="${svn.info}"
+ regexp="URL: https?://google-web-toolkit.googlecode.com/svn/([^\r\n]+)"
+ select="\1"
+ defaultValue="unknown"
+ casesensitive="false" />
+ <exec outputproperty="svn.version" executable="svnversion"
+ failifexecutionfails="false" logError="true">
+ <arg value="${gwt.root}"/>
+ </exec>
+ <propertyregex property="gwt.svn.version"
+ input="${svn.version}"
+ regexp="^(\d+(:\d+)?[MSP]*)$"
+ replace="\1"
+ defaultValue="unknown"
+ casesensitive="false" />
+ <property name="gwt.svnrev"
+ value="${gwt.svn.branch}@${gwt.svn.version}"/>
+ <!-- These files must be filtered for versioning -->
+ <mkdir dir="@{todir}" />
+ <copy todir="@{todir}" overwrite="true">
+ <src.fileset/>
+ <filterset>
+ <filter token="GWT_VERSION" value="${gwt.version}" />
+ <filter token="GWT_SVNREV" value="${gwt.svnrev}" />
+ </filterset>
+ </copy>
+ <echo message="Branding as GWT version ${gwt.version}, SVN rev ${gwt.svnrev}"/>
+ </sequential>
+ </macrodef>
- <macrodef name="gwt.timer">
- <attribute name="name"/>
- <element name="timer.elements" implicit="true" optional="false"/>
- <sequential>
- <taskdef name="timer"
- classname="com.google.gwt.ant.taskdefs.Timer"
- classpath="${gwt.build.lib}/ant-gwt.jar" />
- <timer name="@{name}">
- <timer.elements/>
- </timer>
- </sequential>
- </macrodef>
+ <macrodef name="gwt.timer">
+ <attribute name="name"/>
+ <element name="timer.elements" implicit="true" optional="false"/>
+ <sequential>
+ <taskdef name="timer"
+ classname="com.google.gwt.ant.taskdefs.Timer"
+ classpath="${gwt.build.lib}/ant-gwt.jar" />
+ <timer name="@{name}">
+ <timer.elements/>
+ </timer>
+ </sequential>
+ </macrodef>
- <macrodef name="gwt.checkstyle">
- <element name="sourcepath" implicit="yes" optional="true" />
- <sequential>
- <taskdef resource="checkstyletask.properties" classpath="${gwt.tools.antlib}/checkstyle-all-4.2.jar;${gwt.build.lib}/gwt-customchecks.jar" />
- <checkstyle config="${gwt.root}/eclipse/settings/code-style/gwt-checkstyle.xml" maxWarnings="0">
- <property key="checkstyle.header.file" file="${gwt.root}/eclipse/settings/code-style/google.header" />
- <sourcepath />
- </checkstyle>
- </sequential>
- </macrodef>
+ <macrodef name="gwt.checkstyle">
+ <element name="sourcepath" implicit="yes" optional="true" />
+ <sequential>
+ <taskdef resource="checkstyletask.properties" classpath="${gwt.tools.antlib}/checkstyle-all-4.2.jar;${gwt.build.lib}/gwt-customchecks.jar" />
+ <checkstyle config="${gwt.root}/eclipse/settings/code-style/gwt-checkstyle.xml" maxWarnings="0">
+ <property key="checkstyle.header.file" file="${gwt.root}/eclipse/settings/code-style/google.header" />
+ <sourcepath />
+ </checkstyle>
+ </sequential>
+ </macrodef>
- <macrodef name="property.ensure">
- <attribute name="name" />
- <attribute name="location" />
- <attribute name="message" default="Cannot find dependency ${@{name}}" />
- <attribute name="unless" default="__nonexistent_property__" />
- <sequential>
- <property name="@{name}" location="@{location}" />
- <condition property="@{name}.exists">
- <or>
- <available file="${@{name}}" />
- <isset property="@{unless}" />
- </or>
- </condition>
- <fail unless="@{name}.exists" message="@{message}" />
- </sequential>
- </macrodef>
+ <macrodef name="property.ensure">
+ <attribute name="name" />
+ <attribute name="location" />
+ <attribute name="message" default="Cannot find dependency ${@{name}}" />
+ <attribute name="unless" default="__nonexistent_property__" />
+ <sequential>
+ <property name="@{name}" location="@{location}" />
+ <condition property="@{name}.exists">
+ <or>
+ <available file="${@{name}}" />
+ <isset property="@{unless}" />
+ </or>
+ </condition>
+ <fail unless="@{name}.exists" message="@{message}" />
+ </sequential>
+ </macrodef>
- <!-- Default implementations of the required targets; projects should
- override the ones that matter -->
- <target name="all" depends="verify" />
- <target name="verify" depends="checkstyle, test" description="Verify this project" />
- <target name="checkstyle" description="Static analysis of source" />
- <target name="test" depends="build" description="Test this project" />
- <target name="build" description="Build and (maybe) package this project" />
+ <!-- Default implementations of the required targets; projects should
+ override the ones that matter -->
+ <target name="all" depends="verify" />
+ <target name="verify" depends="checkstyle, test" description="Verify this project" />
+ <target name="checkstyle" description="Static analysis of source" />
+ <target name="test" depends="build" description="Test this project" />
+ <target name="build" description="Build and (maybe) package this project" />
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${project.build}" />
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete dir="${project.build}" />
+ </target>
</project>
diff --git a/dev/build.xml b/dev/build.xml
index 3f4eea8..5f610fe 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -1,12 +1,12 @@
<project name="dev" default="build" basedir=".">
- <property name="gwt.root" location=".." />
- <property name="project.tail" value="dev" />
- <import file="${gwt.root}/platforms.ant.xml" />
+ <property name="gwt.root" location=".." />
+ <property name="project.tail" value="dev" />
+ <import file="${gwt.root}/platforms.ant.xml" />
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${project.build}" failonerror="false" />
- <delete failonerror="false">
- <fileset dir="${gwt.build.lib}" includes="gwt-dev-*.jar"/>
- </delete>
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete dir="${project.build}" failonerror="false" />
+ <delete failonerror="false">
+ <fileset dir="${gwt.build.lib}" includes="gwt-dev-*.jar"/>
+ </delete>
+ </target>
</project>
diff --git a/dev/common.ant.xml b/dev/common.ant.xml
index 3556aff..58266be 100755
--- a/dev/common.ant.xml
+++ b/dev/common.ant.xml
@@ -1,40 +1,40 @@
<project name="dev-common">
- <property name="gwt.root" location="../.." />
- <import file="${gwt.root}/common.ant.xml" />
+ <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" />
+ <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.tools.lib}/eclipse/${gwt.dev.swt.jar}" />
- <pathelement location="${gwt.core.build}/bin" />
- <pathelement location="${gwt.core.build}/alldeps.jar" />
- </classpath>
- </gwt.javac>
- </target>
+ <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}/alldeps.jar" />
+ </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" excludes="**/package.html" />
- <fileset dir="${gwt.core.root}/src" excludes="**/package.html" />
- <fileset dir="${gwt.core.root}/super" excludes="**/package.html" />
- <fileset dir="${javac.out}" />
- <fileset dir="${gwt.core.build}/bin" />
- <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>
- </gwt.jar>
- </target>
+ <target name="build" depends="compile" description="Build and package this project">
+ <mkdir dir="${gwt.build.lib}" />
+ <gwt.jar>
+ <fileset dir="src" excludes="**/package.html" />
+ <fileset dir="${gwt.core.root}/src" excludes="**/package.html" />
+ <fileset dir="${gwt.core.root}/super" excludes="**/package.html" />
+ <fileset dir="${javac.out}" />
+ <fileset dir="${gwt.core.build}/bin" />
+ <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>
+ </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="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/dev/core/build.xml b/dev/core/build.xml
index b48abc7..5b6a713 100755
--- a/dev/core/build.xml
+++ b/dev/core/build.xml
@@ -1,163 +1,163 @@
<project name="dev-core" default="build" basedir=".">
- <property name="gwt.root" location="../.." />
- <property name="project.tail" value="dev/core" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location="../.." />
+ <property name="project.tail" value="dev/core" />
+ <import file="${gwt.root}/common.ant.xml" />
- <property name="alldeps.jar" location="${project.build}/alldeps.jar" />
+ <property name="alldeps.jar" location="${project.build}/alldeps.jar" />
- <fileset id="default.tests" dir="${javac.junit.out}">
- <include name="**/*Test.class" />
- </fileset>
+ <fileset id="default.tests" dir="${javac.junit.out}">
+ <include name="**/*Test.class" />
+ </fileset>
- <target name="compile.tests" depends="build" description="Compiles the test code for this project">
- <mkdir dir="${javac.junit.out}" />
- <gwt.javac srcdir="test" destdir="${javac.junit.out}">
- <classpath>
- <pathelement location="${javac.out}" />
- <pathelement location="${alldeps.jar}" />
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- </classpath>
- </gwt.javac>
- </target>
+ <target name="compile.tests" depends="build" description="Compiles the test code for this project">
+ <mkdir dir="${javac.junit.out}" />
+ <gwt.javac srcdir="test" destdir="${javac.junit.out}">
+ <classpath>
+ <pathelement location="${javac.out}" />
+ <pathelement location="${alldeps.jar}" />
+ <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ </classpath>
+ </gwt.javac>
+ </target>
- <target name="build.alldeps.jar" description="Merges all dependency jars into a single jar">
- <mkdir dir="${project.build}" />
- <gwt.jar destfile="${alldeps.jar}">
- <zipfileset src="${gwt.tools.lib}/apache/tapestry-util-text-4.0.2.jar" />
- <zipfileset src="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
- <zipfileset src="${gwt.tools.lib}/eclipse/jdt-3.3.1.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/ant-launcher-1.6.5.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/catalina-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/catalina-optional-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/commons-beanutils-1.6.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/commons-collections-3.1.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/commons-digester-1.5.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/commons-el-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/commons-logging-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/commons-modeler-1.1.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/jakarta-regexp-1.3.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/jasper-compiler-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/jasper-runtime-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/jsp-api-2.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/mx4j-jmx-1.1.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/naming-common-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/naming-factory-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/naming-java-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/naming-resources-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.4.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/servlets-common-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/servlets-default-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/servlets-invoker-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-coyote-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-http11-1.0.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-jk2-2.1.jar" />
- <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-util-5.1.jar" />
- </gwt.jar>
- </target>
+ <target name="build.alldeps.jar" description="Merges all dependency jars into a single jar">
+ <mkdir dir="${project.build}" />
+ <gwt.jar destfile="${alldeps.jar}">
+ <zipfileset src="${gwt.tools.lib}/apache/tapestry-util-text-4.0.2.jar" />
+ <zipfileset src="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
+ <zipfileset src="${gwt.tools.lib}/eclipse/jdt-3.3.1.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/ant-launcher-1.6.5.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/catalina-1.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/catalina-optional-1.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/commons-beanutils-1.6.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/commons-collections-3.1.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/commons-digester-1.5.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/commons-el-1.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/commons-logging-1.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/commons-modeler-1.1.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/jakarta-regexp-1.3.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/jasper-compiler-1.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/jasper-runtime-1.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/jsp-api-2.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/mx4j-jmx-1.1.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/naming-common-1.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/naming-factory-1.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/naming-java-1.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/naming-resources-1.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.4.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/servlets-common-1.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/servlets-default-1.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/servlets-invoker-1.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-coyote-1.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-http11-1.0.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-jk2-2.1.jar" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/tomcat-util-5.1.jar" />
+ </gwt.jar>
+ </target>
- <property name="filter.pattern" value="com/google/gwt/dev/About.properties" />
+ <property name="filter.pattern" value="com/google/gwt/dev/About.properties" />
- <target name="-filter.src" description="Creates filtered copies of source files" unless="filter.uptodate">
- <delete dir="${src.filtered}" failonerror="false" />
- <gwt.revfilter todir="${src.filtered}" >
- <fileset dir="src" includes="${filter.pattern}" />
- </gwt.revfilter>
- <touch file="${src.filtered}/gwt.version-${gwt.version}" />
- </target>
+ <target name="-filter.src" description="Creates filtered copies of source files" unless="filter.uptodate">
+ <delete dir="${src.filtered}" failonerror="false" />
+ <gwt.revfilter todir="${src.filtered}" >
+ <fileset dir="src" includes="${filter.pattern}" />
+ </gwt.revfilter>
+ <touch file="${src.filtered}/gwt.version-${gwt.version}" />
+ </target>
- <target name="build" depends="build.alldeps.jar" description="Compiles this project">
- <!--
- There are classes missing from dev/core that are necessary
- to compile the rest of dev/core (e.g. BootStrapPlatform); these are
- provided by each platform implementation, but in order to compile the
- core standalone, we need a dummy version of the class to build against.
- -->
- <property name="javac.out-dummy" location="${project.build}/bin-dummy" />
- <mkdir dir="${javac.out-dummy}" />
- <gwt.javac srcdir="src-dummy" destdir="${javac.out-dummy}" />
+ <target name="build" depends="build.alldeps.jar" description="Compiles this project">
+ <!--
+ There are classes missing from dev/core that are necessary
+ to compile the rest of dev/core (e.g. BootStrapPlatform); these are
+ provided by each platform implementation, but in order to compile the
+ core standalone, we need a dummy version of the class to build against.
+ -->
+ <property name="javac.out-dummy" location="${project.build}/bin-dummy" />
+ <mkdir dir="${javac.out-dummy}" />
+ <gwt.javac srcdir="src-dummy" destdir="${javac.out-dummy}" />
- <!-- Files with hardcoded version information must be filtered -->
- <property name="src.filtered" location="${project.build}/src-filtered" />
- <condition property="filter.uptodate">
- <and>
- <available file="${src.filtered}/gwt.version-${gwt.version}" />
- <uptodate>
- <srcfiles dir="src" includes="${filter.pattern}" />
- <globmapper from="*" to="${src.filtered}/*" />
- </uptodate>
- </and>
- </condition>
- <antcall target="-filter.src" />
+ <!-- Files with hardcoded version information must be filtered -->
+ <property name="src.filtered" location="${project.build}/src-filtered" />
+ <condition property="filter.uptodate">
+ <and>
+ <available file="${src.filtered}/gwt.version-${gwt.version}" />
+ <uptodate>
+ <srcfiles dir="src" includes="${filter.pattern}" />
+ <globmapper from="*" to="${src.filtered}/*" />
+ </uptodate>
+ </and>
+ </condition>
+ <antcall target="-filter.src" />
- <mkdir dir="${javac.out}" />
- <gwt.javac srcdir="super" excludes="com/google/gwt/dev/jjs/intrinsic/"/>
- <gwt.javac srcdir="${src.filtered}" />
- <gwt.javac srcdir="src" excludes="${filter.pattern}">
- <classpath>
- <pathelement location="${javac.out-dummy}" />
- <pathelement location="${alldeps.jar}" />
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- <!-- 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" />
- </classpath>
- </gwt.javac>
- <copy todir="${javac.out}">
- <fileset dir="src" includes="**/*.properties"/>
+ <mkdir dir="${javac.out}" />
+ <gwt.javac srcdir="super" excludes="com/google/gwt/dev/jjs/intrinsic/"/>
+ <gwt.javac srcdir="${src.filtered}" />
+ <gwt.javac srcdir="src" excludes="${filter.pattern}">
+ <classpath>
+ <pathelement location="${javac.out-dummy}" />
+ <pathelement location="${alldeps.jar}" />
+ <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ <!-- 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" />
+ </classpath>
+ </gwt.javac>
+ <copy todir="${javac.out}">
+ <fileset dir="src" includes="**/*.properties"/>
</copy>
- </target>
+ </target>
- <target name="checkstyle" description="Static analysis of source">
- <gwt.checkstyle>
- <fileset dir="src">
- <filename name="com/google/gwt/dev/asm/**/*.java" negate="yes" />
- <filename name="com/google/gwt/dev/js/rhino/**/*.java" negate="yes" />
- <filename name="org/eclipse/**/*.java" negate="yes" />
- <filename name="org/apache/**/*.java" negate="yes" />
- </fileset>
- </gwt.checkstyle>
+ <target name="checkstyle" description="Static analysis of source">
+ <gwt.checkstyle>
+ <fileset dir="src">
+ <filename name="com/google/gwt/dev/asm/**/*.java" negate="yes" />
+ <filename name="com/google/gwt/dev/js/rhino/**/*.java" negate="yes" />
+ <filename name="org/eclipse/**/*.java" negate="yes" />
+ <filename name="org/apache/**/*.java" negate="yes" />
+ </fileset>
+ </gwt.checkstyle>
- <gwt.checkstyle>
- <fileset dir="super/com/google/gwt/dev/jjs/intrinsic" />
- </gwt.checkstyle>
- </target>
+ <gwt.checkstyle>
+ <fileset dir="super/com/google/gwt/dev/jjs/intrinsic" />
+ </gwt.checkstyle>
+ </target>
- <target name="test" depends="build, compile.tests" description="Run unit tests for this project.">
- <!-- TODO: refactor gwt.junit so it can be reused here -->
- <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
- <classpath>
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- <pathelement location="${gwt.tools.antlib}/ant-junit-1.6.5.jar" />
- </classpath>
- </taskdef>
-
- <echo message="Writing test results to ${junit.out}/reports for ${test.cases}" />
- <mkdir dir="${junit.out}/reports" />
-
- <echo message="${javac.out} ${javac.junit.out}" />
- <junit dir="${junit.out}" fork="yes" printsummary="yes" haltonfailure="true">
- <classpath>
- <pathelement location="test" />
- <pathelement location="${javac.junit.out}" />
- <pathelement location="${javac.out}" />
- <pathelement location="${alldeps.jar}" />
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- <!-- Pull in gwt-dev and gwt-user sources for .gwt.xml files -->
- <pathelement location="${gwt.root}/user/src/" />
- <pathelement location="${gwt.root}/user/super/" />
- <pathelement location="${gwt.root}/dev/core/super" />
- </classpath>
-
- <formatter type="plain" />
- <formatter type="xml" />
-
- <batchtest todir="${junit.out}/reports">
- <fileset refid="default.tests" />
- </batchtest>
- </junit>
- </target>
+ <target name="test" depends="build, compile.tests" description="Run unit tests for this project.">
+ <!-- TODO: refactor gwt.junit so it can be reused here -->
+ <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
+ <classpath>
+ <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ <pathelement location="${gwt.tools.antlib}/ant-junit-1.6.5.jar" />
+ </classpath>
+ </taskdef>
+
+ <echo message="Writing test results to ${junit.out}/reports for ${test.cases}" />
+ <mkdir dir="${junit.out}/reports" />
+
+ <echo message="${javac.out} ${javac.junit.out}" />
+ <junit dir="${junit.out}" fork="yes" printsummary="yes" haltonfailure="true">
+ <classpath>
+ <pathelement location="test" />
+ <pathelement location="${javac.junit.out}" />
+ <pathelement location="${javac.out}" />
+ <pathelement location="${alldeps.jar}" />
+ <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ <!-- Pull in gwt-dev and gwt-user sources for .gwt.xml files -->
+ <pathelement location="${gwt.root}/user/src/" />
+ <pathelement location="${gwt.root}/user/super/" />
+ <pathelement location="${gwt.root}/dev/core/super" />
+ </classpath>
+
+ <formatter type="plain" />
+ <formatter type="xml" />
+
+ <batchtest todir="${junit.out}/reports">
+ <fileset refid="default.tests" />
+ </batchtest>
+ </junit>
+ </target>
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${project.build}" />
- <delete file="${project.lib}" />
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete dir="${project.build}" />
+ <delete file="${project.lib}" />
+ </target>
</project>
diff --git a/dev/linux/build.xml b/dev/linux/build.xml
index 4d18953..0b077f4 100755
--- a/dev/linux/build.xml
+++ b/dev/linux/build.xml
@@ -1,5 +1,5 @@
<project name="dev-linux" default="build" basedir=".">
- <property name="project.tail" value="dev/linux" />
- <property name="gwt.dev.swt.jar" value="org.eclipse.swt.gtk-linux-3.2.1.jar"/>
- <import file="../common.ant.xml" />
+ <property name="project.tail" value="dev/linux" />
+ <property name="gwt.dev.swt.jar" value="org.eclipse.swt.gtk-linux-3.2.1.jar"/>
+ <import file="../common.ant.xml" />
</project>
diff --git a/dev/mac/build.xml b/dev/mac/build.xml
index fb66cb1..715aa21 100755
--- a/dev/mac/build.xml
+++ b/dev/mac/build.xml
@@ -1,5 +1,5 @@
<project name="dev-mac" default="build" basedir=".">
- <property name="project.tail" value="dev/mac" />
- <property name="gwt.dev.swt.jar" value="org.eclipse.swt.carbon-macosx-3.2.1.jar"/>
- <import file="../common.ant.xml" />
+ <property name="project.tail" value="dev/mac" />
+ <property name="gwt.dev.swt.jar" value="org.eclipse.swt.carbon-macosx-3.2.1.jar"/>
+ <import file="../common.ant.xml" />
</project>
diff --git a/dev/windows/build.xml b/dev/windows/build.xml
index d33f9c3..c504aca 100755
--- a/dev/windows/build.xml
+++ b/dev/windows/build.xml
@@ -1,5 +1,5 @@
<project name="dev-windows" default="build" basedir=".">
- <property name="project.tail" value="dev/windows" />
- <property name="gwt.dev.swt.jar" value="org.eclipse.swt.win32-win32-3.2.1.jar"/>
- <import file="../common.ant.xml" />
+ <property name="project.tail" value="dev/windows" />
+ <property name="gwt.dev.swt.jar" value="org.eclipse.swt.win32-win32-3.2.1.jar"/>
+ <import file="../common.ant.xml" />
</project>
diff --git a/distro-source/build.xml b/distro-source/build.xml
index 62604a5..26a338c 100755
--- a/distro-source/build.xml
+++ b/distro-source/build.xml
@@ -1,10 +1,10 @@
<project name="dist" default="build" basedir=".">
- <property name="gwt.root" location=".." />
- <property name="project.tail" value="distro-source" />
- <import file="${gwt.root}/platforms.ant.xml" />
+ <property name="gwt.root" location=".." />
+ <property name="project.tail" value="distro-source" />
+ <import file="${gwt.root}/platforms.ant.xml" />
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${gwt.build.dist}" failonerror="false" />
- <delete dir="${gwt.build.staging}" failonerror="false" />
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete dir="${gwt.build.dist}" failonerror="false" />
+ <delete dir="${gwt.build.staging}" failonerror="false" />
+ </target>
</project>
diff --git a/distro-source/common.ant.xml b/distro-source/common.ant.xml
index eed395f..a1c24cf 100755
--- a/distro-source/common.ant.xml
+++ b/distro-source/common.ant.xml
@@ -1,30 +1,30 @@
<project name="dist-common">
- <property name="gwt.root" location="../.." />
- <property name="project.tail" value="distro-source/${dist.platform}" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location="../.." />
+ <property name="project.tail" value="distro-source/${dist.platform}" />
+ <import file="${gwt.root}/common.ant.xml" />
- <property name="project.distname" value="gwt-${dist.platform}-${gwt.version}" />
- <property name="project.staging" location="${gwt.build.staging}/${project.distname}" />
+ <property name="project.distname" value="gwt-${dist.platform}-${gwt.version}" />
+ <property name="project.staging" location="${gwt.build.staging}/${project.distname}" />
- <patternset id="chmod.executables">
- <include name="*Creator" />
- <include name="benchmarkViewer" />
- </patternset>
+ <patternset id="chmod.executables">
+ <include name="*Creator" />
+ <include name="benchmarkViewer" />
+ </patternset>
- <patternset id="chmod.not.executables">
- <exclude name="*Creator" />
- <exclude name="benchmarkViewer" />
- </patternset>
+ <patternset id="chmod.not.executables">
+ <exclude name="*Creator" />
+ <exclude name="benchmarkViewer" />
+ </patternset>
- <target name="filter" description="Filters distro files for versioning">
- <gwt.revfilter todir="${project.build}" >
- <fileset dir="../core/src" />
- </gwt.revfilter>
- </target>
+ <target name="filter" description="Filters distro files for versioning">
+ <gwt.revfilter todir="${project.build}" >
+ <fileset dir="../core/src" />
+ </gwt.revfilter>
+ </target>
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${project.build}" failonerror="false" />
- <delete dir="${project.staging}" failonerror="false" />
- <delete file="${project.dist}" failonerror="false" />
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete dir="${project.build}" failonerror="false" />
+ <delete dir="${project.staging}" failonerror="false" />
+ <delete file="${project.dist}" failonerror="false" />
+ </target>
</project>
diff --git a/distro-source/linux/build.xml b/distro-source/linux/build.xml
index 4240f6c..dc0aa37 100755
--- a/distro-source/linux/build.xml
+++ b/distro-source/linux/build.xml
@@ -1,78 +1,78 @@
<project name="dist-linux" default="build" basedir=".">
- <property name="dist.platform" value="linux" />
- <import file="../common.ant.xml" />
- <property name="project.dist" location="${gwt.build.dist}/${project.distname}.tar.bz2" />
+ <property name="dist.platform" value="linux" />
+ <import file="../common.ant.xml" />
+ <property name="project.dist" location="${gwt.build.dist}/${project.distname}.tar.bz2" />
- <target name="build" depends="filter" description="Packages the distro">
- <!-- TODO: figure out how to share most of this across platforms -->
- <mkdir dir="${gwt.build.dist}" />
- <gwt.tgz.cat destfile="${project.dist}" compression="bzip2">
- <!-- jars -->
- <tarfileset file="${gwt.build.lib}/gwt-dev-${dist.platform}.jar" prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-user.jar" prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-servlet.jar" prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-benchmark-viewer.jar" prefix="${project.distname}" />
+ <target name="build" depends="filter" description="Packages the distro">
+ <!-- TODO: figure out how to share most of this across platforms -->
+ <mkdir dir="${gwt.build.dist}" />
+ <gwt.tgz.cat destfile="${project.dist}" compression="bzip2">
+ <!-- jars -->
+ <tarfileset file="${gwt.build.lib}/gwt-dev-${dist.platform}.jar" prefix="${project.distname}" />
+ <tarfileset file="${gwt.build.lib}/gwt-user.jar" prefix="${project.distname}" />
+ <tarfileset file="${gwt.build.lib}/gwt-servlet.jar" prefix="${project.distname}" />
+ <tarfileset file="${gwt.build.lib}/gwt-benchmark-viewer.jar" prefix="${project.distname}" />
- <!-- jni libs-->
- <tarfileset dir="${gwt.build.jni}/${dist.platform}" prefix="${project.distname}" />
- <tarfileset dir="${gwt.tools.lib}/eclipse" prefix="${project.distname}">
- <include name="libswt-*gtk-3235.so" />
- </tarfileset>
+ <!-- jni libs-->
+ <tarfileset dir="${gwt.build.jni}/${dist.platform}" prefix="${project.distname}" />
+ <tarfileset dir="${gwt.tools.lib}/eclipse" prefix="${project.distname}">
+ <include name="libswt-*gtk-3235.so" />
+ </tarfileset>
- <!-- raw files -->
- <tarfileset dir="${project.build}" prefix="${project.distname}" mode="755">
- <patternset refid="chmod.executables" />
- </tarfileset>
- <tarfileset dir="${project.build}" prefix="${project.distname}">
- <patternset refid="chmod.not.executables" />
- </tarfileset>
- <tarfileset dir="src" prefix="${project.distname}" mode="755">
- <patternset refid="chmod.executables" />
- </tarfileset>
- <tarfileset dir="src" prefix="${project.distname}">
- <patternset refid="chmod.not.executables" />
- </tarfileset>
+ <!-- raw files -->
+ <tarfileset dir="${project.build}" prefix="${project.distname}" mode="755">
+ <patternset refid="chmod.executables" />
+ </tarfileset>
+ <tarfileset dir="${project.build}" prefix="${project.distname}">
+ <patternset refid="chmod.not.executables" />
+ </tarfileset>
+ <tarfileset dir="src" prefix="${project.distname}" mode="755">
+ <patternset refid="chmod.executables" />
+ </tarfileset>
+ <tarfileset dir="src" prefix="${project.distname}">
+ <patternset refid="chmod.not.executables" />
+ </tarfileset>
- <!-- doc -->
- <tarfileset dir="${gwt.build.out}" prefix="${project.distname}">
- <include name="doc" />
- <include name="doc/html/**" />
- <include name="doc/css/**" />
- <include name="doc/javadoc/**" />
- </tarfileset>
+ <!-- doc -->
+ <tarfileset dir="${gwt.build.out}" prefix="${project.distname}">
+ <include name="doc" />
+ <include name="doc/html/**" />
+ <include name="doc/css/**" />
+ <include name="doc/javadoc/**" />
+ </tarfileset>
- <!-- samples -->
- <tarfileset dir="${gwt.build.out}" prefix="${project.distname}">
- <include name="samples" />
- <include name="samples/*" />
- <include name="samples/*/src/**" />
- <include name="samples/*/bin/**" />
- <include name="samples/*/www/**" />
- <exclude name="samples/*/www/.*/**" />
- </tarfileset>
- <tarfileset dir="${gwt.build.out}/samples-scripts/${dist.platform}" mode="755" prefix="${project.distname}/samples">
- <include name="*/*-compile" />
- <include name="*/*-shell" />
- </tarfileset>
+ <!-- samples -->
+ <tarfileset dir="${gwt.build.out}" prefix="${project.distname}">
+ <include name="samples" />
+ <include name="samples/*" />
+ <include name="samples/*/src/**" />
+ <include name="samples/*/bin/**" />
+ <include name="samples/*/www/**" />
+ <exclude name="samples/*/www/.*/**" />
+ </tarfileset>
+ <tarfileset dir="${gwt.build.out}/samples-scripts/${dist.platform}" mode="755" prefix="${project.distname}/samples">
+ <include name="*/*-compile" />
+ <include name="*/*-shell" />
+ </tarfileset>
- <includetar src="${gwt.tools.redist}/mozilla/mozilla-1.7.12.tar.gz" compression="gzip" prefix="${project.distname}" />
- </gwt.tgz.cat>
+ <includetar src="${gwt.tools.redist}/mozilla/mozilla-1.7.12.tar.gz" compression="gzip" prefix="${project.distname}" />
+ </gwt.tgz.cat>
- <if>
- <isset property="build.host.islinux" />
- <then>
- <!--
- Untar distro into the staging directory. Must use GNU tar
- to handle permissions and symlinks correctly.
- -->
- <mkdir dir="${gwt.build.staging}" />
- <exec executable="tar" failonerror="true">
- <arg value="-xpjf" />
- <arg file="${project.dist}" />
- <arg value="-C" />
- <arg file="${gwt.build.staging}" />
- </exec>
- </then>
- </if>
- </target>
+ <if>
+ <isset property="build.host.islinux" />
+ <then>
+ <!--
+ Untar distro into the staging directory. Must use GNU tar
+ to handle permissions and symlinks correctly.
+ -->
+ <mkdir dir="${gwt.build.staging}" />
+ <exec executable="tar" failonerror="true">
+ <arg value="-xpjf" />
+ <arg file="${project.dist}" />
+ <arg value="-C" />
+ <arg file="${gwt.build.staging}" />
+ </exec>
+ </then>
+ </if>
+ </target>
</project>
diff --git a/distro-source/mac/build.xml b/distro-source/mac/build.xml
index c7a6a76..338d8f7 100755
--- a/distro-source/mac/build.xml
+++ b/distro-source/mac/build.xml
@@ -1,78 +1,78 @@
<project name="dist-mac" default="build" basedir=".">
- <property name="dist.platform" value="mac" />
- <import file="../common.ant.xml" />
- <property name="project.dist" location="${gwt.build.dist}/${project.distname}.tar.gz" />
+ <property name="dist.platform" value="mac" />
+ <import file="../common.ant.xml" />
+ <property name="project.dist" location="${gwt.build.dist}/${project.distname}.tar.gz" />
- <target name="build" depends="filter" description="Packages the distro">
- <!-- TODO: figure out how to share most of this across platforms -->
- <mkdir dir="${gwt.build.dist}" />
- <gwt.tgz.cat destfile="${project.dist}">
- <!-- jars -->
- <tarfileset file="${gwt.build.lib}/gwt-dev-${dist.platform}.jar" prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-user.jar" prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-servlet.jar" prefix="${project.distname}" />
- <tarfileset file="${gwt.build.lib}/gwt-benchmark-viewer.jar" prefix="${project.distname}" />
+ <target name="build" depends="filter" description="Packages the distro">
+ <!-- TODO: figure out how to share most of this across platforms -->
+ <mkdir dir="${gwt.build.dist}" />
+ <gwt.tgz.cat destfile="${project.dist}">
+ <!-- jars -->
+ <tarfileset file="${gwt.build.lib}/gwt-dev-${dist.platform}.jar" prefix="${project.distname}" />
+ <tarfileset file="${gwt.build.lib}/gwt-user.jar" prefix="${project.distname}" />
+ <tarfileset file="${gwt.build.lib}/gwt-servlet.jar" prefix="${project.distname}" />
+ <tarfileset file="${gwt.build.lib}/gwt-benchmark-viewer.jar" prefix="${project.distname}" />
- <!-- jni libs-->
- <tarfileset dir="${gwt.build.jni}/${dist.platform}" prefix="${project.distname}" />
- <tarfileset dir="${gwt.tools.lib}/eclipse" prefix="${project.distname}">
- <include name="libswt-*carbon-3235.jnilib" />
- <!-- Use our modified version instead of this stock version -->
- <exclude name="libswt-webkit-carbon-3235.jnilib" />
- </tarfileset>
+ <!-- jni libs-->
+ <tarfileset dir="${gwt.build.jni}/${dist.platform}" prefix="${project.distname}" />
+ <tarfileset dir="${gwt.tools.lib}/eclipse" prefix="${project.distname}">
+ <include name="libswt-*carbon-3235.jnilib" />
+ <!-- Use our modified version instead of this stock version -->
+ <exclude name="libswt-webkit-carbon-3235.jnilib" />
+ </tarfileset>
- <!-- raw files -->
- <tarfileset dir="${project.build}" prefix="${project.distname}" mode="755">
- <patternset refid="chmod.executables" />
- </tarfileset>
- <tarfileset dir="${project.build}" prefix="${project.distname}">
- <patternset refid="chmod.not.executables" />
- </tarfileset>
- <tarfileset dir="src" prefix="${project.distname}" mode="755">
- <patternset refid="chmod.executables" />
- </tarfileset>
- <tarfileset dir="src" prefix="${project.distname}">
- <patternset refid="chmod.not.executables" />
- </tarfileset>
+ <!-- raw files -->
+ <tarfileset dir="${project.build}" prefix="${project.distname}" mode="755">
+ <patternset refid="chmod.executables" />
+ </tarfileset>
+ <tarfileset dir="${project.build}" prefix="${project.distname}">
+ <patternset refid="chmod.not.executables" />
+ </tarfileset>
+ <tarfileset dir="src" prefix="${project.distname}" mode="755">
+ <patternset refid="chmod.executables" />
+ </tarfileset>
+ <tarfileset dir="src" prefix="${project.distname}">
+ <patternset refid="chmod.not.executables" />
+ </tarfileset>
- <!-- doc -->
- <tarfileset dir="${gwt.build.out}" prefix="${project.distname}">
- <include name="doc" />
- <include name="doc/html/**" />
- <include name="doc/css/**" />
- <include name="doc/javadoc/**" />
- </tarfileset>
+ <!-- doc -->
+ <tarfileset dir="${gwt.build.out}" prefix="${project.distname}">
+ <include name="doc" />
+ <include name="doc/html/**" />
+ <include name="doc/css/**" />
+ <include name="doc/javadoc/**" />
+ </tarfileset>
- <!-- samples -->
- <tarfileset dir="${gwt.build.out}" prefix="${project.distname}">
- <include name="samples" />
- <include name="samples/*" />
- <include name="samples/*/src/**" />
- <include name="samples/*/bin/**" />
- <include name="samples/*/www/**" />
- <exclude name="samples/*/www/.*/**" />
- </tarfileset>
- <tarfileset dir="${gwt.build.out}/samples-scripts/${dist.platform}" mode="755" prefix="${project.distname}/samples">
- <include name="*/*-compile" />
- <include name="*/*-shell" />
- </tarfileset>
- </gwt.tgz.cat>
+ <!-- samples -->
+ <tarfileset dir="${gwt.build.out}" prefix="${project.distname}">
+ <include name="samples" />
+ <include name="samples/*" />
+ <include name="samples/*/src/**" />
+ <include name="samples/*/bin/**" />
+ <include name="samples/*/www/**" />
+ <exclude name="samples/*/www/.*/**" />
+ </tarfileset>
+ <tarfileset dir="${gwt.build.out}/samples-scripts/${dist.platform}" mode="755" prefix="${project.distname}/samples">
+ <include name="*/*-compile" />
+ <include name="*/*-shell" />
+ </tarfileset>
+ </gwt.tgz.cat>
- <if>
- <isset property="build.host.ismac" />
- <then>
- <!--
- Untar distro into the staging directory. Must use GNU tar
- to handle permissions and symlinks correctly.
- -->
- <mkdir dir="${gwt.build.staging}" />
- <exec executable="tar" failonerror="true">
- <arg value="-xpzf" />
- <arg file="${project.dist}" />
- <arg value="-C" />
- <arg file="${gwt.build.staging}" />
- </exec>
- </then>
- </if>
- </target>
+ <if>
+ <isset property="build.host.ismac" />
+ <then>
+ <!--
+ Untar distro into the staging directory. Must use GNU tar
+ to handle permissions and symlinks correctly.
+ -->
+ <mkdir dir="${gwt.build.staging}" />
+ <exec executable="tar" failonerror="true">
+ <arg value="-xpzf" />
+ <arg file="${project.dist}" />
+ <arg value="-C" />
+ <arg file="${gwt.build.staging}" />
+ </exec>
+ </then>
+ </if>
+ </target>
</project>
diff --git a/distro-source/windows/build.xml b/distro-source/windows/build.xml
index 84d0ee7..015ec56 100755
--- a/distro-source/windows/build.xml
+++ b/distro-source/windows/build.xml
@@ -1,57 +1,57 @@
<project name="dist-windows" default="build" basedir=".">
- <property name="dist.platform" value="windows" />
- <import file="../common.ant.xml" />
- <property name="project.dist" location="${gwt.build.dist}/${project.distname}.zip" />
+ <property name="dist.platform" value="windows" />
+ <import file="../common.ant.xml" />
+ <property name="project.dist" location="${gwt.build.dist}/${project.distname}.zip" />
- <target name="build" depends="filter" description="Packages the distro">
- <!-- TODO: figure out how to share most of this across platforms -->
- <mkdir dir="${gwt.build.dist}" />
- <zip destfile="${project.dist}">
- <!-- jars -->
- <zipfileset file="${gwt.build.lib}/gwt-dev-${dist.platform}.jar" prefix="${project.distname}" />
- <zipfileset file="${gwt.build.lib}/gwt-user.jar" prefix="${project.distname}" />
- <zipfileset file="${gwt.build.lib}/gwt-servlet.jar" prefix="${project.distname}" />
- <zipfileset file="${gwt.build.lib}/gwt-benchmark-viewer.jar" prefix="${project.distname}" />
+ <target name="build" depends="filter" description="Packages the distro">
+ <!-- TODO: figure out how to share most of this across platforms -->
+ <mkdir dir="${gwt.build.dist}" />
+ <zip destfile="${project.dist}">
+ <!-- jars -->
+ <zipfileset file="${gwt.build.lib}/gwt-dev-${dist.platform}.jar" prefix="${project.distname}" />
+ <zipfileset file="${gwt.build.lib}/gwt-user.jar" prefix="${project.distname}" />
+ <zipfileset file="${gwt.build.lib}/gwt-servlet.jar" prefix="${project.distname}" />
+ <zipfileset file="${gwt.build.lib}/gwt-benchmark-viewer.jar" prefix="${project.distname}" />
- <!-- jni libs-->
- <zipfileset dir="${gwt.build.jni}/${dist.platform}" prefix="${project.distname}" />
- <zipfileset dir="${gwt.tools.lib}/eclipse" prefix="${project.distname}">
- <include name="swt-*win32-3235.dll" />
- </zipfileset>
+ <!-- jni libs-->
+ <zipfileset dir="${gwt.build.jni}/${dist.platform}" prefix="${project.distname}" />
+ <zipfileset dir="${gwt.tools.lib}/eclipse" prefix="${project.distname}">
+ <include name="swt-*win32-3235.dll" />
+ </zipfileset>
- <!-- raw files -->
- <zipfileset dir="${project.build}" prefix="${project.distname}" />
- <zipfileset dir="src" prefix="${project.distname}" />
+ <!-- raw files -->
+ <zipfileset dir="${project.build}" prefix="${project.distname}" />
+ <zipfileset dir="src" prefix="${project.distname}" />
- <!-- doc -->
- <zipfileset dir="${gwt.build.out}" prefix="${project.distname}">
- <include name="doc" />
- <include name="doc/html/**" />
- <include name="doc/css/**" />
- <include name="doc/javadoc/**" />
- </zipfileset>
+ <!-- doc -->
+ <zipfileset dir="${gwt.build.out}" prefix="${project.distname}">
+ <include name="doc" />
+ <include name="doc/html/**" />
+ <include name="doc/css/**" />
+ <include name="doc/javadoc/**" />
+ </zipfileset>
- <!-- samples -->
- <zipfileset dir="${gwt.build.out}" prefix="${project.distname}">
- <include name="samples" />
- <include name="samples/*" />
- <include name="samples/*/src/**" />
- <include name="samples/*/bin/**" />
- <include name="samples/*/www/**" />
- <exclude name="samples/*/www/.*/**" />
- </zipfileset>
- <zipfileset dir="${gwt.build.out}/samples-scripts/${dist.platform}" prefix="${project.distname}/samples">
- <include name="*/*-compile.cmd" />
- <include name="*/*-shell.cmd" />
- </zipfileset>
- </zip>
+ <!-- samples -->
+ <zipfileset dir="${gwt.build.out}" prefix="${project.distname}">
+ <include name="samples" />
+ <include name="samples/*" />
+ <include name="samples/*/src/**" />
+ <include name="samples/*/bin/**" />
+ <include name="samples/*/www/**" />
+ <exclude name="samples/*/www/.*/**" />
+ </zipfileset>
+ <zipfileset dir="${gwt.build.out}/samples-scripts/${dist.platform}" prefix="${project.distname}/samples">
+ <include name="*/*-compile.cmd" />
+ <include name="*/*-shell.cmd" />
+ </zipfileset>
+ </zip>
- <if>
- <isset property="build.host.iswindows" />
- <then>
- <mkdir dir="${gwt.build.staging}" />
- <unzip src="${project.dist}" dest="${gwt.build.staging}" />
- </then>
- </if>
- </target>
+ <if>
+ <isset property="build.host.iswindows" />
+ <then>
+ <mkdir dir="${gwt.build.staging}" />
+ <unzip src="${project.dist}" dest="${gwt.build.staging}" />
+ </then>
+ </if>
+ </target>
</project>
diff --git a/doc/build.xml b/doc/build.xml
index 9a42ed7..99d0a7b 100644
--- a/doc/build.xml
+++ b/doc/build.xml
@@ -1,130 +1,130 @@
<project name="doc" default="all" basedir=".">
- <property name="gwt.root" location=".." />
- <property name="project.tail" value="doc" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location=".." />
+ <property name="project.tail" value="doc" />
+ <import file="${gwt.root}/common.ant.xml" />
- <property.ensure name="java.tools.path" location="${java.home}/../lib/tools.jar" unless="build.host.ismac" message="Cannot find ${java.home}/../lib/tools.jar; please use a JDK when building doc rather than a JRE." />
+ <property.ensure name="java.tools.path" location="${java.home}/../lib/tools.jar" unless="build.host.ismac" message="Cannot find ${java.home}/../lib/tools.jar; please use a JDK when building doc rather than a JRE." />
- <property.ensure name="gwt.user.jar" location="${gwt.build.lib}/gwt-user.jar" />
- <!-- Platform shouldn't matter here, just picking one -->
- <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-linux.jar" />
+ <property.ensure name="gwt.user.jar" location="${gwt.build.lib}/gwt-user.jar" />
+ <!-- Platform shouldn't matter here, just picking one -->
+ <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-linux.jar" />
- <property name="USER_PKGS"
+ <property name="USER_PKGS"
value="com.google.gwt.core.client;com.google.gwt.core.ext;com.google.gwt.core.ext.linker;com.google.gwt.core.ext.typeinfo;com.google.gwt.dom.client;com.google.gwt.i18n.client;com.google.gwt.i18n.rebind.format;com.google.gwt.i18n.rebind.keygen;com.google.gwt.json.client;com.google.gwt.junit.client;com.google.gwt.benchmarks.client;com.google.gwt.user.client;com.google.gwt.user.client.rpc;com.google.gwt.user.client.ui;com.google.gwt.user.server.rpc;com.google.gwt.xml.client;com.google.gwt.http.client" />
- <property name="LANG_PKGS" value="java.lang;java.lang.annotation;java.util;java.io;java.sql" />
+ <property name="LANG_PKGS" value="java.lang;java.lang.annotation;java.util;java.io;java.sql" />
- <!-- Individual classes to include when we don't want to
- include an entire package.
- -->
- <property name="USER_CLASSES"
- value="${gwt.root}/user/src/com/google/gwt/junit/tools/GWTTestSuite.java" />
+ <!-- Individual classes to include when we don't want to
+ include an entire package.
+ -->
+ <property name="USER_CLASSES"
+ value="${gwt.root}/user/src/com/google/gwt/junit/tools/GWTTestSuite.java" />
- <!--
- *** Note that if the USER_SOURCE_PATH paths are updated,
- the fileset dependencies in the outofdate tags in the
- javadoc target must be updated as well.
- -->
- <path id="USER_SOURCE_PATH">
- <pathelement location="${gwt.root}/user/src" />
- <pathelement location="${gwt.root}/user/javadoc" />
- <pathelement location="${gwt.root}/user/super" />
- <pathelement location="${gwt.root}/dev/core/src" />
- <pathelement location="${gwt.root}/dev/core/super" />
- </path>
+ <!--
+ *** Note that if the USER_SOURCE_PATH paths are updated,
+ the fileset dependencies in the outofdate tags in the
+ javadoc target must be updated as well.
+ -->
+ <path id="USER_SOURCE_PATH">
+ <pathelement location="${gwt.root}/user/src" />
+ <pathelement location="${gwt.root}/user/javadoc" />
+ <pathelement location="${gwt.root}/user/super" />
+ <pathelement location="${gwt.root}/dev/core/src" />
+ <pathelement location="${gwt.root}/dev/core/super" />
+ </path>
- <path id="USER_CLASS_PATH">
- <pathelement location="${gwt.user.jar}" />
- <pathelement location="${gwt.dev.jar}" />
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- <pathelement location="${gwt.tools.lib}/jfreechart/jfreechart-1.0.3.jar" />
- </path>
+ <path id="USER_CLASS_PATH">
+ <pathelement location="${gwt.user.jar}" />
+ <pathelement location="${gwt.dev.jar}" />
+ <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ <pathelement location="${gwt.tools.lib}/jfreechart/jfreechart-1.0.3.jar" />
+ </path>
- <path id="DOC_PATH">
- <pathelement location="./src" />
- <pathelement location="${gwt.build.lib}/gwt-doctool.jar" />
- <path path="${java.tools.path}" />
- <path refid="USER_SOURCE_PATH" />
- </path>
+ <path id="DOC_PATH">
+ <pathelement location="./src" />
+ <pathelement location="${gwt.build.lib}/gwt-doctool.jar" />
+ <path path="${java.tools.path}" />
+ <path refid="USER_SOURCE_PATH" />
+ </path>
- <target name="javadoc">
- <outofdate>
- <sourcefiles>
- <fileset file="./src/gwt-user.html" />
- <fileset dir="${gwt.root}/user/src">
- <include name="**/*.java" />
- </fileset>
- <fileset dir="${gwt.root}/user/javadoc">
- <include name="**/*.java" />
- </fileset>
- <fileset dir="${gwt.root}/user/super">
- <include name="**/*.java" />
- </fileset>
- <fileset dir="${gwt.root}/dev/core/src">
- <include name="**/*.java" />
- </fileset>
- <fileset dir="${gwt.root}/dev/core/super">
- <include name="**/*.java" />
- </fileset>
- </sourcefiles>
- <targetfiles>
- <!--
- only checks one output file, will not rebuild other
- files if this one is up to date
- -->
- <pathelement path="${project.build}/javadoc/index.html" />
- </targetfiles>
- <sequential>
- <echo>Building javadoc</echo>
- <java classpathref="DOC_PATH" classname="com.google.doctool.custom.GWTJavaDoclet" fork="yes" failonerror="true">
- <arg value="-quiet" />
- <arg value="-source" />
- <arg value="1.5" />
- <arg value="-windowtitle" />
- <arg value="Google Web Toolkit Javadoc" />
- <arg value="-encoding"/>
- <arg value="UTF-8"/>
- <arg value="-d" />
- <arg value="${project.build}/javadoc" />
- <arg value="-classpath" />
- <arg pathref="USER_CLASS_PATH" />
- <arg value="-sourcepath" />
- <arg pathref="USER_SOURCE_PATH" />
- <arg value="-examplepackages" />
- <arg value="com.google.gwt.examples;com.google.gwt.examples.i18n;com.google.gwt.examples.http.client;com.google.gwt.examples.rpc.server;com.google.gwt.examples.benchmarks" />
- <arg value="-packages" />
- <arg value="${USER_PKGS};${USER_CLASSES}" />
- </java>
- </sequential>
- </outofdate>
- </target>
+ <target name="javadoc">
+ <outofdate>
+ <sourcefiles>
+ <fileset file="./src/gwt-user.html" />
+ <fileset dir="${gwt.root}/user/src">
+ <include name="**/*.java" />
+ </fileset>
+ <fileset dir="${gwt.root}/user/javadoc">
+ <include name="**/*.java" />
+ </fileset>
+ <fileset dir="${gwt.root}/user/super">
+ <include name="**/*.java" />
+ </fileset>
+ <fileset dir="${gwt.root}/dev/core/src">
+ <include name="**/*.java" />
+ </fileset>
+ <fileset dir="${gwt.root}/dev/core/super">
+ <include name="**/*.java" />
+ </fileset>
+ </sourcefiles>
+ <targetfiles>
+ <!--
+ only checks one output file, will not rebuild other
+ files if this one is up to date
+ -->
+ <pathelement path="${project.build}/javadoc/index.html" />
+ </targetfiles>
+ <sequential>
+ <echo>Building javadoc</echo>
+ <java classpathref="DOC_PATH" classname="com.google.doctool.custom.GWTJavaDoclet" fork="yes" failonerror="true">
+ <arg value="-quiet" />
+ <arg value="-source" />
+ <arg value="1.5" />
+ <arg value="-windowtitle" />
+ <arg value="Google Web Toolkit Javadoc" />
+ <arg value="-encoding"/>
+ <arg value="UTF-8"/>
+ <arg value="-d" />
+ <arg value="${project.build}/javadoc" />
+ <arg value="-classpath" />
+ <arg pathref="USER_CLASS_PATH" />
+ <arg value="-sourcepath" />
+ <arg pathref="USER_SOURCE_PATH" />
+ <arg value="-examplepackages" />
+ <arg value="com.google.gwt.examples;com.google.gwt.examples.i18n;com.google.gwt.examples.http.client;com.google.gwt.examples.rpc.server;com.google.gwt.examples.benchmarks" />
+ <arg value="-packages" />
+ <arg value="${USER_PKGS};${USER_CLASSES}" />
+ </java>
+ </sequential>
+ </outofdate>
+ </target>
- <target name="wiki-lang">
- <outofdate>
- <sourcefiles>
- <fileset file="./src/RefJreHeader.wiki" />
- <fileset dir="${gwt.root}/user/super/com/google/gwt/emul">
- <include name="**/*.java" />
- </fileset>
- </sourcefiles>
- <targetfiles>
- <pathelement path="${project.build}/wiki/RefJreEmulation.wiki" />
- </targetfiles>
- <sequential>
- <java classpathref="DOC_PATH" classname="com.google.doctool.JreDocTool" fork="yes" failonerror="true">
- <arg value="-out" />
- <arg value="${project.build}/wiki/RefJreEmulation.wiki" />
- <arg value="-header" />
- <arg value="./src/RefJreHeader.wiki" />
- <arg value="-classpath" />
- <arg pathref="USER_CLASS_PATH" />
- <arg value="-sourcepath" />
- <arg path="${gwt.root}/user/super/com/google/gwt/emul" />
- <arg value="-packages" />
- <arg value="${LANG_PKGS}" />
- </java>
- </sequential>
- </outofdate>
- </target>
+ <target name="wiki-lang">
+ <outofdate>
+ <sourcefiles>
+ <fileset file="./src/RefJreHeader.wiki" />
+ <fileset dir="${gwt.root}/user/super/com/google/gwt/emul">
+ <include name="**/*.java" />
+ </fileset>
+ </sourcefiles>
+ <targetfiles>
+ <pathelement path="${project.build}/wiki/RefJreEmulation.wiki" />
+ </targetfiles>
+ <sequential>
+ <java classpathref="DOC_PATH" classname="com.google.doctool.JreDocTool" fork="yes" failonerror="true">
+ <arg value="-out" />
+ <arg value="${project.build}/wiki/RefJreEmulation.wiki" />
+ <arg value="-header" />
+ <arg value="./src/RefJreHeader.wiki" />
+ <arg value="-classpath" />
+ <arg pathref="USER_CLASS_PATH" />
+ <arg value="-sourcepath" />
+ <arg path="${gwt.root}/user/super/com/google/gwt/emul" />
+ <arg value="-packages" />
+ <arg value="${LANG_PKGS}" />
+ </java>
+ </sequential>
+ </outofdate>
+ </target>
- <target name="build" depends="javadoc, wiki-lang" />
+ <target name="build" depends="javadoc, wiki-lang" />
</project>
diff --git a/jni/build.xml b/jni/build.xml
index 147493b..1f08cdf 100755
--- a/jni/build.xml
+++ b/jni/build.xml
@@ -1,5 +1,5 @@
<project name="jni" default="build" basedir=".">
- <property name="gwt.root" location=".." />
- <property name="project.tail" value="jni" />
- <import file="${gwt.root}/platforms.ant.xml" />
+ <property name="gwt.root" location=".." />
+ <property name="project.tail" value="jni" />
+ <import file="${gwt.root}/platforms.ant.xml" />
</project>
diff --git a/jni/linux/build.xml b/jni/linux/build.xml
index 2bd2a20..5f0db6b 100755
--- a/jni/linux/build.xml
+++ b/jni/linux/build.xml
@@ -1,18 +1,18 @@
<project name="jni-linux" default="build" basedir=".">
- <property name="gwt.root" location="../.." />
- <property name="project.tail" value="jni/linux" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location="../.." />
+ <property name="project.tail" value="jni/linux" />
+ <import file="${gwt.root}/common.ant.xml" />
- <target name="build" description="Builds a JNI lib">
- <mkdir dir="${project.jni}" />
- <!-- TODO: Actually build this from source! -->
- <copy todir="${project.jni}">
- <fileset dir="prebuilt" />
- </copy>
- </target>
+ <target name="build" description="Builds a JNI lib">
+ <mkdir dir="${project.jni}" />
+ <!-- TODO: Actually build this from source! -->
+ <copy todir="${project.jni}">
+ <fileset dir="prebuilt" />
+ </copy>
+ </target>
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${project.build}" failonerror="false" />
- <delete dir="${project.jni}" failonerror="false" />
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete dir="${project.build}" failonerror="false" />
+ <delete dir="${project.jni}" failonerror="false" />
+ </target>
</project>
diff --git a/jni/mac/build.xml b/jni/mac/build.xml
index 2bb1631..66b6580 100755
--- a/jni/mac/build.xml
+++ b/jni/mac/build.xml
@@ -1,18 +1,18 @@
<project name="jni-mac" default="build" basedir=".">
- <property name="gwt.root" location="../.." />
- <property name="project.tail" value="jni/mac" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location="../.." />
+ <property name="project.tail" value="jni/mac" />
+ <import file="${gwt.root}/common.ant.xml" />
- <target name="build" description="Builds a JNI lib">
- <mkdir dir="${project.jni}" />
- <!-- TODO: Actually build this from source! -->
- <copy todir="${project.jni}">
- <fileset dir="prebuilt" />
- </copy>
- </target>
+ <target name="build" description="Builds a JNI lib">
+ <mkdir dir="${project.jni}" />
+ <!-- TODO: Actually build this from source! -->
+ <copy todir="${project.jni}">
+ <fileset dir="prebuilt" />
+ </copy>
+ </target>
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${project.build}" failonerror="false" />
- <delete dir="${project.jni}" failonerror="false" />
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete dir="${project.build}" failonerror="false" />
+ <delete dir="${project.jni}" failonerror="false" />
+ </target>
</project>
diff --git a/jni/windows/build.xml b/jni/windows/build.xml
index a97d383..f5951cf 100755
--- a/jni/windows/build.xml
+++ b/jni/windows/build.xml
@@ -1,18 +1,18 @@
<project name="jni-windows" default="build" basedir=".">
- <property name="gwt.root" location="../.." />
- <property name="project.tail" value="jni/windows" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location="../.." />
+ <property name="project.tail" value="jni/windows" />
+ <import file="${gwt.root}/common.ant.xml" />
- <target name="build" description="Builds a JNI lib">
- <mkdir dir="${project.jni}" />
- <!-- TODO: Actually build this from source! -->
- <copy todir="${project.jni}">
- <fileset dir="prebuilt" />
- </copy>
- </target>
+ <target name="build" description="Builds a JNI lib">
+ <mkdir dir="${project.jni}" />
+ <!-- TODO: Actually build this from source! -->
+ <copy todir="${project.jni}">
+ <fileset dir="prebuilt" />
+ </copy>
+ </target>
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${project.build}" failonerror="false" />
- <delete dir="${project.jni}" failonerror="false" />
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete dir="${project.build}" failonerror="false" />
+ <delete dir="${project.jni}" failonerror="false" />
+ </target>
</project>
diff --git a/platforms.ant.xml b/platforms.ant.xml
index da52d32..6c5e1df 100755
--- a/platforms.ant.xml
+++ b/platforms.ant.xml
@@ -1,44 +1,44 @@
<project name="platforms">
- <import file="${gwt.root}/common.ant.xml" />
+ <import file="${gwt.root}/common.ant.xml" />
- <!-- "build" is the default when subprojects are directly targetted -->
- <property name="target" value="build" />
+ <!-- "build" is the default when subprojects are directly targetted -->
+ <property name="target" value="build" />
- <available file="core/build.xml" type="file" property="core.exists" />
- <target name="core" description="Run core" if="core.exists">
- <gwt.ant dir="core" />
- </target>
+ <available file="core/build.xml" type="file" property="core.exists" />
+ <target name="core" description="Run core" if="core.exists">
+ <gwt.ant dir="core" />
+ </target>
- <target name="linux" depends="core" description="Run linux">
- <gwt.ant dir="linux" />
- </target>
+ <target name="linux" depends="core" description="Run linux">
+ <gwt.ant dir="linux" />
+ </target>
- <target name="windows" depends="core" description="Run windows">
- <gwt.ant dir="windows" />
- </target>
+ <target name="windows" depends="core" description="Run windows">
+ <gwt.ant dir="windows" />
+ </target>
- <target name="mac" depends="core" description="Run mac">
- <gwt.ant dir="mac" />
- </target>
+ <target name="mac" depends="core" description="Run mac">
+ <gwt.ant dir="mac" />
+ </target>
- <target name="-do" depends="linux, windows, mac" description="Run all platforms" />
+ <target name="-do" depends="linux, windows, mac" description="Run all platforms" />
- <target name="build" description="Build each platforms">
- <antcall target="-do">
- <param name="target" value="build" />
- </antcall>
- </target>
+ <target name="build" description="Build each platforms">
+ <antcall target="-do">
+ <param name="target" value="build" />
+ </antcall>
+ </target>
- <target name="checkstyle" description="Static analysis of source for each platform">
- <antcall target="-do">
- <param name="target" value="checkstyle" />
- </antcall>
- </target>
+ <target name="checkstyle" description="Static analysis of source for each platform">
+ <antcall target="-do">
+ <param name="target" value="checkstyle" />
+ </antcall>
+ </target>
- <target name="test" description="Test each platform">
- <antcall target="-do">
- <param name="target" value="test" />
- </antcall>
- </target>
+ <target name="test" description="Test each platform">
+ <antcall target="-do">
+ <param name="target" value="test" />
+ </antcall>
+ </target>
</project>
diff --git a/samples/build.xml b/samples/build.xml
index bd74c3c..81d72a3 100644
--- a/samples/build.xml
+++ b/samples/build.xml
@@ -1,77 +1,77 @@
<project name="samples" default="build" basedir=".">
- <property name="gwt.root" location=".." />
- <property name="project.tail" value="samples" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location=".." />
+ <property name="project.tail" value="samples" />
+ <import file="${gwt.root}/common.ant.xml" />
- <!-- "build" is the default when subprojects are directly targetted -->
- <property name="target" value="build" />
+ <!-- "build" is the default when subprojects are directly targetted -->
+ <property name="target" value="build" />
- <target name="dynatable" description="Build dynatable">
- <gwt.ant dir="dynatable" />
- </target>
+ <target name="dynatable" description="Build dynatable">
+ <gwt.ant dir="dynatable" />
+ </target>
- <target name="hello" description="Build hello">
- <gwt.ant dir="hello" />
- </target>
+ <target name="hello" description="Build hello">
+ <gwt.ant dir="hello" />
+ </target>
- <target name="i18n" description="Build i18n">
- <gwt.ant dir="i18n" />
- </target>
+ <target name="i18n" description="Build i18n">
+ <gwt.ant dir="i18n" />
+ </target>
- <target name="json" description="Build json">
- <gwt.ant dir="json" />
- </target>
+ <target name="json" description="Build json">
+ <gwt.ant dir="json" />
+ </target>
- <target name="mail" description="Build mail">
- <gwt.ant dir="mail" />
- </target>
+ <target name="mail" description="Build mail">
+ <gwt.ant dir="mail" />
+ </target>
- <target name="showcase" description="Build showcase">
- <gwt.ant dir="showcase" />
- </target>
+ <target name="showcase" description="Build showcase">
+ <gwt.ant dir="showcase" />
+ </target>
- <target name="simplexml" description="Build simplexml">
- <gwt.ant dir="simplexml" />
- </target>
+ <target name="simplexml" description="Build simplexml">
+ <gwt.ant dir="simplexml" />
+ </target>
- <target name="-do" description="Run all subprojects" >
- <antcall target="dynatable" />
- <antcall target="hello" />
- <antcall target="i18n" />
- <antcall target="json" />
- <antcall target="mail" />
- <antcall target="showcase" />
- <antcall target="simplexml" />
- </target>
+ <target name="-do" description="Run all subprojects" >
+ <antcall target="dynatable" />
+ <antcall target="hello" />
+ <antcall target="i18n" />
+ <antcall target="json" />
+ <antcall target="mail" />
+ <antcall target="showcase" />
+ <antcall target="simplexml" />
+ </target>
- <target name="build" description="Builds GWT">
- <gwt.timer name="all">
- <antcall target="-do">
- <param name="target" value="build" />
- </antcall>
- </gwt.timer>
- <length property="gwt.sample.length">
- <fileset dir="${gwt.build.out}/samples">
- <include name="**/www/com*/**"/>
- </fileset>
- </length>
- <echo message="compiled size of all samples is ${gwt.sample.length} bytes."/>
- </target>
+ <target name="build" description="Builds GWT">
+ <gwt.timer name="all">
+ <antcall target="-do">
+ <param name="target" value="build" />
+ </antcall>
+ </gwt.timer>
+ <length property="gwt.sample.length">
+ <fileset dir="${gwt.build.out}/samples">
+ <include name="**/www/com*/**"/>
+ </fileset>
+ </length>
+ <echo message="compiled size of all samples is ${gwt.sample.length} bytes."/>
+ </target>
- <target name="checkstyle" description="Static analysis of GWT source">
- <antcall target="-do">
- <param name="target" value="checkstyle" />
- </antcall>
- </target>
+ <target name="checkstyle" description="Static analysis of GWT source">
+ <antcall target="-do">
+ <param name="target" value="checkstyle" />
+ </antcall>
+ </target>
- <target name="test" description="Test GWT">
- <antcall target="-do">
- <param name="target" value="test" />
- </antcall>
- </target>
+ <target name="test" description="Test GWT">
+ <antcall target="-do">
+ <param name="target" value="test" />
+ </antcall>
+ </target>
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${project.build}" />
- <delete dir="${gwt.build.out}/samples-scripts" />
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete dir="${project.build}" />
+ <delete dir="${gwt.build.out}/samples-scripts" />
+ </target>
</project>
diff --git a/samples/common.ant.xml b/samples/common.ant.xml
index 119dbf6..12df2bc 100755
--- a/samples/common.ant.xml
+++ b/samples/common.ant.xml
@@ -1,109 +1,109 @@
<project name="samples-common">
- <property name="gwt.root" location="../.." />
- <property name="project.tail" value="samples/${sample.root}" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location="../.." />
+ <property name="project.tail" value="samples/${sample.root}" />
+ <import file="${gwt.root}/common.ant.xml" />
- <property name="sample.package" value="${sample.root}" />
- <property name="sample.main" value="${sample.module}" />
+ <property name="sample.package" value="${sample.root}" />
+ <property name="sample.main" value="${sample.module}" />
- <property.ensure name="gwt.user.jar" location="${gwt.build.lib}/gwt-user.jar" />
- <!-- Platform shouldn't matter here, just picking one -->
- <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-linux.jar" />
+ <property.ensure name="gwt.user.jar" location="${gwt.build.lib}/gwt-user.jar" />
+ <!-- Platform shouldn't matter here, just picking one -->
+ <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-linux.jar" />
- <!-- Mirror directory for scripts; makes building distro easier -->
- <property name="samples.scripts" value="${gwt.build.out}/samples-scripts" />
- <!-- Use the uppercase name rather than the lowercase name -->
- <property name="sample.build" value="${gwt.build.out}/samples/${sample.main}" />
+ <!-- Mirror directory for scripts; makes building distro easier -->
+ <property name="samples.scripts" value="${gwt.build.out}/samples-scripts" />
+ <!-- Use the uppercase name rather than the lowercase name -->
+ <property name="sample.build" value="${gwt.build.out}/samples/${sample.main}" />
- <target name="source" description="Copy source to the output folder">
- <mkdir dir="${sample.build}/src" />
- <copy todir="${sample.build}/src">
- <fileset dir="src" />
- </copy>
- </target>
+ <target name="source" description="Copy source to the output folder">
+ <mkdir dir="${sample.build}/src" />
+ <copy todir="${sample.build}/src">
+ <fileset dir="src" />
+ </copy>
+ </target>
- <target name="compile" description="Compile all java files">
- <mkdir dir="${sample.build}/bin" />
- <gwt.javac destdir="${sample.build}/bin">
- <classpath>
- <pathelement location="${gwt.user.jar}" />
- <pathelement location="${gwt.dev.jar}" />
- </classpath>
- </gwt.javac>
- </target>
+ <target name="compile" description="Compile all java files">
+ <mkdir dir="${sample.build}/bin" />
+ <gwt.javac destdir="${sample.build}/bin">
+ <classpath>
+ <pathelement location="${gwt.user.jar}" />
+ <pathelement location="${gwt.dev.jar}" />
+ </classpath>
+ </gwt.javac>
+ </target>
- <target name="gwtc" description="Compile to JavaScript">
- <outofdate>
- <sourcefiles>
- <fileset dir="src" />
- <fileset dir="${sample.build}/bin" />
- <fileset file="${gwt.user.jar}" />
- <fileset file="${gwt.dev.jar}" />
- </sourcefiles>
- <targetfiles path="${sample.build}/www/com.google.gwt.sample.${sample.package}.${sample.module}/com.google.gwt.sample.${sample.package}.${sample.module}.nocache.js" />
- <sequential>
- <mkdir dir="${sample.build}/www" />
- <gwt.timer name="${sample.main}">
- <java dir="${sample.build}" classname="com.google.gwt.dev.GWTCompiler" classpath="src:${sample.build}/bin:${gwt.user.jar}:${gwt.dev.jar}" fork="yes" failonerror="true">
- <jvmarg value="-Xmx256M"/>
- <arg value="-out" />
- <arg file="${sample.build}/www" />
- <arg value="com.google.gwt.sample.${sample.package}.${sample.module}" />
- </java>
- </gwt.timer>
- <length property="sample.size">
- <fileset dir="${sample.build}/www/com.google.gwt.sample.${sample.package}.${sample.module}"/>
- </length>
- <echo message="output size for ${sample.main} is ${sample.size} bytes"/>
- </sequential>
- </outofdate>
- </target>
+ <target name="gwtc" description="Compile to JavaScript">
+ <outofdate>
+ <sourcefiles>
+ <fileset dir="src" />
+ <fileset dir="${sample.build}/bin" />
+ <fileset file="${gwt.user.jar}" />
+ <fileset file="${gwt.dev.jar}" />
+ </sourcefiles>
+ <targetfiles path="${sample.build}/www/com.google.gwt.sample.${sample.package}.${sample.module}/com.google.gwt.sample.${sample.package}.${sample.module}.nocache.js" />
+ <sequential>
+ <mkdir dir="${sample.build}/www" />
+ <gwt.timer name="${sample.main}">
+ <java dir="${sample.build}" classname="com.google.gwt.dev.GWTCompiler" classpath="src:${sample.build}/bin:${gwt.user.jar}:${gwt.dev.jar}" fork="yes" failonerror="true">
+ <jvmarg value="-Xmx256M"/>
+ <arg value="-out" />
+ <arg file="${sample.build}/www" />
+ <arg value="com.google.gwt.sample.${sample.package}.${sample.module}" />
+ </java>
+ </gwt.timer>
+ <length property="sample.size">
+ <fileset dir="${sample.build}/www/com.google.gwt.sample.${sample.package}.${sample.module}"/>
+ </length>
+ <echo message="output size for ${sample.main} is ${sample.size} bytes"/>
+ </sequential>
+ </outofdate>
+ </target>
- <macrodef name="applicationCreator">
- <attribute name="platform" />
- <attribute name="extension" default="" />
- <sequential>
- <outofdate>
- <sourcefiles />
- <targetfiles>
- <pathelement location="${samples.scripts}/@{platform}/${sample.main}/${sample.main}-compile@{extension}" />
- <pathelement location="${samples.scripts}/@{platform}/${sample.main}/${sample.main}-shell@{extension}" />
- </targetfiles>
- <sequential>
- <mkdir dir="${samples.scripts}/@{platform}/${sample.main}" />
- <java classname="com.google.gwt.user.tools.ApplicationCreator" 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-dev-@{platform}.jar" />
- <arg value="-ignore" />
- <arg value="-out" />
- <arg file="${samples.scripts}/@{platform}/${sample.main}" />
- <arg value="com.google.gwt.sample.${sample.package}.client.${sample.main}" />
- </java>
- </sequential>
- </outofdate>
- </sequential>
- </macrodef>
+ <macrodef name="applicationCreator">
+ <attribute name="platform" />
+ <attribute name="extension" default="" />
+ <sequential>
+ <outofdate>
+ <sourcefiles />
+ <targetfiles>
+ <pathelement location="${samples.scripts}/@{platform}/${sample.main}/${sample.main}-compile@{extension}" />
+ <pathelement location="${samples.scripts}/@{platform}/${sample.main}/${sample.main}-shell@{extension}" />
+ </targetfiles>
+ <sequential>
+ <mkdir dir="${samples.scripts}/@{platform}/${sample.main}" />
+ <java classname="com.google.gwt.user.tools.ApplicationCreator" 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-dev-@{platform}.jar" />
+ <arg value="-ignore" />
+ <arg value="-out" />
+ <arg file="${samples.scripts}/@{platform}/${sample.main}" />
+ <arg value="com.google.gwt.sample.${sample.package}.client.${sample.main}" />
+ </java>
+ </sequential>
+ </outofdate>
+ </sequential>
+ </macrodef>
- <target name="scripts" description="Create launch scripts">
- <applicationCreator platform="linux" />
- <applicationCreator platform="windows" extension=".cmd" />
- <applicationCreator platform="mac" />
- </target>
+ <target name="scripts" description="Create launch scripts">
+ <applicationCreator platform="linux" />
+ <applicationCreator platform="windows" extension=".cmd" />
+ <applicationCreator platform="mac" />
+ </target>
- <target name="build" depends="source, compile, gwtc, scripts" description="Build and package this project" />
+ <target name="build" depends="source, compile, gwtc, scripts" description="Build and package this project" />
- <target name="checkstyle" description="Static analysis of source">
- <gwt.checkstyle>
- <fileset dir="src" />
- </gwt.checkstyle>
- </target>
+ <target name="checkstyle" description="Static analysis of source">
+ <gwt.checkstyle>
+ <fileset dir="src" />
+ </gwt.checkstyle>
+ </target>
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${sample.build}" />
- <delete includeemptydirs="true">
- <fileset dir="${samples.scripts}">
- <include name="*/${sample.main}/**" />
- </fileset>
- </delete>
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete dir="${sample.build}" />
+ <delete includeemptydirs="true">
+ <fileset dir="${samples.scripts}">
+ <include name="*/${sample.main}/**" />
+ </fileset>
+ </delete>
+ </target>
</project>
diff --git a/samples/dynatable/build.xml b/samples/dynatable/build.xml
index 436aa88..00c96d6 100755
--- a/samples/dynatable/build.xml
+++ b/samples/dynatable/build.xml
@@ -1,5 +1,5 @@
<project name="dynatable" default="build" basedir=".">
- <property name="sample.root" value="dynatable" />
- <property name="sample.module" value="DynaTable" />
- <import file="../common.ant.xml" />
+ <property name="sample.root" value="dynatable" />
+ <property name="sample.module" value="DynaTable" />
+ <import file="../common.ant.xml" />
</project>
diff --git a/samples/hello/build.xml b/samples/hello/build.xml
index 5d6836c..1a30f1f 100755
--- a/samples/hello/build.xml
+++ b/samples/hello/build.xml
@@ -1,5 +1,5 @@
<project name="hello" default="build" basedir=".">
- <property name="sample.root" value="hello" />
- <property name="sample.module" value="Hello" />
- <import file="../common.ant.xml" />
+ <property name="sample.root" value="hello" />
+ <property name="sample.module" value="Hello" />
+ <import file="../common.ant.xml" />
</project>
diff --git a/samples/i18n/build.xml b/samples/i18n/build.xml
index 5e28f84..f2b7a18 100755
--- a/samples/i18n/build.xml
+++ b/samples/i18n/build.xml
@@ -1,5 +1,5 @@
<project name="i18n" default="build" basedir=".">
- <property name="sample.root" value="i18n" />
- <property name="sample.module" value="I18N" />
- <import file="../common.ant.xml" />
+ <property name="sample.root" value="i18n" />
+ <property name="sample.module" value="I18N" />
+ <import file="../common.ant.xml" />
</project>
diff --git a/samples/json/build.xml b/samples/json/build.xml
index feb838f..b0410e5 100755
--- a/samples/json/build.xml
+++ b/samples/json/build.xml
@@ -1,5 +1,5 @@
<project name="json" default="build" basedir=".">
- <property name="sample.root" value="json" />
- <property name="sample.module" value="JSON" />
- <import file="../common.ant.xml" />
+ <property name="sample.root" value="json" />
+ <property name="sample.module" value="JSON" />
+ <import file="../common.ant.xml" />
</project>
diff --git a/samples/mail/build.xml b/samples/mail/build.xml
index f95fe01..e850baa 100755
--- a/samples/mail/build.xml
+++ b/samples/mail/build.xml
@@ -1,5 +1,5 @@
<project name="mail" default="build" basedir=".">
- <property name="sample.root" value="mail" />
- <property name="sample.module" value="Mail" />
- <import file="../common.ant.xml" />
+ <property name="sample.root" value="mail" />
+ <property name="sample.module" value="Mail" />
+ <import file="../common.ant.xml" />
</project>
diff --git a/samples/showcase/build.xml b/samples/showcase/build.xml
index f733288..720f85d 100755
--- a/samples/showcase/build.xml
+++ b/samples/showcase/build.xml
@@ -1,5 +1,5 @@
<project name="showcase" default="build" basedir=".">
- <property name="sample.root" value="showcase" />
- <property name="sample.module" value="Showcase" />
- <import file="../common.ant.xml" />
+ <property name="sample.root" value="showcase" />
+ <property name="sample.module" value="Showcase" />
+ <import file="../common.ant.xml" />
</project>
diff --git a/samples/simplerpc/build.xml b/samples/simplerpc/build.xml
index f35f65e..1d2a497 100644
--- a/samples/simplerpc/build.xml
+++ b/samples/simplerpc/build.xml
@@ -1,5 +1,5 @@
<project name="dynatable" default="build" basedir=".">
- <property name="sample.root" value="simplercp" />
- <property name="sample.module" value="SimpleRPC" />
- <import file="../common.ant.xml" />
+ <property name="sample.root" value="simplercp" />
+ <property name="sample.module" value="SimpleRPC" />
+ <import file="../common.ant.xml" />
</project>
diff --git a/samples/simplexml/build.xml b/samples/simplexml/build.xml
index 1d915f2..38d3455 100755
--- a/samples/simplexml/build.xml
+++ b/samples/simplexml/build.xml
@@ -1,5 +1,5 @@
<project name="simplexml" default="build" basedir=".">
- <property name="sample.root" value="simplexml" />
- <property name="sample.module" value="SimpleXML" />
- <import file="../common.ant.xml" />
+ <property name="sample.root" value="simplexml" />
+ <property name="sample.module" value="SimpleXML" />
+ <import file="../common.ant.xml" />
</project>
diff --git a/servlet/build.xml b/servlet/build.xml
index 2b8cb39..ebbfa40 100755
--- a/servlet/build.xml
+++ b/servlet/build.xml
@@ -1,29 +1,29 @@
<project name="servlet" default="build" basedir=".">
- <property name="gwt.root" location=".." />
- <property name="project.tail" value="servlet" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location=".." />
+ <property name="project.tail" value="servlet" />
+ <import file="${gwt.root}/common.ant.xml" />
- <property.ensure name="gwt.user.root" location="${gwt.root}/user" />
- <property.ensure name="gwt.user.build" location="${gwt.build.out}/user" />
- <property.ensure name="gwt.user.bin" location="${gwt.user.build}/bin" />
+ <property.ensure name="gwt.user.root" location="${gwt.root}/user" />
+ <property.ensure name="gwt.user.build" location="${gwt.build.out}/user" />
+ <property.ensure name="gwt.user.bin" location="${gwt.user.build}/bin" />
- <target name="build" description="Packages this project into a jar">
- <mkdir dir="${gwt.build.lib}" />
- <gwt.jar>
- <fileset dir="${gwt.user.bin}">
- <exclude name="**/rebind/**" />
- <exclude name="**/tools/**" />
- <exclude name="com/google/gwt/json/**" />
- <exclude name="com/google/gwt/junit/*" />
- <exclude name="com/google/gwt/junit/client/GWTTestCase.*" />
- <exclude name="com/google/gwt/junit/remote/**" />
- <exclude name="com/google/gwt/junit/server/**" />
- <exclude name="com/google/gwt/benchmarks/*" />
- </fileset>
- </gwt.jar>
- </target>
+ <target name="build" description="Packages this project into a jar">
+ <mkdir dir="${gwt.build.lib}" />
+ <gwt.jar>
+ <fileset dir="${gwt.user.bin}">
+ <exclude name="**/rebind/**" />
+ <exclude name="**/tools/**" />
+ <exclude name="com/google/gwt/json/**" />
+ <exclude name="com/google/gwt/junit/*" />
+ <exclude name="com/google/gwt/junit/client/GWTTestCase.*" />
+ <exclude name="com/google/gwt/junit/remote/**" />
+ <exclude name="com/google/gwt/junit/server/**" />
+ <exclude name="com/google/gwt/benchmarks/*" />
+ </fileset>
+ </gwt.jar>
+ </target>
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete file="${project.lib}" />
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete file="${project.lib}" />
+ </target>
</project>
diff --git a/tools/api-checker/build.xml b/tools/api-checker/build.xml
index 9e2691d..3259342 100755
--- a/tools/api-checker/build.xml
+++ b/tools/api-checker/build.xml
@@ -1,86 +1,86 @@
<project name="api-checker" default="build" basedir=".">
<property name="gwt.root" location="../.." />
- <property name="project.tail" value="tools/api-checker" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="project.tail" value="tools/api-checker" />
+ <import file="${gwt.root}/common.ant.xml" />
<property name="tools.build" value="${gwt.build.out}/${project.tail}" />
- <!-- Platform shouldn't matter here, just picking one -->
- <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-linux.jar" />
- <property.ensure name="gwt.user.jar" location="${gwt.build.lib}/gwt-user.jar" />
+ <!-- Platform shouldn't matter here, just picking one -->
+ <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-linux.jar" />
+ <property.ensure name="gwt.user.jar" location="${gwt.build.lib}/gwt-user.jar" />
- <target name="compile" description="Compile all class files">
- <mkdir dir="${javac.out}" />
- <gwt.javac>
- <classpath>
- <pathelement location="${gwt.dev.jar}" />
- <pathelement location="${gwt.user.jar}" />
- </classpath>
- </gwt.javac>
- </target>
+ <target name="compile" description="Compile all class files">
+ <mkdir dir="${javac.out}" />
+ <gwt.javac>
+ <classpath>
+ <pathelement location="${gwt.dev.jar}" />
+ <pathelement location="${gwt.user.jar}" />
+ </classpath>
+ </gwt.javac>
+ </target>
- <target name="compile.tests" description="Compiles the test code for this project">
- <mkdir dir="${javac.junit.out}" />
- <gwt.javac srcdir="test" destdir="${javac.junit.out}">
- <classpath>
- <pathelement location="${javac.out}" />
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- <pathelement location="${gwt.dev.staging.jar}" />
- <pathelement location="${gwt.dev.jar}" />
- <pathelement location="${gwt.user.jar}" />
- </classpath>
- </gwt.javac>
- </target>
+ <target name="compile.tests" description="Compiles the test code for this project">
+ <mkdir dir="${javac.junit.out}" />
+ <gwt.javac srcdir="test" destdir="${javac.junit.out}">
+ <classpath>
+ <pathelement location="${javac.out}" />
+ <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ <pathelement location="${gwt.dev.staging.jar}" />
+ <pathelement location="${gwt.dev.jar}" />
+ <pathelement location="${gwt.user.jar}" />
+ </classpath>
+ </gwt.javac>
+ </target>
<target name="build" depends="compile" description="Build and package this project">
- <mkdir dir="${gwt.build.lib}" />
+ <mkdir dir="${gwt.build.lib}" />
- <gwt.jar>
- <fileset dir="src" excludes="**/package.html" />
- <fileset dir="${javac.out}" />
- </gwt.jar>
- </target>
+ <gwt.jar>
+ <fileset dir="src" excludes="**/package.html" />
+ <fileset dir="${javac.out}" />
+ </gwt.jar>
+ </target>
- <target name="test" depends="build, compile.tests" description="Run unit tests for this project.">
- <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
- <classpath>
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- <pathelement location="${gwt.tools.antlib}/ant-junit-1.6.5.jar" />
- </classpath>
- </taskdef>
-
- <echo message="Writing test results to ${junit.out}/reports" />
- <mkdir dir="${junit.out}/reports" />
-
- <junit dir="${junit.out}" fork="yes" printsummary="yes" haltonfailure="true">
- <classpath>
- <pathelement location="test" />
- <pathelement location="${gwt.build.out}/dev/core/bin"/>
- <pathelement location="${gwt.build.out}/tools/api-checker/bin"/>
- <pathelement location="${gwt.tools.lib}/eclipse/jdt-3.3.1.jar"/>
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- <pathelement location="${javac.junit.out}" />
- </classpath>
-
- <formatter type="plain" />
- <formatter type="xml" />
- <batchtest todir="${junit.out}/reports">
+ <target name="test" depends="build, compile.tests" description="Run unit tests for this project.">
+ <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
+ <classpath>
+ <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ <pathelement location="${gwt.tools.antlib}/ant-junit-1.6.5.jar" />
+ </classpath>
+ </taskdef>
+
+ <echo message="Writing test results to ${junit.out}/reports" />
+ <mkdir dir="${junit.out}/reports" />
+
+ <junit dir="${junit.out}" fork="yes" printsummary="yes" haltonfailure="true">
+ <classpath>
+ <pathelement location="test" />
+ <pathelement location="${gwt.build.out}/dev/core/bin"/>
+ <pathelement location="${gwt.build.out}/tools/api-checker/bin"/>
+ <pathelement location="${gwt.tools.lib}/eclipse/jdt-3.3.1.jar"/>
+ <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ <pathelement location="${javac.junit.out}" />
+ </classpath>
+
+ <formatter type="plain" />
+ <formatter type="xml" />
+ <batchtest todir="${junit.out}/reports">
<fileset dir="${javac.junit.out}"
includes="**/*Test.class"/>
- </batchtest>
- </junit>
- </target>
+ </batchtest>
+ </junit>
+ </target>
- <target name="checkstyle" description="Static analysis of source">
- <gwt.checkstyle>
- <fileset dir="src"/>
- </gwt.checkstyle>
- </target>
+ <target name="checkstyle" description="Static analysis of source">
+ <gwt.checkstyle>
+ <fileset dir="src"/>
+ </gwt.checkstyle>
+ </target>
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${project.build}" />
- <delete file="${project.lib}" />
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete dir="${project.build}" />
+ <delete file="${project.lib}" />
+ </target>
</project>
diff --git a/tools/benchmark-viewer/build.xml b/tools/benchmark-viewer/build.xml
index 3fa38f6..398350f 100755
--- a/tools/benchmark-viewer/build.xml
+++ b/tools/benchmark-viewer/build.xml
@@ -11,127 +11,127 @@
-->
<property name="gwt.root" location="../.." />
- <property name="project.tail" value="tools/benchmark-viewer" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="project.tail" value="tools/benchmark-viewer" />
+ <import file="${gwt.root}/common.ant.xml" />
<property name="tools.build" value="${gwt.build.out}/${project.tail}" />
<property name="tools.module" value="com.google.gwt.benchmarks.viewer.ReportViewer" />
<property name="tools.module.path" value="com/google/gwt/benchmarks/viewer/public" />
- <!--
- Default hosted mode test cases
- -->
- <fileset id="default.hosted.tests" dir="${javac.junit.out}">
- <include name="**/*Test.class" />
- </fileset>
+ <!--
+ Default hosted mode test cases
+ -->
+ <fileset id="default.hosted.tests" dir="${javac.junit.out}">
+ <include name="**/*Test.class" />
+ </fileset>
- <!--
- Default web mode test cases
- -->
- <fileset id="default.web.tests" dir="${javac.junit.out}">
- <include name="**/*Test.class" />
- </fileset>
+ <!--
+ Default web mode test cases
+ -->
+ <fileset id="default.web.tests" dir="${javac.junit.out}">
+ <include name="**/*Test.class" />
+ </fileset>
- <!-- Platform shouldn't matter here, just picking one -->
- <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-linux.jar" />
- <property.ensure name="gwt.user.jar" location="${gwt.build.lib}/gwt-user.jar" />
+ <!-- Platform shouldn't matter here, just picking one -->
+ <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-linux.jar" />
+ <property.ensure name="gwt.user.jar" location="${gwt.build.lib}/gwt-user.jar" />
- <target name="compile" description="Compile all class files">
- <mkdir dir="${javac.out}" />
- <gwt.javac>
- <classpath>
- <pathelement location="${gwt.tools.lib}/tomcat/servlet-api-2.4.jar" />
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- <pathelement location="${gwt.tools.lib}/jfreechart/jfreechart-1.0.3.jar" />
- <pathelement location="${gwt.tools.lib}/jfreechart/jcommon-1.0.6.jar" />
- <pathelement location="${gwt.dev.jar}" />
- <pathelement location="${gwt.user.jar}" />
- </classpath>
- </gwt.javac>
- </target>
+ <target name="compile" description="Compile all class files">
+ <mkdir dir="${javac.out}" />
+ <gwt.javac>
+ <classpath>
+ <pathelement location="${gwt.tools.lib}/tomcat/servlet-api-2.4.jar" />
+ <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ <pathelement location="${gwt.tools.lib}/jfreechart/jfreechart-1.0.3.jar" />
+ <pathelement location="${gwt.tools.lib}/jfreechart/jcommon-1.0.6.jar" />
+ <pathelement location="${gwt.dev.jar}" />
+ <pathelement location="${gwt.user.jar}" />
+ </classpath>
+ </gwt.javac>
+ </target>
- <target name="compile.tests" description="Compiles the test code for this project">
- <mkdir dir="${javac.junit.out}" />
- <gwt.javac srcdir="test" destdir="${javac.junit.out}">
- <classpath>
- <pathelement location="${javac.out}" />
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- <pathelement location="${gwt.dev.staging.jar}" />
- </classpath>
- </gwt.javac>
- </target>
+ <target name="compile.tests" description="Compiles the test code for this project">
+ <mkdir dir="${javac.junit.out}" />
+ <gwt.javac srcdir="test" destdir="${javac.junit.out}">
+ <classpath>
+ <pathelement location="${javac.out}" />
+ <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ <pathelement location="${gwt.dev.staging.jar}" />
+ </classpath>
+ </gwt.javac>
+ </target>
- <target name="build" depends="compile, gwtc" description="Build and package this project">
- <mkdir dir="${gwt.build.lib}" />
+ <target name="build" depends="compile, gwtc" description="Build and package this project">
+ <mkdir dir="${gwt.build.lib}" />
<copy todir="${tools.build}/www-new/${tools.module.path}" flatten="true" >
<fileset dir="${tools.build}/www/${tools.module}" />
</copy>
- <gwt.jar>
- <fileset dir="src" excludes="**/package.html" />
- <fileset dir="${javac.out}" />
+ <gwt.jar>
+ <fileset dir="src" excludes="**/package.html" />
+ <fileset dir="${javac.out}" />
<fileset dir="${tools.build}/www-new" />
<zipfileset src="${gwt.tools.lib}/jfreechart/itext-1.4.6.jar"/>
<zipfileset src="${gwt.tools.lib}/jfreechart/jcommon-1.0.6.jar"/>
<zipfileset src="${gwt.tools.lib}/jfreechart/jfreechart-1.0.3.jar"/>
- </gwt.jar>
- </target>
+ </gwt.jar>
+ </target>
- <target name="checkstyle" description="Static analysis of source">
- <gwt.checkstyle>
- <fileset dir="src"/>
- </gwt.checkstyle>
- </target>
+ <target name="checkstyle" description="Static analysis of source">
+ <gwt.checkstyle>
+ <fileset dir="src"/>
+ </gwt.checkstyle>
+ </target>
- <target name="gwtc" description="Compile to JavaScript">
- <mkdir dir="${tools.build}/www" />
- <outofdate>
- <sourcefiles>
- <fileset dir="src" />
- <fileset file="${gwt.user.jar}" />
- <fileset file="${gwt.dev.jar}" />
- </sourcefiles>
- <targetfiles>
- <fileset dir="${tools.build}/www" />
- </targetfiles>
- <sequential>
- <java dir="${tools.build}" classname="com.google.gwt.dev.GWTCompiler" classpath="src:${gwt.user.jar}:${gwt.dev.jar}" fork="yes" failonerror="true">
- <jvmarg value="-Xmx256M"/>
- <arg value="-out" />
- <arg file="${tools.build}/www" />
- <arg value="${tools.module}" />
- </java>
- </sequential>
- </outofdate>
- </target>
+ <target name="gwtc" description="Compile to JavaScript">
+ <mkdir dir="${tools.build}/www" />
+ <outofdate>
+ <sourcefiles>
+ <fileset dir="src" />
+ <fileset file="${gwt.user.jar}" />
+ <fileset file="${gwt.dev.jar}" />
+ </sourcefiles>
+ <targetfiles>
+ <fileset dir="${tools.build}/www" />
+ </targetfiles>
+ <sequential>
+ <java dir="${tools.build}" classname="com.google.gwt.dev.GWTCompiler" classpath="src:${gwt.user.jar}:${gwt.dev.jar}" fork="yes" failonerror="true">
+ <jvmarg value="-Xmx256M"/>
+ <arg value="-out" />
+ <arg file="${tools.build}/www" />
+ <arg value="${tools.module}" />
+ </java>
+ </sequential>
+ </outofdate>
+ </target>
- <target name="remoteweb-test" description="Run a remoteweb test at the given host and path">
- <echo message="Performing remote browser testing at rmi://${gwt.remote.browser}" />
- <gwt.junit test.args="-out www -web -remoteweb rmi://${gwt.remote.browser}" test.out="${junit.out}/${gwt.remote.browser}" test.cases="default.web.tests" />
- </target>
+ <target name="remoteweb-test" description="Run a remoteweb test at the given host and path">
+ <echo message="Performing remote browser testing at rmi://${gwt.remote.browser}" />
+ <gwt.junit test.args="-out www -web -remoteweb rmi://${gwt.remote.browser}" test.out="${junit.out}/${gwt.remote.browser}" test.cases="default.web.tests" />
+ </target>
- <target name="test" depends="compile, compile.tests" description="Run hosted-mode, web-mode and remoteweb tests for this project.">
- <property.ensure name="distro.built" location="${gwt.dev.staging.jar}" message="GWT must be built before performing any tests. This can be fixed by running ant in the ${gwt.root} directory." />
+ <target name="test" depends="compile, compile.tests" description="Run hosted-mode, web-mode and remoteweb tests for this project.">
+ <property.ensure name="distro.built" location="${gwt.dev.staging.jar}" message="GWT must be built before performing any tests. This can be fixed by running ant in the ${gwt.root} directory." />
- <!--
- Run hosted and web mode tests for the platform on which this build
- is executing
- -->
- <parallel threadcount="1">
- <gwt.junit test.out="${junit.out}/${build.host.platform}-hosted-mode" test.cases="default.hosted.tests" />
+ <!--
+ Run hosted and web mode tests for the platform on which this build
+ is executing
+ -->
+ <parallel threadcount="1">
+ <gwt.junit test.out="${junit.out}/${build.host.platform}-hosted-mode" test.cases="default.hosted.tests" />
- <gwt.junit test.args="-out www -web" test.out="${junit.out}/${build.host.platform}-web-mode" test.cases="default.web.tests" />
+ <gwt.junit test.args="-out www -web" test.out="${junit.out}/${build.host.platform}-web-mode" test.cases="default.web.tests" />
- <!--
- Run remote browser testing for the comma delimited list of remote browsers
- -->
- <foreach list="${gwt.remote.browsers}" delimiter="," parallel="true" maxThreads="1" target="remoteweb-test" param="gwt.remote.browser" />
- </parallel>
- </target>
+ <!--
+ Run remote browser testing for the comma delimited list of remote browsers
+ -->
+ <foreach list="${gwt.remote.browsers}" delimiter="," parallel="true" maxThreads="1" target="remoteweb-test" param="gwt.remote.browser" />
+ </parallel>
+ </target>
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${project.build}" />
- <delete file="${project.lib}" />
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete dir="${project.build}" />
+ <delete file="${project.lib}" />
+ </target>
</project>
diff --git a/tools/build.xml b/tools/build.xml
index f271a9e..3c89a8a 100755
--- a/tools/build.xml
+++ b/tools/build.xml
@@ -1,7 +1,7 @@
<project name="tools" default="build" basedir=".">
- <property name="gwt.root" location=".." />
- <property name="project.tail" value="tools" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location=".." />
+ <property name="project.tail" value="tools" />
+ <import file="${gwt.root}/common.ant.xml" />
<!-- "build" is the default when subprojects are directly targetted -->
<property name="target" value="build" />
@@ -14,24 +14,24 @@
<gwt.ant dir="api-checker" />
</target>
- <target name="-do" depends="benchmark-viewer,api-checker" description="Run all subfolders" />
+ <target name="-do" depends="benchmark-viewer,api-checker" description="Run all subfolders" />
- <target name="build" description="Build each subfolder">
- <antcall target="-do">
- <param name="target" value="build" />
- </antcall>
- </target>
+ <target name="build" description="Build each subfolder">
+ <antcall target="-do">
+ <param name="target" value="build" />
+ </antcall>
+ </target>
- <target name="checkstyle" description="Static analysis of source for each subfolder">
- <antcall target="-do">
- <param name="target" value="checkstyle" />
- </antcall>
- </target>
+ <target name="checkstyle" description="Static analysis of source for each subfolder">
+ <antcall target="-do">
+ <param name="target" value="checkstyle" />
+ </antcall>
+ </target>
- <target name="test" depends="build" description="Test each subfolder">
- <antcall target="-do">
- <param name="target" value="test" />
- </antcall>
- </target>
+ <target name="test" depends="build" description="Test each subfolder">
+ <antcall target="-do">
+ <param name="target" value="test" />
+ </antcall>
+ </target>
</project>
diff --git a/user/build.xml b/user/build.xml
index 6e653e3..3cb3045 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -1,136 +1,136 @@
<project name="user" default="build" basedir=".">
- <property name="gwt.root" location=".." />
- <property name="project.tail" value="user" />
- <property name="test.args" value="" />
- <import file="${gwt.root}/common.ant.xml" />
+ <property name="gwt.root" location=".." />
+ <property name="project.tail" value="user" />
+ <property name="test.args" value="" />
+ <import file="${gwt.root}/common.ant.xml" />
- <!--
- Default hosted mode test cases
- -->
- <fileset id="default.hosted.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.includes}" />
+ <!--
+ Default hosted mode test cases
+ -->
+ <fileset id="default.hosted.tests" dir="${javac.junit.out}"
+ includes="${gwt.junit.testcase.includes}" />
- <!--
- Default web mode test cases
- -->
- <fileset id="default.web.tests" dir="${javac.junit.out}"
- includes="${gwt.junit.testcase.includes}" />
+ <!--
+ Default web mode test cases
+ -->
+ <fileset id="default.web.tests" dir="${javac.junit.out}"
+ includes="${gwt.junit.testcase.includes}" />
- <!-- Platform shouldn't matter here, just picking one -->
- <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-linux.jar" />
+ <!-- Platform shouldn't matter here, just picking one -->
+ <property.ensure name="gwt.dev.jar" location="${gwt.build.lib}/gwt-dev-linux.jar" />
- <target name="compile" description="Compile all class files">
- <mkdir dir="${javac.out}" />
- <gwt.javac>
- <classpath>
- <pathelement location="${gwt.tools.lib}/tomcat/servlet-api-2.4.jar" />
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- <pathelement location="${gwt.tools.lib}/jfreechart/jfreechart-1.0.3.jar" />
- <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
- <pathelement location="${gwt.dev.jar}" />
- </classpath>
- </gwt.javac>
+ <target name="compile" description="Compile all class files">
+ <mkdir dir="${javac.out}" />
+ <gwt.javac>
+ <classpath>
+ <pathelement location="${gwt.tools.lib}/tomcat/servlet-api-2.4.jar" />
+ <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ <pathelement location="${gwt.tools.lib}/jfreechart/jfreechart-1.0.3.jar" />
+ <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
+ <pathelement location="${gwt.dev.jar}" />
+ </classpath>
+ </gwt.javac>
- <!-- Build the BrowserManagerServer_Stub to allow remote browser testing -->
- <rmic base="${javac.out}"
+ <!-- Build the BrowserManagerServer_Stub to allow remote browser testing -->
+ <rmic base="${javac.out}"
classname="com.google.gwt.junit.remote.BrowserManagerServer"
stubversion="1.2"/>
- </target>
+ </target>
- <!--
- Compile test code for dev/core to pick up TypeOracleTestUtils and others.
- -->
- <target name="compile.dev.core.tests" description="Compiles test dependencies in dev/core">
- <gwt.ant dir="../dev/core" target="compile.tests" />
- </target>
-
- <target name="compile.tests" depends="compile.dev.core.tests" description="Compiles the test code for this project">
- <mkdir dir="${javac.junit.out}" />
- <gwt.javac srcdir="test" excludes="com/google/gwt/langtest/**" destdir="${javac.junit.out}">
- <classpath>
- <pathelement location="${javac.out}" />
- <pathelement location="${gwt.build}/out/dev/core/bin-test" />
- <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
- <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
- <pathelement location="${gwt.dev.staging.jar}" />
- </classpath>
- </gwt.javac>
- </target>
+ <!--
+ Compile test code for dev/core to pick up TypeOracleTestUtils and others.
+ -->
+ <target name="compile.dev.core.tests" description="Compiles test dependencies in dev/core">
+ <gwt.ant dir="../dev/core" target="compile.tests" />
+ </target>
+
+ <target name="compile.tests" depends="compile.dev.core.tests" description="Compiles the test code for this project">
+ <mkdir dir="${javac.junit.out}" />
+ <gwt.javac srcdir="test" excludes="com/google/gwt/langtest/**" destdir="${javac.junit.out}">
+ <classpath>
+ <pathelement location="${javac.out}" />
+ <pathelement location="${gwt.build}/out/dev/core/bin-test" />
+ <pathelement location="${gwt.tools.lib}/junit/junit-3.8.1.jar" />
+ <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar" />
+ <pathelement location="${gwt.dev.staging.jar}" />
+ </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" excludes="**/package.html" />
- <fileset dir="super" excludes="**/package.html" />
- <fileset dir="${javac.out}" />
- <zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.4.jar" />
- </gwt.jar>
- </target>
+ <target name="build" depends="compile" description="Build and package this project">
+ <mkdir dir="${gwt.build.lib}" />
+ <gwt.jar>
+ <fileset dir="src" excludes="**/package.html" />
+ <fileset dir="super" excludes="**/package.html" />
+ <fileset dir="${javac.out}" />
+ <zipfileset src="${gwt.tools.lib}/tomcat/servlet-api-2.4.jar" />
+ </gwt.jar>
+ </target>
- <target name="checkstyle" description="Static analysis of source">
- <gwt.checkstyle>
- <fileset dir="src" />
- <fileset dir="super/com/google/gwt/emul" />
- <fileset dir="super/com/google/gwt/junit/translatable" />
- </gwt.checkstyle>
- </target>
+ <target name="checkstyle" description="Static analysis of source">
+ <gwt.checkstyle>
+ <fileset dir="src" />
+ <fileset dir="super/com/google/gwt/emul" />
+ <fileset dir="super/com/google/gwt/junit/translatable" />
+ </gwt.checkstyle>
+ </target>
- <target name="remoteweb-test" description="Run a remoteweb test at the given host and path" if="gwt.remote.browsers">
- <echo message="Performing remote browser testing at ${gwt.remote.browsers}" />
- <gwt.junit test.args="${test.args} -out www -remoteweb ${gwt.remote.browsers}" test.out="${junit.out}/remoteweb" test.cases="default.web.tests" >
- <extraclasspaths>
- <pathelement location="${gwt.build}/out/dev/core/bin-test" />
- </extraclasspaths>
- </gwt.junit>
- </target>
+ <target name="remoteweb-test" description="Run a remoteweb test at the given host and path" if="gwt.remote.browsers">
+ <echo message="Performing remote browser testing at ${gwt.remote.browsers}" />
+ <gwt.junit test.args="${test.args} -out www -remoteweb ${gwt.remote.browsers}" test.out="${junit.out}/remoteweb" test.cases="default.web.tests" >
+ <extraclasspaths>
+ <pathelement location="${gwt.build}/out/dev/core/bin-test" />
+ </extraclasspaths>
+ </gwt.junit>
+ </target>
- <target name="selenium-test" description="Run a remote test using Selenium RC test at the given host and path" if="gwt.selenium.hosts">
- <echo message="Performing remote browser testing using Selenium RC at ${gwt.selenium.hosts}" />
- <gwt.junit test.args="${test.args} -out www -selenium ${gwt.selenium.hosts}" test.out="${junit.out}/selenium" test.cases="default.web.tests" >
- <extraclasspaths>
- <pathelement location="${gwt.build}/out/dev/core/bin-test" />
- </extraclasspaths>
- </gwt.junit>
- </target>
+ <target name="selenium-test" description="Run a remote test using Selenium RC test at the given host and path" if="gwt.selenium.hosts">
+ <echo message="Performing remote browser testing using Selenium RC at ${gwt.selenium.hosts}" />
+ <gwt.junit test.args="${test.args} -out www -selenium ${gwt.selenium.hosts}" test.out="${junit.out}/selenium" test.cases="default.web.tests" >
+ <extraclasspaths>
+ <pathelement location="${gwt.build}/out/dev/core/bin-test" />
+ </extraclasspaths>
+ </gwt.junit>
+ </target>
- <target name="test.hosted" depends="compile, compile.tests" description="Run only hosted-mode tests for this project.">
- <gwt.junit test.args="${test.args}" test.out="${junit.out}/${build.host.platform}-hosted-mode" test.cases="default.hosted.tests" >
- <extraclasspaths>
- <pathelement location="${gwt.build}/out/dev/core/bin-test" />
- </extraclasspaths>
- </gwt.junit>
- </target>
+ <target name="test.hosted" depends="compile, compile.tests" description="Run only hosted-mode tests for this project.">
+ <gwt.junit test.args="${test.args}" test.out="${junit.out}/${build.host.platform}-hosted-mode" test.cases="default.hosted.tests" >
+ <extraclasspaths>
+ <pathelement location="${gwt.build}/out/dev/core/bin-test" />
+ </extraclasspaths>
+ </gwt.junit>
+ </target>
- <target name="test.web" depends="compile, compile.tests" description="Run only web-mode tests for this project.">
- <gwt.junit test.args="${test.args} -out www -web" test.out="${junit.out}/${build.host.platform}-web-mode" test.cases="default.web.tests" >
- <extraclasspaths>
- <pathelement location="${gwt.build}/out/dev/core/bin-test" />
- </extraclasspaths>
- </gwt.junit>
- </target>
+ <target name="test.web" depends="compile, compile.tests" description="Run only web-mode tests for this project.">
+ <gwt.junit test.args="${test.args} -out www -web" test.out="${junit.out}/${build.host.platform}-web-mode" test.cases="default.web.tests" >
+ <extraclasspaths>
+ <pathelement location="${gwt.build}/out/dev/core/bin-test" />
+ </extraclasspaths>
+ </gwt.junit>
+ </target>
- <target name="test" depends="compile, compile.tests" description="Run hosted-mode, web-mode, remoteweb, and selenium tests for this project.">
- <property.ensure name="distro.built" location="${gwt.dev.staging.jar}" message="GWT must be built before performing any tests. This can be fixed by running ant in the ${gwt.root} directory." />
+ <target name="test" depends="compile, compile.tests" description="Run hosted-mode, web-mode, remoteweb, and selenium tests for this project.">
+ <property.ensure name="distro.built" location="${gwt.dev.staging.jar}" message="GWT must be built before performing any tests. This can be fixed by running ant in the ${gwt.root} directory." />
- <!--
- Run hosted and web mode tests for the platform on which this build
- is executing
- -->
- <limit failonerror="true" hours="2">
- <parallel threadsPerProcessor="1">
- <!-- selenium-test is a no-op unless gwt.selenium.hosts is defined -->
- <antcall target="selenium-test"/>
- <!-- remoteweb-test is a no-op unless gwt.remote.browsers is defined -->
- <antcall target="remoteweb-test"/>
- <antcall target="test.hosted"/>
- <antcall target="test.web"/>
- </parallel>
- </limit>
- </target>
+ <!--
+ Run hosted and web mode tests for the platform on which this build
+ is executing
+ -->
+ <limit failonerror="true" hours="2">
+ <parallel threadsPerProcessor="1">
+ <!-- selenium-test is a no-op unless gwt.selenium.hosts is defined -->
+ <antcall target="selenium-test"/>
+ <!-- remoteweb-test is a no-op unless gwt.remote.browsers is defined -->
+ <antcall target="remoteweb-test"/>
+ <antcall target="test.hosted"/>
+ <antcall target="test.web"/>
+ </parallel>
+ </limit>
+ </target>
- <target name="clean" description="Cleans this project's intermediate and output files">
- <delete dir="${project.build}" />
- <delete file="${project.lib}" />
- </target>
+ <target name="clean" description="Cleans this project's intermediate and output files">
+ <delete dir="${project.build}" />
+ <delete file="${project.lib}" />
+ </target>
</project>
