You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2006/06/16 14:26:55 UTC
svn commit: r414812 - in /incubator/harmony/enhanced/classlib/trunk: make/
modules/annotation/make/ modules/applet/make/ modules/archive/make/
modules/auth/make/ modules/awt/make/ modules/beans/make/
modules/crypto/make/ modules/jndi/make/ modules/logg...
Author: hindessm
Date: Fri Jun 16 05:26:54 2006
New Revision: 414812
URL: http://svn.apache.org/viewvc?rev=414812&view=rev
Log:
Fixed modules "ant clean" to remove the class files that they create.
Modified:
incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
incubator/harmony/enhanced/classlib/trunk/modules/annotation/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/math/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/nio/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/regex/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/text/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml
Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Fri Jun 16 05:26:54 2006
@@ -65,14 +65,12 @@
target: clean-bin
================================= -->
<target name="clean-bin" description="Delete all built classes">
+ <call-modules target="clean" />
<delete includeemptydirs="true" failonerror="false">
<fileset dir="${build.output}">
<include name="**/**" />
</fileset>
</delete>
-
- <call-modules target="clean" />
-
</target>
<!-- =================================
Modified: incubator/harmony/enhanced/classlib/trunk/modules/annotation/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/annotation/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/annotation/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/annotation/make/build.xml Fri Jun 16 05:26:54 2006
@@ -58,8 +58,11 @@
</target>
<target name="clean">
- <delete dir="${hy.annotation.bin.main}" />
- <delete dir="${hy.annotation.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.annotation}/make/patternset.txt" />
+ <fileset dir="${hy.annotation.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml Fri Jun 16 05:26:54 2006
@@ -58,8 +58,11 @@
</target>
<target name="clean">
- <delete dir="${hy.applet.bin.main}" />
- <delete dir="${hy.applet.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.applet}/make/patternset.txt" />
+ <fileset dir="${hy.applet.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml Fri Jun 16 05:26:54 2006
@@ -66,8 +66,11 @@
</target>
<target name="clean">
- <delete dir="${hy.archive.bin.main}" />
- <delete dir="${hy.archive.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.archive}/make/patternset.txt" />
+ <fileset dir="${hy.archive.bin.test}" />
+ </delete>
<antcall target="clean.native.includes" />
</target>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml Fri Jun 16 05:26:54 2006
@@ -60,8 +60,11 @@
</target>
<target name="clean">
- <delete dir="${hy.auth.bin.main}" />
- <delete dir="${hy.auth.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.auth}/make/patternset.txt" />
+ <fileset dir="${hy.auth.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml Fri Jun 16 05:26:54 2006
@@ -59,8 +59,11 @@
</target>
<target name="clean">
- <delete dir="${hy.awt.bin.main}" />
- <delete dir="${hy.awt.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.awt}/make/patternset.txt" />
+ <fileset dir="${hy.awt.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml Fri Jun 16 05:26:54 2006
@@ -59,8 +59,11 @@
</target>
<target name="clean">
- <delete dir="${hy.beans.bin.main}" />
- <delete dir="${hy.beans.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.beans}/make/patternset.txt" />
+ <fileset dir="${hy.beans.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml Fri Jun 16 05:26:54 2006
@@ -59,8 +59,11 @@
</target>
<target name="clean">
- <delete dir="${hy.crypto.bin.main}" />
- <delete dir="${hy.crypto.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.crypto}/make/patternset.txt" />
+ <fileset dir="${hy.crypto.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml Fri Jun 16 05:26:54 2006
@@ -59,8 +59,11 @@
</target>
<target name="clean">
- <delete dir="${hy.jndi.bin.main}" />
- <delete dir="${hy.jndi.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.jndi}/make/patternset.txt" />
+ <fileset dir="${hy.jndi.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml Fri Jun 16 05:26:54 2006
@@ -59,8 +59,11 @@
</target>
<target name="clean">
- <delete dir="${hy.logging.bin.main}" />
- <delete dir="${hy.logging.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.logging}/make/patternset.txt" />
+ <fileset dir="${hy.logging.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml Fri Jun 16 05:26:54 2006
@@ -119,8 +119,11 @@
</target>
<target name="clean">
- <delete dir="${hy.luni.bin.main}" />
- <delete dir="${hy.luni.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.luni}/make/patternset.txt" />
+ <fileset dir="${hy.luni.bin.test}" />
+ </delete>
<antcall target="clean.native.includes" />
</target>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/math/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/make/build.xml Fri Jun 16 05:26:54 2006
@@ -59,8 +59,11 @@
</target>
<target name="clean">
- <delete dir="${hy.math.bin.main}" />
- <delete dir="${hy.math.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.math}/make/patternset.txt" />
+ <fileset dir="${hy.math.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/make/build.xml Fri Jun 16 05:26:54 2006
@@ -59,8 +59,11 @@
</target>
<target name="clean">
- <delete dir="${hy.nio.bin.main}" />
- <delete dir="${hy.nio.bin.test}" />
+ <delete includeemptydirs="true" failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.nio}/make/patternset.txt" />
+ <fileset dir="${hy.nio.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/build.xml Fri Jun 16 05:26:54 2006
@@ -58,8 +58,11 @@
</target>
<target name="clean">
- <delete dir="${hy.nio_char.bin.main}" />
- <delete dir="${hy.nio_char.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.nio_char}/make/patternset.txt" />
+ <fileset dir="${hy.nio_char.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml Fri Jun 16 05:26:54 2006
@@ -59,8 +59,11 @@
</target>
<target name="clean">
- <delete dir="${hy.prefs.bin.main}" />
- <delete dir="${hy.prefs.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.prefs}/make/patternset.txt" />
+ <fileset dir="${hy.prefs.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/make/build.xml Fri Jun 16 05:26:54 2006
@@ -59,8 +59,11 @@
</target>
<target name="clean">
- <delete dir="${hy.regex.bin.main}" />
- <delete dir="${hy.regex.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.regex}/make/patternset.txt" />
+ <fileset dir="${hy.regex.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml Fri Jun 16 05:26:54 2006
@@ -59,8 +59,11 @@
</target>
<target name="clean">
- <delete dir="${hy.rmi.bin.main}" />
- <delete dir="${hy.rmi.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.rmi}/make/patternset.txt" />
+ <fileset dir="${hy.rmi.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/make/build.xml Fri Jun 16 05:26:54 2006
@@ -59,8 +59,11 @@
</target>
<target name="clean">
- <delete dir="${hy.rmi.bin.main}" />
- <delete dir="${hy.rmi.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.rmi}/make/patternset.txt" />
+ <fileset dir="${hy.rmi.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml Fri Jun 16 05:26:54 2006
@@ -60,8 +60,11 @@
</target>
<target name="clean">
- <delete dir="${hy.security.bin.main}" />
- <delete dir="${hy.security.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.security}/make/patternset.txt" />
+ <fileset dir="${hy.security.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml Fri Jun 16 05:26:54 2006
@@ -59,8 +59,11 @@
</target>
<target name="clean">
- <delete dir="${hy.sql.bin.main}" />
- <delete dir="${hy.sql.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.sql}/make/patternset.txt" />
+ <fileset dir="${hy.sql.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/make/build.xml Fri Jun 16 05:26:54 2006
@@ -59,8 +59,11 @@
</target>
<target name="clean">
- <delete dir="${hy.text.bin.main}" />
- <delete dir="${hy.text.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.text}/make/patternset.txt" />
+ <fileset dir="${hy.text.bin.test}" />
+ </delete>
</target>
</project>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml?rev=414812&r1=414811&r2=414812&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml Fri Jun 16 05:26:54 2006
@@ -59,8 +59,11 @@
</target>
<target name="clean">
- <delete dir="${hy.x-net.bin.main}" />
- <delete dir="${hy.x-net.bin.test}" />
+ <delete failonerror="false">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.x-net}/make/patternset.txt" />
+ <fileset dir="${hy.x-net.bin.test}" />
+ </delete>
</target>
</project>