harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r941503 [2/5] - in /harmony/enhanced/java/trunk: ./ classlib/ classlib/make/ classlib/modules/accessibility/ classlib/modules/annotation/ classlib/modules/applet/ classlib/modules/archive/ classlib/modules/auth/ classlib/modules/awt/ classl...
Date Wed, 05 May 2010 21:29:20 GMT
Modified: harmony/enhanced/java/trunk/classlib/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/archive/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/archive/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/archive/build.xml Wed May  5 21:29:16 2010
@@ -28,11 +28,16 @@
     <property file="../../make/depends.properties" />
     <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="clean" depends="clean-java,clean-native,clean-test" />
+    <target name="clean" depends="-clean-java,-clean-native,-clean-test" />
 
-    <target name="check-depends" unless="hy.skip.zlib">
+    <target name="check-depends"
+            depends="-check-depends,-overlay-oss,
+                     -copy-zipsup-include,-copy-zlib-include" />
+
+    <target name="-check-depends" unless="hy.skip.zlib">
         <check-one-file src="${zlib.url}" dest="${zlib.tar}" />
     </target>
 
@@ -42,10 +47,8 @@
                            md5="${zlib.md5}" />
     </target>
 
-    <target name="copy-native-includes"
-            depends="overlay-oss, copy-zipsup-include, copy-zlib-include" />
-
-    <target name="copy-zlib-include" unless="hy.skip.zlib">
+    <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" />
@@ -54,7 +57,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" />
@@ -62,7 +66,7 @@
         </copy>
     </target>
     
-    <target name="overlay-oss"
+    <target name="-overlay-oss"
             depends="-extract-props,-unzip-oss,-ascii2ebcdic-conversion"
             unless="hy.skip.zlib" />
 
@@ -107,35 +111,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"
-            depends="-clean-native-zip,-clean-native-zlib,clean-native-includes,clean-overlay-oss">
+    <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" />
@@ -143,7 +151,7 @@
         </delete>
     </target>
 
-    <target name="clean-overlay-oss" unless="hy.skip.zlib" >
+    <target name="-clean-overlay-oss" unless="hy.skip.zlib" >
         <delete dir="src/main/native/zlib_dist" quiet="true" />
     </target>
     
@@ -159,70 +167,62 @@
     </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/archive.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/archive-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/archive.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/archive.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/archive.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/archive-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}/archive_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/archive_internal_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_internal_tests.jar">
             <fileset dir="bin/test-internal" />
         </hy.jar.bin>
 
@@ -237,8 +237,8 @@
         </copy>
     </target>
 
-    <target name="compile-tests">
-        <compile-tests description="archive internal tests"
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} internal tests"
                        destdir="bin/test-internal">
             <javac-elements>
                 <src>
@@ -246,7 +246,7 @@
                 </src>
             </javac-elements>
         </compile-tests>
-        <compile-tests description="archive api tests">
+        <compile-tests description="${hy.module} api tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />
@@ -255,11 +255,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/trunk/classlib/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/auth/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/auth/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/auth/build.xml Wed May  5 21:29:16 2010
@@ -27,9 +27,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">
@@ -43,81 +45,71 @@
     </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" depends="build-native-all" />
-    <target name="build-native-all" >
+    <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">
-        <delete file="${hy.jdk}/jre/lib/boot/auth.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/auth-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/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">
-        <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/auth.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/auth.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/auth.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/auth-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}/auth_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -136,8 +128,8 @@
         </copy>
     </target>
 
-    <target name="compile-tests">
-        <compile-tests description="auth api tests">
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} api tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java/common"/>
@@ -147,11 +139,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/trunk/classlib/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/build.xml Wed May  5 21:29:16 2010
@@ -27,10 +27,11 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build"
-            depends="check-depends,compile-java,copy-resources,build-jar" />
+    <target name="build" depends="check-depends,-build-no-check"/>
+    <target name="-build-no-check"
+            depends="-copy-resources,-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="check-depends" depends="-check-depends,-extract" />
 
