Reviewers: felix8a,
Description:
Refactor 'precajole' targets to sequester testing "light" precajole map
from production "heavy" map. This avoids problems with previous setup
wherein the "light" contents were being written out to the production
"precajole.jar" output.
Please review this at http://codereview.appspot.com/5677069/
Affected files:
M build.xml
Index: build.xml
===================================================================
--- build.xml (revision 4782)
+++ build.xml (working copy)
@@ -46,25 +46,28 @@
<property name="build.sysclasspath" value="ignore" />
<!--== inputs ==-->
- <property name="src" location="src"/>
- <property name="src.caja" location="${src}/com/google/caja"/>
- <property name="tests" location="tests"/>
- <property name="tests.caja" location="${tests}/com/google/caja"/>
- <property name="test.filter" value="*Test"/>
+ <property name="src" location="src"/>
+ <property name="src.caja" location="${src}/com/google/caja"/>
+ <property name="tests" location="tests"/>
+ <property name="tests.caja" location="${tests}/com/google/caja"/>
+ <property name="test.filter" value="*Test"/>
<property name="test.method.filter" value="*"/>
- <property name="third_party" location="third_party"/>
- <property name="demos" location="${src.caja}/demos"/>
+ <property name="third_party" location="third_party"/>
+ <property name="demos" location="${src.caja}/demos"/>
+ <property name="precajolesrc" value="${third_party}/precajole"/>
<!--== outputs ==-->
- <property name="reports" location="ant-reports"/> <!-- emma reports
-->
- <property name="instr" location="ant-instr"/> <!-- instrumented
src -->
- <property name="lib" location="ant-lib"/>
- <property name="gwtlib" location="ant-gwtlib"/>
- <property name="lib.caja" location="${lib}/com/google/caja"/>
- <property name="docs" location="ant-docs"/>
- <property name="ruledocs" location="${docs}/rules"/>
- <property name="javadocs" location="${docs}/java"/>
- <property name="jars" location="ant-jars"/>
- <property name="www" location="ant-www"/> <!-- demo files dir
-->
+ <property name="reports" location="ant-reports"/> <!-- emma
reports -->
+ <property name="instr" location="ant-instr"/> <!-- instrumented
src -->
+ <property name="lib" location="ant-lib"/>
+ <property name="gwtlib" location="ant-gwtlib"/>
+ <property name="precajolelib" location="ant-precajolelib"/>
+ <property name="precajolelib-test" location="ant-precajolelib-test"/>
+ <property name="lib.caja" location="${lib}/com/google/caja"/>
+ <property name="docs" location="ant-docs"/>
+ <property name="ruledocs" location="${docs}/rules"/>
+ <property name="javadocs" location="${docs}/java"/>
+ <property name="jars" location="ant-jars"/>
+ <property name="www" location="ant-www"/> <!-- demo files dir
-->
<!-- servlet dir - needs to be called "war" for GWT eclipse plugin/shell
See http://code.google.com/webtoolkit/doc/1.6/ReleaseNotes_1_6.html
-->
@@ -137,7 +140,7 @@
<pathelement path="${third_party}/java/emma/emma.jar"/>
<path refid="classpath.tests.compile"/>
<pathelement path="${instr}/classes"/>
- <pathelement path="${lib}/precajole"/>
+ <pathelement path="${precajolelib-test}"/>
<!-- Must be last for coverage to work -->
<path refid="classpath.run"/>
</path>
@@ -189,7 +192,9 @@
<delete dir="${instr}"/>
<delete dir="${jars}"/>
<delete dir="${lib}"/>
- <delete dir="${gwtlib}"/>
+ <delete dir="${gwtlib}"/>
+ <delete dir="${precajolelib}"/>
+ <delete dir="${precajolelib-test}"/>
<delete dir="${www}"/>
<delete dir="${maven}"/>
<delete dir="${war}"/>
@@ -204,7 +209,9 @@
<mkdir dir="${instr}"/>
<mkdir dir="${jars}"/>
<mkdir dir="${lib}"/>
- <mkdir dir="${gwtlib}"/>
+ <mkdir dir="${gwtlib}"/>
+ <mkdir dir="${precajolelib}"/>
+ <mkdir dir="${precajolelib-test}"/>
<mkdir dir="${www}"/>
<mkdir dir="${war}"/>
<mkdir dir="${gwt-war}"/>
@@ -496,7 +503,7 @@
</copy>
</target>
- <target name="pluginc" depends="PluginCompiler,tools,precajole"
+ <target name="pluginc" depends="PluginCompiler,tools,precajole-light"
description="Build the plugin compiler and other main classes">
<javac destdir="${lib}" debug="true" target="1.5" source="1.5">
<src path="${src}"/>
@@ -1815,15 +1822,12 @@
classpathref="classpath.run" />
</target>
- <property name="precajole" value="${third_party}/precajole"/>
-
- <target name="precajole" depends="precajole-light"
unless="precajole.skip">
- <precajole spec="${precajole}/heavy.xml" dest="${lib}/precajole" />
- <jar destfile="${jars}/precajole.jar" basedir="${lib}/precajole" />
+ <target name="precajole-light" depends="Precajoler">
+ <precajole spec="${precajolesrc}/light.xml"
dest="${precajolelib-test}" />
</target>
- <target name="precajole-light" depends="Precajoler">
- <precajole spec="${precajole}/light.xml" dest="${lib}/precajole" />
- <jar destfile="${jars}/precajole.jar" basedir="${lib}/precajole" />
+ <target name="precajole" depends="Precajoler">
+ <precajole spec="${precajolesrc}/heavy.xml" dest="${precajolelib}" />
+ <jar destfile="${jars}/precajole.jar" basedir="${precajolelib}" />
</target>
</project>
