Return-Path: 
 <commits-return-62312-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 44773 invoked from network); 9 May 2010 08:27:13 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 9 May 2010 08:27:13 -0000
Received: (qmail 4459 invoked by uid 500); 9 May 2010 08:27:13 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 4336 invoked by uid 500); 9 May 2010 08:27:13 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 4325 invoked by uid 99); 9 May 2010 08:27:12 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 May 2010 08:27:12 +0000
X-ASF-Spam-Status: No, hits=-1735.1 required=10.0
	tests=ALL_TRUSTED,AWL
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 May 2010 08:27:04 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id DC83D2388A4B; Sun,  9 May 2010 08:26:07 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r942511 [4/5] - in /harmony/enhanced/java/branches/java6:
 ./
 classlib/ classlib/depends/libs/ classlib/make/
 classlib/modules/accessibility/ classlib/modules/activation/
 classlib/modules/annotation/ classlib/modules/applet/ classlib/modules...
Date: Sun, 09 May 2010 08:26:06 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100509082607.DC83D2388A4B@eris.apache.org>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/sound/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/sound/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/sound/build.xml Sun May  9 08:26:02 2010
@@ -26,7 +26,8 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="-build-no-check"/>
+    <target name="-build-no-check" depends="-build-jar,-test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -40,68 +41,60 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="build, run-tests" />
+    <target name="-test-module" depends="build,-run-tests" />
 
-    <target name="clean" depends="clean-java,clean-test" />
+    <target name="clean" depends="-clean-java,-clean-test" />
     
-    <target name="clean-java" depends="class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/sound.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/sound-src.jar" />
+    <target name="-clean-java" unless="skip.java.build"
+            depends="-class-patternset">
+        <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>
         <delete-patternset module="${hy.module}" />
     </target>
 
-    <target name="clean-test">
+    <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 
-    <target name="compile-java">
-        <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>
+    <target name="-compile-java" unless="skip.java.build">
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
-    <target name="findbugs" depends="build-jar">
+    <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" depends="svn-info,class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/sound.jar"
+    <target name="-build-jar" unless="skip.java.build"
+            depends="-svn-info,-compile-java,-class-patternset">
+        <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>
 
-    <target name="test-jar" depends="svn-info,compile-tests">
+    <target name="-test-jar" unless="skip.test.build"
+            depends="-svn-info,-compile-tests">
         <mkdir dir="${tests.hdk.dir}" />
 
         <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>
 
@@ -116,14 +109,15 @@
         </copy>
     </target>
 
-    <target name="copy-test-resources">
+    <target name="-copy-test-resources" unless="skip.test.build">
         <copy todir="${tests.resources.hdk.dir}" includeemptydirs="false">
             <fileset dir="src/test/resources" />
         </copy>
     </target>
 
-    <target name="compile-tests" depends="copy-test-resources">
-        <compile-tests description="sound tests">
+    <target name="-compile-tests" unless="skip.test.build"
+            depends="-copy-test-resources">
+        <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>
@@ -133,11 +127,11 @@
         </compile-tests>
     </target>
 
-    <target name="run-tests" depends="test-jar">
+    <target name="-run-tests" depends="-test-jar">
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
-    <target name="class-patternset">
+    <target name="-class-patternset" unless="skip.java.build">
         <make-patternset module="${hy.module}" />
     </target>
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/sql/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/sql/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/sql/build.xml Sun May  9 08:26:02 2010
@@ -28,9 +28,10 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="check-depends, compile-java, build-jar" />
+    <target name="build" depends="check-depends,-build-no-check"/>
+    <target name="-build-no-check" depends="-build-jar,-test-jar" />
 
-    <target name="clean" depends="clean-java,clean-test" />
+    <target name="clean" depends="-clean-java,-clean-test" />
 
     <target name="check-depends">
         <check-one-file src="${derby.url}" dest="${derby.jar}" />
@@ -54,67 +55,59 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="build, run-tests" />
+    <target name="-test-module" depends="build,-run-tests" />
 
-    <target name="clean-java" depends="class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/sql.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/sql-src.jar" />
+    <target name="-clean-java" unless="skip.java.build"
+            depends="-class-patternset">
+        <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>
         <delete-patternset module="${hy.module}" />
     </target>
 
-    <target name="clean-test">
+    <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete dir="${hy.hdk}/build/test/derby" /> 
         <delete failonerror="false" dir="bin"/>
     </target>
 
-    <target name="compile-java">
-        <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>
+    <target name="-compile-java" unless="skip.java.build">
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
-    <target name="findbugs" depends="build-jar">
+    <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" depends="svn-info,class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/sql.jar"
+    <target name="-build-jar" unless="skip.java.build"
+            depends="-svn-info,-compile-java,-class-patternset">
+        <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>
 
-    <target name="test-jar" depends="svn-info,compile-tests">
+    <target name="-test-jar" unless="skip.test.build"
+            depends="-svn-info,-compile-tests">
         <mkdir dir="${tests.hdk.dir}" />
         
         <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>
 
@@ -139,8 +132,8 @@
         </copy>
     </target>
 
-    <target name="compile-tests">
-        <compile-tests description="sql tests">
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />
@@ -149,11 +142,11 @@
         </compile-tests>
     </target>
 
-    <target name="run-tests" depends="test-jar">
+    <target name="-run-tests" depends="-test-jar">
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
-    <target name="class-patternset">
+    <target name="-class-patternset" unless="skip.java.build">
         <make-patternset module="${hy.module}" />
     </target>
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/stax/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/stax/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/stax/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/stax/build.xml Sun May  9 08:26:02 2010
@@ -27,21 +27,20 @@
     <import file="${hy.hdk}/build/ant/properties.xml" />
     <import file="${hy.hdk}/build/ant/depends.xml" />
 
-    <target name="build" depends="check-depends, -copy-jars" />
+    <target name="build" depends="check-depends" />
 
-    <target name="check-depends">
+    <target name="check-depends" depends="-check,-copy-jars" />
+    <target name="-check">
         <check-one-file src="${stax.url}" dest="${stax.jar}" />
     </target>
         
     <target name="fetch-depends">
-
         <mkdir dir="${stax.dir}" />
         <download-one-file src="${stax.url}" dest="${stax.jar}"
                            md5="${stax.md5}" />
-
     </target>
 
-    <target name="-copy-jars">
+    <target name="-copy-jars" unless="skip.java.build">
         <copy todir="${hy.jdk}/jre/lib/boot/${stax.basename}"
               file="${stax.jar}" />
         <copy todir="${hy.jdk}/jre/lib/boot/${stax.basename}/META-INF">
