harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r804962 - in /harmony/enhanced/classlib/trunk: make/ modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/beans/ modules/concurrent/ modules/crypto/ modules/imageio/ modules/instrume...
Date Mon, 17 Aug 2009 13:01:30 GMT
Author: hindessm
Date: Mon Aug 17 13:01:29 2009
New Revision: 804962

URL: http://svn.apache.org/viewvc?rev=804962&view=rev
Log:
Summary: Cleaning up "ant clean".

In modules,

 * Fix "clean" target to clean native as well as java and test.

 * Split old "clean" target to "clean-java" and "clean-test".

 * Move "clean-native-includes" dependency from the old "clean"(java) target
   to the "clean-native" target.

 * Add missing "clean-overlay-oss" dependency on the "clean-native" target.

In make/build-java.xml "clean" polls the modules "clean-java" target.

In make/build-native.xml, poll the modules once with just "clean-native"
rather that three times ("clean-native", "clean-native-includes" and
"clean-overlay-oss") since the last two are now depends of "clean-native".

In make/build-test.xml, "clean" polls the modules "clean-test" targets.

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

Modified: harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-java.xml Mon Aug 17 13:01:29 2009
@@ -66,7 +66,7 @@
                      -clean-bin-catch-all"/>
 
     <target name="-modules-clean-bin">
-        <poll-modules target="clean" />
+        <poll-modules target="clean-java" />
     </target>
 
     <target name="-clean-bin-catch-all-test">

Modified: harmony/enhanced/classlib/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-native.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-native.xml Mon Aug 17 13:01:29 2009
@@ -54,15 +54,13 @@
     <!-- ================================= 
           target: build
          ================================= -->
-    <target name="build"
-        depends="overlay-oss, copy-includes, layout, make-all" />
+    <target name="build" depends="overlay-oss,copy-includes,layout,make-all" />
 
 
     <!-- ================================= 
           target: clean              
          ================================= -->
-    <target name="clean"
-        depends="make-clean, clean-includes, clean-overlay-oss, clean-layout" />
+    <target name="clean" depends="make-clean,clean-includes,clean-layout" />
 
 
     <!-- This target invokes make on the all target to compile all natives -->
@@ -172,12 +170,6 @@
           target: clean-includes              
          ================================= -->
     <target name="clean-includes" >
-	<!-- Call clean.native.includes targets to delete global
-   	     includes under deploy/includes/harmony -->
-        
-        <poll-modules target="clean-native-includes" />
-
-        <!-- delete the deploy/include and deploy/jdk/include directories -->
         <delete dir="${hy.hdk}/include" />
         <delete dir="${hy.hdk}/jdk/include" />
     </target>
@@ -204,11 +196,4 @@
 	<delete dir="${hy.hdk}/build/make" />
     </target>
 
-    <!-- ================================= 
-          target: clean-overlay-oss              
-         ================================= -->
-    <target name="clean-overlay-oss">
-        <poll-modules target="clean-overlay-oss" />
-    </target>
-
 </project>

Modified: harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-test.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-test.xml Mon Aug 17 13:01:29 2009
@@ -40,6 +40,7 @@
             depends="process-empty, gen-report, check-test-result" />
 
     <target name="clean">
+        <poll-modules target="clean-test" />
         <delete dir="${tests.output}" />
         <delete dir="${tests.support.output}" />
         <delete dir="${hy.hdk}/build/test" />

Modified: harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Mon Aug 17 13:01:29 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/accessibility.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/accessibility-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/annotation/build.xml Mon Aug 17 13:01:29 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/annotation.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/annotation-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/applet/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/applet/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/applet/build.xml Mon Aug 17 13:01:29 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/applet.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/applet-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/build.xml Mon Aug 17 13:01:29 2009
@@ -29,6 +29,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-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" />
 
@@ -75,10 +77,6 @@
         <delete dir="src/main/native/zlib_dist_ascii" />
     </target>
     
-    <target name="clean-overlay-oss" unless="hy.skip.zlib" >
-        <delete dir="src/main/native/zlib_dist" quiet="true" />
-    </target>
-    
     <!-- Build native code -->
     <target name="build-native"
             depends="-build-native-zip,-build-native-zlib,-build-native-archive" />
@@ -121,25 +119,31 @@
         </copy>
     </target>
     
-    <!-- Clean natives -->
     <target name="clean-native"
-            depends="-clean-native-zip,-clean-native-zlib,-clean-native-archive"/>
+            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">
-        <make dir="src/main/native/zip/${hy.os.family}"
-              target="clean" />
+        <make dir="src/main/native/zip/${hy.os.family}" target="clean" />
     </target>
 
     <target name="-clean-native-zlib" unless="hy.skip.zlib">
