harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r936097 - in /harmony/enhanced/java/branches/mrh/classlib: ./ make/ modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/beans/ modules/concurrent/ modules/crypto/ modules/imageio/ m...
Date Tue, 20 Apr 2010 22:39:34 GMT
Author: hindessm
Date: Tue Apr 20 22:39:33 2010
New Revision: 936097

URL: http://svn.apache.org/viewvc?rev=936097&view=rev
Log:
Part way through some experimental build changes.  25% faster builds.

Removed:
    harmony/enhanced/java/branches/mrh/classlib/make/build-java.xml
    harmony/enhanced/java/branches/mrh/classlib/make/build-native.xml
    harmony/enhanced/java/branches/mrh/classlib/make/build-test.xml
Modified:
    harmony/enhanced/java/branches/mrh/classlib/build.xml
    harmony/enhanced/java/branches/mrh/classlib/make/depends.properties
    harmony/enhanced/java/branches/mrh/classlib/make/properties.xml
    harmony/enhanced/java/branches/mrh/classlib/make/run-test.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/annotation/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/auth/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/prefs/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/print/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/regex/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/rmi/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/security/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/sound/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/sql/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/swing/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/text/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/x-net/build.xml

Modified: harmony/enhanced/java/branches/mrh/classlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/build.xml Tue Apr 20 22:39:33 2010
@@ -74,8 +74,22 @@ module:
 
     <property name="hy.hdk" location="deploy" />
 
+    <property name="build.output" location="build/classes" />
+    <property name="tests.output" location="build/test_report" />
+    <property name="tests.support.output" location="build/test_support" />
+    <property name="tests.report.dir" value="${tests.output}/html"/>
+    <property file="make/depends.properties" />
+
+    <condition property="needs.vme.v3.hack" value="true">
+        <or>
+            <equals arg1="${hy.platform}" arg2="windows.x86" />
+            <equals arg1="${hy.platform}" arg2="linux.x86" />
+        </or>
+    </condition>
+
     <!-- import properties for snapshot targets -->
-    <import file="${basedir}/make/properties.xml" />
+    <import file="make/properties.xml" />
+    <import file="make/depends.xml" />
 
     <!-- ================================
 	 target : rebuild
@@ -85,120 +99,318 @@ module:
     <target name="rebuild" depends="clean,build"
         description="Performs a full build - that is 'clean' then 'build'" />
 	
-    <target name="build" depends="build-java,build-native,build-test"
-        description="Compiles the java and native code to produce a jdk" />
-
-    <target name="support-jar" depends="build-java" >
-        <ant antfile="make/build-test.xml" inheritall="false"
-             target="support-jar"/>
-    </target>
+    <target name="build"
+        description="Compiles the java, natives and tests to produce a jdk/hdk"
+        depends="-build-java,-build-native,-build-test,-build-modules" />
 
     <target name="clean"
-            depends="clean-java,clean-native,clean-test,-clean-hdk" 
+            depends="-init-hdk-for-clean,-clean-modules,-clean-check,
+                     -clean-native,-clean-test,-clean-hdk" 
             description="Removes all the files generated by a build" />
 
-    <!-- ================================
-	 target : rebuild-java
-	     
-	 builds java source with a clean first
-	 ================================= -->
-    <target name="rebuild-java" depends="clean-java,build-java"
-            description="Like 'rebuild' but for java code only" />
-
-    <!-- ================================= 
-          target: build-java              
-
-          runs the build target in build-java.xml
-         ================================= -->
-    <target name="build-java" depends="-init-hdk"
+    <target name="-build-java" unless="skip.java.build"
+            depends="-init-hdk,-layout-java"
             description="Compiles the java code only" >
-        <echo>
-========================================
-Building Java component archives...
-========================================
-        </echo>
-        <ant antfile="make/build-java.xml" inheritall="false" target="build"/>
-    </target>
+        <ensure-javac/>
+        <mkdir dir="${build.output}" />
 
