harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r805957 [2/2] - in /harmony/enhanced/classlib/branches/java6: ./ make/ modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/beans/ modules/concurrent/ modules/concurrent/src/main/jav...
Date Wed, 19 Aug 2009 20:10:40 GMT
Modified: harmony/enhanced/classlib/branches/java6/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio/build.xml?rev=805957&r1=805956&r2=805957&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio/build.xml Wed Aug 19 20:10:30 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -49,7 +49,7 @@
         <make dir="src/main/native/nio/${hy.os.family}" />
 
         <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
             <fileset dir="src/main/native/nio">
                 <include name="*${shlib.suffix}*" />
                 <include name="*${progdb.suffix}*" if="is.windows" />
@@ -57,19 +57,20 @@
             </fileset>
         </copy>
         <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" overwrite="yes">
+        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
             <fileset dir="src/main/native/nio/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
     </target>
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/nio.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/nio-src.jar" />
         <delete includeemptydirs="true" failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-native">
@@ -82,7 +83,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling NIO classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -109,20 +110,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java/common">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/nio.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="common.resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}" />
             </manifest>
@@ -186,4 +179,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml?rev=805957&r1=805956&r2=805957&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio_char/build.xml Wed Aug 19 20:10:30 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -57,12 +57,13 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/nio_char.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/nio_char-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-native">
@@ -75,7 +76,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling NIO_CHAR classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -101,21 +102,13 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/nio_char.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <service type="java.nio.charset.spi.CharsetProvider" provider="org.apache.harmony.niochar.CharsetProviderImpl" />
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -182,4 +175,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/branches/java6/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/pack200/build.xml?rev=805957&r1=805956&r2=805957&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/pack200/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/pack200/build.xml Wed Aug 19 20:10:30 2009
@@ -27,8 +27,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build"
-            depends="check-depends, compile-java, copy-resources, build-jar" />
+    <target name="build" depends="check-depends, compile-java, build-jar" />
 
     <target name="check-depends">
         <check-one-file src="${asm.url}" dest="${asm.jar}" />
@@ -63,12 +62,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/pack200.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/pack200-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -77,7 +77,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling PACK200 classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -119,20 +119,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/pack200.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -184,7 +176,7 @@
     <target name="compile-tests"> 
         <mkdir dir="bin/test" />
 
-        <echo message="Compiling PACK200 tests" />
+        <echo message="Compiling ${hy.module} tests" />
         <javac srcdir="src/test/java"
                destdir="bin/test"
                sourcepath=""
@@ -208,4 +200,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 19 20:10:30 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1:785554-804992
+/harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1:785554-805827

Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 19 20:10:30 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java:782694-804992
+/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java:782694-805827

Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 19 20:10:30 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java:782694-804992
+/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java:782694-805827

Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml?rev=805957&r1=805956&r2=805957&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/build.xml Wed Aug 19 20:10:30 2009
@@ -34,7 +34,7 @@
         </and>
     </condition>
 
-    <target name="build" /> <!-- depends="compile-java, copy-resources, build-jar" -->
+    <target name="build" />
 
     <target name="clean" depends="clean-native,clean-test" />
 
@@ -53,7 +53,7 @@
 
     <target name="copy-native-includes"
             depends="-copy-thread-include,-copy-thread-stub-include" >
-        <copy todir="${hy.hdk}/include" overwrite="yes">
+        <copy todir="${hy.hdk}/include" preservelastmodified="true">
             <fileset dir="src/main/native/include/shared">
                 <include name="hyport.h" />
                 <include name="hycomp.h" />
@@ -67,7 +67,7 @@
                 <include name="utf8encode.h" />
             </fileset>
         </copy>
-        <copy todir="${hy.hdk}/include" overwrite="yes">
+        <copy todir="${hy.hdk}/include" preservelastmodified="true">
             <fileset dir="src/main/native/include/${hy.os.family}">
                 <include name="hymutex.h" />
                 <include name="hysock.h" />
@@ -77,7 +77,7 @@
     </target>
 
     <target name="-copy-thread-include" unless="hy.skip.thr" >
-        <copy todir="${hy.hdk}/include" overwrite="yes">
+        <copy todir="${hy.hdk}/include" preservelastmodified="true">
             <fileset dir="src/main/native/include/shared">
                 <include name="hythread.h" />
             </fileset>
@@ -85,7 +85,7 @@
     </target>
 
     <target name="-copy-thread-stub-include" if="hy.skip.thr" >
