harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r405075 - in /incubator/harmony/enhanced/classlib/trunk: make/ make/patternsets/ modules/applet/make/ modules/applet/make/common/ modules/archive/make/ modules/archive/make/common/ modules/auth/make/ modules/auth/make/common/ modules/awt/ma...
Date Mon, 08 May 2006 15:38:54 GMT
Author: tellison
Date: Mon May  8 08:38:50 2006
New Revision: 405075

URL: http://svn.apache.org/viewcvs?rev=405075&view=rev
Log:
Apply patch HARMONY-439 (java build improvements - delegation to modules)

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/applet/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/applet.txt
    incubator/harmony/enhanced/classlib/trunk/modules/archive/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/archive.txt
    incubator/harmony/enhanced/classlib/trunk/modules/auth/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/auth.txt
    incubator/harmony/enhanced/classlib/trunk/modules/awt/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/awt.txt
    incubator/harmony/enhanced/classlib/trunk/modules/beans/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/beans.txt
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/crypto.txt
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/jndi.txt
    incubator/harmony/enhanced/classlib/trunk/modules/logging/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/logging.txt
    incubator/harmony/enhanced/classlib/trunk/modules/luni/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/luni.txt
    incubator/harmony/enhanced/classlib/trunk/modules/math/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/math.txt
    incubator/harmony/enhanced/classlib/trunk/modules/nio/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/nio.txt
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/nio_char.txt
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/prefs.txt
    incubator/harmony/enhanced/classlib/trunk/modules/regex/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/regex.txt
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/rmi.txt
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/security.txt
    incubator/harmony/enhanced/classlib/trunk/modules/sql/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/sql.txt
    incubator/harmony/enhanced/classlib/trunk/modules/text/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/text.txt
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/patternset.txt
      - copied unchanged from r405036, incubator/harmony/enhanced/classlib/trunk/make/patternsets/x-net.txt
Removed:
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/applet.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/archive.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/auth.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/awt.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/beans.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/crypto.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/jndi.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/logging.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/luni.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/math.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/nio.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/nio_char.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/prefs.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/regex.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/rmi.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/security.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/sql.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/text.txt
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/x-net.txt
Modified:
    incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
    incubator/harmony/enhanced/classlib/trunk/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/make/properties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/hyproperties.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Mon May  8 08:38:50 2006
@@ -38,8 +38,6 @@
     <property name="depends.jars" location="depends/jars" />
     <property name="depends.manifests" location="depends/manifests" />
     <property name="depends.files" location="depends/files" />
-    <property name="components.patternsets" location="make/patternsets" />
-    <property name="components.output" location="build/components" />
     <property name="target.output" location="deploy" />
     <property file="make/depends.properties" />
 
@@ -54,12 +52,12 @@
     <!-- ================================= 
           target: build
          ================================= -->
-    <target name="build" depends="compile, package, layout" />
+    <target name="build" depends="compile, layout" />
 
     <!-- ================================= 
           target: clean            
          ================================= -->
-    <target name="clean" depends="clean-bin, clean-layout, clean-package" />
+    <target name="clean" depends="clean-bin, clean-layout" />
 
 
     <!-- ================================= 
@@ -71,175 +69,11 @@
                 <include name="**/**" />
             </fileset>
         </delete>
-    </target>
+        
+        <call-modules target="clean" />
 
-    <!-- ================================= 
-          target: clean-package
-         ================================= -->
-    <target name="clean-package" description="Delete all built component jars">
-        <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="${components.output}">
-                <include name="**/**" />
-            </fileset>
-        </delete>
     </target>
 