-    <!-- ================================= 
-          target: clean-java              
+        <hy.javac destdir="${build.output}"
+               includeAntRuntime="no">
+            
+            <src path="modules/accessibility/src/main/java" />
+            <src path="modules/annotation/src/main/java" />
+            <src path="modules/applet/src/main/java" />
+            <src path="modules/archive/src/main/java" />
+            <src path="modules/auth/src/main/java/${hy.os.family}" />
+            <src path="modules/auth/src/main/java/common" />
+            <src path="modules/awt/src/main/java/${hy.os.family}" />
+            <src path="modules/awt/src/main/java/common" />
+            <src path="modules/beans/src/main/java" />
+            <src path="modules/concurrent/src/main/java" />
+            <src path="modules/crypto/src/main/java" />
+            <src path="modules/instrument/src/main/java" />
+            <src path="modules/imageio/src/main/java" />
+            <src path="modules/jndi/src/main/java" />
+            <src path="modules/logging/src/main/java" />
+            <src path="modules/lang-management/src/main/java" />
+            <src path="modules/luni-kernel/src/main/java" />
+            <src path="modules/luni/src/main/java" />
+            <src path="modules/math/src/main/java" />
+            <src path="modules/misc/src/main/java" />
+            <src path="modules/nio/src/main/java/common" />
+            <src path="modules/nio/src/main/java/${hy.os.family}" />
+            <src path="modules/nio_char/src/main/java" />
+            <!-- pack200 uses customized build script and 
+                 should not be built from top-level build.xml -->
+            <!--src path="modules/pack200/src/main/java" /-->
+            <src path="modules/prefs/src/main/java" />
+            <src path="modules/print/src/main/java/${hy.os.family}" />
+            <src path="modules/print/src/main/java/common" />
+            <src path="modules/regex/src/main/java" />
+            <src path="modules/rmi/src/main/java" />
+            <src path="modules/security-kernel/src/main/java" />
+            <src path="modules/security/src/main/java/${hy.os.family}" />
+            <src path="modules/security/src/main/java/common" />
+            <src path="modules/sound/src/main/java" />
+            <src path="modules/sql/src/main/java" />
+            <src path="modules/suncompat/src/main/java" />
+            <src path="modules/swing/src/main/java/${hy.os.family}" />
+            <src path="modules/swing/src/main/java/common" />
+            <src path="modules/text/src/main/java" />
+            <src path="modules/x-net/src/main/java/" />
+
+            <classpath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                    <exclude name="**/*-src.jar" />
+                </fileset>
+            </classpath>
 
-          runs the clean target in build-java.xml
-         ================================= -->
-    <target name="clean-java" depends="-init-hdk-for-clean"
-            description="Removes the compiled java code" >
-        <ant antfile="make/build-java.xml" inheritall="false" target="clean" >
-            <property name="keep.working" value="${keep.working}" />
-        </ant>
+            <!-- We need to set some BCP to avoid the compiler picking
+                 up the JRE's JARs -->
+            <bootclasspath>
+                <fileset dir="${depends.jars}">
+                    <!-- FIXME: picked mx4j arbitrarily, needs to be non-empty set -->
+                    <include name="**/mx4j.jar" />
+                </fileset>
+            </bootclasspath>
+        </hy.javac>
     </target>
 
-    <!-- ================================
-	 target : rebuild-native
-	     
-	 builds native source with a clean first
-	 ================================= -->
-    <target name="rebuild-native" depends="clean-native,build-native"
-            description="Like 'rebuild' but for native code only" />
-
-    <!-- ================================= 
-          target: build-native             
-
-          runs the build target in build-native.xml
-         ================================= -->
-    <target name="build-native" depends="-init-hdk"
-            description="Compiles the native code only" >
-        <echo>
-========================================
-Building native libs and executables...
-========================================
-        </echo>
-        <ant antfile="make/build-native.xml" inheritall="false" target="build"/>
+    <target name="-build-modules">
+        <poll-modules target="build" />
     </target>
 
