harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r939090 [1/2] - in /harmony/enhanced/java/branches/mrh/classlib: make/ modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/beans/ modules/concurrent/ modules/crypto/ modules/imageio...
Date Wed, 28 Apr 2010 21:03:54 GMT
Author: hindessm
Date: Wed Apr 28 21:03:53 2010
New Revision: 939090

URL: http://svn.apache.org/viewvc?rev=939090&view=rev
Log:
Wrap classes compilation so differences are more obvious.

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

Modified: harmony/enhanced/java/branches/mrh/classlib/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/properties.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/properties.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/properties.xml Wed Apr 28 21:03:53 2010
@@ -690,6 +690,12 @@ Alternatively, you can switch to another
                 <attribute name="Implementation-URL"
                            value="http://harmony.apache.org"/>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
+                <attribute name="Specification-Vendor"
+                           value="Sun Microsystems, Inc." />
+                <attribute name="Specification-Title"
+                           value="Java Platform API Specification" />
+                <attribute name="Specification-Version"
+                           value="${hy.specification.version}" />
                 <attribute name="X-Compile-Source-JDK"
                            value="${hy.javac.source}"/> 
                 <attribute name="X-Compile-Target-JDK"
@@ -715,6 +721,27 @@ Alternatively, you can switch to another
         </jar>
     </presetdef>
    
+    <macrodef name="compile-classes">
+        <attribute name="description" default="" />
+        <attribute name="destdir" default="../../build/classes" />
+        <element name="javac-elements" />
+        <sequential>
+            <echo message="Compiling @{description}" />
+            
+            <mkdir dir="@{destdir}" />
+
+            <hy.javac sourcepath="" destdir="@{destdir}">
+                <javac-elements />
+                <compilerarg line="${build.compilerarg}" />
+                <bootclasspath>
+                    <fileset dir="${hy.jre}/lib/boot">
+                        <include name="**/*.jar" />
+                    </fileset>
+                </bootclasspath>
+            </hy.javac>
+        </sequential>
+    </macrodef>
+
     <macrodef name="compile-tests">
         <attribute name="description" default="" />
         <attribute name="destdir" default="bin/test" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml Wed Apr 28 21:03:53 2010
@@ -47,8 +47,8 @@
     
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/accessibility.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/accessibility-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -61,41 +61,30 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-                  srcdir="src/main/java" 
-                  destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/accessibility.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/accessibility.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
         <mkdir dir="${hy.jdk}/jre/lib/boot"/>
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/accessibility.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/accessibility-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
 
@@ -107,7 +96,7 @@
 
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/accessibility_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -124,7 +113,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="accessibility api tests">
+        <compile-tests description="${hy.module} api tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/java/common" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/annotation/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/annotation/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/annotation/build.xml Wed Apr 28 21:03:53 2010
@@ -47,8 +47,8 @@
     
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/annotation.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/annotation-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -61,40 +61,29 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/annotation.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/annotation.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/annotation.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/annotation-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
@@ -105,7 +94,7 @@
         
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/annotation_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -121,7 +110,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="annotation api tests">
+        <compile-tests description="${hy.module} api tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml Wed Apr 28 21:03:53 2010
@@ -47,8 +47,8 @@
     
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/applet.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/applet-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -61,40 +61,29 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-                  srcdir="src/main/java"
-                  destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/applet.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/applet.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/applet.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/applet-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
 
@@ -106,7 +95,7 @@
 
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/applet_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -122,7 +111,7 @@
      </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="applet tests">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml Wed Apr 28 21:03:53 2010
@@ -150,8 +150,8 @@
 
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/archive.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/archive-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -164,40 +164,29 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/archive.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/archive.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/archive.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/archive-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
@@ -208,11 +197,11 @@
         
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/archive_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/archive_internal_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_internal_tests.jar">
             <fileset dir="bin/test-internal" />
         </hy.jar.bin>
 
@@ -228,7 +217,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="archive internal tests"
+        <compile-tests description="${hy.module} internal tests"
                        destdir="bin/test-internal">
             <javac-elements>
                 <src>
@@ -236,7 +225,7 @@
                 </src>
             </javac-elements>
         </compile-tests>