-    <!-- ================================= 
-          target: package
-         ================================= -->
-    <target name="package" depends="compile" description="Create component jars">
-        <mkdir dir="${components.output}" />
-
-        <!-- Create applet jar -->
-        <jar destfile="${components.output}/applet.jar"
-        	manifest="modules/applet/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}" 
-                includesfile="${components.patternsets}/applet.txt" />
-        </jar>
-
-        <!-- Create archive jar -->
-        <jar destfile="${components.output}/archive.jar"
-        	manifest="modules/archive/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}" 
-                includesfile="${components.patternsets}/archive.txt" />
-        </jar>
-
-		<!-- Create auth jar -->
-		<jar destfile="${components.output}/auth.jar"
-			manifest="modules/auth/META-INF/MANIFEST.MF">
-			<fileset dir="${build.output}" 
-				includesfile="${components.patternsets}/auth.txt" />
-		</jar>
-
-        <!-- Create awt jar -->
-        <jar destfile="${components.output}/awt.jar"
-        	manifest="modules/awt/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}" 
-                includesfile="${components.patternsets}/awt.txt" />
-        </jar>
-
-        <!-- Create beans jar -->
-        <jar destfile="${components.output}/beans.jar"
-        	manifest="modules/beans/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}" 
-                includesfile="${components.patternsets}/beans.txt" />
-        </jar>
-
-        <!-- Create (non-functional) kernel jars (to compile against) -->
-        <jar destfile="${components.output}/luni-kernel-stubs.jar"
-        	manifest="modules/luni-kernel/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}" 
-                includesfile="${components.patternsets}/luni-kernel.txt" />
-        </jar>
-        <jar destfile="${components.output}/security-kernel-stubs.jar"
-        	manifest="modules/security-kernel/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}" 
-                includesfile="${components.patternsets}/security-kernel.txt" />
-        </jar>
-
-        <!-- Create luni jar -->
-        <jar destfile="${components.output}/luni.jar"
-        	manifest="modules/luni/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}" 
-                includesfile="${components.patternsets}/luni.txt" 
-                excludesfile="${components.patternsets}/luni-kernel.txt" />
-        </jar>
-
-        <!-- Create nio jar -->
-        <jar destfile="${components.output}/nio.jar"
-        	manifest="modules/nio/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}" 
-                includesfile="${components.patternsets}/nio.txt" />
-        </jar>
-
-        <!-- Create nio_char jar -->
-        <jar destfile="${components.output}/nio_char.jar"
-        	manifest="modules/nio_char/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}" 
-                includesfile="${components.patternsets}/nio_char.txt" />
-        </jar>
-
-        <!-- Create security jar -->
-        <jar destfile="${components.output}/security.jar"
-        	manifest="modules/security/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}" 
-                includesfile="${components.patternsets}/security.txt" 
-                excludesfile="${components.patternsets}/security-kernel.txt" />
-        </jar>
-
-        <!-- Create x-net jar -->
-        <jar destfile="${components.output}/x-net.jar"
-        	manifest="modules/x-net/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}"
-                includesfile="${components.patternsets}/x-net.txt"/>
-        </jar>
-
-        <!-- Create crypto jar -->
-        <jar destfile="${components.output}/crypto.jar"
-        	manifest="modules/crypto/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}"
-                includesfile="${components.patternsets}/crypto.txt"/>
-        </jar>
-
-        <!-- Create text jar -->
-        <jar destfile="${components.output}/text.jar"
-        	manifest="modules/text/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}"
-                includesfile="${components.patternsets}/text.txt"/>
-        </jar>
-
-        <!-- Create math jar -->
-        <jar destfile="${components.output}/math.jar"
-        	manifest="modules/math/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}"
-                includesfile="${components.patternsets}/math.txt"/>
-        </jar>
-
-        <!-- Create regex jar -->
-        <jar destfile="${components.output}/regex.jar"
-        	manifest="modules/regex/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}"
-                includesfile="${components.patternsets}/regex.txt" />
-        </jar>
-
-        <!-- Create rmi jar -->
-        <jar destfile="${components.output}/rmi.jar"
-        	manifest="modules/rmi/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}" 
-                includesfile="${components.patternsets}/rmi.txt" />
-        </jar>
-
-        <!-- Create sql jar -->
-        <jar destfile="${components.output}/sql.jar"
-        	manifest="modules/sql/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}"
-                includesfile="${components.patternsets}/sql.txt" />
-        </jar>
-
-        <!-- Create jndi jar -->
-        <jar destfile="${components.output}/jndi.jar"
-        	manifest="modules/jndi/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}"
-                includesfile="${components.patternsets}/jndi.txt" />
-        </jar>
-
-        <!-- Create logging jar -->
-        <jar destfile="${components.output}/logging.jar"
-        	manifest="modules/logging/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}"
-                includesfile="${components.patternsets}/logging.txt" />
-        </jar>
-
-        <!-- Create prefs jar -->
-        <jar destfile="${components.output}/prefs.jar"
-        	manifest="modules/prefs/META-INF/MANIFEST.MF">
-            <fileset dir="${build.output}"
-                includesfile="${components.patternsets}/prefs.txt" />
-        </jar>
-
-    </target>
-
-
     <!-- =================================
           target: compile
          ================================= -->
