You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/04/23 00:33:47 UTC
svn commit: r937088 [1/2] - in /harmony/enhanced/java/branches/mrh/classlib:
./ modules/accessibility/ modules/annotation/ modules/applet/
modules/archive/ modules/auth/ modules/awt/ modules/beans/
modules/concurrent/ modules/crypto/ modules/imageio/ m...
Author: hindessm
Date: Thu Apr 22 22:33:46 2010
New Revision: 937088
URL: http://svn.apache.org/viewvc?rev=937088&view=rev
Log:
First pass at putting back build-native, build-java, build-test functionality
using properties - build.java, build.native and build.test - that all
default to true.
Modified:
harmony/enhanced/java/branches/mrh/classlib/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/annotation/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/auth/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/jmx/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/luni-kernel/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/orb/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/prefs/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/print/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/regex/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/rmi/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/security-kernel/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/security/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/sound/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/sql/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/swing/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/text/build.xml
harmony/enhanced/java/branches/mrh/classlib/modules/x-net/build.xml
Modified: harmony/enhanced/java/branches/mrh/classlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/build.xml Thu Apr 22 22:33:46 2010
@@ -321,7 +321,7 @@ ${built.files.list}
</target>
- <target name="-layout-natives"
+ <target name="-layout-natives" unless="skip.native.build"
depends="check-depends,-layout.windows,-layout.vme.v3.hack"
description="Construct the correct directory structure for native binaries">
@@ -339,13 +339,15 @@ ${built.files.list}
</target>
- <target name="-layout.windows" if="is.windows">
+ <target name="-layout.windows" unless="skip.native.build"
+ if="is.windows">
<!-- workaround until msdll is moved. -->
<copy file="${msvcr.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
<copy file="${msvcp.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
</target>
- <target name="-layout.vme.v3.hack" if="needs.vme.v3.hack">
+ <target name="-layout.vme.v3.hack" unless="skip.native.build"
+ if="needs.vme.v3.hack">
<echo>Deploying empty ICU dynamic library stub</echo>
<copy todir="${hy.jdk}/jre/bin" verbose="true">
<fileset dir="${depends.files}">
@@ -389,7 +391,7 @@ ${built.files.list}
</target>
<target name="-build-test" unless="skip.test.build"
- depends="-test-init-hdk,support-jar"
+ depends="-test-init-hdk,-support-jar"
description="Compile and archive all tests" />
<target name="-clean-test" unless="skip.test.build"
@@ -531,7 +533,8 @@ Generating snapshot zip
/>
<!-- test support -->
- <target name="support-jar" depends="compile-support">
+ <target name="-support-jar" unless="skip.test.build"
+ depends="-compile-support">
<mkdir dir="${hy.hdk}/build/test" />
<hy.jar.bin destfile="${hy.hdk}/build/test/support.jar"
manifest="support/META-INF/MANIFEST.MF">
@@ -544,7 +547,8 @@ Generating snapshot zip
</copy>
</target>
- <target name="compile-support" depends="copy-test-resources,-check-depends"
+ <target name="-compile-support" unless="skip.test.build"
+ depends="-copy-test-resources,-check-depends"
description="Compile the unit test source">
<ensure-javac/>
<mkdir dir="${tests.support.output}" />
@@ -566,7 +570,7 @@ Generating snapshot zip
</hy.javac>
</target>
- <target name="copy-test-resources"
+ <target name="-copy-test-resources" unless="skip.test.build"
description="Copy non-Java files from test support tree to the support output tree">
<mkdir dir="${tests.support.output}" />
<copy todir="${tests.support.output}" includeemptydirs="false">
@@ -579,7 +583,8 @@ Generating snapshot zip
todir="${hy.hdk}/build/test" outputencoding="UTF-8" />
</target>
- <target name="-test-init-hdk" depends="-init-hdk">
+ <target name="-test-init-hdk" unless="skip.test.build"
+ depends="-init-hdk">
<copy file="make/test.properties"
tofile="${hy.hdk}/build/test/test.properties"/>
<copy file="make/run-test.xml"
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml Thu Apr 22 22:33:46 2010
@@ -40,11 +40,12 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
<target name="clean" depends="-clean-java,-clean-test" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/accessibility.jar" />
<delete file="${hy.jdk}/jre/lib/boot/accessibility-src.jar" />
<delete failonerror="false">
@@ -53,12 +54,12 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -84,7 +85,8 @@
outputFile="${findBugs.report}/accessibility.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<mkdir dir="${hy.jdk}/jre/lib/boot"/>
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/accessibility.jar"
manifest="META-INF/MANIFEST.MF">
@@ -98,7 +100,8 @@
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -119,7 +122,7 @@
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="accessibility api tests">
<javac-elements>
<src>
@@ -133,7 +136,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/annotation/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/annotation/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/annotation/build.xml Thu Apr 22 22:33:46 2010
@@ -40,11 +40,12 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
<target name="clean" depends="-clean-java,-clean-test" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/annotation.jar" />
<delete file="${hy.jdk}/jre/lib/boot/annotation-src.jar" />
<delete failonerror="false">
@@ -53,12 +54,12 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -84,7 +85,8 @@
outputFile="${findBugs.report}/annotation.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/annotation.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -96,7 +98,8 @@
</hy.jar.src>
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -116,7 +119,7 @@
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="annotation api tests">
<javac-elements>
<src>
@@ -130,7 +133,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml Thu Apr 22 22:33:46 2010
@@ -40,11 +40,12 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
<target name="clean" depends="-clean-java,-clean-test" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/applet.jar" />
<delete file="${hy.jdk}/jre/lib/boot/applet-src.jar" />
<delete failonerror="false">
@@ -53,12 +54,12 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -84,7 +85,8 @@
outputFile="${findBugs.report}/applet.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/applet.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -97,7 +99,8 @@
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -117,7 +120,7 @@
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="applet tests">
<javac-elements>
<src>
@@ -131,7 +134,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml Thu Apr 22 22:33:46 2010
@@ -36,6 +36,7 @@
depends="-overlay-oss,-copy-zipsup-include,-copy-zlib-include" />
<target name="-copy-zlib-include" unless="hy.skip.zlib">
+ <!-- TOFIX: should add property for: unless="skip.native.build" -->
<copy todir="${hy.hdk}/include" preservelastmodified="true">
<fileset dir="src/main/native/zlib_dist">
<include name="zlib.h" />
@@ -44,7 +45,8 @@
</copy>
</target>
- <target name="-copy-zipsup-include" if="hy.skip.zip.api">
+ <target name="-copy-zipsup-include" unless="skip.native.build"
+ if="hy.skip.zip.api">
<copy todir="${hy.hdk}/include" preservelastmodified="true">
<fileset dir="src/main/native/include/shared">
<include name="zipsup.h" />
@@ -87,35 +89,39 @@
</target>
<!-- Build native code -->
- <target name="-build-native"
+ <target name="-build-native" unless="skip.native.build"
depends="-build-native-zip,-build-native-zlib,-build-native-archive" />
- <target name="-build-native-zip" if="hy.skip.zip.api">
+ <target name="-build-native-zip" unless="skip.native.build"
+ if="hy.skip.zip.api">
<make dir="src/main/native/zip/${hy.os.family}" />
</target>
<target name="-build-native-zlib" unless="hy.skip.zlib">
+ <!-- TOFIX: should add property for: unless="skip.native.build" -->
<make dir="src/main/native/zlib/${hy.os.family}" />
</target>
- <target name="-build-native-archive">
+ <target name="-build-native-archive" unless="skip.native.build">
<make dir="src/main/native/archive/${hy.os.family}" />
</target>
- <target name="-clean-native"
+ <target name="-clean-native" unless="skip.native.build"
depends="-clean-native-zip,-clean-native-zlib,-clean-native-includes,-clean-overlay-oss">
<make dir="src/main/native/archive/${hy.os.family}" target="clean" />
</target>
- <target name="-clean-native-zip" if="hy.skip.zip.api">
+ <target name="-clean-native-zip" unless="skip.native.build"
+ if="hy.skip.zip.api">
<make dir="src/main/native/zip/${hy.os.family}" target="clean" />
</target>
<target name="-clean-native-zlib" unless="hy.skip.zlib">
+ <!-- TOFIX: should add property for: unless="skip.native.build" -->
<make dir="src/main/native/zlib/${hy.os.family}" target="clean" />
</target>
- <target name="-clean-native-includes">
+ <target name="-clean-native-includes" unless="skip.native.build">
<delete failonerror="false">
<fileset dir="${hy.hdk}/include">
<include name="zipsup.h" />
@@ -139,9 +145,10 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/archive.jar" />
<delete file="${hy.jdk}/jre/lib/boot/archive-src.jar" />
<delete failonerror="false">
@@ -150,12 +157,12 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -181,7 +188,8 @@
outputFile="${findBugs.report}/archive.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/archive.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -193,7 +201,8 @@
</hy.jar.src>
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -217,7 +226,7 @@
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="archive internal tests"
destdir="bin/test-internal">
<javac-elements>
@@ -239,7 +248,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/auth/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/auth/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/auth/build.xml Thu Apr 22 22:33:46 2010
@@ -43,14 +43,15 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
<!-- Build native code -->
- <target name="-build-native">
+ <target name="-build-native" unless="skip.native.build">
<make dir="src/main/native/auth/${hy.os.family}" />
</target>
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/auth.jar" />
<delete file="${hy.jdk}/jre/lib/boot/auth-src.jar" />
<delete failonerror="false">
@@ -59,16 +60,16 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-native">
+ <target name="-clean-native" unless="skip.native.build">
<make dir="src/main/native/auth/${hy.os.family}" target="clean" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -98,7 +99,8 @@
outputFile="${findBugs.report}/auth.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/auth.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -111,7 +113,8 @@
</hy.jar.src>
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -135,7 +138,7 @@
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="auth api tests">
<javac-elements>
<src>
@@ -150,7 +153,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml Thu Apr 22 22:33:46 2010
@@ -147,9 +147,10 @@ ${line.separator}For Fedora try: yum ins
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/awt.jar" />
<delete file="${hy.jdk}/jre/lib/boot/awt-src.jar" />
<delete dir="${hy.jdk}/jre/lib/cmm" quiet="true" />
@@ -160,12 +161,12 @@ ${line.separator}For Fedora try: yum ins
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -220,7 +221,8 @@ ${line.separator}For Fedora try: yum ins
outputFile="${findBugs.report}/awt.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/awt.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -233,10 +235,10 @@ ${line.separator}For Fedora try: yum ins
</hy.jar.src>
</target>
- <target name="-build-native"
+ <target name="-build-native" unless="skip.native.build"
depends="-build-native-common,
-build-native-unix,-build-native-windows" />
- <target name="-build-native-common">
+ <target name="-build-native-common" unless="skip.native.build">
<make dir="src/main/native/lcmm/${hy.os.family}">
<make-elements>
<env key="HY_LCMS_VER" value="${lcms.ver}" />
@@ -259,17 +261,18 @@ ${line.separator}For Fedora try: yum ins
<make dir="src/main/native/fontlib/${hy.os.family}" />
</target>
- <target name="-build-native-unix" if="is.unix">
+ <target name="-build-native-unix" if="is.unix" unless="skip.native.build">
<make dir="src/main/native/x11wrapper/${hy.os.family}" />
<make dir="src/main/native/linuxfont/${hy.os.family}" />
</target>
- <target name="-build-native-windows" if="is.windows">
+ <target name="-build-native-windows" unless="skip.native.build"
+ if="is.windows">
<make dir="src/main/native/win32wrapper/${hy.os.family}" />
<make dir="src/main/native/winfont/${hy.os.family}" />
</target>
- <target name="-clean-native"
+ <target name="-clean-native" unless="skip.native.build"
depends="-clean-native-unix,-clean-native-windows">
<make dir="src/main/native/lcmm/${hy.os.family}"
target="clean"/>
@@ -283,21 +286,23 @@ ${line.separator}For Fedora try: yum ins
target="clean"/>
</target>
- <target name="-clean-native-unix" if="is.unix">
+ <target name="-clean-native-unix" if="is.unix" unless="skip.native.build">
<make dir="src/main/native/x11wrapper/${hy.os.family}"
target="clean"/>
<make dir="src/main/native/linuxfont/${hy.os.family}"
target="clean"/>
</target>
- <target name="-clean-native-windows" if="is.windows">
+ <target name="-clean-native-windows" unless="skip.native.build"
+ if="is.windows">
<make dir="src/main/native/win32wrapper/${hy.os.family}"
target="clean"/>
<make dir="src/main/native/winfont/${hy.os.family}"
target="clean"/>
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -331,7 +336,7 @@ ${line.separator}For Fedora try: yum ins
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="awt boot tests"
destdir="bin/test/boot">
<javac-elements>
@@ -355,7 +360,7 @@ ${line.separator}For Fedora try: yum ins
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml Thu Apr 22 22:33:46 2010
@@ -40,11 +40,12 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
<target name="clean" depends="-clean-java,-clean-test" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/beans.jar" />
<delete file="${hy.jdk}/jre/lib/boot/beans-src.jar" />
<delete failonerror="false">
@@ -53,12 +54,12 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -84,7 +85,8 @@
outputFile="${findBugs.report}/beans.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/beans.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -96,7 +98,8 @@
</hy.jar.src>
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -133,7 +136,7 @@
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="beans test support"
destdir="bin/test_support">
<javac-elements>
@@ -165,7 +168,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml Thu Apr 22 22:33:46 2010
@@ -40,11 +40,12 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
<target name="clean" depends="-clean-java,-clean-test" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/concurrent.jar" />
<delete file="${hy.jdk}/jre/lib/boot/concurrent-src.jar" />
<delete failonerror="false">
@@ -53,12 +54,12 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -84,7 +85,8 @@
outputFile="${findBugs.report}/concurrent.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/concurrent.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -95,7 +97,8 @@
</hy.jar.src>
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -115,7 +118,7 @@
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="concurrent tests">
<javac-elements>
<src>
@@ -129,7 +132,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml Thu Apr 22 22:33:46 2010
@@ -40,11 +40,12 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
<target name="clean" depends="-clean-java,-clean-test" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/crypto.jar" />
<delete file="${hy.jdk}/jre/lib/boot/crypto-src.jar" />
<delete failonerror="false">
@@ -53,12 +54,12 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -84,7 +85,8 @@
outputFile="${findBugs.report}/crypto.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/crypto.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -96,7 +98,8 @@
</hy.jar.src>
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -134,7 +137,7 @@
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="crypto test support files"
destdir="bin/test/support">
@@ -196,7 +199,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml Thu Apr 22 22:33:46 2010
@@ -103,9 +103,10 @@ ${line.separator}For Fedora try: yum ins
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/imageio.jar" />
<delete file="${hy.jdk}/jre/lib/boot/imageio-src.jar" />
<delete failonerror="false">
@@ -114,17 +115,17 @@ ${line.separator}For Fedora try: yum ins
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-native">
+ <target name="-clean-native" unless="skip.native.build">
<make dir="src/main/native/jpegencoder/${hy.os.family}" target="clean"/>
<make dir="src/main/native/pngencoder/${hy.os.family}" target="clean" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ImageIO classes" />
<mkdir dir="../../build/classes" />
@@ -143,7 +144,7 @@ ${line.separator}For Fedora try: yum ins
</hy.javac>
</target>
- <target name="-build-native">
+ <target name="-build-native" unless="skip.native.build">
<make dir="src/main/native/jpegencoder/${hy.os.family}">
<make-elements>
<env key="HY_JPEG_VER" value="${jpeg.ver}" />
@@ -164,7 +165,8 @@ ${line.separator}For Fedora try: yum ins
outputFile="${findBugs.report}/imageio.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/imageio.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -176,7 +178,8 @@ ${line.separator}For Fedora try: yum ins
</hy.jar.src>
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -200,7 +203,7 @@ ${line.separator}For Fedora try: yum ins
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="imageio tests">
<javac-elements>
<src>
@@ -214,7 +217,7 @@ ${line.separator}For Fedora try: yum ins
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml Thu Apr 22 22:33:46 2010
@@ -45,11 +45,12 @@
<target name="-test-module" depends="build, -run-tests" />
<!-- Build native code -->
- <target name="-build-native">
+ <target name="-build-native" unless="skip.native.build">
<make dir="src/main/native/instrument/${hy.os.family}" />
</target>
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/instrument.jar" />
<delete file="${hy.jdk}/jre/lib/boot/instrument-src.jar" />
<delete failonerror="false">
@@ -58,16 +59,16 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-native">
+ <target name="-clean-native" unless="skip.native.build">
<make dir="src/main/native/instrument/${hy.os.family}" target="clean" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -92,7 +93,8 @@
outputFile="${findBugs.report}/instrument.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/instrument.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -104,7 +106,8 @@
</hy.jar.src>
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -130,7 +133,7 @@
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="instrument tests">
<javac-elements>
<src>
@@ -144,7 +147,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/jmx/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/jmx/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/jmx/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/jmx/build.xml Thu Apr 22 22:33:46 2010
@@ -76,7 +76,7 @@
<touch file="${mx4j.jar}" />
</target>
- <target name="-copy-jars">
+ <target name="-copy-jars" unless="skip.java.build">
<copy todir="${hy.jdk}/jre/lib/boot">
<fileset dir="${depends.jars}">
<patternset includes="mx4j_${mx4j.version}/*.jar" />
@@ -89,7 +89,7 @@
<target name="test" />
- <target name="-clean-java">
+ <target name="-clean-java" unless="skip.java.build">
<delete dir="${hy.jdk}/jre/lib/boot/mx4j_${mx4j.version}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml Thu Apr 22 22:33:46 2010
@@ -40,11 +40,12 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
<target name="clean" depends="-clean-java,-clean-test" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/jndi.jar" />
<delete file="${hy.jdk}/jre/lib/boot/jndi-src.jar" />
<delete failonerror="false">
@@ -53,12 +54,12 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -84,7 +85,8 @@
outputFile="${findBugs.report}/jndi.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/jndi.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -96,7 +98,8 @@
</hy.jar.src>
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -122,7 +125,7 @@
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="jndi tests">
<javac-elements>
<src>
@@ -136,7 +139,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml Thu Apr 22 22:33:46 2010
@@ -40,11 +40,12 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
<target name="clean" depends="-clean-java,-clean-test" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/lang-management.jar" />
<delete file="${hy.jdk}/jre/lib/boot/lang-management-src.jar" />
<delete failonerror="false">
@@ -53,12 +54,12 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -84,7 +85,8 @@
outputFile="${findBugs.report}/lang-management.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/lang-management.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -95,7 +97,8 @@
</hy.jar.src>
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -119,7 +122,7 @@
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="lang-management api tests"
destdir="bin/api">
<javac-elements>
@@ -142,7 +145,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml Thu Apr 22 22:33:46 2010
@@ -40,11 +40,12 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
<target name="clean" depends="-clean-java,-clean-test" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/logging.jar" />
<delete file="${hy.jdk}/jre/lib/boot/logging-src.jar" />
<delete failonerror="false">
@@ -53,12 +54,12 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -84,7 +85,8 @@
outputFile="${findBugs.report}/logging.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/logging.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -107,7 +109,8 @@
</copy>
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -137,7 +140,7 @@
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="logging internal tests"
destdir="bin/test-internal">
<javac-elements>
@@ -162,7 +165,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni-kernel/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni-kernel/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni-kernel/build.xml Thu Apr 22 22:33:46 2010
@@ -37,7 +37,8 @@ the top-level build.
</fail>
</target>
- <target name="build" depends="svn-info,-class-patternset">
+ <target name="build" unless="skip.java.build"
+ depends="svn-info,-class-patternset">
<hy.jar.bin destfile="${stub.jar}" manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
</hy.jar.bin>
@@ -45,7 +46,8 @@ the top-level build.
<target name="clean" depends="-clean-java" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${stub.jar}" />
<delete failonerror="false">
<fileset refid="classes" />
@@ -53,7 +55,7 @@ the top-level build.
<delete-patternset module="${hy.module}" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml Thu Apr 22 22:33:46 2010
@@ -40,7 +40,7 @@
<check-one-file src="${fdlibm.url}" dest="${fdlibm.tar}" />
</target>
- <target name="-copy-includes">
+ <target name="-copy-includes" unless="skip.native.build">
<copy todir="${hy.hdk}/include" preservelastmodified="true">
<fileset dir="src/main/native/include">
<include name="vmi.h" />
@@ -63,11 +63,11 @@
</target>
<!-- Build native code -->
- <target name="-build-native"
+ <target name="-build-native" unless="skip.native.build"
depends="-build-native-core, -build-native-secondary" />
<!-- Build the core luni native components -->
- <target name="-build-native-core" >
+ <target name="-build-native-core" unless="skip.native.build">
<!-- Build vmi dll -->
<make dir="src/main/native/vmi/${hy.os.family}" />
@@ -91,11 +91,11 @@
</target>
<!-- Build secondary native luni components -->
- <target name="-build-native-secondary"
+ <target name="-build-native-secondary" unless="skip.native.build"
depends="-build-native-secondary1,-build-hyzip,-build-native-secondary2"
/>
- <target name="-build-native-secondary1" >
+ <target name="-build-native-secondary1" unless="skip.native.build">
<!-- Build fdlibm lib -->
<make dir="src/main/native/fdlibm/${hy.os.family}" />
@@ -108,17 +108,18 @@
</target>
<target name="-build-hyzip" unless="hy.skip.zip.api">
+ <!-- TOFIX: should add property for: unless="skip.native.build" -->
<!-- Build hyzip lib -->
<make dir="src/main/native/hyzip/${hy.os.family}" />
</target>
- <target name="-build-native-secondary2" >
+ <target name="-build-native-secondary2" unless="skip.native.build">
<!-- Build launcher executables -->
<make dir="src/main/native/launcher/${hy.os.family}" />
</target>
<!-- Overlay OSS packages into their required locations -->
- <target name="-unzip-oss">
+ <target name="-unzip-oss" unless="skip.native.build">
<untar src="${fdlibm.tar}" compression="gzip" dest="${fdlibm.dist}">
<patternset>
<exclude name="fdlibm53"/>
@@ -140,7 +141,8 @@
<chmod dir="src/main/native/fdlibm_dist" perm="ugo+r" />
</target>
- <target name="-ascii2ebcdic-conversion" if="is.zos">
+ <target name="-ascii2ebcdic-conversion" unless="skip.native.build"
+ if="is.zos">
<move todir="src/main/native/fdlibm_dist_ascii">
<fileset dir="src/main/native/fdlibm_dist">
<include name="**/*" />
@@ -175,9 +177,10 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -test-jar, -run-tests" />
+ <target name="-test-module" depends="build,-test-jar,-run-tests" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/luni.jar" />
<delete file="${hy.jdk}/jre/lib/boot/luni-src.jar" />
<delete failonerror="false">
@@ -186,7 +189,7 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-native"
+ <target name="-clean-native" unless="skip.native.build"
depends="-clean-native-includes,-clean-overlay-oss">
<make dir="src/main/native/fdlibm/${hy.os.family}" target="clean" />
<make dir="src/main/native/vmi/${hy.os.family}" target="clean" />
@@ -196,7 +199,7 @@
<make dir="src/main/native/launcher/${hy.os.family}" target="clean" />
</target>
- <target name="-clean-native-includes">
+ <target name="-clean-native-includes" unless="skip.native.build">
<delete failonerror="false">
<fileset dir="${hy.hdk}/include">
<include name="vmi.h" />
@@ -218,16 +221,16 @@
</target>
<!-- Clean overlaid OSS packages -->
- <target name="-clean-overlay-oss" >
+ <target name="-clean-overlay-oss" unless="skip.native.build">
<delete dir="src/main/native/fdlibm_dist" quiet="true" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -253,7 +256,8 @@
outputFile="${findBugs.report}/luni.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/luni.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -265,7 +269,8 @@
</hy.jar.src>
</target>
- <target name="-test-jar" depends="-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="-compile-tests">
<mkdir dir="${tests.hdk.dir}"/>
<copy file="make/run-test.xml"
@@ -311,7 +316,7 @@
</target>
<!-- compile both api tests and impl tests-->
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="luni api tests" destdir="bin/test/api">
<javac-elements>
<src>
@@ -337,7 +342,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml Thu Apr 22 22:33:46 2010
@@ -40,11 +40,12 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
<target name="clean" depends="-clean-java,-clean-test" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/math.jar" />
<delete file="${hy.jdk}/jre/lib/boot/math-src.jar" />
<delete failonerror="false">
@@ -53,12 +54,12 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -84,7 +85,8 @@
outputFile="${findBugs.report}/math.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/math.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -96,7 +98,8 @@
</hy.jar.src>
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -116,7 +119,7 @@
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="math tests">
<javac-elements>
<src>
@@ -130,7 +133,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml Thu Apr 22 22:33:46 2010
@@ -40,10 +40,11 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
<target name="clean" depends="-clean-java,-clean-native,-clean-test" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/misc.jar" />
<delete file="${hy.jdk}/jre/lib/boot/misc-src.jar" />
<delete failonerror="false">
@@ -52,16 +53,16 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-native">
+ <target name="-clean-native" unless="skip.java.build">
<make dir="src/main/native/accessors/${hy.os.family}" target="clean" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -87,7 +88,8 @@
outputFile="${findBugs.report}/misc.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/misc.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -99,11 +101,12 @@
</hy.jar.src>
</target>
- <target name="-build-native">
+ <target name="-build-native" unless="skip.native.build">
<make dir="src/main/native/accessors/${hy.os.family}" />
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -123,7 +126,7 @@
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="misc tests">
<javac-elements>
<src>
@@ -137,7 +140,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml Thu Apr 22 22:33:46 2010
@@ -42,14 +42,15 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
<!-- Build natives.-->
- <target name="-build-native">
+ <target name="-build-native" unless="skip.native.build">
<make dir="src/main/native/nio/${hy.os.family}" />
</target>
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/nio.jar" />
<delete file="${hy.jdk}/jre/lib/boot/nio-src.jar" />
<delete includeemptydirs="true" failonerror="false">
@@ -58,16 +59,16 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-native">
+ <target name="-clean-native" unless="skip.native.build">
<make dir="src/main/native/nio/${hy.os.family}" target="clean" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin" />
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -97,7 +98,8 @@
outputFile="${findBugs.report}/nio.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/nio.jar"
manifest="META-INF/MANIFEST.MF">
<fileset refid="classes" />
@@ -109,7 +111,8 @@
</hy.jar.src>
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -133,7 +136,7 @@
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="nio tests">
<javac-elements>
<src>
@@ -148,7 +151,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml Thu Apr 22 22:33:46 2010
@@ -31,7 +31,7 @@
<target name="clean" depends="-clean-java,-clean-native,-clean-test" />
<!-- Build natives.-->
- <target name="-build-native">
+ <target name="-build-native" unless="skip.native.build">
<make dir="src/main/native/niochar/${hy.os.family}" />
</target>
@@ -47,9 +47,10 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/nio_char.jar" />
<delete file="${hy.jdk}/jre/lib/boot/nio_char-src.jar" />
<delete failonerror="false">
@@ -58,16 +59,16 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-native">
+ <target name="-clean-native" unless="skip.native.build">
<make dir="src/main/native/niochar/${hy.os.family}" target="clean" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -96,7 +97,8 @@
outputFile="${findBugs.report}/nio_char.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/nio_char.jar"
manifest="META-INF/MANIFEST.MF">
<service type="java.nio.charset.spi.CharsetProvider"
@@ -114,7 +116,8 @@
</hy.jar.src>
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -139,7 +142,7 @@
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<compile-tests description="nio_char tests">
<javac-elements>
<src>
@@ -153,7 +156,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/orb/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/orb/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/orb/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/orb/build.xml Thu Apr 22 22:33:46 2010
@@ -27,7 +27,7 @@
<import file="${hy.hdk}/build/ant/properties.xml" />
<import file="${hy.hdk}/build/ant/depends.xml" />
- <target name="build" depends="check-depends, -copy-jars" />
+ <target name="build" depends="check-depends,-copy-jars" />
<target name="clean" depends="-clean-java" />
@@ -67,7 +67,7 @@
</target>
- <target name="-copy-jars">
+ <target name="-copy-jars" unless="skip.java.build">
<copy todir="${hy.jdk}/jre/lib/boot">
<fileset dir="${depends.jars}">
<patternset includes="yoko-${yoko.version}/*.jar" />
@@ -78,7 +78,7 @@
<target name="test" />
- <target name="-clean-java">
+ <target name="-clean-java" unless="skip.java.build">
<delete dir="${hy.jdk}/jre/lib/boot/yoko-${yoko.version}" />
<delete dir="${hy.jdk}/jre/lib/boot/bcel-${bcel.version}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml Thu Apr 22 22:33:46 2010
@@ -58,11 +58,12 @@
</target>
<!-- internal target for local and global test run sequence -->
- <target name="-test-module" depends="build, -run-tests" />
+ <target name="-test-module" depends="build,-run-tests" />
<target name="clean" depends="-clean-java,-clean-test" />
- <target name="-clean-java" depends="-class-patternset">
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
<delete file="${hy.jdk}/jre/lib/boot/pack200.jar" />
<delete file="${hy.jdk}/jre/lib/boot/pack200-src.jar" />
<delete failonerror="false">
@@ -71,12 +72,12 @@
<delete-patternset module="${hy.module}" />
</target>
- <target name="-clean-test">
+ <target name="-clean-test" unless="skip.test.build">
<delete dir="${tests.hdk.dir}" failonerror="false" />
<delete failonerror="false" dir="bin"/>
</target>
- <target name="-compile-java">
+ <target name="-compile-java" unless="skip.java.build">
<echo message="Compiling ${hy.module} classes" />
<mkdir dir="../../build/classes" />
@@ -118,7 +119,8 @@
outputFile="${findBugs.report}/pack200.xml"/>
</target>
- <target name="-build-jar" depends="svn-info,-compile-java,-class-patternset">
+ <target name="-build-jar" unless="skip.java.build"
+ depends="svn-info,-compile-java,-class-patternset">
<hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/pack200.jar"
manifest="META-INF/MANIFEST.MF">
<manifest>
@@ -137,7 +139,8 @@
</hy.jar.src>
</target>
- <target name="-test-jar" depends="svn-info,-compile-tests">
+ <target name="-test-jar" unless="skip.test.build"
+ depends="svn-info,-compile-tests">
<mkdir dir="${tests.hdk.dir}" />
<copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
@@ -161,7 +164,7 @@
</copy>
</target>
- <target name="-compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
<mkdir dir="bin/test" />
<mkdir dir="${hy.hdk}/build/test" />
@@ -193,7 +196,7 @@
<ant dir="${tests.hdk.dir}" target="test-module" />
</target>
- <target name="-class-patternset">
+ <target name="-class-patternset" unless="skip.java.build">
<make-patternset module="${hy.module}" />
</target>
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml?rev=937088&r1=937087&r2=937088&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml Thu Apr 22 22:33:46 2010
@@ -50,9 +50,11 @@
</target>
<target name="-test-module"
- depends="-make-report-dir,-compile-native-tests,-run-native-tests" />
- <target name="check-depends"
- depends="-copy-thread-include,-copy-thread-stub-include,-copy-ascii-ebcdic-include" >
+ depends="-make-report-dir,-compile-native-tests,
+ -run-native-tests" />
+ <target name="check-depends" unless="skip.native.build"
+ depends="-copy-thread-include,-copy-thread-stub-include,
+ -copy-ascii-ebcdic-include" >
<copy todir="${hy.hdk}/include" preservelastmodified="true">
<fileset dir="src/main/native/include/shared">
<include name="hyport.h" />
@@ -77,6 +79,7 @@
</target>
<target name="-copy-thread-include" unless="hy.skip.thr" >
+ <!-- TOFIX: should add property for: unless="skip.native.build" -->
<copy todir="${hy.hdk}/include" preservelastmodified="true">
<fileset dir="src/main/native/include/shared">
<include name="hythread.h" />
@@ -84,7 +87,8 @@
</copy>
</target>
- <target name="-copy-thread-stub-include" if="hy.skip.thr" >
+ <target name="-copy-thread-stub-include" if="hy.skip.thr"
+ unless="skip.native.build">
<copy todir="${hy.hdk}/include" preservelastmodified="true">
<fileset dir="src/main/native/thrstub/shared">
<include name="hythread.h" />
@@ -92,7 +96,8 @@
</copy>
</target>
- <target name="-copy-ascii-ebcdic-include" if="is.zos" >
+ <target name="-copy-ascii-ebcdic-include" if="is.zos"
+ unless="skip.native.build">
<copy todir="${hy.hdk}/include" overwrite="yes">
<fileset dir="src/main/native/a2e/${hy.os.family}/headers">
<include name="atoe.h" />
@@ -122,7 +127,7 @@
</target>
<!-- Build the portlib native components -->
- <target name="-build-native"
+ <target name="-build-native" unless="skip.native.build"
depends="-build-native-common,-build-native-thread,
-build-native-thrstub,-build-native-port" />
<target name="-build-native-common" depends="-build-ascii-ebcdic">
@@ -133,12 +138,13 @@
<make dir="src/main/native/pool/${hy.os.family}" />
</target>
- <target name="-build-ascii-ebcdic" if="is.zos" >
+ <target name="-build-ascii-ebcdic" if="is.zos" unless="skip.native.build">
<!-- Build a2e lib for zOS platforms -->
<make dir="src/main/native/a2e/${hy.os.family}" />
</target>
<target name="-build-native-thread" unless="hy.skip.thr">
+ <!-- TOFIX: should add property for: unless="skip.native.build" -->
<!-- Build thread dll -->
<make dir="src/main/native/thread/${hy.os.family}" />
@@ -153,6 +159,7 @@
</target>
<target name="-build-copy-thread" unless="hy.thr.nodeploy">
+ <!-- TOFIX: should add property for: unless="skip.native.build" -->
<copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
<fileset dir="src/main/native/thread">
<include name="*${shlib.suffix}*" />
@@ -162,18 +169,20 @@
</copy>
</target>
- <target name="-build-native-thrstub" if="hy.skip.thr">
+ <target name="-build-native-thrstub" if="hy.skip.thr"
+ unless="skip.native.build">
<!-- Build thread dll -->
<make dir="src/main/native/thrstub/${hy.os.family}" />
</target>
- <target name="-build-native-port">
+ <target name="-build-native-port" unless="skip.native.build">
<!-- Build port dll -->
<make dir="src/main/native/port/${hy.os.family}" />
</target>
<!-- Clean natives -->
- <target name="-clean-native" depends="-clean-native-includes, -clean-native-ascii-ebcdic">
+ <target name="-clean-native" unless="skip.native.build"
+ depends="-clean-native-includes, -clean-native-ascii-ebcdic">
<make dir="src/main/native/thread/${hy.os.family}" target="clean" />
<make dir="src/main/native/thrstub/${hy.os.family}" target="clean" />
<make dir="src/main/native/port/${hy.os.family}" target="clean" />
@@ -181,12 +190,14 @@
<make dir="src/main/native/pool/${hy.os.family}" target="clean" />
</target>
- <target name="-clean-native-ascii-ebcdic" if="is.zos" >
+ <target name="-clean-native-ascii-ebcdic" if="is.zos"
+ unless="skip.native.build">
<!-- Clean a2e lib for zOS platforms -->
<make dir="src/main/native/a2e/${hy.os.family}" target="clean" />
</target>
- <target name="-clean-native-includes" depends="-clean-ascii-ebcdic-includes">
+ <target name="-clean-native-includes" unless="skip.native.build"
+ depends="-clean-ascii-ebcdic-includes">
<delete failonerror="false">
<fileset dir="${hy.hdk}/include">
<include name="hyport.h" />
@@ -207,7 +218,8 @@
</delete>
</target>
- <target name="-clean-ascii-ebcdic-includes" if="is.zos" >
+ <target name="-clean-ascii-ebcdic-includes" if="is.zos"
+ unless="skip.native.build">
<delete failonerror="false">
<fileset dir="${hy.hdk}/include">
<include name="atoe.h" />
@@ -240,7 +252,8 @@
<mkdir dir="${tests.output}" />
</target>
- <target name="-compile-native-tests" if="test.portlib">
+ <target name="-compile-native-tests" unless="skip.test.build"
+ if="test.portlib">
<make dir="src/test/native/init/${hy.os.family}" />
<make dir="src/test/native/hycpu/${hy.os.family}" />
<make dir="src/test/native/hyerror/${hy.os.family}" />
@@ -291,7 +304,7 @@
<antcall target="-touch-errors-file" />
</target>
- <target name="-clean-test" >
+ <target name="-clean-test" unless="skip.test.build">
<make dir="src/test/native/init/${hy.os.family}"
target="clean" />
<make dir="src/test/native/hycpu/${hy.os.family}"