@@ -146,11 +147,12 @@ ${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">
-        <delete file="${hy.jdk}/jre/lib/boot/awt.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/awt-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 dir="${hy.jdk}/jre/lib/cmm" quiet="true" />
         <delete dir="${hy.jdk}/jre/lib/fonts" quiet="true" />
         <delete failonerror="false">
@@ -159,35 +161,23 @@ ${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">
-        <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="copy-resources" depends="-copy-win-resources">
+    <target name="-copy-resources" depends="-copy-win-resources">
 
         <mkdir dir="${hy.jdk}/jre/lib/cmm" />
         <copy todir="${hy.jdk}/jre/lib/cmm">
@@ -212,31 +202,31 @@ ${line.separator}For Fedora try: yum ins
               tofile="${hy.jdk}/jre/lib/font.properties"/>
     </target>
 
-    <target name="findbugs" depends="build-jar">
+    <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/awt.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/awt.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/awt.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/awt-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="build-native" depends="build-native-all" />
-    <target name="build-native-all"
-        depends="-build-native-common,-build-native-unix,-build-native-windows" />
-        
-    <target name="-build-native-common">
+    <target name="-build-native" unless="skip.native.build"
+            depends="-build-native-common,
+                     -build-native-unix,-build-native-windows" />
+    <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 +249,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,33 +274,35 @@ ${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" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/awt_boot_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_boot_tests.jar">
             <fileset dir="bin/test/boot">
                 <exclude name="**/*Headless*Test.class" />
             </fileset>
         </hy.jar.bin>
-        <hy.jar.bin destfile="${tests.hdk.dir}/awt_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test/classes" />
         </hy.jar.bin>
-        <hy.jar.bin destfile="${tests.hdk.dir}/awt_headless_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_headless_tests.jar">
             <fileset dir="bin/test/boot">
                 <include name="**/*Headless*Test.class" />
             </fileset>
@@ -331,8 +324,8 @@ ${line.separator}For Fedora try: yum ins
         </copy>
     </target>
 
-    <target name="compile-tests">
-        <compile-tests description="awt boot tests"
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} boot tests"
                        destdir="bin/test/boot">
             <javac-elements>
                 <src>
@@ -340,7 +333,7 @@ ${line.separator}For Fedora try: yum ins
                 </src>
             </javac-elements>
         </compile-tests>
-        <compile-tests description="awt tests"
+        <compile-tests description="${hy.module} tests"
                        destdir="bin/test/classes">
             <javac-elements>
                 <src>
@@ -351,11 +344,11 @@ ${line.separator}For Fedora try: yum ins
         </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/trunk/classlib/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/beans/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/beans/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/beans/build.xml Wed May  5 21:29:16 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,76 +41,68 @@
     </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/beans.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/beans-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/beans.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/beans.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/beans.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/beans-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}/beans_test_support.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_test_support.jar">
             <fileset dir="bin/test_support" />
         </hy.jar.bin>
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/beans_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/beans_impl_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_impl_tests.jar">
             <fileset dir="bin/test-internal" />
         </hy.jar.bin>
 
@@ -133,8 +126,8 @@
         </copy>
     </target>
 
-    <target name="compile-tests"> 
-        <compile-tests description="beans test support"
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} test support"
                        destdir="bin/test_support">
             <javac-elements>
                 <src>
@@ -142,7 +135,7 @@
                 </src>
             </javac-elements>
         </compile-tests>
-        <compile-tests description="beans internal tests"
+        <compile-tests description="${hy.module} internal tests"
                        destdir="bin/test-internal">
             <javac-elements>
                 <src>
@@ -151,7 +144,7 @@
                 <classpath location="bin/test_support" />
             </javac-elements>
         </compile-tests>
-        <compile-tests description="beans api tests">
+        <compile-tests description="${hy.module} api tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />
@@ -161,11 +154,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/trunk/classlib/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/concurrent/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/concurrent/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/concurrent/build.xml Wed May  5 21:29:16 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,67 +41,59 @@
     </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/concurrent.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/concurrent-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/concurrent.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/concurrent.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/concurrent.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" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/concurrent-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}/concurrent_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -115,8 +108,8 @@
         </copy>
       </target>
 