@@ -249,28 +83,27 @@
 
         <javac destdir="${build.output}" source="${hy.javac.source}" target="${hy.javac.target}" debug="on">
             <src path="modules/applet/src/main/java" />
+            <src path="modules/archive/src/main/java" />
+            <src path="modules/auth/src/main/java/${hy.os}" />
             <src path="modules/auth/src/main/java/common" />
-            <src path="modules/auth/src/main/java/windows" />
-            <src path="modules/auth/src/main/java/linux" />
             <src path="modules/awt/src/main/java" />
             <src path="modules/beans/src/main/java" />
             <src path="modules/crypto/src/main/java" />
-            <src path="modules/regex/src/main/java" />
-            <src path="modules/math/src/main/java" />
-            <src path="modules/archive/src/main/java" />
-            <src path="modules/luni/src/main/java" />
+            <src path="modules/jndi/src/main/java" />
+            <src path="modules/logging/src/main/java" />
             <src path="modules/luni-kernel/src/main/java" />
+            <src path="modules/luni/src/main/java" />
+            <src path="modules/math/src/main/java" />
             <src path="modules/nio/src/main/java" />
             <src path="modules/nio_char/src/main/java" />
-            <src path="modules/security/src/main/java/common" />
-            <src path="modules/security-kernel/src/main/java" />
-            <src path="modules/x-net/src/main/java/" />
+            <src path="modules/prefs/src/main/java" />
+            <src path="modules/regex/src/main/java" />
             <src path="modules/rmi/src/main/java" />
+            <src path="modules/security-kernel/src/main/java" />
+            <src path="modules/security/src/main/java/common" />
             <src path="modules/sql/src/main/java" />
             <src path="modules/text/src/main/java" />
-            <src path="modules/jndi/src/main/java" />
-            <src path="modules/logging/src/main/java" />
-            <src path="modules/prefs/src/main/java" />
+            <src path="modules/x-net/src/main/java/" />
 
             <classpath location="${build.output}" />
             <classpath>
@@ -279,6 +112,11 @@
                 </fileset>
             </classpath>
         </javac>
+
+        <mkdir dir="${target.output}/jre/lib/boot" />
+
+        <call-modules target="build" />
+
     </target>
 
 
@@ -333,7 +171,7 @@
           target: layout              
          ================================= -->
     <target name="layout" 
-        depends="package" 
+        depends="compile" 
         description="Construct the correct directory structure for the class libs">
         <!-- Create the structure -->
         <mkdir dir="${target.output}/jre/bin" />
@@ -357,13 +195,6 @@
         <copy todir="${target.output}/jre/lib/ext" overwrite="yes"
               verbose="yes" flatten="yes">
             <fileset file="${bcprov.jar}" />
-        </copy>
-
-        <!-- Copy across the component jars -->
-        <copy todir="${target.output}/jre/lib/boot" overwrite="yes">
-            <fileset dir="${components.output}">
-                <patternset includes="*.jar" />
-            </fileset>
         </copy>
 
         <!-- Copy across the support files -->

Modified: incubator/harmony/enhanced/classlib/trunk/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build.xml Mon May  8 08:38:50 2006
@@ -80,46 +80,6 @@
              repository.
              <ant antfile="doc/build.xml" inheritall="false" target="clean" />
          -->
-
-        <ant antfile="modules/applet/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/archive/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/auth/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/awt/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/beans/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/crypto/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/jndi/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/logging/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/luni/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/math/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/nio_char/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/nio/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/prefs/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/regex/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/rmi/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/security/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/sql/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/text/make/build.xml" inheritall="false"
-             target="clean" />
-        <ant antfile="modules/x-net/make/build.xml" inheritall="false"
-             target="clean" />
-
     </target>
 
     <!-- ================================= 

