harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r417017 - in /incubator/harmony/enhanced/classlib/trunk: make/ modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/beans/ modules/crypto/ modules/jndi/ modules/logging/ modules/luni...
Date Sun, 25 Jun 2006 13:22:15 GMT
Author: hindessm
Date: Sun Jun 25 06:22:13 2006
New Revision: 417017

URL: http://svn.apache.org/viewvc?rev=417017&view=rev
Log:
Fixing patternsets to exclude kernel classes.

Modified:
    incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
    incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/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=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Sun Jun 25 06:22:13 2006
@@ -64,7 +64,8 @@
     <!-- ================================= 
           target: clean-bin              
          ================================= -->
-    <target name="clean-bin" description="Delete all built classes">
+    <target name="clean-bin" description="Delete all built classes"
+            depends="clean-kernel-patternsets">
         <call-modules target="clean" />
         <delete includeemptydirs="true" failonerror="false">
             <fileset dir="${build.output}">
@@ -73,10 +74,22 @@
         </delete>
     </target>
 
+    <target name="copy-kernel-patternsets">
+        <mkdir dir="${hy.hdk}/build/patternsets" />
+        <copy file="modules/luni-kernel/make/patternset.txt"
+              tofile="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <copy file="modules/security-kernel/make/patternset.txt"
+              tofile="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </target>
+
+    <target name="clean-kernel-patternsets">
+        <delete dir="${hy.hdk}/build/patternsets" />
+    </target>
+
     <!-- =================================
           target: compile
          ================================= -->
-    <target name="compile" depends="prepare-depends"
+    <target name="compile" depends="copy-kernel-patternsets, prepare-depends"
             description="Compile the source">
         <mkdir dir="${build.output}" />
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.accessibility}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -35,8 +41,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.accessibility}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.accessibility.bin.test}" />
         </delete>
     </target>
@@ -64,8 +69,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.accessibility.packaging.jarname}.jar"
              manifest="${hy.accessibility}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.accessibility}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml Sun Jun 25 06:22:13 2006
@@ -24,6 +24,13 @@
 
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.annotation}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -34,8 +41,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.annotation}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.annotation.bin.test}" />
         </delete>
     </target>
@@ -63,8 +69,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.annotation.packaging.jarname}.jar"
              manifest="${hy.annotation}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.annotation}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/build.xml Sun Jun 25 06:22:13 2006
@@ -24,6 +24,13 @@
 
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.applet}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -34,8 +41,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.applet}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.applet.bin.test}" />
         </delete>
     </target>
@@ -63,8 +69,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/applet.jar"
              manifest="${hy.applet}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.applet}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.archive}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -43,8 +49,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.archive}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.archive.bin.test}" />
         </delete>
     	<antcall target="clean.native.includes" />
@@ -81,8 +86,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/archive.jar"
              manifest="${hy.archive}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.archive}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/build.xml Sun Jun 25 06:22:13 2006
@@ -26,6 +26,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.auth}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -44,8 +50,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.auth}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.auth.bin.test}" />
         </delete>
     </target>
@@ -77,8 +82,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.auth.packaging.jarname}.jar"
              manifest="${hy.auth}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.auth}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.awt}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -41,8 +47,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.awt}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.awt.bin.test}" />
         </delete>
     </target>
@@ -74,8 +79,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/awt.jar"
              manifest="${hy.awt}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.awt}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.beans}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -37,8 +43,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.beans}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.beans.bin.test}" />
         </delete>
     </target>
@@ -66,8 +71,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/beans.jar"
              manifest="${hy.beans}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.beans}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.crypto}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -37,8 +43,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.crypto}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.crypto.bin.test}" />
         </delete>
     </target>
@@ -66,8 +71,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.crypto.packaging.jarname}.jar"
              manifest="${hy.crypto}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.crypto}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.jndi}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -35,8 +41,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.jndi}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.jndi.bin.test}" />
         </delete>
     </target>
@@ -64,8 +69,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/jndi.jar"
              manifest="${hy.jndi}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.jndi}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.logging}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -35,8 +41,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.logging}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.logging.bin.test}" />
         </delete>
     </target>
@@ -64,8 +69,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/logging.jar"
              manifest="${hy.logging}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.logging}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.luni}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -83,8 +89,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.luni}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.luni.bin.test}" />
         </delete>
     	<antcall target="clean.native.includes" />
@@ -138,8 +143,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/luni.jar"
              manifest="${hy.luni}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.luni}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.math}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -35,8 +41,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.math}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.math.bin.test}" />
         </delete>
     </target>
