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
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@6284 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/build-tools/ant-gwt/build.xml b/build-tools/ant-gwt/build.xml
index bc2bc02..9c34b3a 100644
--- a/build-tools/ant-gwt/build.xml
+++ b/build-tools/ant-gwt/build.xml
@@ -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>
diff --git a/common.ant.xml b/common.ant.xml
index eccfb24..896729f 100755
--- a/common.ant.xml
+++ b/common.ant.xml
@@ -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>
diff --git a/dev/core/build.xml b/dev/core/build.xml
index 4bdbd75..806cdfc 100755
--- a/dev/core/build.xml
+++ b/dev/core/build.xml
@@ -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>
diff --git a/tools/api-checker/build.xml b/tools/api-checker/build.xml
index f7998b5..0328c28 100755
--- a/tools/api-checker/build.xml
+++ b/tools/api-checker/build.xml
@@ -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>
diff --git a/user/build.xml b/user/build.xml
index 1fc0af0..4db7d74 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -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>