Modified: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Mon May  8 08:38:50 2006
@@ -153,4 +153,13 @@
         </exec>
     </target>
 
+    <macrodef name="call-modules">
+        <attribute name="target" />
+        <sequential>
+            <subant target="@{target}">
+                <fileset dir="modules" includes="*/make/build.xml" />
+            </subant>
+        </sequential>
+    </macrodef>
+
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml Mon May  8 08:38:50 2006
@@ -20,11 +20,11 @@
     <target name="compile.java" description="Compile APPLET java code">
         <echo message="Compiling APPLET classes from ${hy.applet.src.main.java}" />
 
-        <mkdir dir="${hy.applet.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.applet.src.main.java}"
-            destdir="${hy.applet.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -39,8 +39,9 @@
 
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/applet.jar"
-            manifest="${hy.applet}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.applet.bin.main}" />
+             manifest="${hy.applet}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.applet}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -37,6 +37,7 @@
    </applet>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml Mon May  8 08:38:50 2006
@@ -20,11 +20,11 @@
     <target name="compile.java" description="Compile ARCHIVE java code">
         <echo message="Compiling ARCHIVE classes from ${hy.archive.src.main.java}" />
 
-        <mkdir dir="${hy.archive.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.archive.src.main.java}"
-            destdir="${hy.archive.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -39,8 +39,9 @@
 
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/archive.jar"
-            manifest="${hy.archive}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.archive.bin.main}" />
+             manifest="${hy.archive}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.archive}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -37,6 +37,7 @@
    </archive>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml Mon May  8 08:38:50 2006
@@ -28,10 +28,10 @@
     <target name="compile.java" description="Compile AUTH java code">
         <echo message="Compiling AUTH classes from ${hy.auth.src.main.java}" />
 
-        <mkdir dir="${hy.auth.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
-            destdir="${hy.auth.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -51,8 +51,9 @@
 
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/${hy.auth.packaging.jarname}.jar"
-            manifest="${hy.auth}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.auth.bin.main}" />
+             manifest="${hy.auth}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.auth}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -38,6 +38,7 @@
    </auth>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml Mon May  8 08:38:50 2006
@@ -20,11 +20,11 @@
     <target name="compile.java" description="Compile AWT java code">
         <echo message="Compiling AWT classes from ${hy.awt.src.main.java}" />
 
-        <mkdir dir="${hy.awt.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.awt.src.main.java}"
-            destdir="${hy.awt.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -39,8 +39,9 @@
 
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/awt.jar"
-            manifest="${hy.awt}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.awt.bin.main}" />
+             manifest="${hy.awt}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.awt}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -37,6 +37,7 @@
    </awt>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml Mon May  8 08:38:50 2006
@@ -20,11 +20,11 @@
     <target name="compile.java" description="Compile BEANS java code">
         <echo message="Compiling BEANS classes from ${hy.beans.src.main.java}" />
 
-        <mkdir dir="${hy.beans.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.beans.src.main.java}"
-            destdir="${hy.beans.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -39,8 +39,9 @@
 
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/beans.jar"
-            manifest="${hy.beans}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.beans.bin.main}" />
+             manifest="${hy.beans}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.beans}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -37,6 +37,7 @@
    </beans>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml Mon May  8 08:38:50 2006
@@ -22,11 +22,11 @@
     <target name="compile.java" description="Compile CRYPTO java code">
         <echo message="Compiling CRYPTO classes from ${hy.crypto.src.main.java}" />
 
-        <mkdir dir="${hy.crypto.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.crypto.src.main.java}"
-            destdir="${hy.crypto.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -41,8 +41,9 @@
 
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/${hy.crypto.packaging.jarname}.jar"
-            manifest="${hy.crypto}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.crypto.bin.main}" />
+             manifest="${hy.crypto}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.crypto}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -38,6 +38,7 @@
    </crypto>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml Mon May  8 08:38:50 2006