-        <compile-tests description="archive api tests">
+        <compile-tests description="${hy.module} api tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/auth/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/auth/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/auth/build.xml Wed Apr 28 21:03:53 2010
@@ -54,8 +54,8 @@
     
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/auth.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/auth-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -72,44 +72,32 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-                  destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <src>
-                <pathelement location="src/main/java/common"/>
-                <pathelement location="src/main/java/${hy.os.family}" />
-            </src>
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src>
+                    <pathelement location="src/main/java/common"/>
+                    <pathelement location="src/main/java/${hy.os.family}" />
+                </src>
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/auth.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/auth.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/auth.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="common.resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/auth-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java/common" />
             <fileset dir="src/main/java/${hy.os.family}" />
         </hy.jar.src>
@@ -121,7 +109,7 @@
         
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/auth_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -141,7 +129,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="auth api tests">
+        <compile-tests description="${hy.module} api tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java/common"/>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml Wed Apr 28 21:03:53 2010
@@ -151,8 +151,8 @@ ${line.separator}For Fedora try: yum ins
 
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/awt.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/awt-src.jar" />    
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />    
         <delete dir="${hy.jdk}/jre/lib/cmm" quiet="true" />
         <delete dir="${hy.jdk}/jre/lib/fonts" quiet="true" />
         <delete failonerror="false">
@@ -167,26 +167,14 @@ ${line.separator}For Fedora try: yum ins
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-                  destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <src>
-                <pathelement location="src/main/java/common"/>
-                <pathelement location="src/main/java/${hy.os.family}" />
-            </src>
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src>
+                    <pathelement location="src/main/java/common"/>
+                    <pathelement location="src/main/java/${hy.os.family}" />
+                </src>
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="-copy-resources" depends="-copy-win-resources">
@@ -216,20 +204,20 @@ ${line.separator}For Fedora try: yum ins
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/awt.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/awt.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/awt.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="common.resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/awt-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java/common" />
             <fileset dir="src/main/java/${hy.os.family}" />
         </hy.jar.src>
@@ -306,15 +294,15 @@ ${line.separator}For Fedora try: yum ins
         <mkdir dir="${tests.hdk.dir}" />
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/awt_boot_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_boot_tests.jar">
             <fileset dir="bin/test/boot">
                 <exclude name="**/*Headless*Test.class" />
             </fileset>
         </hy.jar.bin>
-        <hy.jar.bin destfile="${tests.hdk.dir}/awt_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test/classes" />
         </hy.jar.bin>
-        <hy.jar.bin destfile="${tests.hdk.dir}/awt_headless_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_headless_tests.jar">
             <fileset dir="bin/test/boot">
                 <include name="**/*Headless*Test.class" />
             </fileset>
@@ -337,7 +325,7 @@ ${line.separator}For Fedora try: yum ins
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="awt boot tests"
+        <compile-tests description="${hy.module} boot tests"
                        destdir="bin/test/boot">
             <javac-elements>
                 <src>
@@ -345,7 +333,7 @@ ${line.separator}For Fedora try: yum ins
                 </src>
             </javac-elements>
         </compile-tests>
-        <compile-tests description="awt tests"
+        <compile-tests description="${hy.module} tests"
                        destdir="bin/test/classes">
             <javac-elements>
                 <src>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml Wed Apr 28 21:03:53 2010
@@ -47,8 +47,8 @@
     
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/beans.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/beans-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -61,40 +61,29 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/beans.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/beans.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/beans.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/beans-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
@@ -105,15 +94,15 @@
         
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/beans_test_support.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_test_support.jar">
             <fileset dir="bin/test_support" />
         </hy.jar.bin>
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/beans_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/beans_impl_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_impl_tests.jar">
             <fileset dir="bin/test-internal" />
         </hy.jar.bin>
 
@@ -138,7 +127,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="beans test support"
+        <compile-tests description="${hy.module} test support"
                        destdir="bin/test_support">
             <javac-elements>
                 <src>
@@ -146,7 +135,7 @@
                 </src>
             </javac-elements>
         </compile-tests>
-        <compile-tests description="beans internal tests"
+        <compile-tests description="${hy.module} internal tests"
                        destdir="bin/test-internal">
             <javac-elements>
                 <src>
@@ -155,7 +144,7 @@
                 <classpath location="bin/test_support" />
             </javac-elements>
         </compile-tests>