-        <copy todir="${hy.hdk}/include" overwrite="yes">
+        <copy todir="${hy.hdk}/include" preservelastmodified="true">
             <fileset dir="src/main/native/thrstub/shared">
                 <include name="hythread.h" />
             </fileset>
@@ -110,7 +110,7 @@
         <antcall target="-build-copy-thread" />
 
         <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" overwrite="yes">
+        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
             <fileset dir="src/main/native/thread/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
@@ -118,7 +118,7 @@
     </target>
 
     <target name="-build-copy-thread" unless="hy.thr.nodeploy">
-        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
             <fileset dir="src/main/native/thread">
                 <include name="*${shlib.suffix}*" />
                 <include name="*${progdb.suffix}*" if="is.windows" />
@@ -131,7 +131,7 @@
         <!-- Build thread dll -->
         <make dir="src/main/native/thrstub/${hy.os.family}" />
 
-        <copy todir="${hy.hdk}/lib" overwrite="yes">
+        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
             <fileset dir="src/main/native/thrstub">
                 <include name="*${shlib.suffix}*" />
                 <include name="*${progdb.suffix}*" if="is.windows" />
@@ -148,7 +148,7 @@
         <!-- Build port dll -->
         <make dir="src/main/native/port/${hy.os.family}" />
 
-        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
             <fileset dir="src/main/native/port">
                 <include name="*${shlib.suffix}*" />
                 <include name="*${progdb.suffix}*" if="is.windows" />
@@ -156,7 +156,7 @@
             </fileset>
         </copy>
         <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" overwrite="yes">
+        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
             <fileset dir="src/main/native/port/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>

Modified: harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml?rev=805957&r1=805956&r2=805957&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/prefs/build.xml Wed Aug 19 20:10:30 2009
@@ -27,7 +27,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -65,12 +65,13 @@
         </copy>
     </target>
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/prefs.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/prefs-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <!-- Clean natives. Currently there are only windows natives for
@@ -85,7 +86,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling PREFS classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -108,20 +109,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/prefs.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -184,4 +177,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/branches/java6/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/print/build.xml?rev=805957&r1=805956&r2=805957&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/print/build.xml Wed Aug 19 20:10:30 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -43,12 +43,13 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/print.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/print-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-native" if="is.windows">
@@ -61,7 +62,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling PRINT classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -88,7 +89,7 @@
     <target name="build-native-all" if="is.windows">
         <make dir="src/main/native/print/${hy.os.family}" />
         <!-- Copy the built shared libs over to the jre/bin dir -->
-        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+        <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
             <fileset dir="src/main/native/print/">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
@@ -96,25 +97,14 @@
             </fileset>
         </copy>
         <!-- Copy link exports file on z/OS -->
-        <copy todir="${hy.hdk}/lib" overwrite="yes">
+        <copy todir="${hy.hdk}/lib" preservelastmodified="true">
             <fileset dir="src/main/native/print/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java/common">
-                <exclude name="**/*.java" />
-                <exclude name="**/javax.print.StreamPrintServiceFactory" />
-                <exclude name="**/javax.print.PrintServiceLookup" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/print.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
@@ -125,6 +115,11 @@
                 dir="src/main/java/${hy.os.family}/org/apache/harmony/x/print"
                 includes="javax.print.PrintServiceLookup"/>
             <fileset refid="classes" />
+            <fileset dir="src/main/java/common">
+                <exclude name="**/*.java" />
+                <exclude name="**/javax.print.StreamPrintServiceFactory" />
+                <exclude name="**/javax.print.PrintServiceLookup" />
+            </fileset>
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -190,4 +185,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/branches/java6/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/regex/build.xml?rev=805957&r1=805956&r2=805957&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/regex/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/regex/build.xml Wed Aug 19 20:10:30 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/regex.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/regex-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling REGEX classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/regex.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -156,4 +149,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml?rev=805957&r1=805956&r2=805957&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/rmi/build.xml Wed Aug 19 20:10:30 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/rmi.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/rmi-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling RMI classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/rmi.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -159,4 +152,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/branches/java6/modules/security-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security-kernel/build.xml?rev=805957&r1=805956&r2=805957&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security-kernel/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security-kernel/build.xml Wed Aug 19 20:10:30 2009
@@ -37,7 +37,7 @@
         </fail>
     </target>
 
-    <target name="build" depends="svn-info">
+    <target name="build" depends="svn-info,class-patternset">
         <jar destfile="${stub.jar}" manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <manifest>
