Revision: 6284 Author: [email protected] Date: Fri Oct 2 07:37:34 2009 Log: Adding the suffix ".if.enabled" to emma ant targets to avoid confusion. The targets are noops if emma.enabled is not defined.
Patch by: jlabanca Review by: rjrjr http://code.google.com/p/google-web-toolkit/source/detail?r=6284 Modified: /trunk/build-tools/ant-gwt/build.xml /trunk/common.ant.xml /trunk/dev/core/build.xml /trunk/tools/api-checker/build.xml /trunk/user/build.xml ======================================= --- /trunk/build-tools/ant-gwt/build.xml Wed Aug 5 12:55:36 2009 +++ /trunk/build-tools/ant-gwt/build.xml Fri Oct 2 07:37:34 2009 @@ -15,7 +15,7 @@ </gwt.javac> </target> - <target name="compile.tests" depends="build, compile.emma" description="Compiles the test code for this project"> + <target name="compile.tests" depends="build, compile.emma.if.enabled" description="Compiles the test code for this project"> <mkdir dir="${javac.junit.out}" /> <gwt.javac srcdir="test" destdir="${javac.junit.out}"> <classpath> ======================================= --- /trunk/common.ant.xml Mon Sep 28 12:14:04 2009 +++ /trunk/common.ant.xml Fri Oct 2 07:37:34 2009 @@ -192,7 +192,7 @@ <echo message="Writing test results to @{test.reports} for @{test.cases}" /> <mkdir dir="@{test.reports}" /> - <antcall target="-create.emma.coverage"> + <antcall target="-create.emma.coverage.if.enabled"> <param name="test.emma.coverage" value="@{test.emma.coverage}"/> </antcall> <condition property="emma.lib" value="${emma.dir}/emma-2.0.5312-patched.jar" else=""> @@ -357,7 +357,7 @@ <taskdef resource="emma_ant.properties" classpathref="emma.taskdef.lib" /> - <target name="compile.emma" description="Instruments emma classes" unless="emma.compiled"> + <target name="compile.emma.if.enabled" description="Instruments emma classes" unless="emma.compiled"> <delete dir="${javac.emma.out}" /> <property name="emma.compiled" value="true" /> <antcall target="-compile.emma.if.enabled" /> @@ -376,7 +376,7 @@ </emma> </target> - <target name="-create.emma.coverage" description="Create the emma coverage directory" if="emma.enabled"> + <target name="-create.emma.coverage.if.enabled" description="Create the emma coverage directory" if="emma.enabled"> <delete dir="${test.emma.coverage}" /> <mkdir dir="${test.emma.coverage}" /> </target> ======================================= --- /trunk/dev/core/build.xml Thu Aug 20 15:05:36 2009 +++ /trunk/dev/core/build.xml Fri Oct 2 07:37:34 2009 @@ -7,7 +7,7 @@ <property name="gwt.junit.testcase.dev.core.includes" value="**/com/google/**/*Test.class" /> <property name="gwt.junit.testcase.dev.core.excludes" value="" /> - <target name="compile.tests" depends="build, compile.emma" description="Compiles the test code for this project"> + <target name="compile.tests" depends="build, compile.emma.if.enabled" description="Compiles the test code for this project"> <mkdir dir="${javac.junit.out}" /> <gwt.javac srcdir="test" destdir="${javac.junit.out}"> <classpath> ======================================= --- /trunk/tools/api-checker/build.xml Wed Aug 5 12:55:36 2009 +++ /trunk/tools/api-checker/build.xml Fri Oct 2 07:37:34 2009 @@ -22,7 +22,7 @@ </gwt.javac> </target> - <target name="compile.tests" depends="compile.emma" description="Compiles the test code for this project"> + <target name="compile.tests" depends="compile.emma.if.enabled" description="Compiles the test code for this project"> <mkdir dir="${javac.junit.out}" /> <gwt.javac srcdir="test" destdir="${javac.junit.out}"> <classpath> ======================================= --- /trunk/user/build.xml Mon Sep 21 10:33:24 2009 +++ /trunk/user/build.xml Fri Oct 2 07:37:34 2009 @@ -66,7 +66,7 @@ <gwt.ant dir="../dev/core" target="compile.tests" /> </target> - <target name="compile.tests" depends="compile.dev.core.tests, compile.emma" description="Compiles the test code for this project"> + <target name="compile.tests" depends="compile.dev.core.tests, compile.emma.if.enabled" 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> --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