-    <!-- ================================= 
-          target: clean-native              
+    <target name="-clean-modules">
+        <poll-modules target="clean" />
+    </target>
+
+    <target name="-layout-java" depends="check-depends">
+
+        <!-- Create the structure -->
+        <mkdir dir="${hy.jdk}/jre/bin" />
+        <mkdir dir="${hy.jdk}/jre/lib/boot" />
+        <mkdir dir="${hy.jdk}/jre/lib/ext" />
+        <mkdir dir="${hy.jdk}/jre/lib/security" />
+
+        <!-- Copy across the required files -->
+        <copy file="LICENSE" todir="${hy.hdk}" verbose="yes" />
+        <copy file="NOTICE" todir="${hy.hdk}" verbose="yes" />
+
+        <!-- Copy across the boot dependency jars --><!-- TOFIX clean these? -->
+        <copy todir="${hy.jdk}/jre/lib/boot">
+            <fileset dir="${depends.jars}">
+                <patternset includes="icu4j_4.2.1/*.jar" />
+                <patternset includes="xalan-j_2.7.0/xalan.jar" />
+                <patternset includes="xerces_2.9.1/*.jar" />
+            </fileset>
+            <fileset dir="${depends.manifests}"/>
+        </copy>
+
+        <!-- Copy across the extension dependency jars -->
+        <copy tofile="${hy.jdk}/jre/lib/ext/bcprov.jar" verbose="true"
+              flatten="yes" overwrite="true">
+            <fileset file="${bcprov.jar}" />
+        </copy>
+
+        <!-- Copy across the support files -->
+        <copy todir="${hy.jdk}/jre/lib">
+            <fileset dir="${depends.files}">
+                <include name="content-types.properties" />
+            </fileset>
+        </copy>
+
+        <copy todir="${hy.jdk}/jre/lib/boot">
+            <fileset dir="${depends.files}">
+                <include name="bootclasspath.properties" />
+            </fileset>
+        </copy>
+        <fixcrlf srcdir="${hy.jdk}/jre/lib/boot"
+            includes="bootclasspath.properties" />
+
+        <copy todir="${hy.jdk}/jre/lib/security">
+             <fileset dir="${depends.files}">
+                 <include name="java.policy" />
+                 <include name="java.security" />
+             </fileset>
+         </copy>
+
+        <copy todir="${hy.jdk}/jre/lib">
+            <fileset dir="${depends.files}">
+                <include name="net.properties" />
+            </fileset>
+        </copy>
+
+        <copy todir="${hy.jdk}/jre/lib">
+            <fileset dir="${depends.files}">
+                <include name="rowset.properties" />
+            </fileset>
+        </copy>
+
+    </target>
+
+    <target name="-clean-check" unless="skip.java.build"
+            depends="-clean-java-catch-all-test,
+                     -clean-java-catch-all,
+                     -clean-java-layout"
+            description="Checks that the module clean worked correctly" />
+
+    <target name="-clean-java-catch-all-test">
+        <!-- without this test the pathconvert in the catch all clean
+             target fails -->
+        <available property="catch.all.required"
+                   file="${build.output}" type="dir" />
+    </target>
+
+    <target name="-clean-java-catch-all" if="catch.all.required">
+        <fileset id="built.files" dir="${build.output}">
+            <include name="**/**" />
+        </fileset>
+        <pathconvert property="built.files.list"
+                     refid="built.files"
+                     pathsep="${line.separator}" />
+        <condition property="built.files.exist">
+            <not>
+                <equals arg1="${built.files.list}" arg2="" />
+            </not>
+        </condition>
+
+        <delete includeemptydirs="true" failonerror="false">
+            <fileset refid="built.files" />
+        </delete>
+
+        <condition property="continue">
+            <equals arg1="${keep.working}" arg2="true" />
+        </condition>
+
+        <fail if="built.files.exist" unless="continue">
+...
+
+Built files still exist after module clean targets have run.  This
+probably means that one or more patternsets are incomplete.  The
+remaining files are:
+
+${built.files.list}
+
+        </fail>
+    </target>
+
+    <target name="-clean-java-layout">
+        <delete includeemptydirs="true" failonerror="false">
+            <fileset dir="${hy.jdk}">
+                <exclude name="jre/bin/default/**" />
+                <exclude name="jre/bin/**" />
+                <exclude name="jre/lib/ext/**" />
+            </fileset>
+            <fileset dir="${hy.hdk}">
+                <include name="LICENSE" />
+                <include name="NOTICE" />
+            </fileset>
+        </delete>
+    </target>
 
-          runs the clean target in build-native.xml
-         ================================= -->
-    <target name="clean-native" depends="-init-hdk-for-clean"
-        description="Removes the compiled native code" >
+    <target name="-build-native" unless="skip.native.build"
+            depends="-init-hdk,-layout-natives"
+            description="Compiles the native code only" >
 
-        <ant antfile="make/build-native.xml" inheritall="false" target="clean" />
+        <!-- these must be run in a specific order due to dependencies -->
+    	<ant dir="modules/portlib" target="build-native" />
+        <ant dir="modules/luni" target="build-native-core" />
+    	<ant dir="modules/archive" target="build-native" />
+    	<ant dir="modules/luni" target="build-native-secondary" />
+
+    </target>
+
+    <target name="-layout-natives"
+            depends="check-depends,-layout.windows,-layout.vme.v3.hack"
+        description="Construct the correct directory structure for native binaries">
+
+    	<!-- Create the target directory structure -->
+        <mkdir dir="${hy.jdk}/jre/bin" />
+        <mkdir dir="${hy.jdk}/include" />
+    	<mkdir dir="${hy.hdk}/lib"/>
+
+    	<!-- NLS catalog files -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${depends.files}">
+                <include name="harmony*.properties" />
+            </fileset>
+        </copy>
+
+    </target>
+
+    <target name="-layout.windows" if="is.windows">
+        <!-- workaround until msdll is moved. -->
+        <copy file="${msvcr.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
+        <copy file="${msvcp.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
+    </target>
+
+    <target name="-layout.vme.v3.hack" if="needs.vme.v3.hack">
+        <echo>Deploying empty ICU dynamic library stub</echo>
+        <copy todir="${hy.jdk}/jre/bin" verbose="true">
+            <fileset dir="${depends.files}">
+                <include name="hyempty.dll" if="is.windows" />
+            </fileset>
+            <globmapper from="*hyempty.dll" to="*ICUInterface34.dll" />
+        </copy>
+        <copy todir="${hy.jdk}/jre/bin" verbose="true">
+            <fileset dir="${depends.files}">
+                <include name="libhyempty.so" if="is.linux" />
+            </fileset>
+            <globmapper from="*libhyempty.so" to="*libICUInterface34.so" />
+        </copy>
+    </target>
+
+    <target name="-clean-native" unless="skip.native.build"
+            depends="-init-hdk-for-clean"
+            description="Removes the compiled native code" >
+    	<delete dir="${hy.hdk}/lib" />
+
+        <delete dir="${hy.hdk}/include" />
+        <delete dir="${hy.hdk}/jdk/include" />
+
+        <delete includeemptydirs="true" failonerror="false">
+            <fileset dir="${hy.jdk}">
+                <include name="**/bin/java${exe.suffix}" />
+                <include name="**/bin/javaw${exe.suffix}" />
+                <include name="**/bin/*${shlib.suffix}*" />
+                <include name="**/bin/*.pdb" />
+            	<include name="**/bin/harmony*.properties" />
+            </fileset>
+        </delete>
     </target>
 