@@ -64,8 +69,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/math.jar"
              manifest="${hy.math}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.math}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/misc/build.xml Sun Jun 25 06:22:13 2006
@@ -24,6 +24,13 @@
 
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.misc}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -34,8 +41,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.misc}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.misc.bin.test}" />
         </delete>
     </target>
@@ -63,8 +69,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.misc.packaging.jarname}.jar"
              manifest="${hy.misc}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.misc}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.nio}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -35,8 +41,7 @@
 
     <target name="clean">
         <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.nio}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.nio.bin.test}" />
         </delete>
     </target>
@@ -64,8 +69,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/nio.jar"
              manifest="${hy.nio}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.nio}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.nio_char}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -35,8 +41,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.nio_char}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.nio_char.bin.test}" />
         </delete>
     </target>
@@ -63,8 +68,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.nio_char.packaging.jarname}.jar"
              manifest="${hy.nio_char}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.nio_char}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
     <target name="compile.tests">

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.prefs}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -52,8 +58,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.prefs}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.prefs.bin.test}" />
         </delete>
     </target>
@@ -93,8 +98,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/prefs.jar"
              manifest="${hy.prefs}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.prefs}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.regex}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -35,8 +41,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.regex}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.regex.bin.test}" />
         </delete>
     </target>
@@ -64,8 +69,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/regex.jar"
             manifest="${hy.regex}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.regex}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.rmi}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -37,8 +43,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.rmi}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.rmi.bin.test}" />
         </delete>
     </target>
@@ -66,8 +71,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.rmi.packaging.jarname}.jar"
              manifest="${hy.rmi}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.rmi}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi2.1.4/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.rmi2.1.4}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -35,8 +41,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.rmi}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.rmi.bin.test}" />
         </delete>
     </target>
@@ -63,8 +68,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/rmi.jar"
              manifest="${hy.rmi}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.rmi}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
     <target name="compile.tests">

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml Sun Jun 25 06:22:13 2006
@@ -26,6 +26,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.security}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -38,8 +44,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.security}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.security.bin.test}" />
         </delete>
     </target>
@@ -67,8 +72,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.security.packaging.jarname}.jar"
              manifest="${hy.security}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.security}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.sql}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -35,8 +41,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.sql}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.sql.bin.test}" />
         </delete>
     </target>
@@ -64,8 +69,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/sql.jar"
              manifest="${hy.sql}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.sql}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.swing}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -41,8 +47,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.swing}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.swing.bin.test}" />
         </delete>
     </target>
@@ -74,8 +79,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.swing.packaging.jarname}.jar"
              manifest="${hy.swing}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.swing}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.text}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -35,8 +41,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.text}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.text.bin.test}" />
         </delete>
     </target>
@@ -64,8 +69,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/text.jar"
              manifest="${hy.text}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.text}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
 	<!-- set global properties for this build. -->
 	<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.tools}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
 	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
 	<property name="build.compiler" value="modern" />
@@ -35,8 +41,7 @@
 
 	<target name="clean">
 		<delete failonerror="false">
-			<fileset dir="${hy.build}"
-                     includesfile="${hy.tools}/make/patternset.txt" />
+            <fileset refid="classes" />
 			<fileset dir="${hy.tools.bin.test}" />
 		</delete>
 	</target>
@@ -70,8 +75,7 @@
 
 		<jar destfile="${hy.jdk}/lib/tools.jar"
              manifest="${hy.tools}/META-INF/MANIFEST.MF">
-			<fileset dir="${hy.build}"
-                     includesfile="${hy.tools}/make/patternset.txt" />
+            <fileset refid="classes" />
 		</jar>
 	</target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?rev=417017&r1=417016&r2=417017&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml Sun Jun 25 06:22:13 2006
@@ -25,6 +25,12 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.x-net}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
     <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
     <property name="build.compiler" value="modern" />
@@ -37,8 +43,7 @@
 
     <target name="clean">
         <delete failonerror="false">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.x-net}/make/patternset.txt" />
+            <fileset refid="classes" />
             <fileset dir="${hy.x-net.bin.test}" />
         </delete>
     </target>
@@ -66,8 +71,7 @@
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.x-net.packaging.jarname}.jar"
             manifest="${hy.x-net}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.build}"
-                     includesfile="${hy.x-net}/make/patternset.txt" />
+            <fileset refid="classes" />
         </jar>
     </target>
 



Mime
View raw message