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/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>