-    <target name="clean-test" depends="-init-hdk-for-clean"
-            description="Removes the generated tests" >
-        <ant antfile="make/build-test.xml" inheritall="false" target="clean" />
+    <target name="test"
+            depends="-test-init-hdk,clean-test-output"
+            description="Runs all tests">
+        <ant dir="${hy.hdk}/build/test" inheritall="false" target="test">
+            <property name="tests.output" value="${tests.output}"/>
+        </ant>
     </target>
 
-    <target name="test" depends="-init-hdk"
-            description="Runs all tests">
-        <echo>
-========================================
-Testing class libraries...
-========================================
-</echo>
-        <ant antfile="make/build-test.xml" inheritall="false" target="test-all"/>
+    <target name="-build-test" unless="skip.tests.build"
+            depends="-test-init-hdk,support-jar"
+            description="Compile and archive all tests" />
+
+    <target name="-clean-test" unless="skip.tests.build"
+            depends="-init-hdk-for-clean"
+            description="Removes the generated tests" >
+        <delete dir="${tests.support.output}" />
+        <delete dir="${hy.hdk}/build/test" />
     </target>
 
-    <target name="build-test" depends="-init-hdk,support-jar"
-            description="Compile and archive all tests">
-        <echo>
-========================================
-Compiling and archiving test classes ...
-========================================
-</echo>
-        <ant antfile="make/build-test.xml" inheritall="false" target="test-jar-modules"/>
+    <target name="clean-test-output">
+        <delete dir="${tests.output}" />
     </target>
 
-    <target name="findbugs" depends="-init-hdk"
+    <target name="findbugs" depends="check-depends"
             description="Runs FindBugs on all modules">
         <echo>
 ========================================
 Finding bugs in all class libraries...
 ========================================
 </echo>
-        <ant antfile="make/build-test.xml" inheritall="false" target="findbugs"/>
+        <poll-modules target="findbugs" />
     </target>
 
     <!-- ================================= 
@@ -299,12 +511,15 @@ Generating snapshot zip
         <chksum file="${deploy.zip}" type="sha" />
     </target>
 
-    <target name="check-depends" depends="-init-hdk"
+    <target name="check-depends" depends="-init-hdk,-check-depends"
             description="Report on whether the dependencies are met">
-        <ant antfile="make/depends.xml" inheritall="false" target="check" />
         <poll-modules target="check-depends" />
     </target>
 
+    <target name="-check-depends" description="Check top-level dependencies">
+        <ant antfile="make/depends.xml" inheritall="false" target="check" />
+    </target>
+
     <target name="fetch-depends" depends="-init-hdk"
         description="Fetches dependencies. Note: Some of Harmony's dependencies are licensed under terms other than the Apache License v2.">
         <ant antfile="make/depends.xml" inheritall="false" target="download" />
@@ -315,6 +530,64 @@ Generating snapshot zip
         description="Display the properties that are use in the ant build files"
             />
 
+    <!-- test support -->
+    <target name="support-jar" depends="compile-support">
+        <mkdir dir="${hy.hdk}/build/test" />
+        <hy.jar.bin destfile="${hy.hdk}/build/test/support.jar"
+                    manifest="support/META-INF/MANIFEST.MF">
+            <fileset dir="${tests.support.output}" />
+        </hy.jar.bin>
+        <copy todir="${hy.hdk}/build/test"> 
+            <fileset dir="${jetty.dir}">
+                <include name="*.jar" />
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="compile-support" depends="copy-test-resources,-check-depends"
+            description="Compile the unit test source">
+        <ensure-javac/>
+        <mkdir dir="${tests.support.output}" />
+        <hy.javac destdir="${tests.support.output}">
+            <src path="support/src/test/java" />
+            <classpath location="${junit.jar}" />
+            <classpath location="${tests.support.output}" />
+            <classpath>
+                <fileset dir="${jetty.dir}">
+                    <include name="*.jar" />
+                </fileset>
+            </classpath>
+            <bootclasspath location="${build.output}" />
+            <bootclasspath>
+                <fileset dir="${hy.hdk}/jdk/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </hy.javac>
+    </target>
+    
+    <target name="copy-test-resources"
+            description="Copy non-Java files from test support tree to the support output tree">
+        <mkdir dir="${tests.support.output}" />
+        <copy todir="${tests.support.output}" includeemptydirs="false">
+            <fileset dir="support/src/test/java">
+                <exclude name="**/*.java" />
+            </fileset>
+            <fileset file="support/src/test/resources/hyts_Foo.c"/>
+        </copy>
+        <copy file="support/src/test/resources/config/testing.policy" 
+              todir="${hy.hdk}/build/test" outputencoding="UTF-8" />
+    </target>
+
+    <target name="-test-init-hdk" depends="-init-hdk">
+        <copy file="make/test.properties"
+              tofile="${hy.hdk}/build/test/test.properties"/>
+        <copy file="make/run-test.xml"
+              tofile="${hy.hdk}/build/test/build.xml"/>
+    </target>
+
+    <!-- hdk initialisation -->
+
     <target name="-init-hdk">
         <init-hdk />
     </target>