-        <compile-tests description="beans api tests">
+        <compile-tests description="${hy.module} api tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml Wed Apr 28 21:03:53 2010
@@ -47,8 +47,8 @@
     
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/concurrent.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/concurrent-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -61,39 +61,28 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/concurrent.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/concurrent.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/concurrent.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/concurrent-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
@@ -104,7 +93,7 @@
 
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/concurrent_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -120,7 +109,7 @@
       </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="concurrent tests">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml Wed Apr 28 21:03:53 2010
@@ -47,8 +47,8 @@
     
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/crypto.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/crypto-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -61,40 +61,29 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/crypto.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/crypto.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/crypto.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/crypto-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
@@ -105,21 +94,21 @@
 
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/crypto_test_support.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_test_support.jar">
             <fileset dir="bin/test/support" />
         </hy.jar.bin>
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/crypto_api_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_api_tests.jar">
             <fileset dir="bin/test/api" />
         </hy.jar.bin>
-        <hy.jar.bin destfile="${tests.hdk.dir}/crypto_api_boot_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_api_boot_tests.jar">
             <fileset dir="bin/test/api.injected" />
         </hy.jar.bin>
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/crypto_impl_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_impl_tests.jar">
             <fileset dir="bin/test/impl" />
         </hy.jar.bin>
-        <hy.jar.bin destfile="${tests.hdk.dir}/crypto_impl_boot_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_impl_boot_tests.jar">
             <fileset dir="bin/test/impl.injected" />
         </hy.jar.bin>
 
@@ -140,7 +129,7 @@
 
     <target name="-compile-tests" unless="skip.test.build">
 
-        <compile-tests description="crypto test support files"
+        <compile-tests description="${hy.module} test support files"
                        destdir="bin/test/support">
             <javac-elements>
                 <src>
@@ -154,7 +143,7 @@
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="crypto api tests"
+        <compile-tests description="${hy.module} api tests"
                        destdir="bin/test/api">
             <javac-elements>
                 <src path="src/test/api/java"/>
@@ -165,7 +154,7 @@
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="crypto api injected tests"
+        <compile-tests description="${hy.module} api injected tests"
                        destdir="bin/test/api.injected">
             <javac-elements>
                 <src path="src/test/api/java.injected"/>
@@ -176,7 +165,7 @@
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="crypto impl injected tests"
+        <compile-tests description="${hy.module} impl injected tests"
                        destdir="bin/test/impl.injected">
             <javac-elements>
                 <src path="src/test/impl/java.injected"/>
@@ -184,7 +173,7 @@
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="crypto impl tests"
+        <compile-tests description="${hy.module} impl tests"
                        destdir="bin/test/impl">
             <javac-elements>
                 <src path="src/test/impl/java"/>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml Wed Apr 28 21:03:53 2010
@@ -108,8 +108,8 @@ ${line.separator}For Fedora try: yum ins
 
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/imageio.jar" />
-	<delete file="${hy.jdk}/jre/lib/boot/imageio-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+	<delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -127,22 +127,11 @@ ${line.separator}For Fedora try: yum ins
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ImageIO classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
     
     <target name="-build-native" unless="skip.native.build">
@@ -161,20 +150,20 @@ ${line.separator}For Fedora try: yum ins
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/imageio.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/imageio.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/imageio.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/imageio-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
@@ -185,7 +174,7 @@ ${line.separator}For Fedora try: yum ins
         
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/imageio_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -205,7 +194,7 @@ ${line.separator}For Fedora try: yum ins
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="imageio tests">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml Wed Apr 28 21:03:53 2010
@@ -48,13 +48,13 @@
 
     <!-- Build native code -->
     <target name="-build-native" unless="skip.native.build">