-        <make dir="src/main/native/zlib/${hy.os.family}"
-              target="clean" />
+        <make dir="src/main/native/zlib/${hy.os.family}" target="clean" />
     </target>
 
-    <target name="-clean-native-archive">
-        <make dir="src/main/native/archive/${hy.os.family}"
-              target="clean" />
+    <target name="clean-native-includes">
+        <delete failonerror="false">
+            <fileset dir="${hy.hdk}/include">
+                <include name="zipsup.h" />
+            </fileset>
+        </delete>
     </target>
 
+    <target name="clean-overlay-oss" unless="hy.skip.zlib" >
+        <delete dir="src/main/native/zlib_dist" quiet="true" />
+    </target>
+    
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -154,22 +158,17 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean" depends="clean-native-includes" >
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/archive.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/archive-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
-        <delete failonerror="false" dir="bin"/>
     </target>
 
-    <target name="clean-native-includes">
-        <delete failonerror="false">
-            <fileset dir="${hy.hdk}/include">
-                <include name="zipsup.h" />
-            </fileset>
-        </delete>
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="compile-java">

Modified: harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/build.xml Mon Aug 17 13:01:29 2009
@@ -28,6 +28,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -63,18 +65,20 @@
         </copy>
     </target>
     
-    <!-- Clean natives -->
-    <target name="clean-native">
-    <make dir="src/main/native/auth/${hy.os.family}" target="clean" />
-    </target>
-
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/auth.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/auth-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-native">
+        <make dir="src/main/native/auth/${hy.os.family}" target="clean" />
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Mon Aug 17 13:01:29 2009
@@ -30,6 +30,8 @@
     <target name="build"
             depends="check-depends,compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="check-depends" depends="-check-depends,-extract" />
 
     <target name="-check-depends"
@@ -146,15 +148,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/awt.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/awt-src.jar" />    
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete dir="${hy.jdk}/jre/lib/cmm" quiet="true" />
         <delete dir="${hy.jdk}/jre/lib/fonts" quiet="true" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/build.xml Mon Aug 17 13:01:29 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/beans.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/beans-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/concurrent/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/concurrent/build.xml Mon Aug 17 13:01:29 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/concurrent.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/concurrent-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/build.xml Mon Aug 17 13:01:29 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/crypto.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/crypto-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/build.xml Mon Aug 17 13:01:29 2009
@@ -30,6 +30,8 @@
     <target name="build"
             depends="check-depends,compile-java,copy-resources,build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="check-depends"
             depends="-check-win-depends,-check-unix-depends" />
 
@@ -103,21 +105,22 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/imageio.jar" />
 	<delete file="${hy.jdk}/jre/lib/boot/imageio-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
-        <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="clean-native">
-        <make dir="src/main/native/jpegencoder/${hy.os.family}"
-              target="clean" />
-        <make dir="src/main/native/pngencoder/${hy.os.family}"
-              target="clean" />
+        <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">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="compile-java">

Modified: harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/build.xml Mon Aug 17 13:01:29 2009
@@ -27,6 +27,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -62,18 +64,20 @@
         </copy>
     </target>
     
-    <!-- Clean natives -->
-    <target name="clean-native">
-        <make dir="src/main/native/instrument/${hy.os.family}" target="clean" />
-    </target>
-
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/instrument.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/instrument-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-native">
+        <make dir="src/main/native/instrument/${hy.os.family}" target="clean" />
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/jmx/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jmx/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jmx/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/jmx/build.xml Mon Aug 17 13:01:29 2009
@@ -29,6 +29,8 @@
 
     <target name="build" depends="check-depends" />
 
+    <target name="clean" depends="clean-java" />
+
     <target name="check-depends" depends="-check,-extract,-copy-jars" />
 
     <target name="-check">
@@ -87,7 +89,7 @@
 
     <target name="test" />
 
-    <target name="clean">
+    <target name="clean-java">
         <delete dir="${hy.jdk}/jre/lib/boot/mx4j_${mx4j.version}" />
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/build.xml Mon Aug 17 13:01:29 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/jndi.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/jndi-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/build.xml Mon Aug 17 13:01:29 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/lang-management.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/lang-management-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/logging/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/logging/build.xml Mon Aug 17 13:01:29 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/logging.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/logging-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni-kernel/build.xml Mon Aug 17 13:01:29 2009
@@ -48,7 +48,9 @@
         </jar>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="clean-java" />
