Author: hindessm
Date: Mon Sep 20 09:48:27 2010
New Revision: 998855
URL: http://svn.apache.org/viewvc?rev=998855&view=rev
Log:
Remove temporary build.x.tools flag from everything that works. I get
some test failures so I've not removed the flag from the test-jar target.
Modified:
harmony/enhanced/java/branches/java6/classlib/modules/x-tools/build.xml
Modified: harmony/enhanced/java/branches/java6/classlib/modules/x-tools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/x-tools/build.xml?rev=998855&r1=998854&r2=998855&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/x-tools/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/x-tools/build.xml Mon Sep 20 09:48:27
2010
@@ -28,8 +28,7 @@
<property file="../../make/depends.properties" />
<target name="build" depends="check-depends,-build-no-check"/>
- <target name="-build-no-check" depends="-build-jar,-test-jar"
- if="build.x.tools" />
+ <target name="-build-no-check" depends="-build-jar,-test-jar" />
<target name="check-depends" unless="skip.java.build">
<check-one-file src="${ecj.jar.url}" dest="${ecj.jar}" />
@@ -72,7 +71,7 @@
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java" unless="skip.java.build" if="build.x.tools">
+ <target name="-compile-java" unless="skip.java.build">
<compile-classes description="${hy.module} classes">
<javac-elements>
<src path="src/main/java" />
@@ -87,7 +86,7 @@
outputFile="${findBugs.report}/${hy.module}.xml"/>
</target>
- <target name="-build-jar" unless="skip.java.build" if="build.x.tools"
+ <target name="-build-jar" unless="skip.java.build"
depends="-svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
manifest="META-INF/MANIFEST.MF">
@@ -100,8 +99,8 @@
</hy.jar.src>
</target>
- <target name="-test-jar" unless="skip.test.build" if="build.x.tools"
- depends="-svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="-svn-info,-compile-tests" if="build.x.tools">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -121,7 +120,7 @@
</copy>
</target>
- <target name="-compile-tests" unless="skip.test.build" if="build.x.tools">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="${hy.module} api tests">
<javac-elements>
<src>
|