Modified: harmony/enhanced/java/branches/mrh/classlib/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/depends.properties?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/depends.properties Tue Apr 20 22:39:33 2010
@@ -15,6 +15,10 @@
 
 depends.dir=depends
 depends.jars=${depends.dir}/jars
+depends.oss=${depends.dir}/oss
+depends.libs=${depends.dir}/libs/${hy.platform}
+depends.files=${depends.dir}/files
+depends.manifests=${depends.dir}/manifests
 maven2.base=http://repo1.maven.org/maven2
 
 xalan.dir=${depends.jars}/xalan-j_2.7.0

Modified: harmony/enhanced/java/branches/mrh/classlib/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/properties.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/properties.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/properties.xml Tue Apr 20 22:39:33 2010
@@ -286,6 +286,18 @@
     <!-- default property for poll-modules macro - i.e. all modules -->
     <property name="build.module" value="*" />
     <property name="exclude.module" value="nothing" />
+    <property name="build.java" value="true" />
+    <property name="build.natives" value="true" />
+    <property name="build.tests" value="true" />
+    <condition property="skip.java.build" value="true">
+        <equals arg1="${build.java}" arg2="false" />
+    </condition>
+    <condition property="skip.natives.build" value="true">
+        <equals arg1="${build.natives}" arg2="false" />
+    </condition>
+    <condition property="skip.tests.build" value="true">
+        <equals arg1="${build.tests}" arg2="false" />
+    </condition>
 
     <!-- flags -->
     <property name="hy.no.thr" value="false" />
@@ -542,7 +554,6 @@ properties in preference to these:
                 <!-- TODO: modules probably need to work these properties
                      out for themselves in order to reduce coupling -->
                 <property name="hy.test.vm.name" value="${hy.test.vm.name}"/>
-                <property name="depends.oss" value="${depends.oss}"/>
                 <fileset dir="@{dir}" includes="@{includes}" excludes="@{excludes}">
                     <containsregexp expression="&lt;target[^&gt;]*name=&quot;@{target}&quot;"/>
                 </fileset>

Modified: harmony/enhanced/java/branches/mrh/classlib/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/run-test.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/run-test.xml Tue Apr 20 22:39:33 2010
@@ -26,12 +26,31 @@
     <property name="target.dir" value="." />
     <property name="work.dir" value="${target.dir}" />
     <property name="tests.output" value="${work.dir}/report" />
+    <property name="report.dir" value="${tests.output}/html" />
     <property name="junit.jar" value="${target.dir}/junit.jar" />
 
+    <property name="gen.report" value="true" />
+    <condition property="do.full.report" value="true">
+        <and>
+            <equals arg1="${gen.report}" arg2="true" />
+            <not><equals arg1="${short.report}" arg2="true" /></not>
+        </and>
+    </condition>
+    <condition property="do.short.report" value="true">
+        <and>
+            <equals arg1="${gen.report}" arg2="true" />
+            <equals arg1="${short.report}" arg2="true" />
+        </and>
+    </condition>
+
     <import file="../ant/properties.xml" />
 
     <target name="test"
-            depends="test-jre-vm-info,-test,gen-report,check-test-result" />
+            depends="test-jre-vm-info,-test,check-test-result" />
+
+    <target name="clean">
+        <delete dir="${tests.output}" />
+    </target>
 
     <target name="-test">
         <echo message="Test Work Dir: ${work.dir}" />
@@ -41,23 +60,94 @@
         <poll-modules dir="." target="test-module" />
     </target>
 
-    <target name="check-test-result">
-        <available property="test.errors" file="${work.dir}/report/test.errors" />
-        <available property="test.failures" file="${work.dir}/report/test.failures" />
+    <target name="check-test-result" depends="-check-crashed,gen-report">
+        <fail if="test.crashes"
+              message="There were test crashes: ${crashed.tests}"/>
+        <available property="test.errors"
+                   file="${tests.output}/test.errors" />
+        <available property="test.failures"
+                   file="${tests.output}/test.failures" />
         <fail if="test.errors" message="There were test errors." />
         <fail if="test.failures" message="There were test failures." />
     </target>
 