@@ -51,7 +50,7 @@
 
     <target name="test" />
 
-    <target name="clean">
+    <target name="clean" unless="skip.java.build">
         <delete dir="${hy.jdk}/jre/lib/boot/${stax.basename}" />
     </target>
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/suncompat/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/suncompat/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/suncompat/build.xml Sun May  9 08:26:02 2010
@@ -26,7 +26,8 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="-build-no-check"/>
+    <target name="-build-no-check" depends="-build-jar,-test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -40,68 +41,60 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="build, run-tests" />
+    <target name="-test-module" depends="build,-run-tests" />
 
-    <target name="clean" depends="clean-java,clean-test" />
+    <target name="clean" depends="-clean-java,-clean-test" />
     
-    <target name="clean-java" depends="class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/suncompat.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/suncompat-src.jar" />
+    <target name="-clean-java" unless="skip.java.build"
+            depends="-class-patternset">
+        <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>
         <delete-patternset module="${hy.module}" />
     </target>
 
-    <target name="clean-test">
+    <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 
-    <target name="compile-java">
-        <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>
+    <target name="-compile-java" unless="skip.java.build">
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
-    <target name="findbugs" depends="build-jar">
+    <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" depends="svn-info,class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/suncompat.jar"
+    <target name="-build-jar" unless="skip.java.build"
+            depends="-svn-info,-compile-java,-class-patternset">
+        <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>
 
-    <target name="test-jar" depends="svn-info,compile-tests">
+    <target name="-test-jar" unless="skip.test.build"
+            depends="-svn-info,-compile-tests">
         <mkdir dir="${tests.hdk.dir}" />
 
         <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>
 
@@ -116,8 +109,8 @@
         </copy>
     </target>
 
-    <target name="compile-tests">
-        <compile-tests description="suncompat tests">
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />
@@ -126,11 +119,11 @@
         </compile-tests>
     </target>
 
-    <target name="run-tests" depends="test-jar">
+    <target name="-run-tests" depends="-test-jar">
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
-    <target name="class-patternset">
+    <target name="-class-patternset" unless="skip.java.build">
         <make-patternset module="${hy.module}" />
     </target>
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/swing/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/swing/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/swing/build.xml Sun May  9 08:26:02 2010
@@ -34,9 +34,10 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="-build-no-check"/>
+    <target name="-build-no-check" depends="-build-jar,-test-jar" />
 
-    <target name="clean" depends="clean-java,clean-test" />
+    <target name="clean" depends="-clean-java,-clean-test" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -50,11 +51,12 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="build, run-tests" />
+    <target name="-test-module" depends="build,-run-tests" />
 
-    <target name="clean-java" depends="class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/swing.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/swing-src.jar" />
+    <target name="-clean-java" unless="skip.java.build"
+            depends="-class-patternset">
+        <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"/>
@@ -62,60 +64,50 @@
         <delete-patternset module="${hy.module}" />
     </target>
 
-    <target name="clean-test">
+    <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 
-    <target name="compile-java">
-        <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>
+    <target name="-compile-java" unless="skip.java.build">
+        <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">
+    <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" depends="svn-info,class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/swing.jar"
+    <target name="-build-jar" unless="skip.java.build"
+            depends="-svn-info,-compile-java,-class-patternset">
+        <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>
 
-    <target name="test-jar" depends="svn-info,compile-tests">
+    <target name="-test-jar" unless="skip.test.build"
+            depends="-svn-info,-compile-tests">
         <mkdir dir="${tests.hdk.dir}" />
         
         <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>
 
@@ -134,8 +126,8 @@
         </copy>
     </target>
 
-    <target name="compile-tests">
-        <compile-tests description="swing tests"
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} tests"
                        destdir="bin/test/injected">
             <javac-elements>
                 <src>
@@ -146,11 +138,11 @@
         </compile-tests>
     </target>
 
-    <target name="run-tests" depends="test-jar">
+    <target name="-run-tests" depends="-test-jar">
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
-    <target name="class-patternset">
+    <target name="-class-patternset" unless="skip.java.build">
         <make-patternset module="${hy.module}" />
     </target>
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/text/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/text/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/text/build.xml Sun May  9 08:26:02 2010
@@ -26,7 +26,8 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="-build-no-check"/>
+    <target name="-build-no-check" depends="-build-jar,-test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -40,68 +41,60 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="build, run-tests" />
+    <target name="-test-module" depends="build,-run-tests" />
     
-    <target name="clean" depends="clean-java,clean-test" />
+    <target name="clean" depends="-clean-java,-clean-test" />
     
-    <target name="clean-java" depends="class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/text.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/text-src.jar" />
+    <target name="-clean-java" unless="skip.java.build"
+            depends="-class-patternset">
+        <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>
         <delete-patternset module="${hy.module}" />
     </target>
 
-    <target name="clean-test">
+    <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 
-    <target name="compile-java">
-        <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>
+    <target name="-compile-java" unless="skip.java.build">
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
-    <target name="findbugs" depends="build-jar">
+    <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" depends="svn-info,class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/text.jar"
+    <target name="-build-jar" unless="skip.java.build"
+            depends="-svn-info,-compile-java,-class-patternset">
+        <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>
 
-    <target name="test-jar" depends="svn-info,compile-tests">
+    <target name="-test-jar" unless="skip.test.build"
+            depends="-svn-info,-compile-tests">
         <mkdir dir="${tests.hdk.dir}" />
 
         <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>
 
@@ -120,8 +113,8 @@
         </copy>
     </target>
 
-    <target name="compile-tests">
-        <compile-tests description="text tests">
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />
@@ -130,11 +123,11 @@
         </compile-tests>
     </target>
 
-    <target name="run-tests" depends="test-jar">
+    <target name="-run-tests" depends="-test-jar">
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
-    <target name="class-patternset">
+    <target name="-class-patternset" unless="skip.java.build">
         <make-patternset module="${hy.module}" />
     </target>
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/x-net/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/x-net/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/x-net/build.xml Sun May  9 08:26:02 2010
@@ -26,7 +26,8 @@
 
     <property file="../../make/depends.properties" />
 
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="-build-no-check"/>
+    <target name="-build-no-check" depends="-build-jar,-test-jar" />
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">
@@ -40,80 +41,72 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="build, run-tests" />
+    <target name="-test-module" depends="build,-run-tests" />
 