+
+    <target name="clean-java">
         <delete file="${stub.jar}" />
         <delete failonerror="false">
             <fileset refid="classes" />

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Mon Aug 17 13:01:29 2009
@@ -29,6 +29,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="copy-native-includes">
         <copy todir="${hy.hdk}/include" overwrite="yes">
             <fileset dir="src/main/native/include">
@@ -156,23 +158,6 @@
         <delete dir="src/main/native/fdlibm_dist_ascii" />
     </target>
 
-    <!-- Clean overlaid OSS packages -->
-    <target name="clean-overlay-oss" >
-        <delete dir="src/main/native/fdlibm_dist" quiet="true" />
-    </target>
-
-    <!-- Clean natives -->
-    <target name="clean-native">
-        <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" />
-        <make dir="src/main/native/vmls/${hy.os.family}" target="clean" />
-        <make dir="src/main/native/hyzip/${hy.os.family}"
-              target="clean" />
-        <make dir="src/main/native/launcher/${hy.os.family}"
-              target="clean" />
-    </target>
-
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -187,14 +172,22 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, test-jar, run-tests" />
 
-    <target name="clean" depends="clean-native-includes" >
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/luni.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/luni-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
-        <delete failonerror="false" dir="bin"/>
+    </target>
+
+    <target name="clean-native"
+            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" />
+        <make dir="src/main/native/vmls/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/hyzip/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/launcher/${hy.os.family}" target="clean" />
     </target>
 
     <target name="clean-native-includes">
@@ -218,6 +211,16 @@
         </delete>
     </target>
 
+    <!-- Clean overlaid OSS packages -->
+    <target name="clean-overlay-oss" >
+        <delete dir="src/main/native/fdlibm_dist" quiet="true" />
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete failonerror="false" dir="bin"/>
+    </target>
+
     <target name="compile-java">
         <echo message="Compiling LUNI classes" />
 

Modified: harmony/enhanced/classlib/trunk/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/math/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/math/build.xml Mon Aug 17 13:01:29 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/math.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/math-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/build.xml Mon Aug 17 13:01:29 2009
@@ -27,6 +27,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -62,20 +64,21 @@
         </copy>
     </target>
 
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/nio.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/nio-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete includeemptydirs="true" failonerror="false">
             <fileset refid="classes" />
         </delete>
-        <delete failonerror="false" dir="bin" />
     </target>
 
-    <!-- Clean natives. -->
     <target name="clean-native">
-        <make dir="src/main/native/nio/${hy.os.family}"
-              target="clean" />
+        <make dir="src/main/native/nio/${hy.os.family}" target="clean" />
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete failonerror="false" dir="bin" />
     </target>
 
     <target name="compile-java">

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Mon Aug 17 13:01:29 2009
@@ -27,6 +27,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-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" >
@@ -55,19 +57,20 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <!-- Clean natives. -->
-    <target name="clean-native">
-        <make dir="src/main/native/niochar/${hy.os.family}"
-                      target="clean" />
-    </target>
-
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/nio_char.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/nio_char-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-native">
+        <make dir="src/main/native/niochar/${hy.os.family}" target="clean" />
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/orb/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/orb/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/orb/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/orb/build.xml Mon Aug 17 13:01:29 2009
@@ -29,6 +29,8 @@
 
     <target name="build" depends="check-depends, -copy-jars" />
 
+    <target name="clean" depends="clean-java" />
+
     <target name="check-depends">
         <check-one-file src="${yoko.url}" dest="${yoko.jar}" />
         <check-one-file src="${yoko-core.url}" dest="${yoko-core.jar}" />
@@ -76,7 +78,7 @@
 
     <target name="test" />
 
-    <target name="clean">
+    <target name="clean-java">
         <delete dir="${hy.jdk}/jre/lib/boot/yoko-${yoko.version}" />
         <delete dir="${hy.jdk}/jre/lib/boot/bcel-${bcel.version}" />
     </target>

Modified: harmony/enhanced/classlib/trunk/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/build.xml Mon Aug 17 13:01:29 2009
@@ -61,13 +61,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/pack200.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/pack200-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/build.xml Mon Aug 17 13:01:29 2009
@@ -36,6 +36,8 @@
 
     <target name="build" /> <!-- depends="compile-java, copy-resources, build-jar" -->
 
+    <target name="clean" depends="clean-native,clean-test" />
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -162,7 +164,7 @@
     </target>
 
     <!-- Clean natives -->
-    <target name="clean-native" depends="-clean-native-tests">
+    <target name="clean-native" depends="clean-native-includes">
         <make dir="src/main/native/thread/${hy.os.family}" target="clean" />
         <make dir="src/main/native/thrstub/${hy.os.family}" target="clean" />
         <make dir="src/main/native/port/${hy.os.family}" target="clean" />