-    <target name="gen-report">
-        <junitreport todir="${tests.output}">
+    <target name="-check-crashed" depends="-check-for-empty, -process-empty"/>
+    <target name="-check-for-empty">
+        <fileset id="empty.test.reports" dir="${tests.output}">
+            <patternset>
+                <include name="TEST-*.xml"/>
+            </patternset>
+            <size value="0" when="equal"/>
+        </fileset>
+
+        <pathconvert refid="empty.test.reports" pathsep="${path.separator}"
+                     property="crashed.tests"/>
+        <condition property="test.crashes">
+            <not>
+                <equals arg1="" arg2="${crashed.tests}" />
+            </not>
+        </condition>
+    </target>
+    <target name="-process-empty" if="test.crashes">
+       <property name="per.crashed.tests.file" 
+                 value="${tests.output}${file.separator}TEST-crashed.xml"/>
+
+       <property name="per.header"
+                 value="&lt;?xml version='1.0' encoding='UTF-8' ?&gt;&lt;testsuite errors='1' name='vmcrash.CrashedTests' time='0'&gt;"/>
+       <property name="per.prefix" value="&lt;testcase classname='"/>
+       <property name="per.middle" value="' name='"/>
+       <property name="per.suffix" 
+                 value="' time='0.0'&gt;&lt;error message='VM crash?'/&gt;&lt;/testcase&gt;"/>
+       <property name="per.footer" value="&lt;/testsuite&gt;"/>
+
+       <echo message="${crashed.tests}" file="${per.crashed.tests.file}"/>
+
+       <replaceregexp file="${per.crashed.tests.file}" flags="g">
+            <regexp pattern="[^${path.separator}]*TEST-([^${path.separator}]*)\.xml${path.separator}?"/>
+            <substitution expression="${per.prefix}\1${per.middle}\1${per.suffix}"/>
+       </replaceregexp>
+       <replaceregexp file="${per.crashed.tests.file}" match="\A"
+                      replace="${per.header}"/>
+       <echo file="${per.crashed.tests.file}" append="yes"
+             message="${per.footer}"/>
+
+       <!-- now let's delete empty reports -->
+       <delete><fileset refid="empty.test.reports"/></delete>
+
+       <!-- Need to ensure the file is UTF-8 on non-ASCII platforms -->
+        <move file="${per.crashed.tests.file}"
+              tofile="${per.crashed.tests.file}.orig" />
+        <copy file="${per.crashed.tests.file}.orig"
+              tofile="${per.crashed.tests.file}" outputencoding="UTF-8" />
+        <delete file="${per.crashed.tests.file}.orig" />
+
+    </target>
+
+    <target name="gen-report" depends="-short-report,-full-report">
+        <!-- this property is simply to fix slashes in displayed string -->
+        <property name="display-location" location="${report.dir}/index.html"/>
+        <echo message="The test report is in ${display-location}"/>
+    </target>
+
+    <target name="-full-report" if="do.full.report">
+        <mkdir dir="${report.dir}" />
+        <junitreport todir="${report.dir}">
             <fileset dir="${tests.output}">
                 <include name="TEST*-*.xml" />
             </fileset>
-            <report format="frames" todir="${tests.output}" />
+            <report format="frames" todir="${report.dir}" />
+        </junitreport>
+    </target>
+
+    <target name="-short-report" unless="do.full.report">
+        <mkdir dir="${report.dir}" />
+        <junitreport todir="${report.dir}">
+            <fileset dir="${tests.output}" includes="TEST*-*.xml">
+                <containsregexp expression='(errors|failures)=.[1-9]' />
+                <exclude name="TESTS-TestSuites.xml" />
+            </fileset>
+            <report format="frames" todir="${report.dir}" />
         </junitreport>
-        <property name="display-location"
-                  location="${tests.output}/index.html"/>
-        <echo message="The test report is in ${display-location}"/>
     </target>
     
 </project>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -84,7 +84,7 @@
             outputFile="${findBugs.report}/accessibility.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <mkdir dir="${hy.jdk}/jre/lib/boot"/>
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/accessibility.jar"
                     manifest="META-INF/MANIFEST.MF">

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/annotation/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/annotation/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/annotation/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -84,7 +84,7 @@
             outputFile="${findBugs.report}/annotation.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/annotation.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -84,7 +84,7 @@
             outputFile="${findBugs.report}/applet.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/applet.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml Tue Apr 20 22:39:33 2010
@@ -28,14 +28,14 @@
 
     <property name="zlib.zip" location="${depends.oss}/zlib_1.2.3.zip" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
     
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
-    <target name="copy-native-includes"
-            depends="overlay-oss, copy-zipsup-include, copy-zlib-include" />
+    <target name="check-depends"
+            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">
         <copy todir="${hy.hdk}/include" preservelastmodified="true">
             <fileset dir="src/main/native/zlib_dist">
                 <include name="zlib.h" />