-    <target name="clean" depends="clean-java,clean-test" />
+    <target name="clean" depends="-clean-java,-clean-test" />
     
-    <target name="clean-java" depends="class-patternset">
-        <delete file="${hy.jdk}/jre/lib/boot/x-net.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/x-net-src.jar" />
+    <target name="-clean-java" unless="skip.java.build"
+            depends="-class-patternset">
+        <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>
         <delete-patternset module="${hy.module}" />
     </target>
 
-    <target name="clean-test">
+    <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
         <delete failonerror="false" dir="bin"/>
     </target>
 
-    <target name="compile-java">
-        <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>
+    <target name="-compile-java" unless="skip.java.build">
+        <compile-classes description="${hy.module} classes">
+            <javac-elements>
+                <src path="src/main/java" />
+            </javac-elements>
+        </compile-classes>
     </target>
 
-    <target name="findbugs" depends="build-jar">
+    <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" depends="svn-info,class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/x-net.jar"
+    <target name="-build-jar" unless="skip.java.build"
+            depends="-svn-info,-compile-java,-class-patternset">
+        <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>
 
-    <target name="test-jar" depends="svn-info,compile-tests">
+    <target name="-test-jar" unless="skip.test.build"
+            depends="-svn-info,-compile-tests">
         <mkdir dir="${tests.hdk.dir}" />
 
         <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>
 
@@ -132,9 +125,9 @@
         </copy>
     </target>
 
-    <target name="compile-tests">
+    <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>
@@ -145,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"/>
@@ -154,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" />
@@ -163,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" />
@@ -171,11 +166,11 @@
         </compile-tests>
     </target>
 
-    <target name="run-tests" depends="test-jar">
+    <target name="-run-tests" depends="-test-jar">
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
-    <target name="class-patternset">
+    <target name="-class-patternset" unless="skip.java.build">
         <make-patternset module="${hy.module}" />
     </target>
 

Modified: harmony/enhanced/java/branches/java6/classlib/modules/xmlsec/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/xmlsec/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/xmlsec/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/xmlsec/build.xml Sun May  9 08:26:02 2010
@@ -27,21 +27,20 @@
     <import file="${hy.hdk}/build/ant/properties.xml" />
     <import file="${hy.hdk}/build/ant/depends.xml" />
 
-    <target name="build" depends="check-depends, -copy-jars" />
+    <target name="build" depends="check-depends" />
 
-    <target name="check-depends">
+    <target name="check-depends" depends="-check,-copy-jars" />
+    <target name="-check">
         <check-one-file src="${xmlsec.url}" dest="${xmlsec.zip}" />
     </target>
         
     <target name="fetch-depends">
-
         <mkdir dir="${xmlsec.dir}" />
         <download-one-file src="${xmlsec.url}" dest="${xmlsec.zip}"
                            md5="${xmlsec.md5}" />
-
     </target>
 
-    <target name="-copy-jars">
+    <target name="-copy-jars" unless="skip.java.build">
         <mkdir dir="${hy.jdk}/jre/lib/boot/xmlsec-${xmlsec.version}" />
         <unzip src="${xmlsec.zip}"
                dest="${hy.jdk}/jre/lib/boot/${xmlsec.basename}" >
@@ -59,7 +58,7 @@
 
     <target name="test" />
 
-    <target name="clean">
+    <target name="clean" unless="skip.java.build">
         <delete dir="${hy.jdk}/jre/lib/boot/${xmlsec.basename}" />
     </target>
 

Propchange: harmony/enhanced/java/branches/java6/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May  9 08:26:02 2010
@@ -1,3 +1,4 @@
-/harmony/enhanced/java/trunk/common_resources:929253-940795
+/harmony/enhanced/java/branches/mrh/common_resources:935751-941490
+/harmony/enhanced/java/trunk/common_resources:929253-942337
 /harmony/enhanced/trunk/common_resources:476396-929252
 /incubator/harmony/enhanced/trunk/common_resources:423974-476394