-    <target name="compile-tests">
-        <compile-tests description="concurrent tests">
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />
@@ -125,11 +118,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/trunk/classlib/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/crypto/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/crypto/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/crypto/build.xml Wed May  5 21:29:16 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,82 +41,74 @@
     </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/crypto.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/crypto-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/crypto.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/crypto.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/crypto.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/crypto-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}/crypto_test_support.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_test_support.jar">
             <fileset dir="bin/test/support" />
         </hy.jar.bin>
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/crypto_api_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_api_tests.jar">
             <fileset dir="bin/test/api" />
         </hy.jar.bin>
-        <hy.jar.bin destfile="${tests.hdk.dir}/crypto_api_boot_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_api_boot_tests.jar">
             <fileset dir="bin/test/api.injected" />
         </hy.jar.bin>
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/crypto_impl_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_impl_tests.jar">
             <fileset dir="bin/test/impl" />
         </hy.jar.bin>
-        <hy.jar.bin destfile="${tests.hdk.dir}/crypto_impl_boot_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_impl_boot_tests.jar">
             <fileset dir="bin/test/impl.injected" />
         </hy.jar.bin>
 
@@ -134,9 +127,9 @@
         </copy>
     </target>
 
-    <target name="compile-tests">
+    <target name="-compile-tests" unless="skip.test.build">
 
-        <compile-tests description="crypto test support files"
+        <compile-tests description="${hy.module} test support files"
                        destdir="bin/test/support">
             <javac-elements>
                 <src>
@@ -150,7 +143,7 @@
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="crypto api tests"
+        <compile-tests description="${hy.module} api tests"
                        destdir="bin/test/api">
             <javac-elements>
                 <src path="src/test/api/java"/>
@@ -161,7 +154,7 @@
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="crypto 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"/>
@@ -172,7 +165,7 @@
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="crypto impl injected tests"
+        <compile-tests description="${hy.module} impl injected tests"
                        destdir="bin/test/impl.injected">
             <javac-elements>
                 <src path="src/test/impl/java.injected"/>
@@ -180,7 +173,7 @@
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="crypto impl tests"
+        <compile-tests description="${hy.module} impl tests"
                        destdir="bin/test/impl">
             <javac-elements>
                 <src path="src/test/impl/java"/>
@@ -192,11 +185,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/trunk/classlib/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/build.xml Wed May  5 21:29:16 2010
@@ -27,9 +27,11 @@
 
     <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,-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="check-depends"
             depends="-check-win-depends,-check-unix-depends" />
@@ -102,48 +104,37 @@ ${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">
-        <delete file="${hy.jdk}/jre/lib/boot/imageio.jar" />
-	<delete file="${hy.jdk}/jre/lib/boot/imageio-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/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">
-        <echo message="Compiling ImageIO 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="build-native" depends="build-native-all" />
-    <target name="build-native-all" >
+    <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}" />
@@ -157,31 +148,33 @@ ${line.separator}For Fedora try: yum ins
         </make>
     </target>
 
-    <target name="findbugs" depends="build-jar">
+    <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/imageio.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/imageio.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/imageio.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/imageio-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}/imageio_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -200,8 +193,8 @@ ${line.separator}For Fedora try: yum ins
         </copy>
     </target>
 
-    <target name="compile-tests">
-        <compile-tests description="imageio tests">
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />
@@ -210,11 +203,11 @@ ${line.separator}For Fedora try: yum ins
         </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/trunk/classlib/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/instrument/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/instrument/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/instrument/build.xml Wed May  5 21:29:16 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,75 +44,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" />
 
     <!-- Build native code -->
-    <target name="build-native" depends="build-native-all" />
-    <target name="build-native-all" >
-        <make dir="src/main/native/instrument/${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/instrument.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/instrument-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/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">
-        <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/instrument.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/instrument.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/instrument.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/instrument-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}/instrument_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -131,8 +125,8 @@
         </copy>
     </target>
 