@@ -44,7 +44,7 @@
         </copy>
     </target>
 	
-    <target name="copy-zipsup-include" if="hy.skip.zip.api">
+    <target name="-copy-zipsup-include" if="hy.skip.zip.api">
         <copy todir="${hy.hdk}/include" preservelastmodified="true">
             <fileset dir="src/main/native/include/shared">
                 <include name="zipsup.h" />
@@ -52,7 +52,7 @@
         </copy>
     </target>
     
-    <target name="overlay-oss"
+    <target name="-overlay-oss"
             depends="-extract-props,-unzip-oss,-ascii2ebcdic-conversion"
             unless="hy.skip.zlib" />
 
@@ -181,7 +181,7 @@
             outputFile="${findBugs.report}/archive.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/archive.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/auth/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/auth/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/auth/build.xml Tue Apr 20 22:39:33 2010
@@ -27,7 +27,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,-build-native,test-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -46,8 +46,7 @@
     <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">
         <make dir="src/main/native/auth/${hy.os.family}" />
     </target>
     
@@ -99,7 +98,7 @@
             outputFile="${findBugs.report}/auth.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/auth.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml Tue Apr 20 22:39:33 2010
@@ -28,7 +28,8 @@
     <property file="../../make/depends.properties" />
 
     <target name="build"
-            depends="check-depends,compile-java,copy-resources,build-jar" />
+            depends="check-depends,copy-resources,
+                     build-jar,-build-native,test-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -219,7 +220,7 @@ ${line.separator}For Fedora try: yum ins
             outputFile="${findBugs.report}/awt.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/awt.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
@@ -232,10 +233,9 @@ ${line.separator}For Fedora try: yum ins
         </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"
+            depends="-build-native-common,
+                     -build-native-unix,-build-native-windows" />
     <target name="-build-native-common">
         <make dir="src/main/native/lcmm/${hy.os.family}">
             <make-elements>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -84,7 +84,7 @@
             outputFile="${findBugs.report}/beans.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/beans.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -84,7 +84,7 @@
             outputFile="${findBugs.report}/concurrent.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/concurrent.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -84,7 +84,7 @@
             outputFile="${findBugs.report}/crypto.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/crypto.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml Tue Apr 20 22:39:33 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-jar,-build-native,test-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -142,8 +143,7 @@ ${line.separator}For Fedora try: yum ins
         </hy.javac>
     </target>
     
-    <target name="build-native" depends="build-native-all" />
-    <target name="build-native-all" >
+    <target name="-build-native">
         <make dir="src/main/native/jpegencoder/${hy.os.family}">
             <make-elements>
                 <env key="HY_JPEG_VER" value="${jpeg.ver}" />
@@ -164,7 +164,7 @@ ${line.separator}For Fedora try: yum ins
             outputFile="${findBugs.report}/imageio.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/imageio.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,-build-native,test-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -45,8 +45,7 @@
     <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">
         <make dir="src/main/native/instrument/${hy.os.family}" />
     </target>
     
@@ -93,7 +92,7 @@
             outputFile="${findBugs.report}/instrument.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/instrument.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -84,7 +84,7 @@
             outputFile="${findBugs.report}/jndi.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/jndi.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -84,7 +84,7 @@
             outputFile="${findBugs.report}/lang-management.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/lang-management.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar, copy-properties" />
+    <target name="build" depends="build-jar,test-jar,copy-properties" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -84,7 +84,7 @@
             outputFile="${findBugs.report}/logging.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/logging.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml Tue Apr 20 22:39:33 2010
@@ -29,16 +29,18 @@
 
     <property name="fdlibm.dist" location="src/main/native/fdlibm_dist"/>
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <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">
         <copy todir="${hy.hdk}/include" preservelastmodified="true">
             <fileset dir="src/main/native/include">
                 <include name="vmi.h" />
@@ -116,8 +118,6 @@
     </target>
 
     <!-- Overlay OSS packages into their required locations -->
-    <target name="overlay-oss" depends="-unzip-oss,-ascii2ebcdic-conversion" />
-
     <target name="-unzip-oss">
         <untar src="${fdlibm.tar}" compression="gzip" dest="${fdlibm.dist}">
             <patternset>
@@ -253,7 +253,7 @@
             outputFile="${findBugs.report}/luni.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/luni.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -84,7 +84,7 @@
             outputFile="${findBugs.report}/math.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/math.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,-build-native,test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,7 +43,7 @@
     <target name="-test-module" depends="build, run-tests" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
-    <target name="clean-java">
+    <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" />
         <delete failonerror="false">
@@ -87,7 +87,7 @@
             outputFile="${findBugs.report}/misc.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/misc.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
@@ -99,8 +99,7 @@
         </hy.jar.src>
     </target>
 
