Author: [email protected]
Date: Fri Jul 10 19:18:10 2009
New Revision: 5716
Modified:
trunk/build.xml
trunk/common.ant.xml
Log:
Ant changes to make top-level "test" also exercise checkstyle and
apicheck. This thus subsumes "prebuild", which people don't know to use
and is thus doomed to go away.
Review by: rjrjr
Modified: trunk/build.xml
==============================================================================
--- trunk/build.xml (original)
+++ trunk/build.xml Fri Jul 10 19:18:10 2009
@@ -118,7 +118,8 @@
<call-subproject subproject="samples" subtarget="checkstyle" />
</target>
- <target name="test" depends="dist-dev" description="[action] Runs all
the GWT tests">
+ <target name="test" depends="dist-dev,apicheck,checkstyle"
+ description="[action] Runs all the GWT tests, including
checkstyle and apicheck">
<call-subproject subproject="buildtools" subtarget="test" />
<call-subproject subproject="dev" subtarget="test" />
<call-subproject subproject="user" subtarget="test" />
@@ -130,7 +131,8 @@
<delete dir="${gwt.build}" />
</target>
- <target name ="presubmit" description="[action] Runs
checkstyle,apichecker, and all tests"
depends="dist-dev,apicheck-nobuild,checkstyle,test">
+ <target name ="presubmit" description="[action] Deprecated for test,
which now does checkstyle and apicheck"
+ depends="test">
</target>
<target name="apicheck-nobuild"
@@ -158,7 +160,7 @@
</java>
</target>
- <target name="apicheck" depends="build,apicheck-nobuild"
+ <target name="apicheck" depends="buildonly,tools,apicheck-nobuild"
description="[action] Builds GWT and checks API compatiblity to
prior release"/>
</project>
Modified: trunk/common.ant.xml
==============================================================================
--- trunk/common.ant.xml (original)
+++ trunk/common.ant.xml Fri Jul 10 19:18:10 2009
@@ -276,6 +276,7 @@
<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"
/>
+ <mkdir dir="@{outputdirectory}"/>
<checkstyle
config="${gwt.root}/eclipse/settings/code-style/gwt-checkstyle.xml"
maxErrors="0" failOnViolation="false"
failureProperty="gwt.checkstyle.failed">
<formatter type="xml"
toFile="@{outputdirectory}/checkstyle_log.xml"/>
<property key="checkstyle.header.file"
file="${gwt.root}/eclipse/settings/code-style/google.header" />
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
