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/05/09 10:26:06 UTC
svn commit: r942511 [3/5] - in /harmony/enhanced/java/branches/java6: ./
classlib/ classlib/depends/libs/ classlib/make/
classlib/modules/accessibility/ classlib/modules/activation/
classlib/modules/annotation/ classlib/modules/applet/ classlib/modules...
Modified: harmony/enhanced/java/branches/java6/classlib/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/luni/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/luni/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/luni/build.xml Sun May 9 08:26:02 2010
@@ -29,16 +29,19 @@
<property name="fdlibm.dist" location="src/main/native/fdlibm_dist"/>
- <target name="build" depends="compile-java, build-jar" />
+ <target name="build" depends="-build-no-check"/>
+ <target name="-build-no-check" depends="-build-jar,-test-jar" />
- <target name="clean" depends="clean-java,clean-native,clean-test" />
+ <target name="clean" depends="-clean-java,-clean-native,-clean-test" />
- <target name="check-depends">
+ <target name="check-depends"
+ depends="-check-depends,-unzip-oss,-copy-includes,
+ -ascii2ebcdic-conversion" />
+ <target name="-check-depends">
<check-one-file src="${fdlibm.url}" dest="${fdlibm.tar}" />
</target>
-
- <target name="copy-native-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" />
@@ -61,11 +64,11 @@
</target>
<!-- Build native code -->
- <target name="build-native"
- depends="build-native-core, build-native-secondary" />
+ <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}" />
@@ -89,11 +92,11 @@
</target>
<!-- Build secondary native luni components -->
- <target name="build-native-secondary"
- depends="-build-native-secondary,-build-hyzip,-build-native-secondary2"
+ <target name="-build-native-secondary" unless="skip.native.build"
+ depends="-build-native-secondary1,-build-hyzip,-build-native-secondary2"
/>
- <target name="-build-native-secondary" >
+ <target name="-build-native-secondary1" unless="skip.native.build">
<!-- Build fdlibm lib -->
<make dir="src/main/native/fdlibm/${hy.os.family}" />
@@ -106,19 +109,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="overlay-oss" depends="-unzip-oss,-ascii2ebcdic-conversion" />
-
- <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 +142,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,19 +178,20 @@
</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">
- <delete file="${hy.jdk}/jre/lib/boot/luni.jar" />
- <delete file="${hy.jdk}/jre/lib/boot/luni-src.jar" />
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
<delete failonerror="false">
<fileset refid="classes" />
</delete>
<delete-patternset module="${hy.module}" />
</target>
- <target name="clean-native"
- depends="clean-native-includes,clean-overlay-oss">
+ <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" />
<make dir="src/main/native/luni/${hy.os.family}" target="clean" />
@@ -196,7 +200,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,64 +222,55 @@
</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">
- <echo message="Compiling ${hy.module} classes" />
-
- <mkdir dir="../../build/classes" />
-
- <hy.javac sourcepath=""
- srcdir="src/main/java"
- destdir="../../build/classes">
-
- <compilerarg line="${build.compilerarg}" />
-
- <bootclasspath>
- <fileset dir="${hy.jdk}/jre/lib/boot">
- <include name="**/*.jar" />
- </fileset>
- </bootclasspath>
- </hy.javac>
+ <target name="-compile-java" unless="skip.java.build">
+ <compile-classes description="${hy.module} classes">
+ <javac-elements>
+ <src path="src/main/java" />
+ </javac-elements>
+ </compile-classes>
</target>
- <target name="findbugs" depends="build-jar">
+ <target name="findbugs" depends="-build-jar">
<run-findBugs
- jarFile="${hy.jdk}/jre/lib/boot/luni.jar"
+ jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
excludeFilter="make/findbugs-exclude-filter.xml"
- outputFile="${findBugs.report}/luni.xml"/>
+ outputFile="${findBugs.report}/${hy.module}.xml"/>
</target>
- <target name="build-jar" depends="svn-info,class-patternset">
- <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/luni.jar"
+ <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">
<fileset refid="classes" />
<fileset refid="resources" />
</hy.jar.bin>
- <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/luni-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
<fileset dir="src/main/java" />
</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"
tofile="${tests.hdk.dir}/build.xml" />
- <hy.jar.bin destfile="${tests.hdk.dir}/luni_tests_api.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_api.jar">
<fileset dir="bin/test/api" />
</hy.jar.bin>
- <hy.jar.bin destfile="${tests.hdk.dir}/luni_tests_impl.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_impl.jar">
<fileset dir="bin/test/impl" />
</hy.jar.bin>
@@ -311,8 +306,9 @@
</target>
<!-- compile both api tests and impl tests-->
- <target name="compile-tests">
- <compile-tests description="luni api tests" destdir="bin/test/api">
+ <target name="-compile-tests" unless="skip.test.build">
+ <compile-tests description="${hy.module} api tests"
+ destdir="bin/test/api">
<javac-elements>
<src>
<pathelement location="src/test/api/common" />
@@ -321,7 +317,8 @@
<include name="**/*.java" />
</javac-elements>
</compile-tests>
- <compile-tests description="luni impl tests" destdir="bin/test/impl">
+ <compile-tests description="${hy.module} impl tests"
+ destdir="bin/test/impl">
<javac-elements>
<src>
<pathelement location="src/test/impl/common" />
@@ -333,11 +330,11 @@
</target>
<!-- run both api tests and impl tests -->
- <target name="run-tests" depends="test-jar">
+ <target name="-run-tests" depends="-test-jar">
<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/java6/classlib/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/math/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/math/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/math/build.xml Sun May 9 08:26:02 2010
@@ -26,7 +26,8 @@
<property file="../../make/depends.properties" />
- <target name="build" depends="compile-java, build-jar" />
+ <target name="build" depends="-build-no-check"/>
+ <target name="-build-no-check" depends="-build-jar,-test-jar" />
<target name="test" depends="-test-module">
<fail message="Some tests failed">
@@ -40,68 +41,60 @@
</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" depends="-clean-java,-clean-test" />
- <target name="clean-java" depends="class-patternset">
- <delete file="${hy.jdk}/jre/lib/boot/math.jar" />
- <delete file="${hy.jdk}/jre/lib/boot/math-src.jar" />
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
<delete failonerror="false">
<fileset refid="classes" />
</delete>
<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">
- <echo message="Compiling ${hy.module} classes" />
-
- <mkdir dir="../../build/classes" />
-
- <hy.javac sourcepath=""
- srcdir="src/main/java"
- destdir="../../build/classes">
-
- <compilerarg line="${build.compilerarg}" />
-
- <bootclasspath>
- <fileset dir="${hy.jdk}/jre/lib/boot">
- <include name="**/*.jar" />
- </fileset>
- </bootclasspath>
- </hy.javac>
+ <target name="-compile-java" unless="skip.java.build">
+ <compile-classes description="${hy.module} classes">
+ <javac-elements>
+ <src path="src/main/java" />
+ </javac-elements>
+ </compile-classes>
</target>
- <target name="findbugs" depends="build-jar">
+ <target name="findbugs" depends="-build-jar">
<run-findBugs
- jarFile="${hy.jdk}/jre/lib/boot/math.jar"
+ jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
excludeFilter="make/findbugs-exclude-filter.xml"
- outputFile="${findBugs.report}/math.xml"/>
+ outputFile="${findBugs.report}/${hy.module}.xml"/>
</target>
- <target name="build-jar" depends="svn-info,class-patternset">
- <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/math.jar"
+ <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">
<fileset refid="classes" />
<fileset refid="resources" />
</hy.jar.bin>
- <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/math-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
<fileset dir="src/main/java" />
</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" />
- <hy.jar.bin destfile="${tests.hdk.dir}/math_tests.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
<fileset dir="bin/test" />
</hy.jar.bin>
@@ -116,8 +109,8 @@
</copy>
</target>
- <target name="compile-tests">
- <compile-tests description="math tests">
+ <target name="-compile-tests" unless="skip.test.build">
+ <compile-tests description="${hy.module} tests">
<javac-elements>
<src>
<pathelement location="src/test/java" />
@@ -126,11 +119,11 @@
</compile-tests>
</target>
- <target name="run-tests" depends="test-jar">
+ <target name="-run-tests" depends="-test-jar">
<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/java6/classlib/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/misc/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/misc/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/misc/build.xml Sun May 9 08:26:02 2010
@@ -26,7 +26,9 @@
<property file="../../make/depends.properties" />
- <target name="build" depends="compile-java, build-jar" />
+ <target name="build" depends="-build-no-check"/>
+ <target name="-build-no-check"
+ depends="-build-jar,-build-native,-test-jar" />
<target name="test" depends="-test-module">
<fail message="Some tests failed">
@@ -40,76 +42,67 @@
</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">
- <delete file="${hy.jdk}/jre/lib/boot/misc.jar" />
- <delete file="${hy.jdk}/jre/lib/boot/misc-src.jar" />
+ <target name="clean" depends="-clean-java,-clean-native,-clean-test" />
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
<delete failonerror="false">
<fileset refid="classes" />
</delete>
<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">
- <echo message="Compiling ${hy.module} classes" />
-
- <mkdir dir="../../build/classes" />
-
- <hy.javac sourcepath=""
- srcdir="src/main/java"
- destdir="../../build/classes">
-
- <compilerarg line="${build.compilerarg}" />
-
- <bootclasspath>
- <fileset dir="${hy.jdk}/jre/lib/boot">
- <include name="**/*.jar" />
- </fileset>
- </bootclasspath>
- </hy.javac>
+ <target name="-compile-java" unless="skip.java.build">
+ <compile-classes description="${hy.module} classes">
+ <javac-elements>
+ <src path="src/main/java" />
+ </javac-elements>
+ </compile-classes>
</target>
- <target name="findbugs" depends="build-jar">
+ <target name="findbugs" depends="-build-jar">
<run-findBugs
- jarFile="${hy.jdk}/jre/lib/boot/misc.jar"
+ jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
excludeFilter="make/findbugs-exclude-filter.xml"
- outputFile="${findBugs.report}/misc.xml"/>
+ outputFile="${findBugs.report}/${hy.module}.xml"/>
</target>
- <target name="build-jar" depends="svn-info,class-patternset">
- <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/misc.jar"
+ <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">
<fileset refid="classes" />
<fileset refid="resources" />
</hy.jar.bin>
- <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/misc-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
<fileset dir="src/main/java" />
</hy.jar.src>
</target>
- <target name="build-native" depends="build-native-all" />
- <target name="build-native-all" >
+ <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" />
- <hy.jar.bin destfile="${tests.hdk.dir}/misc_tests.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
<fileset dir="bin/test" />
</hy.jar.bin>
@@ -124,8 +117,8 @@
</copy>
</target>
- <target name="compile-tests">
- <compile-tests description="misc tests">
+ <target name="-compile-tests" unless="skip.test.build">
+ <compile-tests description="${hy.module} tests">
<javac-elements>
<src>
<pathelement location="src/test/java/common" />
@@ -134,11 +127,11 @@
</compile-tests>
</target>
- <target name="run-tests" depends="test-jar">
+ <target name="-run-tests" depends="-test-jar">
<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/java6/classlib/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio/build.xml Sun May 9 08:26:02 2010
@@ -26,9 +26,11 @@
<property file="../../make/depends.properties" />
- <target name="build" depends="compile-java, build-jar" />
+ <target name="build" depends="-build-no-check"/>
+ <target name="-build-no-check"
+ depends="-build-jar,-build-native,-test-jar" />
- <target name="clean" depends="clean-java,clean-native,clean-test" />
+ <target name="clean" depends="-clean-java,-clean-native,-clean-test" />
<target name="test" depends="-test-module">
<fail message="Some tests failed">
@@ -42,80 +44,70 @@
</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" depends="build-native-all" />
- <target name="build-native-all" >
- <make dir="src/main/native/nio/${hy.os.family}" />
+ <target name="-build-native" unless="skip.native.build">
+ <make dir="src/main/native/${hy.module}/${hy.os.family}" />
</target>
- <target name="clean-java" depends="class-patternset">
- <delete file="${hy.jdk}/jre/lib/boot/nio.jar" />
- <delete file="${hy.jdk}/jre/lib/boot/nio-src.jar" />
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
<delete includeemptydirs="true" failonerror="false">
<fileset refid="classes" />
</delete>
<delete-patternset module="${hy.module}" />
</target>
- <target name="clean-native">
- <make dir="src/main/native/nio/${hy.os.family}" target="clean" />
+ <target name="-clean-native" unless="skip.native.build">
+ <make dir="src/main/native/${hy.module}/${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">
- <echo message="Compiling ${hy.module} classes" />
-
- <mkdir dir="../../build/classes" />
-
- <hy.javac sourcepath=""
- destdir="../../build/classes">
-
- <compilerarg line="${build.compilerarg}" />
-
- <src>
- <pathelement location="src/main/java/common" />
- <pathelement location="src/main/java/${hy.os.family}" />
- </src>
-
- <bootclasspath>
- <fileset dir="${hy.jdk}/jre/lib/boot">
- <include name="**/*.jar" />
- </fileset>
- </bootclasspath>
- </hy.javac>
+ <target name="-compile-java" unless="skip.java.build">
+ <compile-classes description="${hy.module} classes">
+ <javac-elements>
+ <src>
+ <pathelement location="src/main/java/common" />
+ <pathelement location="src/main/java/${hy.os.family}" />
+ </src>
+ </javac-elements>
+ </compile-classes>
</target>
- <target name="findbugs" depends="build-jar">
+ <target name="findbugs" depends="-build-jar">
<run-findBugs
- jarFile="${hy.jdk}/jre/lib/boot/nio.jar"
+ jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
excludeFilter="make/findbugs-exclude-filter.xml"
- outputFile="${findBugs.report}/nio.xml"/>
+ outputFile="${findBugs.report}/${hy.module}.xml"/>
</target>
- <target name="build-jar" depends="svn-info,class-patternset">
- <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/nio.jar"
+ <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">
<fileset refid="classes" />
<fileset refid="common.resources" />
</hy.jar.bin>
- <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/nio-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
<fileset dir="src/main/java/common" />
</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" />
- <hy.jar.bin destfile="${tests.hdk.dir}/nio_tests.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
<fileset dir="bin/test" />
</hy.jar.bin>
@@ -134,8 +126,8 @@
</copy>
</target>
- <target name="compile-tests">
- <compile-tests description="nio tests">
+ <target name="-compile-tests" unless="skip.test.build">
+ <compile-tests description="${hy.module} tests">
<javac-elements>
<src>
<pathelement location="src/test/java/common" />
@@ -145,11 +137,11 @@
</compile-tests>
</target>
- <target name="run-tests" depends="test-jar">
+ <target name="-run-tests" depends="-test-jar">
<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/java6/classlib/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/nio_char/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/nio_char/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/nio_char/build.xml Sun May 9 08:26:02 2010
@@ -26,13 +26,14 @@
<property file="../../make/depends.properties" />
- <target name="build" depends="compile-java, build-jar" />
+ <target name="build" depends="-build-no-check"/>
+ <target name="-build-no-check"
+ depends="-build-jar,-build-native,-test-jar" />
- <target name="clean" depends="clean-java,clean-native,clean-test" />
+ <target name="clean" depends="-clean-java,-clean-native,-clean-test" />
<!-- Build natives.-->
- <target name="build-native" depends="build-native-all" />
- <target name="build-native-all" >
+ <target name="-build-native" unless="skip.native.build">
<make dir="src/main/native/niochar/${hy.os.family}" />
</target>
@@ -48,57 +49,47 @@
</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">
- <delete file="${hy.jdk}/jre/lib/boot/nio_char.jar" />
- <delete file="${hy.jdk}/jre/lib/boot/nio_char-src.jar" />
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
<delete failonerror="false">
<fileset refid="classes" />
</delete>
<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">
- <echo message="Compiling ${hy.module} classes" />
-
- <mkdir dir="../../build/classes" />
-
- <hy.javac sourcepath=""
- srcdir="src/main/java"
- destdir="../../build/classes">
-
- <compilerarg line="${build.compilerarg}" />
-
- <!-- Exclude unwanted data files -->
- <excludesfile name="${basedir}/make/excludesfile" />
-
- <bootclasspath>
- <fileset dir="${hy.jdk}/jre/lib/boot">
- <include name="**/*.jar" />
- </fileset>
- </bootclasspath>
- </hy.javac>
+ <target name="-compile-java" unless="skip.java.build">
+ <compile-classes description="${hy.module} classes">
+ <javac-elements>
+ <src path="src/main/java" />
+ <!-- Exclude unwanted data files -->
+ <excludesfile name="make/excludesfile" />
+ </javac-elements>
+ </compile-classes>
</target>
- <target name="findbugs" depends="build-jar">
+ <target name="findbugs" depends="-build-jar">
<run-findBugs
- jarFile="${hy.jdk}/jre/lib/boot/nio_char.jar"
+ jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
excludeFilter="make/findbugs-exclude-filter.xml"
- outputFile="${findBugs.report}/nio_char.xml"/>
+ outputFile="${findBugs.report}/${hy.module}.xml"/>
</target>
- <target name="build-jar" depends="svn-info,class-patternset">
- <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/nio_char.jar"
+ <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">
<service type="java.nio.charset.spi.CharsetProvider"
provider="org.apache.harmony.niochar.CharsetProviderImpl"/>
@@ -106,21 +97,22 @@
<fileset refid="resources" />
</hy.jar.bin>
- <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/nio_char-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
<service type="java.nio.charset.spi.CharsetProvider"
provider="org.apache.harmony.niochar.CharsetProviderImpl"/>
<fileset dir="src/main/java">
- <excludesfile name="${basedir}/make/excludesfile"/>
+ <excludesfile name="make/excludesfile"/>
</fileset>
</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" />
- <hy.jar.bin destfile="${tests.hdk.dir}/nio_char_tests.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
<fileset dir="bin/test" />
</hy.jar.bin>
@@ -140,8 +132,8 @@
</copy>
</target>
- <target name="compile-tests">
- <compile-tests description="nio_char tests">
+ <target name="-compile-tests" unless="skip.test.build">
+ <compile-tests description="${hy.module} tests">
<javac-elements>
<src>
<pathelement location="src/test/java" />
@@ -150,11 +142,11 @@
</compile-tests>
</target>
- <target name="run-tests" depends="test-jar">
+ <target name="-run-tests" depends="-test-jar">
<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/java6/classlib/modules/orb/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/orb/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/orb/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/orb/build.xml Sun May 9 08:26:02 2010
@@ -27,9 +27,10 @@
<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,-build-no-check"/>
+ <target name="-build-no-check" depends="-copy-jars" />
- <target name="clean" depends="clean-java" />
+ <target name="clean" depends="-clean-java" />
<target name="check-depends">
<check-one-file src="${yoko.url}" dest="${yoko.jar}" />
@@ -67,7 +68,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 +79,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/java6/classlib/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/pack200/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/pack200/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/pack200/build.xml Sun May 9 08:26:02 2010
@@ -27,7 +27,8 @@
<property file="../../make/depends.properties" />
- <target name="build" depends="check-depends, compile-java, build-jar" />
+ <target name="build" depends="check-depends,-build-no-check"/>
+ <target name="-build-no-check" depends="-build-jar,-test-jar" />
<target name="check-depends">
<check-one-file src="${asm.url}" dest="${asm.jar}" />
@@ -58,25 +59,26 @@
</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" depends="-clean-java,-clean-test" />
- <target name="clean-java" depends="class-patternset">
- <delete file="${hy.jdk}/jre/lib/boot/pack200.jar" />
- <delete file="${hy.jdk}/jre/lib/boot/pack200-src.jar" />
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
<delete failonerror="false">
<fileset refid="classes" />
</delete>
<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" />
@@ -97,29 +99,23 @@
</bootclasspath>
</hy.javac>
<!-- Java5 classes, with generics -->
- <hy.javac sourcepath=""
- srcdir="src/main/java5"
- destdir="../../build/classes">
-
- <compilerarg line="${build.compilerarg}" />
-
- <bootclasspath>
- <fileset dir="${hy.jdk}/jre/lib/boot">
- <include name="**/*.jar" />
- </fileset>
- </bootclasspath>
- </hy.javac>
+ <compile-classes description="${hy.module} java5 classes">
+ <javac-elements>
+ <src path="src/main/java5" />
+ </javac-elements>
+ </compile-classes>
</target>
- <target name="findbugs" depends="build-jar">
+ <target name="findbugs" depends="-build-jar">
<run-findBugs
- jarFile="${hy.jdk}/jre/lib/boot/pack200.jar"
+ jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
excludeFilter="make/findbugs-exclude-filter.xml"
- outputFile="${findBugs.report}/pack200.xml"/>
+ outputFile="${findBugs.report}/${hy.module}.xml"/>
</target>
- <target name="build-jar" depends="svn-info,class-patternset">
- <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/pack200.jar"
+ <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">
<manifest>
<attribute name="X-Compile-Source-JDK"
@@ -131,18 +127,19 @@
<fileset refid="resources" />
</hy.jar.bin>
- <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/pack200-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
<fileset dir="src/main/java" />
<fileset dir="src/main/java/../java5" />
</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" />
- <hy.jar.bin destfile="${tests.hdk.dir}/pack200_tests.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
<fileset dir="bin/test" />
</hy.jar.bin>
@@ -161,7 +158,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" />
@@ -189,11 +186,11 @@
</hy.javac>
</target>
- <target name="run-tests" depends="test-jar">
+ <target name="-run-tests" depends="-test-jar">
<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/java6/classlib/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/portlib/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/portlib/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/portlib/build.xml Sun May 9 08:26:02 2010
@@ -35,9 +35,9 @@
</and>
</condition>
- <target name="build" />
+ <target name="build" depends="-build-native"/>
- <target name="clean" depends="clean-native,clean-test" />
+ <target name="clean" depends="-clean-native,-clean-test" />
<target name="test" depends="-test-module">
<fail message="Some tests failed">
@@ -50,10 +50,11 @@
</target>
<target name="-test-module"
- depends="-make-report-dir,-compile-native-tests,-run-native-tests" />
-
- <target name="copy-native-includes"
- 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" />
@@ -78,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" />
@@ -85,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" />
@@ -93,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" />
@@ -123,9 +127,10 @@
</target>
<!-- Build the portlib native components -->
- <target name="build-native"
- depends="-build-native,-build-native-thread,-build-native-thrstub,-build-native-port" />
- <target name="-build-native" depends="-build-ascii-ebcdic">
+ <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">
<!-- Build common lib -->
<make dir="src/main/native/common/${hy.os.family}" />
@@ -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}" />
@@ -288,10 +301,10 @@
<fileset dir="." includes="TEST-*.xml" />
</delete>
- <antcall target="touch-errors-file" />
+ <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}"
@@ -322,7 +335,7 @@
target="clean" />
</target>
- <target name="touch-errors-file" if="test.errors">
+ <target name="-touch-errors-file" if="test.errors">
<echo file="${tests.output}/test.errors"
append="true">portlib${line.separator}</echo>
</target>
Modified: harmony/enhanced/java/branches/java6/classlib/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/prefs/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/prefs/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/prefs/build.xml Sun May 9 08:26:02 2010
@@ -28,9 +28,11 @@
<property file="../../make/depends.properties" />
- <target name="build" depends="compile-java, build-jar" />
+ <target name="build" depends="-build-no-check"/>
+ <target name="-build-no-check"
+ depends="-build-jar,-build-native,-test-jar" />
- <target name="clean" depends="clean-java,clean-native,clean-test" />
+ <target name="clean" depends="-clean-java,-clean-native,-clean-test" />
<target name="test" depends="-test-module">
<fail message="Some tests failed">
@@ -44,18 +46,18 @@
</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. Currently there are only windows natives for
prefs, so we check if we are on a windows platform -->
- <target name="build-native" depends="build-native-all" />
- <target name="build-native-all" if="is.windows">
+ <target name="-build-native" if="is.windows" unless="skip.native.build">
<make dir="src/main/native/prefs/${hy.os.family}" />
</target>
- <target name="clean-java" depends="class-patternset">
- <delete file="${hy.jdk}/jre/lib/boot/prefs.jar" />
- <delete file="${hy.jdk}/jre/lib/boot/prefs-src.jar" />
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
<delete failonerror="false">
<fileset refid="classes" />
</delete>
@@ -64,59 +66,50 @@
<!-- Clean natives. Currently there are only windows natives for
prefs, so we check if we are on a windows platform -->
- <target name="clean-native" if="is.windows">
+ <target name="-clean-native" if="is.windows" unless="skip.native.build">
<make dir="src/main/native/prefs/${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">
- <echo message="Compiling ${hy.module} classes" />
-
- <mkdir dir="../../build/classes" />
-
- <hy.javac sourcepath=""
- srcdir="src/main/java"
- destdir="../../build/classes">
-
- <compilerarg line="${build.compilerarg}" />
-
- <bootclasspath>
- <fileset dir="${hy.jdk}/jre/lib/boot">
- <include name="**/*.jar" />
- </fileset>
- </bootclasspath>
- </hy.javac>
+ <target name="-compile-java" unless="skip.java.build">
+ <compile-classes description="${hy.module} classes">
+ <javac-elements>
+ <src path="src/main/java" />
+ </javac-elements>
+ </compile-classes>
</target>
- <target name="findbugs" depends="build-jar">
+ <target name="findbugs" depends="-build-jar">
<run-findBugs
- jarFile="${hy.jdk}/jre/lib/boot/prefs.jar"
+ jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
excludeFilter="make/findbugs-exclude-filter.xml"
- outputFile="${findBugs.report}/prefs.xml"/>
+ outputFile="${findBugs.report}/${hy.module}.xml"/>
</target>
- <target name="build-jar" depends="svn-info,class-patternset">
- <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/prefs.jar"
+ <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">
<fileset refid="classes" />
<fileset refid="resources" />
</hy.jar.bin>
- <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/prefs-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
<fileset dir="src/main/java" />
</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" />
- <hy.jar.bin destfile="${tests.hdk.dir}/prefs_tests.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
<fileset dir="bin/test" />
</hy.jar.bin>
@@ -135,8 +128,8 @@
</copy>
</target>
- <target name="compile-tests">
- <compile-tests description="prefs tests">
+ <target name="-compile-tests" unless="skip.test.build">
+ <compile-tests description="${hy.module} tests">
<javac-elements>
<src>
<pathelement location="src/test/java" />
@@ -145,11 +138,11 @@
</compile-tests>
</target>
- <target name="run-tests" depends="test-jar">
+ <target name="-run-tests" depends="-test-jar">
<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/java6/classlib/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/print/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/print/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/print/build.xml Sun May 9 08:26:02 2010
@@ -26,9 +26,11 @@
<property file="../../make/depends.properties" />
- <target name="build" depends="compile-java, build-jar" />
+ <target name="build" depends="-build-no-check"/>
+ <target name="-build-no-check"
+ depends="-build-jar,-build-native,-test-jar" />
- <target name="clean" depends="clean-java,clean-native,clean-test" />
+ <target name="clean" depends="-clean-java,-clean-native,-clean-test" />
<target name="test" depends="-test-module">
<fail message="Some tests failed">
@@ -42,59 +44,50 @@
</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">
- <delete file="${hy.jdk}/jre/lib/boot/print.jar" />
- <delete file="${hy.jdk}/jre/lib/boot/print-src.jar" />
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
<delete failonerror="false">
<fileset refid="classes" />
</delete>
<delete-patternset module="${hy.module}" />
</target>
- <target name="clean-native" if="is.windows">
+ <target name="-clean-native" if="is.windows" unless="skip.native.build">
<make dir="src/main/native/print/${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">
- <echo message="Compiling ${hy.module} classes" />
-
- <mkdir dir="../../build/classes" />
-
- <hy.javac sourcepath=""
- srcdir="src/main/java/common"
- destdir="../../build/classes">
-
- <compilerarg line="${build.compilerarg}" />
-
- <bootclasspath>
- <fileset dir="${hy.jdk}/jre/lib/boot">
- <include name="**/*.jar" />
- </fileset>
- </bootclasspath>
- </hy.javac>
+ <target name="-compile-java" unless="skip.java.build">
+ <compile-classes description="${hy.module} classes">
+ <javac-elements>
+ <src path="src/main/java/common" />
+ <src path="src/main/java/${hy.os.family}" />
+ </javac-elements>
+ </compile-classes>
</target>
- <target name="build-native" depends="build-native-all" />
- <target name="build-native-all" if="is.windows">
+ <target name="-build-native" if="is.windows" unless="skip.native.build">
<make dir="src/main/native/print/${hy.os.family}" />
</target>
- <target name="findbugs" depends="build-jar">
+ <target name="findbugs" depends="-build-jar">
<run-findBugs
- jarFile="${hy.jdk}/jre/lib/boot/print.jar"
+ jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
excludeFilter="make/findbugs-exclude-filter.xml"
- outputFile="${findBugs.report}/print.xml"/>
+ outputFile="${findBugs.report}/${hy.module}.xml"/>
</target>
- <target name="build-jar" depends="svn-info,class-patternset">
- <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/print.jar"
+ <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">
<metainf prefix="META-INF/services"
dir="src/main/java/common/org/apache/harmony/x/print"
@@ -110,7 +103,7 @@
</fileset>
</hy.jar.bin>
- <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/print-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
<metainf prefix="META-INF/services"
dir="src/main/java/common/org/apache/harmony/x/print"
includes="javax.print.StreamPrintServiceFactory"/>
@@ -122,12 +115,13 @@
</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" />
- <hy.jar.bin destfile="${tests.hdk.dir}/print_tests.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
<fileset dir="bin/test" />
</hy.jar.bin>
@@ -142,8 +136,8 @@
</copy>
</target>
- <target name="compile-tests">
- <compile-tests description="print tests">
+ <target name="-compile-tests" unless="skip.test.build">
+ <compile-tests description="${hy.module} tests">
<javac-elements>
<src>
<pathelement location="src/test/api/java/common" />
@@ -152,11 +146,11 @@
</compile-tests>
</target>
- <target name="run-tests" depends="test-jar">
+ <target name="-run-tests" depends="-test-jar">
<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/java6/classlib/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/regex/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/regex/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/regex/build.xml Sun May 9 08:26:02 2010
@@ -26,7 +26,8 @@
<property file="../../make/depends.properties" />
- <target name="build" depends="compile-java, build-jar" />
+ <target name="build" depends="-build-no-check"/>
+ <target name="-build-no-check" depends="-build-jar,-test-jar" />
<target name="test" depends="-test-module">
<fail message="Some tests failed">
@@ -40,68 +41,60 @@
</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" depends="-clean-java,-clean-test" />
- <target name="clean-java" depends="class-patternset">
- <delete file="${hy.jdk}/jre/lib/boot/regex.jar" />
- <delete file="${hy.jdk}/jre/lib/boot/regex-src.jar" />
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
<delete failonerror="false">
<fileset refid="classes" />
</delete>
<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">
- <echo message="Compiling ${hy.module} classes" />
-
- <mkdir dir="../../build/classes" />
-
- <hy.javac sourcepath=""
- srcdir="src/main/java"
- destdir="../../build/classes">
-
- <compilerarg line="${build.compilerarg}" />
-
- <bootclasspath>
- <fileset dir="${hy.jdk}/jre/lib/boot">
- <include name="**/*.jar" />
- </fileset>
- </bootclasspath>
- </hy.javac>
+ <target name="-compile-java" unless="skip.java.build">
+ <compile-classes description="${hy.module} classes">
+ <javac-elements>
+ <src path="src/main/java" />
+ </javac-elements>
+ </compile-classes>
</target>
- <target name="findbugs" depends="build-jar">
+ <target name="findbugs" depends="-build-jar">
<run-findBugs
- jarFile="${hy.jdk}/jre/lib/boot/regex.jar"
+ jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
excludeFilter="make/findbugs-exclude-filter.xml"
- outputFile="${findBugs.report}/regex.xml"/>
+ outputFile="${findBugs.report}/${hy.module}.xml"/>
</target>
- <target name="build-jar" depends="svn-info,class-patternset">
- <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/regex.jar"
+ <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">
<fileset refid="classes" />
<fileset refid="resources" />
</hy.jar.bin>
- <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/regex-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
<fileset dir="src/main/java" />
</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" />
- <hy.jar.bin destfile="${tests.hdk.dir}/regex_tests.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
<fileset dir="bin/test" />
</hy.jar.bin>
@@ -120,8 +113,8 @@
</copy>
</target>
- <target name="compile-tests">
- <compile-tests description="regex tests">
+ <target name="-compile-tests" unless="skip.test.build">
+ <compile-tests description="${hy.module} tests">
<javac-elements>
<src>
<pathelement location="src/test/java" />
@@ -130,11 +123,11 @@
</compile-tests>
</target>
- <target name="run-tests" depends="test-jar">
+ <target name="-run-tests" depends="-test-jar">
<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/java6/classlib/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/rmi/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/rmi/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/rmi/build.xml Sun May 9 08:26:02 2010
@@ -26,7 +26,8 @@
<property file="../../make/depends.properties" />
- <target name="build" depends="compile-java, build-jar" />
+ <target name="build" depends="-build-no-check"/>
+ <target name="-build-no-check" depends="-build-jar,-test-jar" />
<target name="test" depends="-test-module">
<fail message="Some tests failed">
@@ -40,68 +41,60 @@
</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" depends="-clean-java,-clean-test" />
- <target name="clean-java" depends="class-patternset">
- <delete file="${hy.jdk}/jre/lib/boot/rmi.jar" />
- <delete file="${hy.jdk}/jre/lib/boot/rmi-src.jar" />
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
<delete failonerror="false">
<fileset refid="classes" />
</delete>
<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">
- <echo message="Compiling ${hy.module} classes" />
-
- <mkdir dir="../../build/classes" />
-
- <hy.javac sourcepath=""
- srcdir="src/main/java"
- destdir="../../build/classes">
-
- <compilerarg line="${build.compilerarg}" />
-
- <bootclasspath>
- <fileset dir="${hy.jdk}/jre/lib/boot">
- <include name="**/*.jar" />
- </fileset>
- </bootclasspath>
- </hy.javac>
+ <target name="-compile-java" unless="skip.java.build">
+ <compile-classes description="${hy.module} classes">
+ <javac-elements>
+ <src path="src/main/java" />
+ </javac-elements>
+ </compile-classes>
</target>
- <target name="findbugs" depends="build-jar">
+ <target name="findbugs" depends="-build-jar">
<run-findBugs
- jarFile="${hy.jdk}/jre/lib/boot/rmi.jar"
+ jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
excludeFilter="make/findbugs-exclude-filter.xml"
- outputFile="${findBugs.report}/rmi.xml"/>
+ outputFile="${findBugs.report}/${hy.module}.xml"/>
</target>
- <target name="build-jar" depends="svn-info,class-patternset">
- <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/rmi.jar"
+ <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">
<fileset refid="classes" />
<fileset refid="resources" />
</hy.jar.bin>
- <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/rmi-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
<fileset dir="src/main/java" />
</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" />
- <hy.jar.bin destfile="${tests.hdk.dir}/rmi_tests.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
<fileset dir="bin/test/api" />
</hy.jar.bin>
@@ -121,8 +114,9 @@
<copy file="make/all.policy" todir="${tests.resources.hdk.dir}" />
</target>
- <target name="compile-tests">
- <compile-tests description="rmi api tests" destdir="bin/test/api">
+ <target name="-compile-tests" unless="skip.test.build">
+ <compile-tests description="${hy.module} api tests"
+ destdir="bin/test/api">
<javac-elements>
<src>
<pathelement location="src/test/api/java"/>
@@ -133,11 +127,11 @@
</compile-tests>
</target>
- <target name="run-tests" depends="test-jar">
+ <target name="-run-tests" depends="-test-jar">
<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/java6/classlib/modules/saaj/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/saaj/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/saaj/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/saaj/build.xml Sun May 9 08:26:02 2010
@@ -27,10 +27,10 @@
<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" />
<target name="check-depends"
- depends="-check-depends,-extract-props,-extract" />
+ depends="-check-depends,-extract-props,-extract,-copy-jars" />
<target name="-check-depends">
<check-one-file src="${axis.url}" dest="${axis.zip}" />
@@ -52,14 +52,12 @@
</target>
<target name="fetch-depends">
-
<mkdir dir="${axis.dir}" />
<download-one-file src="${axis.url}" dest="${axis.zip}"
md5="${axis.md5}" />
-
</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="${axis.dirname}/*.jar" />
@@ -72,7 +70,7 @@
<target name="test" />
- <target name="clean">
+ <target name="clean" unless="skip.java.build">
<delete dir="${hy.jdk}/jre/lib/boot/${axis.dirname}" />
</target>
Modified: harmony/enhanced/java/branches/java6/classlib/modules/script/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/script/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/script/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/script/build.xml Sun May 9 08:26:02 2010
@@ -27,10 +27,10 @@
<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" />
<target name="check-depends"
- depends="-check-depends,-extract-props,-extract" />
+ depends="-check-depends,-extract-props,-extract,-copy-jars" />
<target name="-check-depends">
<check-one-file src="${bsf.url}" dest="${bsf.zip}" />
@@ -52,14 +52,12 @@
</target>
<target name="fetch-depends">
-
<mkdir dir="${bsf.dir}" />
<download-one-file src="${bsf.url}" dest="${bsf.zip}"
md5="${bsf.md5}" />
-
</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="bsf-${bsf.version}/*.jar" />
@@ -72,7 +70,7 @@
<target name="test" />
- <target name="clean">
+ <target name="clean" unless="skip.java.build">
<delete dir="${hy.jdk}/jre/lib/boot/bsf-${bsf.version}" />
</target>
Modified: harmony/enhanced/java/branches/java6/classlib/modules/security-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/security-kernel/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/security-kernel/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/security-kernel/build.xml Sun May 9 08:26:02 2010
@@ -17,7 +17,7 @@
-->
<project name="Security Kernel Stub JAR Build"
- default="warn" basedir=".">
+ default="-warn" basedir=".">
<description>Build for security kernel stub jar</description>
@@ -26,9 +26,9 @@
<import file="${hy.hdk}/build/ant/properties.xml" />
<property name="stub.jar"
- location="${hy.jdk}/jre/lib/boot/security-kernel-stubs.jar" />
+ location="${hy.jdk}/jre/lib/boot/${hy.module}-stubs.jar" />
- <target name="warn">
+ <target name="-warn">
<fail>...
This module is a non-functional stub. It is intended only for use by
@@ -37,15 +37,18 @@ the top-level build.
</fail>
</target>
- <target name="build" depends="svn-info,class-patternset">
+ <target name="build" depends="-build-no-check"/>
+ <target name="-build-no-check" 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>
</target>
- <target name="clean" depends="clean-java" />
+ <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 +56,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/java6/classlib/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/security/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/security/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/security/build.xml Sun May 9 08:26:02 2010
@@ -26,9 +26,11 @@
<property file="../../make/depends.properties" />
- <target name="build" depends="compile-java, build-jar" />
+ <target name="build" depends="-build-no-check"/>
+ <target name="-build-no-check"
+ depends="-build-jar,-build-native,-test-jar" />
- <target name="clean" depends="clean-java,clean-native,clean-test" />
+ <target name="clean" depends="-clean-java,-clean-native,-clean-test" />
<target name="test" depends="-test-module">
<fail message="Some tests failed">
@@ -42,96 +44,82 @@
</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 -->
- <available file="src/main/native/security/${hy.os.family}"
- property="native.present" />
-
- <target name="build-native" depends="build-native-all" />
- <target name="build-native-all" if="native.present" >
+ <target name="-build-native" unless="skip.native.build">
<make dir="src/main/native/security/${hy.os.family}" />
</target>
- <target name="clean-java" depends="class-patternset">
- <delete file="${hy.jdk}/jre/lib/boot/security.jar" />
- <delete file="${hy.jdk}/jre/lib/boot/security-src.jar" />
+ <target name="-clean-java" unless="skip.java.build"
+ depends="-class-patternset">
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+ <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
<delete failonerror="false">
<fileset refid="classes" />
</delete>
<delete-patternset module="${hy.module}" />
</target>
- <target name="clean-native" if="native.present" >
+ <target name="-clean-native" unless="skip.native.build">
<make dir="src/main/native/security/${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">
- <echo message="Compiling ${hy.module} classes" />
-
- <mkdir dir="../../build/classes" />
-
- <hy.javac sourcepath=""
- destdir="../../build/classes">
-
- <compilerarg line="${build.compilerarg}" />
-
- <src>
- <pathelement location="src/main/java/common"/>
- <pathelement location="src/main/java/${hy.os.family}" />
- </src>
-
- <bootclasspath>
- <fileset dir="${hy.jdk}/jre/lib/boot">
- <include name="**/*.jar" />
- </fileset>
- </bootclasspath>
- </hy.javac>
+ <target name="-compile-java" unless="skip.java.build">
+ <compile-classes description="${hy.module} classes">
+ <javac-elements>
+ <src>
+ <pathelement location="src/main/java/common"/>
+ <pathelement location="src/main/java/${hy.os.family}" />
+ </src>
+ </javac-elements>
+ </compile-classes>
</target>
- <target name="findbugs" depends="build-jar">
+ <target name="findbugs" depends="-build-jar">
<run-findBugs
- jarFile="${hy.jdk}/jre/lib/boot/security.jar"
+ jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
excludeFilter="make/findbugs-exclude-filter.xml"
- outputFile="${findBugs.report}/security.xml"/>
+ outputFile="${findBugs.report}/${hy.module}.xml"/>
</target>
- <target name="build-jar" depends="svn-info,class-patternset">
- <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/security.jar"
+ <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">
<fileset refid="classes" />
<fileset refid="common.resources" />
</hy.jar.bin>
- <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/security-src.jar">
+ <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
<fileset dir="src/main/java/common" />
<fileset dir="src/main/java/${hy.os.family}" />
</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" />
- <hy.jar.bin destfile="${tests.hdk.dir}/security_tests_api.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_api.jar">
<fileset dir="bin/test/api" />
</hy.jar.bin>
- <hy.jar.bin destfile="${tests.hdk.dir}/security_tests_api_in.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_api_in.jar">
<fileset dir="bin/test/api.injected" />
</hy.jar.bin>
- <hy.jar.bin destfile="${tests.hdk.dir}/security_tests_impl.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_impl.jar">
<fileset dir="bin/test/impl" />
</hy.jar.bin>
- <hy.jar.bin destfile="${tests.hdk.dir}/security_tests_impl_in.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_impl_in.jar">
<fileset dir="bin/test/impl.injected" />
</hy.jar.bin>
- <hy.jar.bin destfile="${tests.hdk.dir}/security_tests_support.jar">
+ <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_support.jar">
<fileset dir="bin/test/support" />
</hy.jar.bin>
@@ -150,9 +138,9 @@
</copy>
</target>
- <target name="compile-tests">
+ <target name="-compile-tests" unless="skip.test.build">
- <compile-tests description="security test support files"
+ <compile-tests description="${hy.module} test support files"
destdir="bin/test/support">
<javac-elements>
<src>
@@ -162,7 +150,7 @@
</javac-elements>
</compile-tests>
- <compile-tests description="security api tests" destdir="bin/test/api">
+ <compile-tests description="${hy.module} api tests" destdir="bin/test/api">
<javac-elements>
<src>
<pathelement location="src/test/api/java"/>
@@ -173,7 +161,7 @@
</javac-elements>
</compile-tests>
- <compile-tests description="security api injected tests"
+ <compile-tests description="${hy.module} api injected tests"
destdir="bin/test/api.injected">
<javac-elements>
<src path="src/test/api/java.injected"/>
@@ -182,7 +170,7 @@
</javac-elements>
</compile-tests>
- <compile-tests description="security impl injected tests"
+ <compile-tests description="${hy.module} impl injected tests"
destdir="bin/test/impl.injected">
<javac-elements>
<src>
@@ -194,7 +182,7 @@
</javac-elements>
</compile-tests>
- <compile-tests description="security impl tests"
+ <compile-tests description="${hy.module} impl tests"
destdir="bin/test/impl">
<javac-elements>
<src>
@@ -207,11 +195,11 @@
</compile-tests>
</target>
- <target name="run-tests" depends="test-jar">
+ <target name="-run-tests" depends="-test-jar">
<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>