-    <target name="build-native" depends="build-native-all" />
-    <target name="build-native-all" >
+    <target name="-build-native">
         <make dir="src/main/native/accessors/${hy.os.family}" />
     </target>
     

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,-build-native,test-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -45,8 +45,7 @@
     <target name="-test-module" depends="build, run-tests" />
 
     <!-- Build natives.-->
-    <target name="build-native" depends="build-native-all" />
-    <target name="build-native-all" >
+    <target name="-build-native">
         <make dir="src/main/native/nio/${hy.os.family}" />
     </target>
 
@@ -98,7 +97,7 @@
             outputFile="${findBugs.report}/nio.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/nio.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml Tue Apr 20 22:39:33 2010
@@ -26,13 +26,12 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,-build-native,test-jar" />
 
     <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">
         <make dir="src/main/native/niochar/${hy.os.family}" />
     </target>
 
@@ -97,7 +96,7 @@
             outputFile="${findBugs.report}/nio_char.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/nio_char.jar"
              manifest="META-INF/MANIFEST.MF">
             <service type="java.nio.charset.spi.CharsetProvider"

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml Tue Apr 20 22:39:33 2010
@@ -27,7 +27,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="check-depends, compile-java, build-jar" />
+    <target name="build" depends="check-depends,build-jar,test-jar" />
 
     <target name="check-depends">
         <check-one-file src="${asm.url}" dest="${asm.jar}" />
@@ -118,7 +118,7 @@
             outputFile="${findBugs.report}/pack200.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/pack200.jar"
              manifest="META-INF/MANIFEST.MF">
             <manifest>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml Tue Apr 20 22:39:33 2010
@@ -51,9 +51,8 @@
 
     <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" >
+    <target name="check-depends"
+        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" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/prefs/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/prefs/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/prefs/build.xml Tue Apr 20 22:39:33 2010
@@ -28,7 +28,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,-build-native,test-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -48,8 +48,7 @@
 
     <!-- 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">
         <make dir="src/main/native/prefs/${hy.os.family}" />
     </target>
 
@@ -99,7 +98,7 @@
             outputFile="${findBugs.report}/prefs.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/prefs.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,-build-native,test-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -81,8 +81,7 @@
         </hy.javac>
     </target>
     
-    <target name="build-native" depends="build-native-all" />
-    <target name="build-native-all" if="is.windows">
+    <target name="-build-native" if="is.windows">
         <make dir="src/main/native/print/${hy.os.family}" />
     </target>
 
@@ -93,7 +92,7 @@
             outputFile="${findBugs.report}/print.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/print.jar"
                     manifest="META-INF/MANIFEST.MF">
             <metainf prefix="META-INF/services"

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/regex/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/regex/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/regex/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -84,7 +84,7 @@
             outputFile="${findBugs.report}/regex.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/regex.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/rmi/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/rmi/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/rmi/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -84,7 +84,7 @@
             outputFile="${findBugs.report}/rmi.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/rmi.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/security/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/security/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/security/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,-build-native,test-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -44,12 +44,7 @@
     <!-- internal target for local and global test run sequence -->
     <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">
         <make dir="src/main/native/security/${hy.os.family}" />
     </target>
     
@@ -62,7 +57,7 @@
         <delete-patternset module="${hy.module}" />
     </target>
 
-    <target name="clean-native" if="native.present" >
+    <target name="clean-native">
         <make dir="src/main/native/security/${hy.os.family}" target="clean" />
     </target>
 
@@ -101,7 +96,7 @@
             outputFile="${findBugs.report}/security.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/security.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/sound/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/sound/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/sound/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -84,7 +84,7 @@
             outputFile="${findBugs.report}/sound.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/sound.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/sql/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/sql/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/sql/build.xml Tue Apr 20 22:39:33 2010
@@ -28,7 +28,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="check-depends, compile-java, build-jar" />
+    <target name="build" depends="check-depends,build-jar,test-jar" />
 
     <target name="clean" depends="clean-java,clean-test" />
 
@@ -97,7 +97,7 @@
             outputFile="${findBugs.report}/sql.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/sql.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -84,7 +84,7 @@
             outputFile="${findBugs.report}/suncompat.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/suncompat.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/build.xml Tue Apr 20 22:39:33 2010
@@ -34,7 +34,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <target name="clean" depends="clean-java,clean-test" />
 
@@ -97,7 +97,7 @@
             outputFile="${findBugs.report}/swing.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/swing.jar"
              manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/text/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/text/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/text/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -84,7 +84,7 @@
             outputFile="${findBugs.report}/text.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/text.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/x-net/build.xml?rev=936097&r1=936096&r2=936097&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/x-net/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/x-net/build.xml Tue Apr 20 22:39:33 2010
@@ -26,7 +26,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="build-jar,test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -84,7 +84,7 @@
             outputFile="${findBugs.report}/x-net.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="build-jar" depends="svn-info,compile-java,class-patternset">
         <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/x-net.jar"
                 manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />



Mime
View raw message