-    <target name="compile-tests">
-        <compile-tests description="instrument tests">
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />
@@ -141,11 +135,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/trunk/classlib/modules/jmx/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/jmx/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/jmx/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/jmx/build.xml Wed May  5 21:29:16 2010
@@ -29,7 +29,7 @@
 
     <target name="build" depends="check-depends" />
 
-    <target name="clean" depends="clean-java" />
+    <target name="clean" depends="-clean-java" />
 
     <target name="check-depends" depends="-check,-extract,-copy-jars" />
 
@@ -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/trunk/classlib/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/jndi/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/jndi/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/jndi/build.xml Wed May  5 21:29:16 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/jndi.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/jndi-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/jndi.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/jndi.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/jndi.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/jndi-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}/jndi_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -122,8 +115,8 @@
         </copy>
     </target>
 
-    <target name="compile-tests">
-        <compile-tests description="jndi tests">
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />
@@ -132,11 +125,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/trunk/classlib/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/lang-management/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/lang-management/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/lang-management/build.xml Wed May  5 21:29:16 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,71 +41,63 @@
     </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/lang-management.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/lang-management-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/lang-management.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/lang-management.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/lang-management.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" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/lang-management-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}/lang-management_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/api" />
         </hy.jar.bin>
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/lang-management_impl_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_impl_tests.jar">
             <fileset dir="bin/impl" />
         </hy.jar.bin>
 
@@ -119,8 +112,8 @@
         </copy>
     </target>
 
-    <target name="compile-tests">
-        <compile-tests description="lang-management api tests"
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} api tests"
                        destdir="bin/api">
             <javac-elements>
                 <src>
@@ -128,7 +121,7 @@
                 </src>
             </javac-elements>
         </compile-tests>
-        <compile-tests description="lang-management impl tests"
+        <compile-tests description="${hy.module} impl tests"
                        destdir="bin/impl">
             <javac-elements>
                 <src>
@@ -138,11 +131,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/trunk/classlib/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/logging/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/logging/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/logging/build.xml Wed May  5 21:29:16 2010
@@ -26,7 +26,9 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar, copy-properties" />
+    <target name="build" depends="-build-no-check"/>
+    <target name="-build-no-check"
+            depends="-build-jar,-test-jar,-copy-properties" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -40,52 +42,43 @@
     </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/logging.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/logging-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/logging.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/logging.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/logging.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 dir="src/main/java">
@@ -94,12 +87,12 @@
             </fileset>
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/logging-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="copy-properties">
+    <target name="-copy-properties">
         <copy todir="${hy.jdk}/jre/lib" flatten="yes">
             <fileset dir="src/main/java">
                 <include name="**/logging.properties" />
@@ -107,15 +100,16 @@
         </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" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/logging_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
-        <hy.jar.bin destfile="${tests.hdk.dir}/logging_boot_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_boot_tests.jar">
             <fileset dir="bin/test-internal" />
         </hy.jar.bin>
 
@@ -137,8 +131,8 @@
         </copy>
     </target>
 
-    <target name="compile-tests">
-        <compile-tests description="logging internal tests"
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} internal tests"
                        destdir="bin/test-internal">
             <javac-elements>
                 <src>
@@ -146,7 +140,7 @@
                 </src>
             </javac-elements>
         </compile-tests>
-        <compile-tests description="logging api tests">
+        <compile-tests description="${hy.module} api tests">
             <javac-elements>
                 <bootclasspath>
                     <pathelement path="bin/test-internal"/>
@@ -158,11 +152,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/trunk/classlib/modules/luni-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni-kernel/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni-kernel/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni-kernel/build.xml Wed May  5 21:29:16 2010
@@ -17,7 +17,7 @@
 -->
 
 <project name="LUNI Kernel Stub JAR Build"
-         default="warn" basedir=".">
+         default="-warn" basedir=".">
 
     <description>Build for luni 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/luni-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/trunk/classlib/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/build.xml Wed May  5 21:29:16 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>
 



Mime
View raw message