@@ -20,11 +20,11 @@
     <target name="compile.java" description="Compile JNDI java code">
         <echo message="Compiling JNDI classes from ${hy.jndi.src.main.java}" />
 
-        <mkdir dir="${hy.jndi.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.jndi.src.main.java}"
-            destdir="${hy.jndi.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -39,8 +39,9 @@
 
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/jndi.jar"
-            manifest="${hy.jndi}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.jndi.bin.main}" />
+             manifest="${hy.jndi}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.jndi}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -37,6 +37,7 @@
    </jndi>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml Mon May  8 08:38:50 2006
@@ -21,11 +21,11 @@
     	depends="copy.resources">
         <echo message="Compiling LOGGING classes from ${hy.logging.src.main.java}" />
 
-        <mkdir dir="${hy.logging.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.logging.src.main.java}"
-            destdir="${hy.logging.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -40,8 +40,9 @@
 
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/logging.jar"
-            manifest="${hy.logging}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.logging.bin.main}" />
+             manifest="${hy.logging}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.logging}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -39,6 +39,7 @@
    </logging>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml Mon May  8 08:38:50 2006
@@ -21,11 +21,11 @@
     	depends="copy.resources">
         <echo message="Compiling LUNI classes from ${hy.luni.src.main.java}" />
 
-        <mkdir dir="${hy.luni.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.luni.src.main.java}"
-            destdir="${hy.luni.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -39,8 +39,10 @@
     </target>
 
     <target name="build.jar">
-        <jar destfile="${hy.target}/jre/lib/boot/luni.jar" manifest="${hy.luni}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.luni.bin.main}" />
+        <jar destfile="${hy.target}/jre/lib/boot/luni.jar"
+             manifest="${hy.luni}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.luni}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -37,6 +37,7 @@
    </luni>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml Mon May  8 08:38:50 2006
@@ -20,11 +20,11 @@
     <target name="compile.java" description="Compile MATH java code">
         <echo message="Compiling MATH classes from ${hy.math.src.main.java}" />
 
-        <mkdir dir="${hy.math.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.math.src.main.java}"
-            destdir="${hy.math.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -39,8 +39,9 @@
 
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/math.jar"
-            manifest="${hy.math}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.math.bin.main}" />
+             manifest="${hy.math}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.math}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -37,6 +37,7 @@
    </math>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml Mon May  8 08:38:50 2006
@@ -20,11 +20,11 @@
     <target name="compile.java" description="Compile NIO java code">
         <echo message="Compiling NIO classes from ${hy.nio.src.main.java}" />
 
-        <mkdir dir="${hy.nio.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.nio.src.main.java}"
-            destdir="${hy.nio.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -39,8 +39,9 @@
 
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/nio.jar"
-            manifest="${hy.nio}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.nio.bin.main}" />
+             manifest="${hy.nio}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.nio}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -37,6 +37,7 @@
    </nio>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml Mon May  8 08:38:50 2006
@@ -20,11 +20,11 @@
     <target name="compile.java" description="Compile NIO_CHAR java code">
         <echo message="Compiling NIO_CHAR classes from ${hy.nio_char.src.main.java}" />
 
-        <mkdir dir="${hy.nio_char.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.nio_char.src.main.java}"
-            destdir="${hy.nio_char.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -39,8 +39,9 @@
 
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/${hy.nio_char.packaging.jarname}.jar"
-            manifest="${hy.nio_char}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.nio_char.bin.main}" />
+             manifest="${hy.nio_char}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.nio_char}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -38,6 +38,7 @@
    </nio_char>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml Mon May  8 08:38:50 2006
@@ -20,11 +20,11 @@
     <target name="compile.java" description="Compile PREFS java code">
         <echo message="Compiling PREFS classes from ${hy.prefs.src.main.java}" />
 
-        <mkdir dir="${hy.prefs.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.prefs.src.main.java}"
-            destdir="${hy.prefs.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -39,8 +39,9 @@
 
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/prefs.jar"
-            manifest="${hy.prefs}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.prefs.bin.main}" />
+             manifest="${hy.prefs}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.prefs}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -37,6 +37,7 @@
    </prefs>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml Mon May  8 08:38:50 2006
