harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r939090 [2/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
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/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/print.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/print-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>
@@ -66,22 +66,12 @@
     </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/common"
-                  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/common" />
+                <src path="src/main/java/${hy.os.family}" />
+            </javac-elements>
+        </compile-classes>
     </target>
     
     <target name="-build-native" if="is.windows" unless="skip.native.build">
@@ -90,14 +80,14 @@
 
     <target name="findbugs" depends="-build-jar">
         <run-findBugs
-            jarFile="${hy.jdk}/jre/lib/boot/print.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/print.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/print.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <metainf prefix="META-INF/services"
                 dir="src/main/java/common/org/apache/harmony/x/print"
@@ -113,7 +103,7 @@
             </fileset>
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/print-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <metainf prefix="META-INF/services"
                 dir="src/main/java/common/org/apache/harmony/x/print"
                 includes="javax.print.StreamPrintServiceFactory"/>
@@ -131,7 +121,7 @@
         
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/print_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -147,7 +137,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="print tests">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/java/common" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/regex/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/regex/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/regex/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/regex.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/regex-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/regex.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/regex.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/regex.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/regex-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}/regex_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -125,7 +114,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="regex tests">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/rmi/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/rmi/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/rmi/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/rmi.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/rmi-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/rmi.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/rmi.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/rmi.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/rmi-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}/rmi_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test/api" />
         </hy.jar.bin>
 
@@ -126,7 +115,8 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="rmi 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/java"/>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/security-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/security-kernel/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/security-kernel/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/security-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/security-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/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/security/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/security/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/security/build.xml Wed Apr 28 21:03:53
2010
@@ -52,8 +52,8 @@
     
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/security.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/security-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>
@@ -70,44 +70,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/security.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/security.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/security.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/security-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>
@@ -119,19 +107,19 @@
 
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/security_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}/security_tests_api_in.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_api_in.jar">
             <fileset dir="bin/test/api.injected" />
         </hy.jar.bin>
-        <hy.jar.bin destfile="${tests.hdk.dir}/security_tests_impl.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_impl.jar">
             <fileset dir="bin/test/impl" />
         </hy.jar.bin>
-        <hy.jar.bin destfile="${tests.hdk.dir}/security_tests_impl_in.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_impl_in.jar">
             <fileset dir="bin/test/impl.injected" />
         </hy.jar.bin>
-        <hy.jar.bin destfile="${tests.hdk.dir}/security_tests_support.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_support.jar">
             <fileset dir="bin/test/support" />
         </hy.jar.bin>
 
@@ -152,7 +140,7 @@
 
     <target name="-compile-tests" unless="skip.test.build">
 
-        <compile-tests description="security test support files"
+        <compile-tests description="${hy.module} test support files"
                        destdir="bin/test/support">
             <javac-elements>
                 <src>
@@ -162,7 +150,7 @@
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="security 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/java"/>
@@ -173,7 +161,7 @@
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="security 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"/>
@@ -182,7 +170,7 @@
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="security impl injected tests"
+        <compile-tests description="${hy.module} impl injected tests"
                        destdir="bin/test/impl.injected">
             <javac-elements>
                 <src>
@@ -194,7 +182,7 @@
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="security impl tests"
+        <compile-tests description="${hy.module} impl tests"
                        destdir="bin/test/impl">
             <javac-elements>
                 <src>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/sound/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/sound/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/sound/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/sound.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/sound-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/sound.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/sound.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/sound.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/sound-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}/sound_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -128,7 +117,7 @@
 
     <target name="-compile-tests" unless="skip.test.build"
             depends="-copy-test-resources">
-        <compile-tests description="sound tests">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <classpath location="${tests.resources.hdk.dir}/org/apache/harmony/sound/tests/javax/sound/sampled/soundProvider.jar"
/>
                 <src>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/sql/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/sql/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/sql/build.xml Wed Apr 28 21:03:53
2010
@@ -59,8 +59,8 @@
 
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/sql.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/sql-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>
@@ -74,40 +74,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/sql.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/sql.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/sql.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/sql-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
@@ -118,7 +107,7 @@
         
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
-        <hy.jar.bin destfile="${tests.hdk.dir}/sql_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -144,7 +133,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="sql tests">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/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/suncompat.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/suncompat-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 Sun Compat 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/suncompat.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/suncompat.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/suncompat.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/suncompat-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}/suncompat_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="suncompat tests">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/build.xml Wed Apr 28 21:03:53
2010
@@ -55,8 +55,8 @@
 
     <target name="-clean-java" unless="skip.java.build"
             depends="-class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/swing.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/swing-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" />
             <fileset refid="hidden.classes"/>
@@ -70,45 +70,33 @@
     </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/swing.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/swing.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/swing.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
              manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="hidden.classes" />
             <fileset refid="common.resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/swing-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}/swing_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test/injected" />
         </hy.jar.bin>
 
@@ -139,7 +127,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="swing tests"
+        <compile-tests description="${hy.module} tests"
                        destdir="bin/test/injected">
             <javac-elements>
                 <src>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/text/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/text/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/text/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/text.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/text-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/text.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/text.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/text.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/text-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}/text_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -125,7 +114,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <compile-tests description="text tests">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/x-net/build.xml?rev=939090&r1=939089&r2=939090&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/x-net/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/x-net/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/x-net.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/x-net-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/x-net.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/x-net.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/x-net.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/x-net-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,19 +94,19 @@
 
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/x-net_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}/x-net_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}/x-net_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>
 
-        <hy.jar.bin destfile="${tests.hdk.dir}/x-net_impl_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_impl_tests.jar">
             <fileset dir="bin/test/impl" />
         </hy.jar.bin>
 
@@ -138,7 +127,7 @@
 
     <target name="-compile-tests" unless="skip.test.build">
 
-        <compile-tests description="x-net test support files"
+        <compile-tests description="${hy.module} test support files"
                        destdir="bin/test/support">
             <javac-elements>
                 <src>
@@ -149,7 +138,8 @@
             </javac-elements>
         </compile-tests>
         
-        <compile-tests description="x-net api tests" destdir="bin/test/api">
+        <compile-tests description="${hy.module} api tests"
+                       destdir="bin/test/api">
             <javac-elements>
                 <classpath location="bin/test/support" />
                 <src path="src/test/api/java"/>
@@ -158,7 +148,7 @@
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="x-net impl injected tests"
+        <compile-tests description="${hy.module} impl injected tests"
                        destdir="bin/test/impl.injected">
             <javac-elements>
                 <classpath location="bin/test/support" />
@@ -167,7 +157,8 @@
             </javac-elements>
         </compile-tests>
         
-        <compile-tests description="x-net impl tests" destdir="bin/test/impl">
+        <compile-tests description="${hy.module} impl tests"
+                       destdir="bin/test/impl">
             <javac-elements>
                 <src path="src/test/impl/java"/>
                 <include name="**/*Test.java" />



Mime
View raw message