-        <make dir="src/main/native/instrument/${hy.os.family}" />
+        <make dir="src/main/native/${hy.module}/${hy.os.family}" />
     </target>
     
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/instrument.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/instrument-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -71,39 +71,29 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-                  srcdir="src/main/java"
-                  destdir="../../build/classes">               
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/instrument.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/instrument.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/instrument.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/instrument-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
@@ -114,7 +104,7 @@
         
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/instrument_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -136,7 +126,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="instrument tests">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml Wed Apr 28 21:03:53 2010
@@ -47,8 +47,8 @@
     
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/jndi.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/jndi-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -61,40 +61,29 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-            
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/jndi.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/jndi.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/jndi.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/jndi-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
@@ -105,7 +94,7 @@
         
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/jndi_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -127,7 +116,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="jndi tests">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml Wed Apr 28 21:03:53 2010
@@ -47,8 +47,8 @@
     
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/lang-management.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/lang-management-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -61,39 +61,28 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-                  srcdir="src/main/java"
-                  destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/lang-management.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/lang-management.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/lang-management.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/lang-management-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
@@ -104,11 +93,11 @@
 
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/lang-management_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/api" />
         </hy.jar.bin>
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/lang-management_impl_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_impl_tests.jar">
             <fileset dir="bin/impl" />
         </hy.jar.bin>
 
@@ -124,7 +113,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="lang-management api tests"
+        <compile-tests description="${hy.module} api tests"
                        destdir="bin/api">
             <javac-elements>
                 <src>
@@ -132,7 +121,7 @@
                 </src>
             </javac-elements>
         </compile-tests>
-        <compile-tests description="lang-management impl tests"
+        <compile-tests description="${hy.module} impl tests"
                        destdir="bin/impl">
             <javac-elements>
                 <src>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml Wed Apr 28 21:03:53 2010
@@ -48,8 +48,8 @@
     
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/logging.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/logging-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -62,34 +62,23 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/logging.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/logging.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/logging.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset dir="src/main/java">
@@ -98,7 +87,7 @@
             </fileset>
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/logging-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
@@ -117,10 +106,10 @@
 
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/logging_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
-        <hy.jar.bin destfile="${tests.hdk.dir}/logging_boot_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_boot_tests.jar">
             <fileset dir="bin/test-internal" />
         </hy.jar.bin>
 
@@ -143,7 +132,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="logging internal tests"
+        <compile-tests description="${hy.module} internal tests"
                        destdir="bin/test-internal">
             <javac-elements>
                 <src>
@@ -151,7 +140,7 @@
                 </src>
             </javac-elements>
         </compile-tests>
-        <compile-tests description="logging api tests">
+        <compile-tests description="${hy.module} api tests">
             <javac-elements>
                 <bootclasspath>
                     <pathelement path="bin/test-internal"/>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni-kernel/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni-kernel/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni-kernel/build.xml Wed Apr 28 21:03:53 2010
@@ -26,7 +26,7 @@
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="stub.jar"
-              location="${hy.jdk}/jre/lib/boot/luni-kernel-stubs.jar" />
+              location="${hy.jdk}/jre/lib/boot/${hy.module}-stubs.jar" />
 
     <target name="-warn">
         <fail>...

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml Wed Apr 28 21:03:53 2010
@@ -182,8 +182,8 @@
 
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/luni.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/luni-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -232,40 +232,29 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/luni.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/luni.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/luni.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/luni-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
@@ -277,11 +266,11 @@
         <copy file="make/run-test.xml"
               tofile="${tests.hdk.dir}/build.xml" />
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/luni_tests_api.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_api.jar">
             <fileset dir="bin/test/api" />
         </hy.jar.bin>
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/luni_tests_impl.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_impl.jar">
             <fileset dir="bin/test/impl" />
         </hy.jar.bin>
 
@@ -318,7 +307,8 @@
 
     <!-- compile both api tests and impl tests-->
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="luni api tests" destdir="bin/test/api">
+        <compile-tests description="${hy.module} api tests"
+                       destdir="bin/test/api">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/common" />
@@ -327,7 +317,8 @@
                 <include name="**/*.java" />
             </javac-elements>
         </compile-tests>
-        <compile-tests description="luni impl tests" destdir="bin/test/impl">
+        <compile-tests description="${hy.module} impl tests"
+                       destdir="bin/test/impl">
             <javac-elements>
                 <src>
                    <pathelement location="src/test/impl/common" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml Wed Apr 28 21:03:53 2010
@@ -47,8 +47,8 @@
     
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/math.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/math-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -61,40 +61,29 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-                  srcdir="src/main/java"
-                  destdir="../../build/classes">
-               
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/math.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/math.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/math.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/math-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
@@ -105,7 +94,7 @@
         
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/math_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -121,7 +110,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="math tests">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml Wed Apr 28 21:03:53 2010
@@ -47,8 +47,8 @@
     <target name="clean" depends="-clean-java,-clean-native,-clean-test" />
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/misc.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/misc-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -65,40 +65,29 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/misc.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/misc.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/misc.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/misc-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
@@ -113,7 +102,7 @@
         
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/misc_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -129,7 +118,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="misc tests">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java/common" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml Wed Apr 28 21:03:53 2010
@@ -48,13 +48,13 @@
 
     <!-- Build natives.-->
     <target name="-build-native" unless="skip.native.build">