Modified: harmony/enhanced/java/branches/java6/common_resources/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/properties.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/properties.xml (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/properties.xml Sun May  9 08:26:02 2010
@@ -150,7 +150,7 @@
         </not>
      </condition>
 
-    <target name="echo" depends="svn-info, test-jre-vm-info"
+    <target name="echo" depends="-svn-info, test-jre-vm-info"
             description="Display the properties defined by this ant file" >
         <echo>
 Harmony release configuration property:
@@ -207,7 +207,7 @@ Harmony platform properties:
   hy.hdk = ${hy.hdk}
 
 
-The following properties are only set if the "svn-info" target has been
+The following properties are only set if the "-svn-info" target has been
 called:
 
   svn.revision = ${svn.revision}
@@ -381,6 +381,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"

Modified: harmony/enhanced/java/branches/java6/common_resources/make/svn.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/svn.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/svn.xml (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/svn.xml Sun May  9 08:26:02 2010
@@ -21,7 +21,7 @@
 
 <project name="svn-deps">
     
-    <target name="svn-info" 
+    <target name="-svn-info" 
         description="Sets global SVN properties of the workspace: 
         is.svn, svn.revision and svn.info">
         <svn-info dir="${basedir}" prefix="global"/>

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May  9 08:26:02 2010
@@ -1,4 +1,5 @@
-/harmony/enhanced/java/trunk/drlvm:929253-940795
+/harmony/enhanced/java/branches/mrh/drlvm:935751-941490
+/harmony/enhanced/java/trunk/drlvm:929253-942337
 /harmony/enhanced/trunk/drlvm:810871-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/working_vm:423974-476394

Modified: harmony/enhanced/java/branches/java6/drlvm/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/build.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/build.xml Sun May  9 08:26:02 2010
@@ -180,10 +180,10 @@ Usage:
         <mkdir dir="${drlvm.deploy.dir}/include" />        
         <copy todir="${drlvm.deploy.dir}">
             <fileset dir="${hy.hdk}">
-                <include name="**" if="import.hdk"/>
-                <include name="jdk/jre/**" unless="import.hdk"/>
-                <exclude name="jdk/jre/bin/default/**" unless="import.hdk"/>
-                <exclude name="jdk/jre/bin/*hythr*" unless="import.hdk"/>
+                <include name="**" unless="skip.import.hdk"/>
+                <include name="jdk/jre/**" if="skip.import.hdk"/>
+                <exclude name="jdk/jre/bin/default/**" if="skip.import.hdk"/>
+                <exclude name="jdk/jre/bin/*hythr*" if="skip.import.hdk"/>
             </fileset>
         </copy>
     </target>
@@ -239,7 +239,7 @@ Usage:
       so irrespective of the platform, compiler or release/debug
       there's a predicable place to find the output 
       ================================================================== -->
-    <target name="deploy-canonical" if="deploy.canonical.flag">
+    <target name="deploy-canonical" unless="skip.deploy.canonical">
         <property name="canonical.deploy.dir" location="${drlvm.base.dir}/deploy" />
         <delete dir="${canonical.deploy.dir}" failonerror="false" />
         <mkdir dir="${canonical.deploy.dir}" />

Modified: harmony/enhanced/java/branches/java6/drlvm/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/depends.properties?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/depends.properties Sun May  9 08:26:02 2010
@@ -33,7 +33,7 @@ apr.src.tgz.md5=85bcd8005153b8fa63b1e3f9
 # Ant-contrib, version 0.6 or above
 # http://sourceforge.net/project/showfiles.php?group_id=36177
 ant-contrib=${depends.jars}/ant-contrib-1.0b3/ant-contrib.zip
-ant-contrib.jar=${depends.jars}/ant-contrib-1.0b3/ant-contrib.jar
+ant-contrib.jar=${depends.jars}/ant-contrib-1.0b3/ant-contrib-1.0b3.jar
 ant-contrib.unzip.path=ant-contrib/ant-contrib-1.0b3.jar
 ant-contrib.url=http://downloads.sourceforge.net/project/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip
 ant-contrib.md5=c5a75fc28cbc52f09bd43b5506978601

Modified: harmony/enhanced/java/branches/java6/drlvm/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/properties.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/properties.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/properties.xml Sun May  9 08:26:02 2010
@@ -31,6 +31,7 @@
     <condition property="hy.cfg" value="${env.BUILD_CFG}">
         <isset property="env.BUILD_CFG" />
     </condition>
+    <property name="hy.specification.version" value="1.5" />
 
     <!-- pick up cpp compiler from command line or env -->
     <condition property="hy.cpp.compiler" value="${CXX}">
@@ -98,8 +99,15 @@
         <isset property="shlib.is.linklib"/>
     </condition>
     <property name="base.test.dir" location="${drlvm.build.dir}/tests"/>
+
+    <condition property="skip.deploy.canonical" value="true">
+        <equals arg1="${deploy.canonical.flag}" arg2="false" />
+    </condition>
+    <condition property="skip.import.hdk" value="true">
+        <equals arg1="${import.hdk}" arg2="false" />
+    </condition>
     
-    <target name="drlvm-echo" depends="svn-info">
+    <target name="drlvm-echo" depends="-svn-info">
         <echo message="DRLVM build Configuration:" />
         <echo message="     Hosting Java = ${java.version} (${java.vendor})" />
         <echo message="               os = ${hy.os}" />

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/gc_gen.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/gc_gen.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/gc_gen.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/gc_gen.xml Sun May  9 08:26:02 2010
@@ -51,7 +51,6 @@
         </condition>
         
         <path id="gc.includes">
-            <pathelement location="${drlvm.include.dir}" />
             <dirset dir="${vm.home}">
                 <include name="include" />
                 <include name="port/include" />
@@ -74,6 +73,7 @@
                 <include name="verify" />
                 <include name="finalizer_weakref" />
             </dirset>
+            <pathelement location="${drlvm.include.dir}" />
         </path>
         
         <compiler id="cpp.compiler" extends="common.cpp.compiler">

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/hythr.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/hythr.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/hythr.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/hythr.xml Sun May  9 08:26:02 2010
@@ -32,9 +32,9 @@
         <make-native libname="hythr" type="shared">
         <compiler id="c.compiler" extends="common.c.compiler">
             <includepath>
-              <pathelement location="${drlvm.include.dir}" />
               <path refid="vm.include"/>
               <pathelement location="${vm.home}/thread/src" />
+              <pathelement location="${drlvm.include.dir}" />
               <pathelement location="${hy.hdk}/include" />
             </includepath>
 

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/interpreter.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/interpreter.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/interpreter.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/interpreter.xml Sun May  9 08:26:02 2010
@@ -37,7 +37,6 @@
         </compile-asm>
         
         <path id="int.includes">
-            <pathelement location="${drlvm.include.dir}" />
             <dirset dir="${vm.home}">
                 <include name="include" />
                 <include name="vmcore/include" />
@@ -58,6 +57,7 @@
                 <include name="port/src/encoder/ia32_em64t" if="is.x86_64"/>
                 <include name="vmcore/src/lil/em64t/include" if="is.x86_64"/>
             </dirset>
+            <pathelement location="${drlvm.include.dir}" />
         </path>
         <depend-includes paths="int.includes"/>
         <depend-selector rebuild-flag="int.includes.uptodate" id="int.depends"/>

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/jitrino.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/jitrino.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/jitrino.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/jitrino.xml Sun May  9 08:26:02 2010
@@ -50,10 +50,10 @@
                 <include name="vmcore/src/util/win/include" if="is.windows"/>
                 <include name="vmcore/src/util/linux/include" if="is.unix"/>
             </dirset>
-            <pathelement location="${drlvm.include.dir}" />
             <pathelement location="${vm.home}/include" />
             <pathelement location="${vm.home}/vmcore/include" />
             <pathelement location="${vm.home}/port/include" />
+            <pathelement location="${drlvm.include.dir}" />
         </path>
         <depend-includes paths="jit.includes"/>
         <depend-selector rebuild-flag="jit.includes.uptodate" id="jit.depends"/>

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/verifier.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/verifier.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/verifier.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/verifier.xml Sun May  9 08:26:02 2010
@@ -25,9 +25,9 @@
         <init-native/>
         <make-native libname="verifier" type="static">
             <includepath>
-                <pathelement location="${drlvm.include.dir}" />
                 <pathelement location="${vm.home}/vmcore/include" />
                 <pathelement location="${vm.home}/include" />
+                <pathelement location="${drlvm.include.dir}" />
             </includepath>
             <compiler extends="common.cpp.compiler">
                 <fileset dir="${vm.home}/vmcore/src/verifier-3363">

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml Sun May  9 08:26:02 2010
@@ -76,8 +76,6 @@
         </compile-asm>
 
         <path id="vmcore.includes">
-            <pathelement location="${drlvm.include.dir}" />
-
             <dirset dir="${vm.home}">
                 <include name="include" />
                 <include name="vmcore/include" />
@@ -98,6 +96,7 @@
                 <include name="port/src/encoder/ia32_em64t" if="is.x86_64"/>
                 <include name="vmcore/src/lil/em64t/include" if="is.x86_64"/>
             </dirset>
+            <pathelement location="${drlvm.include.dir}" />
             <pathelement location="${hy.hdk}/include" />
         </path>
         <depend-includes paths="vmcore.includes"/>

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/vmi.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/vmi.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/vmi.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/vmi.xml Sun May  9 08:26:02 2010
@@ -26,13 +26,13 @@
         <make-native libname="vmi" type="shared">
             <compiler id="cpp.compiler" extends="common.cpp.compiler">
                 <includepath>
-                    <pathelement location="${drlvm.include.dir}" />
                     <path refid="vm.include"/>
                     <dirset dir="${vm.home}">
                         <include name="vmcore/include" />
                         <include name="vmcore/src/util/win/include" if="is.windows"/>
                         <include name="vmcore/src/util/linux/include" if="is.unix"/>
                     </dirset>
+                    <pathelement location="${drlvm.include.dir}" />
                     <pathelement location="${hy.hdk}/include" />
                 </includepath>
 

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/resource/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/resource/MANIFEST.MF?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/resource/MANIFEST.MF (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/gc_gen/resource/MANIFEST.MF Sun May  9 08:26:02 2010
@@ -3,4 +3,3 @@ Implementation-Title: Apache Harmony
 Implementation-Vendor: The Apache Software Foundation
 Implementation-Vendor-Id: org.apache.harmony
 Implementation-URL: http://harmony.apache.org
-Implementation-Version: 1.5

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/include/open/vm_field_access.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/include/open/vm_field_access.h?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/include/open/vm_field_access.h (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/include/open/vm_field_access.h Sun May  9 08:26:02 2010
@@ -226,6 +226,8 @@ DECLARE_OPEN(void, field_get_track_acces
  */
 DECLARE_OPEN(void, field_get_track_modification_flag, (Field_Handle field, char** address, char* mask));
 
+#ifdef __cplusplus
 }
+#endif
 
 #endif // _VM_FIELD_ACCESS_H

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/include/open/vm_method_access.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/include/open/vm_method_access.h?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/include/open/vm_method_access.h (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/include/open/vm_method_access.h Sun May  9 08:26:02 2010
@@ -570,6 +570,8 @@ DECLARE_OPEN(U_8*, method_get_info_block
  */
 DECLARE_OPEN(unsigned, method_get_info_block_size_jit, (Method_Handle method, JIT_Handle jit));
 
+#ifdef __cplusplus
 }
+#endif
 
 #endif // _VM_METHOD_ACCESS_H

Modified: harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/kernel_classes/resource/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/kernel_classes/resource/MANIFEST.MF?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/kernel_classes/resource/MANIFEST.MF (original)
+++ harmony/enhanced/java/branches/java6/drlvm/vm/vmcore/src/kernel_classes/resource/MANIFEST.MF Sun May  9 08:26:02 2010
@@ -1,8 +1,6 @@
 Manifest-Version: 1.0
 Specification-Title: Java Platform API Specification
-Specification-Version: 1.5
 Implementation-Title: Apache Harmony
 Implementation-Vendor: The Apache Software Foundation
 Implementation-Vendor-Id: org.apache.harmony
 Implementation-URL: http://harmony.apache.org
-Implementation-Version: 1.5

Modified: harmony/enhanced/java/branches/java6/ibm-v4/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/ibm-v4/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/ibm-v4/build.xml (original)
+++ harmony/enhanced/java/branches/java6/ibm-v4/build.xml Sun May  9 08:26:02 2010
@@ -21,6 +21,12 @@
         Layout IBM VME in the required format 
     </description>
 
+    <fail message="Property 'hy.hdk' is not defined">
+        <condition>
+            <not><isset property="hy.hdk" /></not>
+        </condition>
+    </fail>
+
     <!-- set the path root for the external resources  -->
     <property name="common.resources" value="../common_resources" />
     <fail>
@@ -38,8 +44,8 @@
     <property name="ibm.vme.dir" value="${hy.os}-${hy.arch}.vme" />
 
     <target name="build">
-        <mkdir dir="deploy/jdk" />
-        <copy todir="deploy/jdk">
+        <mkdir dir="${hy.hdk}/jdk" />
+        <copy todir="${hy.hdk}/jdk">
             <fileset dir="${ibm.vme.dir}" />
         </copy>
     </target>
@@ -47,7 +53,11 @@
     <target name="fetch-depends" />
 
     <target name="clean">
-        <delete dir="deploy" failonerror="false" />
+        <delete failonerror="false">
+            <fileset dir="${hy.hdk}/jdk">
+                <present targetdir="${ibm.vme.dir}"/>
+            </fileset>
+        </delete>
     </target>
 
 </project>

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May  9 08:26:02 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-940795
+/harmony/enhanced/java/trunk/jdktools:929253-942337
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:810871-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147

Modified: harmony/enhanced/java/branches/java6/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/build.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/build.xml Sun May  9 08:26:02 2010
@@ -20,20 +20,17 @@
      ====================================================================== -->
 <project name="jdktools" default="build" basedir=".">
     <description>
-    	Build jdktools
+        Build jdktools
     </description>
 
-    <import file="make/properties.xml"/>
-        
     <target name="help">
         <echo>
-Apache Harmony Ant Build
+Apache Harmony Tools Build
 
 Usage:
 
   ant build
-    Compiles the java and native code to produce a jdk in
-    "deploy/jdk".
+    Compiles the java and native code and populates the hdk.
 
   ant clean
     Removes all the files generated by a build.
@@ -47,136 +44,84 @@ Usage:
   ant doc
     Generates the javadoc.
 
+  ant fetch-depends
+    Fetches dependencies. Note: Some of Harmony's dependencies are
+    licensed under terms other than the Apache License v2.
+
   ant properties
     Display the common properties that are use in the ant build files.
 
-The 'build' and 'test' targets can be restricted to processing only
-a single module by defining the 'build.module' variable on the ant
-command line.  For example, to run only the luni tests:
+The 'build' and 'test' targets can be configured to only build/test a
+single module by setting the 'build.module' property. For example, to
+run the tests for the "jdktools" module:
 
-  ant -Dbuild.module=jdktools test
+  ant test -Dbuild.module=jdktools
 
-        </echo>
-    </target>
-    
-    <target name="rebuild" depends="clean,build"
-        description="Performs a full build - that is 'clean' then 'build'" />
+The 'test' target can further be configured to run a single test by setting
+the 'test.case' property. For example, to run a specific test in the "luni"
+module:
 
-    <target name="build" depends="build-java,build-native"
-        description="Compiles the java and native code to produce a jdk">
+  ant test -Dbuild.module=jdktools -Dtest.case=org/apache/harmony/tests/tools/javac/MainTest
+        </echo>
     </target>
 
-    <target name="clean" depends="clean-java,clean-native,clean-tests"
-            description="Removes all the files generated by a build" />
+    <property file="${user.home}/.harmony-jdktools.properties" />
+    <property name="common.resources" location="../common_resources" />
+    <import file="make/properties.xml" />
 
-    <target name="rebuild-java" depends="clean-java,build-java"
-            description="Like 'rebuild' but for java code only" />
+    <!-- import properties for snapshot targets -->
+    <import file="${hy.hdk}/build/ant/properties.xml" />
 
-    <target name="build-java" 
-            description="Compiles the java code only" >
-        <echo>
-========================================
-Building Java component archives...
-========================================
-        </echo>
-        <ant antfile="make/build-java.xml" inheritall="false" target="build">
-            <property name="hy.hdk" value="${hy.hdk}"/>
-            <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="harmony.jdktools" value="${harmony.jdktools}"/>
-            <property name="external.resources" value="${external.resources}"/>
-        </ant>
+    <!-- ================================
+	 target : rebuild
+	     
+	 builds with a clean first
+	 ================================= -->
+    <target name="rebuild" depends="clean,build"
+        description="Performs a full build - that is 'clean' then 'build'" />
+	
+    <target name="build" description="Compiles the java, natives and tests">
+        <poll-modules target="build" />
     </target>
 
-    <target name="clean-java" 
-            description="Removes the compiled java code" >
-        <echo>
-========================================
-Cleaning Java component archives...
-========================================
-        </echo>
-        <ant antfile="make/build-java.xml" inheritall="false" target="clean">
-            <property name="hy.hdk" value="${hy.hdk}"/>
-            <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="harmony.jdktools" value="${harmony.jdktools}"/>
-            <property name="external.resources" value="${external.resources}"/>
-        </ant>
+    <target name="clean"
+            description="Removes all the files generated by a build" >
+        <poll-modules target="clean" />
     </target>
 
-    <target name="rebuild-native" depends="clean-native,build-native"
-            description="Like 'rebuild' but for native code only" />
+    <target name="test" depends="clean-test-output,-test-modules"
+            description="Runs all tests" />
 
-    <target name="build-native" 
-            description="Compiles the native code only" >
-        <echo>
-========================================
-Building native libs and executables...
-========================================
-        </echo>
-        <ant antfile="make/build-native.xml" inheritall="false" target="build">
-            <property name="hy.hdk" value="${hy.hdk}"/>
-            <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="harmony.jdktools" value="${harmony.jdktools}"/>
-            <property name="external.resources" value="${external.resources}"/>
-        </ant>
+    <target name="-test-modules">
+        <poll-modules target="test" />
     </target>
 
-    <target name="clean-native"
-        description="Removes the compiled native code" >
-        <echo>
-========================================
-Cleaning native libs and executables...
-========================================
-        </echo>
-        <ant antfile="make/build-native.xml" inheritall="false" target="clean">
-            <property name="hy.hdk" value="${hy.hdk}"/>
-            <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="harmony.jdktools" value="${harmony.jdktools}"/>
-            <property name="external.resources" value="${external.resources}"/>
-        </ant>
-    </target>
-
-    <target name="clean-tests"
-        description="Removes the compiled tests and results" >
-        <echo>
-========================================
-Cleaning compiled tests and results...
-========================================
-        </echo>
-        <ant antfile="make/build-test.xml" inheritall="false" target="clean">
-            <property name="hy.hdk" value="${hy.hdk}"/>
-            <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="harmony.jdktools" value="${harmony.jdktools}"/>
-            <property name="external.resources" value="${external.resources}"/>
-        </ant>
+    <target name="clean-test-output">
+        <delete dir="${tests.output}" />
     </target>
 
-    <target name="test"
-            description="Runs all tests">
+    <target name="findbugs" depends="check-depends"
+            description="Runs FindBugs on all modules">
         <echo>
 ========================================
-Testing jdktools binaries...
+Finding bugs in all class libraries...
 ========================================
 </echo>
-        <ant antfile="make/build-test.xml" inheritall="false" target="test-all">
-            <property name="hy.hdk" value="${hy.hdk}"/>
-            <property name="hy.jdk" value="${hy.jdk}"/>
-            <property name="harmony.jdktools" value="${harmony.jdktools}"/>
-            <property name="external.resources" value="${external.resources}"/>
-        </ant>
+        <poll-modules target="findbugs" />
     </target>
 
     <target name="check-depends"
             description="Report on whether the dependencies are met">
-        <ant antfile="make/depends.xml" target="check"/>
+        <poll-modules target="check-depends" />
     </target>
 
     <target name="fetch-depends"
         description="Fetches dependencies. Note: Some of Harmony's dependencies are licensed under terms other than the Apache License v2.">
-        <ant antfile="make/depends.xml" target="fetch"/>
+        <poll-modules target="fetch-depends" />
     </target>
 
-    <target name="properties" depends="tools-echo"
-        description="Display the properties that are use in the ant build files"/>
+    <target name="properties" depends="echo"
+        description="Display the properties that are use by this build" />
 
 </project>
 

Modified: harmony/enhanced/java/branches/java6/jdktools/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/make/depends.properties?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/jdktools/make/depends.properties Sun May  9 08:26:02 2010
@@ -13,11 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-icu=${depends.jars}/eclipse-ICU4J/com.ibm.icu.base-3.3.zip
+depends.jars=${depends.dir}/jars
+
+icu.dir=${depends.jars}/eclipse-ICU4J
+icu=${icu.dir}/com.ibm.icu.base-3.3.zip
 icu.url=http://archive.eclipse.org/eclipse/downloads/drops/R-3.3-200706251500/com.ibm.icu.base-3.3.zip
 icu.md5=5b8a0fc0e48431d376c7efd7be8c0f7b
 icu.unzip.path=eclipse/plugins/com.ibm.icu.base_3.6.1.v20070417.jar
-icu.jar=${depends.jars}/eclipse-ICU4J/com.ibm.icu.base_3.6.1.v20070417.jar
+icu.jar=${icu.dir}/com.ibm.icu.base_3.6.1.v20070417.jar
 
 jdt.version=3.5.1
 jdt.url.base=${harmony.standard.base}/jars/eclipse-JDT-${jdt.version}

Modified: harmony/enhanced/java/branches/java6/jdktools/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/make/properties.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/make/properties.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/make/properties.xml Sun May  9 08:26:02 2010
@@ -19,55 +19,35 @@
 
  -->
 
-<project name="Top-Level property definitions">
+<project name="Top-Level jdktools property definitions">
     <description>
         Ant file of common properties to be imported by other ant files
     </description>
     
-    <dirname property="prop.imported.basedir" file="${ant.file.Top-Level property definitions}"/>
-    <property name="jdktools.base.dir" location="${prop.imported.basedir}/.." />
-    
-    <property file="jdktools.properties"/>
-    <property file="${user.home}/jdktools.properties"/>
+    <fail message="Property 'hy.hdk' is not defined">
+        <condition>
+            <not><isset property="hy.hdk" /></not>
+        </condition>
+    </fail>
 
-    <!-- Test run property -->
-    <property name="hy.test.forkmode" value="perBatch" />
-    <property name="hy.test.vm.name" value="drl"/>
-
-    <!-- set the path root for the classlib : must be relative to the build directory -->
-    <property name="external.classlib.loc" value="${jdktools.base.dir}/../classlib/deploy" />
-    <property name="external.drlvm.loc" value="${jdktools.base.dir}/../drlvm/deploy" />
-    <property name="external.resources.loc" value="${jdktools.base.dir}/../common_resources" />
-    <property name="external.resources" location="${external.resources.loc}" />
-
-    <property name="harmony.jdktools" location="${jdktools.base.dir}"/>
-    <condition property="hy.deploy" value="${hy.hdk}">
-        <isset property="hy.hdk"/>
-    </condition>
-    <property name="hy.deploy" location="${external.drlvm.loc}"/>
-    <property name="hy.hdk" location="${external.classlib.loc}" />
-    <property name="jdktools.deploy.dir" location="${jdktools.base.dir}/deploy/jdk" />
-    <property name="jretools.deploy.dir" location="${jdktools.base.dir}/deploy/jdk/jre" />
-
-    <!-- set the path root for the external resources  -->
-    <property name="common.resources.loc" value="${jdktools.base.dir}/../common_resources" />
-    <property name="common.resources" location="${common.resources.loc}" />
-    <fail>
+    <fail message="Property 'common.resources' is not defined">
         <condition>
-            <not><available file="${common.resources}/make/properties.xml"/></not>
+            <not><isset property="common.resources" /></not>
+        </condition>
+    </fail>
+
+    <fail message="Property 'hy.hdk' doesn't seem to point to an hdk?">
+        <condition>
+            <not><available file="${hy.hdk}/build/ant/properties.xml" /></not>
+        </condition>
+    </fail>
+
+    <fail message="Property 'common.resources' is not defined">
+        <condition>
+            <not>
+                <available file="${common.resources}/make/depends.properties" />
+            </not>
         </condition>
-        Primary dependency is missing: common_resources.
-        You need to check it out from SVN repository or specify it's location:
-        ant -Dcommon.resources.loc=path
     </fail>
-    
-    <import file="${common.resources}/make/properties.xml"/>
-    <import file="${common.resources}/make/depends.xml"/>
-    
-    <property file="${jdktools.base.dir}/make/depends.properties" />
-    
-    <target name="tools-echo" depends="echo"
-            description="Display the properties defined by this ant file" >
-    </target>
 
 </project>

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml?rev=942511&r1=942510&r2=942511&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jdktools/build.xml Sun May  9 08:26:02 2010
@@ -16,23 +16,19 @@
     limitations under the License.
 -->
 
-<project name="Tools Build" default="build" basedir=".">
-    <description>Build for Tools component</description>
+<project name="JDK Tools Build" default="build" basedir=".">
+    <description>Build for JDK Tools component</description>
 
-    <!-- import common properties -->
-    <import file="${basedir}/../../make/properties.xml" />
-
-    <property name="tests.output" location="../../build/test_report" />
+    <property name="hy.module" value="jdktools" />
     <property name="hy.hdk" location="../../deploy" />
+    <import file="../../make/properties.xml" />
+    <property name="depends.dir" location="${common.resources}/depends" />
+    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <import file="${hy.hdk}/build/ant/depends.xml" />
+    <property file="../../make/depends.properties" />
+    <property file="${common.resources}/make/depends.properties" />
 
-    <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
-
-    <!-- filename for tests exclude list -->
-    <property name="tools.exclude.file"
-              location="${hy.hdk}/build/jdktools.tools.exclude" />
-   
-    <target name="check-depends">
+    <target name="check-depends" unless="skip.java.build">
         <check-one-file src="${jdt.jdi.jar.url}"
                         dest="${jdt.jdi.jar}" />
         <check-one-file src="${jdt.jdimodel.jar.url}"
@@ -48,22 +44,20 @@
         </copy>
     </target>
     
-    <target name="fetch-depends">
+    <target name="fetch-depends" unless="skip.java.build">
         <fetch dep="jdt.jdi.jar"/>
         <fetch dep="jdt.jdimodel.jar"/>
+        <fetch dep="icu"/>
+        <fetch dep="ecj.jar"/>
         <mkdir dir="${bcel.dir}" />
         <download-one-file dest="${bcel.jar}" 
                            src="${bcel.url}" md5="${bcel.md5}"/>
     </target>
 
-    <target name="build" depends="check-depends, build-java" />
-    <target name="build-java" depends="compile-java, build-jar" />
-    <target name="build-native" />
-
-    <target name="clean" depends="clean-java" />
-    <target name="clean-native" />
+    <target name="build" unless="skip.java.build"
+            depends="check-depends,-build-jar,-copy-jars,-test-jar" />
 
-    <target name="test" depends="test-module">
+    <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
                 <or>
@@ -75,18 +69,24 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="test-module" depends="build-tests, prepare-exclude, run-tests" />
+    <target name="-test-module" depends="build,-run-tests" />
 
-    <target name="clean-java">
-        <echo message="Cleaning TOOLS classes" />
+    <target name="clean" depends="-clean-java,-clean-test" />
+
+    <target name="-clean-java" unless="skip.java.build">
+        <echo message="Cleaning ${hy.module} classes" />
+        <delete file="${hy.jdk}/lib/tools.jar" />
+        <delete file="${hy.jdk}/lib/tools-src.jar" />
+        <delete dir="bin/main" includeemptydirs="true" failonerror="false" />
+    </target>
 
-        <delete file="${jdktools.deploy.dir}/lib/tools.jar" />
-        <delete file="${jdktools.deploy.dir}/lib/tools-src.jar" />
-        <delete dir="bin" includeemptydirs="true" failonerror="false" />
+    <target name="-clean-test" unless="skip.test.build">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete failonerror="false" dir="bin/test"/>
     </target>
 
-    <target name="compile-java">
-        <echo message="Compiling TOOLS classes" />
+    <target name="-compile-java" unless="skip.java.build">
+        <echo message="Compiling ${hy.module} classes" />
         <ensure-javac/>
         <mkdir dir="bin/main" />
 
@@ -94,8 +94,10 @@
                   srcdir="src/main/java"
                   destdir="bin/main">
 
+            <compilerarg line="${build.compilerarg}" />
+
             <bootclasspath>
-                <fileset dir="${hy.hdk}/jdk/jre/lib/boot">
+                <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
                 <fileset dir="${hy.hdk}/lib">
@@ -113,14 +115,20 @@
         </hy.javac>
     </target>
 
-    <target name="build-jar" depends="svn-info">
-        <mkdir dir="${jdktools.deploy.dir}/lib" />
+    <target name="findbugs" depends="-build-jar">
+        <run-findBugs
+            jarFile="${hy.jdk}/lib/tools.jar"
+            excludeFilter="make/findbugs-exclude-filter.xml"
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
+    </target>
 
-        <hy.jar.bin destfile="${jdktools.deploy.dir}/lib/tools.jar"
-                    manifest="META-INF/MANIFEST.MF">
+    <target name="-build-jar" unless="skip.java.build"
+            depends="-svn-info,-compile-java">
+        <mkdir dir="${hy.jdk}/lib" />
 
+        <hy.jar.bin destfile="${hy.jdk}/lib/tools.jar"
+                    manifest="META-INF/MANIFEST.MF">
             <fileset dir="bin/main" />
-
             <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
@@ -132,99 +140,57 @@
 
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${jdktools.deploy.dir}/lib/tools-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/lib/tools-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
 
-    <target name="build-tests">
-        <echo message="Compiling TOOLS tests" />
-        <ensure-javac/>
-        <mkdir dir="bin/test" />
-
-        <hy.javac srcdir="src/test/java"
-                  destdir="bin/test"
-                  sourcepath=""
-                  debug="on">
-
-            <bootclasspath>
-                <fileset dir="${hy.hdk}/jdk/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-            <classpath>
-                <pathelement path="${jdktools.deploy.dir}/lib/tools.jar"/>
-                <pathelement path="${junit.jar}"/>
-            </classpath>
-            <classpath location="bin/test" />
-
-            <!-- temporarely exclude one test that breaks compilation -->
-            <exclude name="**/javah/Test02.java"/>
-        </hy.javac>
-    </target>
-
-    <target name="prepare-exclude">
-        <echo message="TOOLS exclude list: ${tools.exclude.file}" />
-        <prepare-exclude-list moduleName="tools" dir="./make"
-                             result="${tools.exclude.file}" />
+    <target name="-copy-jars" unless="skip.java.build">
+        <mkdir dir="${hy.jdk}/lib" />
+        <copy todir="${hy.jdk}/lib" flatten="true">
+            <fileset file="${ecj.jar}"/>
+        </copy>
     </target>
 
-    <target name="run-tests" depends="build-tests, prepare-exclude">
+    <target name="-test-jar" unless="skip.test.build"
+            depends="-svn-info,-compile-tests">
+        <mkdir dir="${tests.hdk.dir}" />
 
-        <property name="test.jre.home" value="${jdktools.deploy.dir}/jre" />
+        <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
-        <echo message="Running TOOLS tests" />
-        <echo message="test.jre.home=${test.jre.home}" />
-
-        <mkdir dir="${tests.output}" />
-
-        <junit fork="yes"
-                       forkmode="${hy.test.forkmode}"
-                       timeout="${hy.test.timeout}"
-                       printsummary="withOutAndErr"
-                       errorproperty="test.errors"
-                       failureproperty="test.failures"
-                       showoutput="on"
-                       dir="${tests.output}"
-                       jvm="${test.jre.home}/bin/java">
-
-            <jvmarg line="${hy.test.vmargs}" />
-
-            <classpath>
-                <pathelement path="bin/test"/>
-                <pathelement path="${jdktools.deploy.dir}/lib/tools.jar"/>
-            </classpath>
-
-            <formatter type="xml" />
-
-            <test name="${test.case}" todir="${tests.output}"
-                              if="test.case" />
-
-            <batchtest todir="${tests.output}" haltonfailure="no"
-                                   unless="test.case">
-
-                <fileset dir="src/test/java">
-                    <!-- if ${test.case}     -->
-                    <include name="${converted.tc}" if="test.case" />
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
+            <fileset dir="bin/test" />
+        </hy.jar.bin>
 
-                    <!-- unless ${test.case} -->
-                    <include name="**/*Test.java" unless="test.case" />
-                    <excludesfile name="${tools.exclude.file}" unless="test.case" />
-                </fileset>
-            </batchtest>
-        </junit>
-        <antcall target="touch-failures-file" />
-        <antcall target="touch-errors-file" />
-    </target>
+        <mkdir dir="${tests.excludes.hdk.dir}"/>
+        <copy todir="${tests.excludes.hdk.dir}">
+            <fileset dir="make" includes="exclude*"/>
+            <filterchain>
+                <tokenfilter>
+                    <replaceregex pattern="\.java" replace="\.class" flags="g"/>
+                </tokenfilter>
+            </filterchain>
+        </copy>
+     </target>
 
-    <target name="touch-failures-file" if="test.failures">
-        <echo file="${tests.output}/test.failures"
-            append="true">tools${line.separator}</echo>
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} tests">
+            <javac-elements>
+                <src>
+                    <pathelement location="src/test/java" />
+                </src>
+                <classpath>
+                    <pathelement path="${hy.jdk}/lib/tools.jar"/>
+                </classpath>
+
+                <!-- temporarely exclude one test that breaks compilation -->
+                <exclude name="**/javah/Test02.java"/>
+            </javac-elements>
+        </compile-tests>
     </target>
 
-    <target name="touch-errors-file" if="test.errors">
-        <echo file="${tests.output}/test.errors"
-            append="true">tools${line.separator}</echo>
+    <target name="-run-tests" depends="-test-jar">
+        <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
 </project>