@@ -170,8 +172,6 @@
         <make dir="src/main/native/pool/${hy.os.family}" target="clean" />
     </target>
 
-    <target name="clean" depends="clean-native-includes" />
-
     <target name="clean-native-includes">
         <delete failonerror="false">
             <fileset dir="${hy.hdk}/include">
@@ -244,7 +244,7 @@
         <antcall target="touch-errors-file" />
     </target>
 
-    <target name="-clean-native-tests" >
+    <target name="clean-test" >
         <make dir="src/test/native/init/${hy.os.family}" 
               target="clean" />
         <make dir="src/test/native/hycpu/${hy.os.family}" 

Modified: harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/build.xml Mon Aug 17 13:01:29 2009
@@ -29,6 +29,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -63,14 +65,12 @@
         </copy>
     </target>
 
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/prefs.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/prefs-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
-        <delete failonerror="false" dir="bin"/>
     </target>
 
     <!-- Clean natives. Currently there are only windows natives for
@@ -79,6 +79,11 @@
         <make dir="src/main/native/prefs/${hy.os.family}" target="clean" />
     </target>
 
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete failonerror="false" dir="bin"/>
+    </target>
+
     <target name="compile-java">
         <echo message="Compiling PREFS classes" />
 

Modified: harmony/enhanced/classlib/trunk/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/print/build.xml Mon Aug 17 13:01:29 2009
@@ -27,6 +27,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -41,19 +43,21 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/print.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/print-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
-        <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="clean-native" if="is.windows">
-        <make dir="src/main/native/print/${hy.os.family}"
-              target="clean" />
+        <make dir="src/main/native/print/${hy.os.family}" target="clean" />
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete failonerror="false" dir="bin"/>
     </target>
 
     <target name="compile-java">

Modified: harmony/enhanced/classlib/trunk/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/build.xml Mon Aug 17 13:01:29 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/regex.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/regex-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/rmi/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/rmi/build.xml Mon Aug 17 13:01:29 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/rmi.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/rmi-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security-kernel/build.xml Mon Aug 17 13:01:29 2009
@@ -48,7 +48,9 @@
         </jar>
     </target>
 
-    <target name="clean">
+    <target name="clean" depends="clean-java" />
+
+    <target name="clean-java">
         <delete file="${stub.jar}" />
         <delete failonerror="false">
             <fileset refid="classes" />

Modified: harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Mon Aug 17 13:01:29 2009
@@ -27,6 +27,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-native,clean-test" />
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -42,7 +44,8 @@
     <target name="-test-module" depends="build, run-tests" />
 
     <!-- Build native code -->
-    <available file="src/main/native/security/${hy.os.family}" property="native.present" />
+    <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" >
@@ -62,18 +65,20 @@
         </copy>
     </target>
     
-    <!-- Clean natives -->
-    <target name="clean-native" if="native.present" >
-        <make dir="src/main/native/security/${hy.os.family}" target="clean" />
-    </target>
-
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/security.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/security-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-native" if="native.present" >
+        <make dir="src/main/native/security/${hy.os.family}" target="clean" />
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sound/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sound/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sound/build.xml Mon Aug 17 13:01:29 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/sound.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/sound-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/build.xml Mon Aug 17 13:01:29 2009
@@ -31,6 +31,8 @@
     <target name="build"
             depends="check-depends, compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-test" />
+
     <target name="check-depends">
         <check-one-file src="${derby.url}" dest="${derby.jar}" />
     </target>
@@ -55,14 +57,17 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/sql.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/sql-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete dir="${hy.hdk}/build/test/derby" /> 
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete dir="${hy.hdk}/build/test/derby" /> 
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/suncompat/build.xml Mon Aug 17 13:01:29 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/suncompat.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/suncompat-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/build.xml Mon Aug 17 13:01:29 2009
@@ -35,6 +35,8 @@
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
+    <target name="clean" depends="clean-java,clean-test" />
+
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
@@ -49,14 +51,17 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/swing.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/swing-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset refid="hidden.classes"/>
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/text/build.xml Mon Aug 17 13:01:29 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
     
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/text.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/text-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?rev=804962&r1=804961&r2=804962&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/build.xml Mon Aug 17 13:01:29 2009
@@ -41,13 +41,18 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean">
+    <target name="clean" depends="clean-java,clean-test" />
+    
+    <target name="clean-java">
         <delete file="${hy.jdk}/jre/lib/boot/x-net.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/x-net-src.jar" />
-        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+    </target>
+
+    <target name="clean-test">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 



Mime
View raw message