@@ -50,11 +50,16 @@
 
     <target name="clean" depends="clean-java" />
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${stub.jar}" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
+    </target>
+
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
     </target>
 
 </project>

Modified: harmony/enhanced/classlib/branches/java6/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/build.xml?rev=805957&r1=805956&r2=805957&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/build.xml Wed Aug 19 20:10:30 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
@@ -65,12 +65,13 @@
         </copy>
     </target>
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/security.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/security-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-native" if="native.present" >
@@ -83,7 +84,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling SECURITY classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -110,20 +111,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java/common">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/security.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="common.resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -262,4 +255,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/branches/java6/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sound/build.xml?rev=805957&r1=805956&r2=805957&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sound/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sound/build.xml Wed Aug 19 20:10:30 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/sound.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/sound-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling SOUND classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/sound.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -159,4 +152,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/build.xml?rev=805957&r1=805956&r2=805957&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/build.xml Wed Aug 19 20:10:30 2009
@@ -28,8 +28,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build"
-            depends="check-depends, compile-java, copy-resources, build-jar" />
+    <target name="build" depends="check-depends, compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-test" />
 
@@ -57,12 +56,13 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/sql.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/sql-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -72,7 +72,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling SQL classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -95,20 +95,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/sql.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -176,4 +168,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml?rev=805957&r1=805956&r2=805957&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/suncompat/build.xml Wed Aug 19 20:10:30 2009
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/suncompat.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/suncompat-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -56,7 +57,7 @@
         <delete failonerror="false" dir="bin"/>
     </target>
 
-    <target name="compile-java" depends="copy-resources">
+    <target name="compile-java">
         <echo message="Compiling Sun Compat classes" />
 
         <mkdir dir="../../build/classes" />
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/suncompat.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -152,4 +145,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/branches/java6/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/swing/build.xml?rev=805957&r1=805956&r2=805957&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/swing/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/swing/build.xml Wed Aug 19 20:10:30 2009
@@ -33,7 +33,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="clean" depends="clean-java,clean-test" />
 
@@ -51,13 +51,14 @@
     <!-- internal target for local and global test run sequence -->
     <target name="-test-module" depends="build, run-tests" />
 
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/swing.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/swing-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset refid="hidden.classes"/>
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -66,7 +67,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling SWING classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -93,21 +94,13 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java/common">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/swing.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <fileset refid="hidden.classes" />
+            <fileset refid="common.resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -171,4 +164,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 19 20:10:30 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java:768152-804992
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java:768152-805827

Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 19 20:10:30 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java:768152-804992
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java:768152-805827

Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/parser/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 19 20:10:30 2009
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/text/parser:768152-804992
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/text/parser:768152-805827

Modified: harmony/enhanced/classlib/branches/java6/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/text/build.xml?rev=805957&r1=805956&r2=805957&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/text/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/text/build.xml Wed Aug 19 20:10:30 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
     
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/text.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/text-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling TEXT classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/text.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -156,4 +149,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>

Modified: harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml?rev=805957&r1=805956&r2=805957&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/x-net/build.xml Wed Aug 19 20:10:30 2009
@@ -25,7 +25,7 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build" depends="compile-java, build-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -43,12 +43,13 @@
 
     <target name="clean" depends="clean-java,clean-test" />
     
-    <target name="clean-java">
+    <target name="clean-java" depends="class-patternset">
         <delete file="${hy.jdk}/jre/lib/boot/x-net.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/x-net-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
+        <delete-patternset module="${hy.module}" />
     </target>
 
     <target name="clean-test">
@@ -57,7 +58,7 @@
     </target>
 
     <target name="compile-java">
-        <echo message="Compiling X-NET classes" />
+        <echo message="Compiling ${hy.module} classes" />
 
         <mkdir dir="../../build/classes" />
 
@@ -80,20 +81,12 @@
         </javac>
     </target>
 
-    <target name="copy-resources">
-        <mkdir dir="../../build/classes" />
-        <copy todir="../../build/classes" includeemptydirs="false">
-            <fileset dir="src/main/java">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build-jar" depends="svn-info">
+    <target name="build-jar" depends="svn-info,class-patternset">
         <jar destfile="${hy.jdk}/jre/lib/boot/x-net.jar"
              manifest="META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
+            <fileset refid="resources" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -208,4 +201,8 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
+    <target name="class-patternset">
+        <make-patternset module="${hy.module}" />
+    </target>
+
 </project>



Mime
View raw message