-        <make dir="src/main/native/nio/${hy.os.family}" />
+        <make dir="src/main/native/${hy.module}/${hy.os.family}" />
     </target>
 
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/nio.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/nio-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete includeemptydirs="true" failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -62,7 +62,7 @@
     </target>
 
     <target name="-clean-native" unless="skip.native.build">
-        <make dir="src/main/native/nio/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/${hy.module}/${hy.os.family}" target="clean" />
     </target>
 
     <target name="-clean-test" unless="skip.test.build">
@@ -71,44 +71,32 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-                  destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <src>
-                <pathelement location="src/main/java/common" />
-                <pathelement location="src/main/java/${hy.os.family}" />
-            </src>
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src>
+                    <pathelement location="src/main/java/common" />
+                    <pathelement location="src/main/java/${hy.os.family}" />
+                </src>
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/nio.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/nio.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/nio.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="common.resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/nio-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java/common" />
         </hy.jar.src>
     </target>
@@ -119,7 +107,7 @@
 
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/nio_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -139,7 +127,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="nio tests">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java/common" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml Wed Apr 28 21:03:53 2010
@@ -53,8 +53,8 @@
 
     <target name="-clean-java" unless="skip.java.build"
             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 file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -71,37 +71,25 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <!-- Exclude unwanted data files -->
-            <excludesfile name="${basedir}/make/excludesfile" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+                <!-- Exclude unwanted data files -->
+                <excludesfile name="make/excludesfile" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/nio_char.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/nio_char.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/nio_char.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
              manifest="META-INF/MANIFEST.MF">
             <service type="java.nio.charset.spi.CharsetProvider"
                      provider="org.apache.harmony.niochar.CharsetProviderImpl"/>
@@ -109,11 +97,11 @@
             <fileset refid="resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/nio_char-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <service type="java.nio.charset.spi.CharsetProvider"
                      provider="org.apache.harmony.niochar.CharsetProviderImpl"/>
             <fileset dir="src/main/java">
-                <excludesfile name="${basedir}/make/excludesfile"/>
+                <excludesfile name="make/excludesfile"/>
             </fileset>
         </hy.jar.src>
     </target>
@@ -124,7 +112,7 @@
 
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/nio_char_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -145,7 +133,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="nio_char tests">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml Wed Apr 28 21:03:53 2010
@@ -65,8 +65,8 @@
     
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/pack200.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/pack200-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -99,30 +99,23 @@
             </bootclasspath>
         </hy.javac>
     	<!-- Java5 classes, with generics -->
-        <hy.javac sourcepath=""
-                  srcdir="src/main/java5"
-                  destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} java5 classes">
+            <javac-elements>
+                <src path="src/main/java5" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/pack200.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/pack200.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/pack200.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
              manifest="META-INF/MANIFEST.MF">
             <manifest>
                 <attribute name="X-Compile-Source-JDK"
@@ -134,7 +127,7 @@
             <fileset refid="resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/pack200-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
             <fileset dir="src/main/java/../java5" />
         </hy.jar.src>
@@ -146,7 +139,7 @@
 
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/pack200_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/prefs/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/prefs/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/prefs/build.xml Wed Apr 28 21:03:53 2010
@@ -56,8 +56,8 @@
 
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/prefs.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/prefs-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -76,40 +76,29 @@
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
-        <echo message="Compiling ${hy.module} classes" />
-
-        <mkdir dir="../../build/classes" />
-
-        <hy.javac sourcepath=""
-               srcdir="src/main/java"
-               destdir="../../build/classes">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </hy.javac>
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/prefs.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/prefs.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
     <target name="-build-jar" unless="skip.java.build"
             depends="-svn-info,-compile-java,-class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/prefs.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/prefs-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
@@ -120,7 +109,7 @@
 
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/prefs_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -140,7 +129,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="prefs tests">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />



Mime
View raw message