@@ -20,11 +20,11 @@
     <target name="compile.java" description="Compile REGEX java code">
         <echo message="Compiling REGEX classes from ${hy.regex.src.main.java}" />
 
-        <mkdir dir="${hy.regex.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.regex.src.main.java}"
-            destdir="${hy.regex.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -40,7 +40,8 @@
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/regex.jar"
             manifest="${hy.regex}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.regex.bin.main}" />
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.regex}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -37,6 +37,7 @@
    </regex>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml Mon May  8 08:38:50 2006
@@ -20,11 +20,11 @@
     <target name="compile.java" description="Compile RMI java code">
         <echo message="Compiling RMI classes from ${hy.rmi.src.main.java}" />
 
-        <mkdir dir="${hy.rmi.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.rmi.src.main.java}"
-            destdir="${hy.rmi.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -39,8 +39,9 @@
 
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/rmi.jar"
-            manifest="${hy.rmi}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.rmi.bin.main}" />
+             manifest="${hy.rmi}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.rmi}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -37,6 +37,7 @@
    </rmi>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml Mon May  8 08:38:50 2006
@@ -22,11 +22,11 @@
     <target name="compile.java" description="Compile SECURITY java code">
         <echo message="Compiling SECURITY classes from ${hy.security.src.main.java}" />
 
-        <mkdir dir="${hy.security.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.security.src.main.java}"
-            destdir="${hy.security.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -42,7 +42,8 @@
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/${hy.security.packaging.jarname}.jar"
             manifest="${hy.security}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.security.bin.main}" />
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.security}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -38,6 +38,7 @@
    </security>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml Mon May  8 08:38:50 2006
@@ -20,11 +20,11 @@
     <target name="compile.java" description="Compile SQL java code">
         <echo message="Compiling SQL classes from ${hy.sql.src.main.java}" />
 
-        <mkdir dir="${hy.sql.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.sql.src.main.java}"
-            destdir="${hy.sql.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -39,8 +39,9 @@
 
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/sql.jar"
-            manifest="${hy.sql}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.sql.bin.main}" />
+             manifest="${hy.sql}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.sql}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -37,6 +37,7 @@
    </sql>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml Mon May  8 08:38:50 2006
@@ -20,11 +20,11 @@
     <target name="compile.java" description="Compile TEXT java code">
         <echo message="Compiling TEXT classes from ${hy.text.src.main.java}" />
 
-        <mkdir dir="${hy.text.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.text.src.main.java}"
-            destdir="${hy.text.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -39,8 +39,9 @@
 
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/text.jar"
-            manifest="${hy.text}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.text.bin.main}" />
+             manifest="${hy.text}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.text}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -37,6 +37,7 @@
    </text>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml Mon May  8 08:38:50 2006
@@ -20,11 +20,11 @@
     <target name="compile.java" description="Compile X-NET java code">
         <echo message="Compiling X-NET classes from ${hy.x-net.src.main.java}" />
 
-        <mkdir dir="${hy.x-net.bin.main}" />
+        <mkdir dir="${hy.build}" />
 
         <javac sourcepath=""
             srcdir="${hy.x-net.src.main.java}"
-            destdir="${hy.x-net.bin.main}"
+            destdir="${hy.build}"
             source="${hy.javac.source}"
             target="${hy.javac.target}"
             debug="${java.debug.option}">
@@ -40,7 +40,8 @@
     <target name="build.jar">
         <jar destfile="${hy.target}/jre/lib/boot/${hy.x-net.packaging.jarname}.jar"
             manifest="${hy.x-net}/META-INF/MANIFEST.MF">
-            <fileset dir="${hy.x-net.bin.main}" />
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.x-net}/make/patternset.txt" />
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/hyproperties.xml?rev=405075&r1=405074&r2=405075&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/hyproperties.xml Mon May  8 08:38:50 2006
@@ -38,6 +38,7 @@
    </x-net>
 
    <target location="../../deploy" />
+   <build location="../../build" />
 
    <tests>
       <reports location="../../build/test_report" />



Mime
View raw message