Return-Path: 
 <commits-return-62291-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 48450 invoked from network); 5 May 2010 21:30:16 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 5 May 2010 21:30:16 -0000
Received: (qmail 6322 invoked by uid 500); 5 May 2010 21:30:16 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 6239 invoked by uid 500); 5 May 2010 21:30:15 -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 6231 invoked by uid 99); 5 May 2010 21:30:15 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 May 2010 21:30:15 +0000
X-ASF-Spam-Status: No, hits=-1723.4 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; Wed, 05 May 2010 21:30:11 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5018323889BF; Wed,  5 May 2010 21:29:21 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r941503 [1/5] - in /harmony/enhanced/java/trunk: ./
 classlib/
 classlib/make/ classlib/modules/accessibility/ classlib/modules/annotation/
 classlib/modules/applet/ classlib/modules/archive/ classlib/modules/auth/
 classlib/modules/awt/ classl...
Date: Wed, 05 May 2010 21:29:20 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100505212921.5018323889BF@eris.apache.org>

Author: hindessm
Date: Wed May  5 21:29:16 2010
New Revision: 941503

URL: http://svn.apache.org/viewvc?rev=941503&view=rev
Log:
Merging from branches/mrh@941490.

Added:
    harmony/enhanced/java/trunk/jdktools/modules/jdktools/make/depends.properties
      - copied unchanged from r941416, harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/make/depends.properties
    harmony/enhanced/java/trunk/jdktools/modules/jdktools/make/run-test.xml
      - copied unchanged from r941416, harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/make/run-test.xml
    harmony/enhanced/java/trunk/jdktools/modules/jpda/make/depends.properties
      - copied unchanged from r941416, harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/depends.properties
    harmony/enhanced/java/trunk/jdktools/modules/jpda/make/run-test.xml
      - copied unchanged from r941416, harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/run-test.xml
    harmony/enhanced/java/trunk/jdktools/modules/jretools/make/depends.properties
      - copied unchanged from r941416, harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/make/depends.properties
    harmony/enhanced/java/trunk/jdktools/modules/jretools/make/run-test.xml
      - copied unchanged from r941416, harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/make/run-test.xml
    harmony/enhanced/java/trunk/jdktools/modules/samsa/make/run-test.xml
      - copied unchanged from r941416, harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/make/run-test.xml
Removed:
    harmony/enhanced/java/trunk/classlib/make/build-java.xml
    harmony/enhanced/java/trunk/classlib/make/build-native.xml
    harmony/enhanced/java/trunk/classlib/make/build-test.xml
    harmony/enhanced/java/trunk/jdktools/make/build-java.xml
    harmony/enhanced/java/trunk/jdktools/make/build-native.xml
    harmony/enhanced/java/trunk/jdktools/make/build-test.xml
Modified:
    harmony/enhanced/java/trunk/   (props changed)
    harmony/enhanced/java/trunk/build.xml
    harmony/enhanced/java/trunk/classlib/   (props changed)
    harmony/enhanced/java/trunk/classlib/build.xml
    harmony/enhanced/java/trunk/classlib/make/depends-common.xml
    harmony/enhanced/java/trunk/classlib/make/depends.properties
    harmony/enhanced/java/trunk/classlib/make/properties.xml
    harmony/enhanced/java/trunk/classlib/modules/accessibility/build.xml
    harmony/enhanced/java/trunk/classlib/modules/annotation/build.xml
    harmony/enhanced/java/trunk/classlib/modules/applet/build.xml
    harmony/enhanced/java/trunk/classlib/modules/archive/build.xml
    harmony/enhanced/java/trunk/classlib/modules/auth/build.xml
    harmony/enhanced/java/trunk/classlib/modules/awt/build.xml
    harmony/enhanced/java/trunk/classlib/modules/beans/build.xml
    harmony/enhanced/java/trunk/classlib/modules/concurrent/build.xml
    harmony/enhanced/java/trunk/classlib/modules/crypto/build.xml
    harmony/enhanced/java/trunk/classlib/modules/imageio/build.xml
    harmony/enhanced/java/trunk/classlib/modules/instrument/build.xml
    harmony/enhanced/java/trunk/classlib/modules/jmx/build.xml
    harmony/enhanced/java/trunk/classlib/modules/jndi/build.xml
    harmony/enhanced/java/trunk/classlib/modules/lang-management/build.xml
    harmony/enhanced/java/trunk/classlib/modules/logging/build.xml
    harmony/enhanced/java/trunk/classlib/modules/luni-kernel/build.xml
    harmony/enhanced/java/trunk/classlib/modules/luni/build.xml
    harmony/enhanced/java/trunk/classlib/modules/math/build.xml
    harmony/enhanced/java/trunk/classlib/modules/misc/build.xml
    harmony/enhanced/java/trunk/classlib/modules/nio/build.xml
    harmony/enhanced/java/trunk/classlib/modules/nio_char/build.xml
    harmony/enhanced/java/trunk/classlib/modules/orb/build.xml
    harmony/enhanced/java/trunk/classlib/modules/pack200/build.xml
    harmony/enhanced/java/trunk/classlib/modules/portlib/build.xml
    harmony/enhanced/java/trunk/classlib/modules/prefs/build.xml
    harmony/enhanced/java/trunk/classlib/modules/print/build.xml
    harmony/enhanced/java/trunk/classlib/modules/regex/build.xml
    harmony/enhanced/java/trunk/classlib/modules/rmi/build.xml
    harmony/enhanced/java/trunk/classlib/modules/security-kernel/build.xml
    harmony/enhanced/java/trunk/classlib/modules/security/build.xml
    harmony/enhanced/java/trunk/classlib/modules/sound/build.xml
    harmony/enhanced/java/trunk/classlib/modules/sql/build.xml
    harmony/enhanced/java/trunk/classlib/modules/suncompat/build.xml
    harmony/enhanced/java/trunk/classlib/modules/swing/build.xml
    harmony/enhanced/java/trunk/classlib/modules/text/build.xml
    harmony/enhanced/java/trunk/classlib/modules/x-net/build.xml
    harmony/enhanced/java/trunk/common_resources/   (props changed)
    harmony/enhanced/java/trunk/common_resources/make/properties.xml
    harmony/enhanced/java/trunk/common_resources/make/svn.xml
    harmony/enhanced/java/trunk/drlvm/   (props changed)
    harmony/enhanced/java/trunk/drlvm/build.xml
    harmony/enhanced/java/trunk/drlvm/make/depends.properties
    harmony/enhanced/java/trunk/drlvm/make/properties.xml
    harmony/enhanced/java/trunk/drlvm/make/vm/gc_gen.xml
    harmony/enhanced/java/trunk/drlvm/make/vm/hythr.xml
    harmony/enhanced/java/trunk/drlvm/make/vm/interpreter.xml
    harmony/enhanced/java/trunk/drlvm/make/vm/jitrino.xml
    harmony/enhanced/java/trunk/drlvm/make/vm/verifier.xml
    harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml
    harmony/enhanced/java/trunk/drlvm/make/vm/vmi.xml
    harmony/enhanced/java/trunk/drlvm/vm/gc_gen/resource/MANIFEST.MF
    harmony/enhanced/java/trunk/drlvm/vm/vmcore/src/kernel_classes/resource/MANIFEST.MF
    harmony/enhanced/java/trunk/ibm-v4/build.xml
    harmony/enhanced/java/trunk/jdktools/build.xml
    harmony/enhanced/java/trunk/jdktools/make/depends.properties
    harmony/enhanced/java/trunk/jdktools/make/properties.xml
    harmony/enhanced/java/trunk/jdktools/modules/jdktools/build.xml
    harmony/enhanced/java/trunk/jdktools/modules/jpda/build.xml
    harmony/enhanced/java/trunk/jdktools/modules/jretools/.classpath   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/.project   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.core.prefs   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/.settings/org.eclipse.jdt.ui.prefs   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/META-INF/MANIFEST.MF   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml   (contents, props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/Messages.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/internal/nls/messages.properties   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/ArgumentsParser.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CRLManager.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CSRGenerator.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertChainVerifier.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertExporter.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertImporter.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/CertReader.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Command.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/EntryManager.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/HelpPrinter.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyCertGenerator.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreCertPrinter.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeyStoreConverter.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolException.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolKSLoaderSaver.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/KeytoolParameters.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/keytool/Main.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Consts.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/Main.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/Controller.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/InvalidPolicyTextException.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyFileHandler.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/control/PolicyTextParser.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/CommentEntry.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/GrantEntry.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystoreEntry.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/KeystorePasswordURLEntry.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Permission.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/PolicyEntry.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/model/Principal.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/BaseFormDialog.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/DirectTextEditorPanel.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/EditorPanel.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GrantEntryEditFormDialog.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/GraphicalEditorPanel.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/KeystoreEntryEditFormDialog.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/LAEFormDialog.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/ListAndEditPanel.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/MainFrame.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PermissionEditFormDialog.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/PrincipalEditFormDialog.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/WarningLogDialog.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/policytool/view/apache.gif   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/KeyStoreLoaderSaver.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/toolutils/Util.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/main/java/org/apache/harmony/jretools/unpack200/Main.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/GenKeyTest.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/keytool/TestUtils.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/jretools/src/test/java/org/apache/harmony/jretools/tests/toolutils/KeyStoreLoaderSaverTest.java   (props changed)
    harmony/enhanced/java/trunk/jdktools/modules/samsa/build.xml

Propchange: harmony/enhanced/java/trunk/
------------------------------------------------------------------------------
    svn:mergeinfo = /harmony/enhanced/java/branches/mrh:935751-941490

Modified: harmony/enhanced/java/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/build.xml (original)
+++ harmony/enhanced/java/trunk/build.xml Wed May  5 21:29:16 2010
@@ -41,15 +41,14 @@ Thanks.
     <!-- debug or release version -->
     <property name="hy.cfg" value="release" />
 
+    <property name="hy.hdk" location="target/hdk" />
+
     <!-- property to identify when components are being built by the 
          federated build -->
     <property name="is.federated.build" value="true" />
 
     <property name="vm.dir" value="drlvm" />
     <property name="vm.dir.loc" location="${vm.dir}" />
-    <condition property="is.svn.vm" value="true">
-        <available file="${vm.dir.loc}/.svn" type="dir" />
-    </condition>
 
     <property name="hy.local.zlib" value="false" />
 
@@ -149,7 +148,6 @@ Usage:
     <!-- ============================================================== -->
     <target name="bundle-hdk" 
         depends="assemble-artifacts,
-                 assemble-hdk-doc,
                  bundle-hdk-tgz,
                  bundle-hdk-zip" />
 
@@ -169,6 +167,13 @@ Usage:
                  fetch-commonresources,
                  fetch-jdktools-libs"/>
 
+    <target name="check-depends"
+        description="Checks dependencies."
+        depends="check-classlib-libs,
+                 check-vm-libs,
+                 check-commonresources,
+                 check-jdktools-libs"/>
+
     <target name="bundle-hdk-tgz" depends="init" if="is.unix">
 
         <!-- create the tar file and then md5 checksum using harmony-hdk-rev as the root,
@@ -342,43 +347,9 @@ Usage:
     <!-- ============================================================== -->
     <target name="assemble-artifacts"
         depends="init,
-                 assemble-stuff,
+                 assemble-hdk-doc,
                  chmod-stuff"/>
 
-    <target name="assemble-stuff">
-        <!-- create the top-level hdk directory -->
-        <mkdir dir="${target.dir}/hdk"/>
-
-        <!-- copy the classlib/deploy tree as the hdk
-             filtering out specific files overriden by the VM -->
-        <copy todir="${target.dir}/hdk">
-            <fileset dir="classlib/deploy">
-                <excludesfile
-                     name="${vm.dir.loc}/make/classlib.override.file.patterns"
-                     />
-                <include name="**/*" />
-            </fileset>
-        </copy>
-
-        <!-- now copy the drlvm/build/deploy/jre/bin/default -->
-        <!-- plus specific file that the VM overrides -->
-        <copy todir="${target.dir}/hdk">
-            <fileset dir="${vm.dir.loc}/deploy">
-                <exclude name="**/jre/bin/*" />
-
-                <!-- TODO: where should these .pdb files go? -->
-                <exclude name="**/*.pdb" unless="copy.progdb" />
-            </fileset>
-            <fileset dir="${vm.dir.loc}/deploy"
-                includesfile="${vm.dir.loc}/make/classlib.override.file.patterns" />
-        </copy>
-
-        <!-- now copy the jdktools/deploy/jdk -->
-        <copy todir="${target.dir}/hdk/jdk/">
-            <fileset dir="jdktools/deploy/jdk" />
-        </copy>
-    </target>
-
     <target name="chmod-stuff" if="is.unix">
         <chmod file="${target.dir}/hdk/jdk/bin/*" perm="ugo+x" />
         <chmod file="${target.dir}/hdk/jdk/jre/bin/java*" perm="ugo+x" />
@@ -394,7 +365,7 @@ Usage:
     <target name="assemble-hdk-doc">
 
         <copy todir="${target.dir}/hdk" overwrite="true">
-            <fileset dir="./">
+            <fileset dir=".">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
             </fileset>
@@ -408,7 +379,7 @@ Usage:
     <target name="assemble-jre-doc">
 
         <copy todir="${target.dir}/hdk/jdk/jre" overwrite="true">
-            <fileset dir="./">
+            <fileset dir=".">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
             </fileset>
@@ -417,7 +388,7 @@ Usage:
 
     <target name="assemble-jdk-doc">
         <copy todir="${target.dir}/hdk/jdk/" overwrite="true">
-            <fileset dir="./">
+            <fileset dir=".">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
             </fileset>
@@ -430,28 +401,31 @@ Usage:
 
     <propertyset id="required.props">
         <propertyref name="hy.cfg" />
+        <propertyref name="hy.hdk" />
         <propertyref name="hy.local.zlib" />
         <propertyref name="use.libstdc++5" />
         <propertyref name="harmony.java.version" />
         <propertyref name="is.federated.build" />
     </propertyset>
     
-    <target name="build-classlib" depends="auto-fetch-classlib-libs">
+    <target name="build-classlib"
+            depends="init,-build-classlib,assemble-hdk-doc"/>
+    <target name="-build-classlib" depends="auto-fetch-classlib-libs">
         <ant antfile="classlib/build.xml" target="build" inheritAll="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
         </ant>
-        <!-- hack to make sure the vm doesn't use the classlib
+        <!-- hack to make sure the federated build doesn't use the classlib
              LICENSE/NOTICE files as they don't cover ICU4C
           -->
-        <copy todir="classlib/deploy" overwrite="true">
-            <fileset dir=".">
+        <delete>
+            <fileset dir="${hy.hdk}">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
             </fileset>
-        </copy>                                                             
+        </delete>
     </target>
 
     <target name="auto-fetch-classlib-libs" if="auto.fetch">
@@ -463,7 +437,17 @@ Usage:
     </target>
 
     <target name="fetch-classlib-libs">
-        <ant antfile="classlib/build.xml" target="fetch-depends" inheritall="false" >
+        <ant antfile="classlib/build.xml" target="fetch-depends"
+             inheritall="false" >
+            <propertyset refid="required.props" />
+            <property name="svn.info" value="${harmony.long.version}"/>
+            <property name="svn.revision" value="${harmony.version}"/>
+        </ant>
+    </target>
+
+    <target name="check-classlib-libs">
+        <ant antfile="classlib/build.xml" target="check-depends"
+             inheritall="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
@@ -479,12 +463,10 @@ Usage:
         </ant>
     </target>
 
-    <target name="init-classlib-hdk">
+    <target name="-init-classlib-hdk-for-clean">
         <ant antfile="classlib/build.xml"
-                target="-init-hdk" inheritAll="false" >
-            <property name="hy.cfg" value="${hy.cfg}"/>
-            <property name="svn.info" value="${harmony.long.version}"/>
-            <property name="svn.revision" value="${harmony.version}"/>
+             target="-init-hdk-for-clean" inheritAll="false" >
+            <propertyset refid="required.props" />
             <property name="keep.working" value="true" />
         </ant>
     </target>
@@ -492,13 +474,15 @@ Usage:
     <!-- ============================================================== -->
     <!-- ensures that dependencies are up to date and then builds a vm  -->
     <!-- ============================================================== -->
-    <target name="build-vm" depends="auto-fetch-vm-libs">
+    <target name="build-vm" depends="init,auto-fetch-vm-libs">
         <ant antfile="${vm.dir.loc}/build.xml"
              target="build" inheritAll="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
-            <property name="deploy.canonical.flag" value="true"/>
+            <property name="deploy.canonical.flag" value="false"/>
+            <property name="drlvm.deploy.dir" location="${hy.hdk}"/>
+            <property name="import.hdk" value="false"/>
         </ant>
     </target>
 
@@ -519,20 +503,32 @@ Usage:
         </ant>
     </target>
 
+    <target name="check-vm-libs">
+        <ant antfile="${vm.dir.loc}/build.xml"
+             target="check-depends" inheritall="false" >
+            <propertyset refid="required.props" />
+            <property name="svn.info" value="${harmony.long.version}"/>
+            <property name="svn.revision" value="${harmony.version}"/>
+        </ant>
+    </target>
+
     <target name="clean-vm">
         <ant antfile="${vm.dir.loc}/build.xml"
              target="clean" inheritall="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
-            <property name="deploy.canonical.flag" value="true"/>
+            <property name="deploy.canonical.flag" value="false"/>
+            <property name="drlvm.deploy.dir" location="${hy.hdk}"/>
+            <property name="import.hdk" value="false"/>
         </ant>
     </target>
 
     <!-- ============================================================== -->
     <!-- fetches the common resources                                   -->
     <!-- ============================================================== -->
-    <target name="build-commonresources" depends="auto-fetch-commonresources"/>
+    <target name="build-commonresources"
+            depends="init,auto-fetch-commonresources"/>
 
     <target name="auto-fetch-commonresources" if="auto.fetch">
         <ant target="fetch-commonresources">
@@ -543,8 +539,18 @@ Usage:
     </target>
 
     <target name="fetch-commonresources">
-        <ant antfile="common_resources/build.xml" target="fetch-depends" inheritall="false" >
-            <property name="hy.cfg" value="${hy.cfg}"/>
+        <ant antfile="common_resources/build.xml" target="fetch-depends"
+             inheritall="false" >
+            <propertyset refid="required.props" />
+            <property name="svn.info" value="${harmony.long.version}"/>
+            <property name="svn.revision" value="${harmony.version}"/>
+        </ant>
+    </target>
+
+    <target name="check-commonresources">
+        <ant antfile="common_resources/build.xml" target="check-depends"
+             inheritall="false" >
+            <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
         </ant>
@@ -553,9 +559,11 @@ Usage:
     <!-- ============================================================== -->
     <!-- ensures dependencies are up to date, then builds jdktools      -->
     <!-- ============================================================== -->
-    <target name="build-jdktools" depends="auto-fetch-jdktools-libs">
+    <target name="build-jdktools"
+            depends="init,auto-fetch-jdktools-libs">
         <ant antfile="jdktools/build.xml" target="build" inheritall="false" >
-            <property name="hy.cfg" value="${hy.cfg}"/>
+            <propertyset refid="required.props" />
+            <property name="common.resources" location="common_resources" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
         </ant>
@@ -563,19 +571,31 @@ Usage:
 
     <target name="auto-fetch-jdktools-libs" if="auto.fetch">
         <ant target="fetch-jdktools-libs" inheritall="false" >
-            <property name="hy.cfg" value="${hy.cfg}"/>
+            <propertyset refid="required.props" />
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
     <target name="fetch-jdktools-libs">
-        <ant antfile="jdktools/build.xml" target="fetch-depends" inheritall="false" >
-            <property name="hy.cfg" value="${hy.cfg}"/>
+        <ant antfile="jdktools/build.xml" target="fetch-depends"
+             inheritall="false" >
+            <propertyset refid="required.props" />
+            <property name="common.resources" location="common_resources" />
+        </ant>
+    </target>
+
+    <target name="check-jdktools-libs">
+        <ant antfile="jdktools/build.xml" target="check-depends"
+             inheritall="false" >
+            <propertyset refid="required.props" />
+            <property name="common.resources" location="common_resources" />
         </ant>
     </target>
 
     <target name="clean-jdktools">
         <ant antfile="jdktools/build.xml" target="clean" inheritall="false" >
-            <property name="hy.cfg" value="${hy.cfg}"/>
+            <propertyset refid="required.props" />
+            <property name="common.resources" location="common_resources" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
         </ant>
@@ -590,29 +610,8 @@ Usage:
     </target>
 
 
-    <!-- ============================================================== -->
-    <!-- hard reset - removes checked out classlib and vm tree          -->
-    <!-- ============================================================== -->
-    <target name="reset"
-        description="removes vm and classlib dirs and resets - BE SURE YOU WANT TO DO THIS"
-        depends="clean,reset-vm">
-
-        <!-- delete the working directories -->
-        <delete dir="classlib"/>
-
-        <!-- do an svn update to reset them -->
-        <exec executable="svn" dir="." failonerror="true">
-            <arg line="update" />
-        </exec>
-
-    </target>
-
-    <target name="reset-vm" if="is.svn.vm">
-        <delete dir="${vm.dir.loc}" />
-    </target>
-
     <target name="clean"
-        depends="init-classlib-hdk,
+        depends="-init-classlib-hdk-for-clean,
                  clean-jdktools,
                  clean-classlib,
                  clean-vm,
@@ -623,7 +622,7 @@ Usage:
     <!-- ============================================================== -->
     <!-- sets up a platform                                             -->
     <!-- ============================================================== -->
-    <target name="init" depends="svn-prop">
+    <target name="init" depends="-svn-prop">
         <!-- Determine our operating system -->
         <condition property="is.windows">
             <os family="windows" />
@@ -755,7 +754,7 @@ Usage:
     <!-- ============================================================== -->
     <!-- svn-prop: gets svn revision number of the build.xml file       -->
     <!-- ============================================================== -->
-    <target name="svn-prop">
+    <target name="-svn-prop">
         
         <tempfile suffix=".xml" property="svn.tmp"/>
         <exec executable="svn" output="${svn.tmp}" resultproperty="svn.rc">
@@ -843,28 +842,9 @@ harmony.java.version=${harmony.java.vers
         <chmod file="${target.dir}/src/debian/rules" perm="ugo+x" />
     </target>
 
-    <target name="test"
-            depends="test-classlib,test-jdktools,process-test-output" />
-
-    <target name="clean-tests">
-        <delete dir="target/test_report" />
-    </target>
-
-    <target name="test-classlib" depends="clean-tests">
-        <ant antfile="classlib/make/build-test.xml"
-             target="test-modules" inheritAll="false" >
-            <propertyset refid="required.props" />
-            <property name="svn.info" value="${harmony.long.version}"/>
-            <property name="svn.revision" value="${harmony.version}"/>
-            <property name="keep.working" value="true" />
-            <property name="tests.output" location="target/test_report" />
-            <property name="test.jre.home" location="target/hdk/jdk/jre" />
-        </ant>
-    </target>
-
-    <target name="test-jdktools" depends="clean-tests">
-        <ant antfile="jdktools/make/build-test.xml"
-             target="test-modules" inheritAll="false" >
+    <target name="test" depends="clean-tests">
+        <ant antfile="target/hdk/build/test/build.xml"
+             target="test" inheritAll="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
@@ -874,16 +854,8 @@ harmony.java.version=${harmony.java.vers
         </ant>
     </target>
 
-    <target name="process-test-output">
-        <ant antfile="classlib/make/build-test.xml"
-             target="process-test-output" inheritAll="false" >
-            <propertyset refid="required.props" />
-            <property name="svn.info" value="${harmony.long.version}"/>
-            <property name="svn.revision" value="${harmony.version}"/>
-            <property name="keep.working" value="true" />
-            <property name="tests.output" location="target/test_report" />
-            <property name="test.jre.home" location="target/hdk/jdk/jre" />
-        </ant>
+    <target name="clean-tests">
+        <delete dir="target/test_report" />
     </target>
 
     <!-- ============================================================== -->

Propchange: harmony/enhanced/java/trunk/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  5 21:29:16 2010
@@ -1 +1,2 @@
 /harmony/enhanced/classlib/trunk:926318-926838
+/harmony/enhanced/java/branches/mrh/classlib:935751-941490

Modified: harmony/enhanced/java/trunk/classlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/build.xml Wed May  5 21:29:16 2010
@@ -74,8 +74,22 @@ module:
 
     <property name="hy.hdk" location="deploy" />
 
+    <property name="build.output" location="build/classes" />
+    <property name="tests.output" location="build/test_report" />
+    <property name="tests.support.output" location="build/test_support" />
+    <property name="tests.report.dir" value="${tests.output}/html"/>
+    <property file="make/depends.properties" />
+
+    <condition property="needs.vme.v3.hack" value="true">
+        <or>
+            <equals arg1="${hy.platform}" arg2="windows.x86" />
+            <equals arg1="${hy.platform}" arg2="linux.x86" />
+        </or>
+    </condition>
+
     <!-- import properties for snapshot targets -->
-    <import file="${basedir}/make/properties.xml" />
+    <import file="make/properties.xml" />
+    <import file="make/depends.xml" />
 
     <!-- ================================
 	 target : rebuild
@@ -85,120 +99,320 @@ module:
     <target name="rebuild" depends="clean,build"
         description="Performs a full build - that is 'clean' then 'build'" />
 	
-    <target name="build" depends="build-java,build-native,build-test"
-        description="Compiles the java and native code to produce a jdk" />
-
-    <target name="support-jar" depends="build-java" >
-        <ant antfile="make/build-test.xml" inheritall="false"
-             target="support-jar"/>
-    </target>
+    <target name="build"
+        description="Compiles the java, natives and tests to produce a jdk/hdk"
+        depends="-build-java,-build-native,-build-test,-build-modules" />
 
     <target name="clean"
-            depends="clean-java,clean-native,clean-test,-clean-hdk" 
+            depends="-init-hdk-for-clean,-clean-modules,-clean-check,
+                     -clean-native,-clean-test,-clean-hdk" 
             description="Removes all the files generated by a build" />
 
-    <!-- ================================
-	 target : rebuild-java
-	     
-	 builds java source with a clean first
-	 ================================= -->
-    <target name="rebuild-java" depends="clean-java,build-java"
-            description="Like 'rebuild' but for java code only" />
-
-    <!-- ================================= 
-          target: build-java              
-
-          runs the build target in build-java.xml
-         ================================= -->
-    <target name="build-java" depends="-init-hdk"
+    <target name="-build-java" unless="skip.java.build"
+            depends="-init-hdk,-layout-java"
             description="Compiles the java code only" >
-        <echo>
-========================================
-Building Java component archives...
-========================================
-        </echo>
-        <ant antfile="make/build-java.xml" inheritall="false" target="build"/>
-    </target>
+        <ensure-javac/>
+        <mkdir dir="${build.output}" />
 
-    <!-- ================================= 
-          target: clean-java              
+        <hy.javac destdir="${build.output}"
+               includeAntRuntime="no">
+            
+            <src path="modules/accessibility/src/main/java" />
+            <src path="modules/annotation/src/main/java" />
+            <src path="modules/applet/src/main/java" />
+            <src path="modules/archive/src/main/java" />
+            <src path="modules/auth/src/main/java/${hy.os.family}" />
+            <src path="modules/auth/src/main/java/common" />
+            <src path="modules/awt/src/main/java/${hy.os.family}" />
+            <src path="modules/awt/src/main/java/common" />
+            <src path="modules/beans/src/main/java" />
+            <src path="modules/concurrent/src/main/java" />
+            <src path="modules/crypto/src/main/java" />
+            <src path="modules/instrument/src/main/java" />
+            <src path="modules/imageio/src/main/java" />
+            <src path="modules/jndi/src/main/java" />
+            <src path="modules/logging/src/main/java" />
+            <src path="modules/lang-management/src/main/java" />
+            <src path="modules/luni-kernel/src/main/java" />
+            <src path="modules/luni/src/main/java" />
+            <src path="modules/math/src/main/java" />
+            <src path="modules/misc/src/main/java" />
+            <src path="modules/nio/src/main/java/common" />
+            <src path="modules/nio/src/main/java/${hy.os.family}" />
+            <src path="modules/nio_char/src/main/java" />
+            <!-- pack200 uses customized build script and 
+                 should not be built from top-level build.xml -->
+            <!--src path="modules/pack200/src/main/java" /-->
+            <src path="modules/prefs/src/main/java" />
+            <src path="modules/print/src/main/java/${hy.os.family}" />
+            <src path="modules/print/src/main/java/common" />
+            <src path="modules/regex/src/main/java" />
+            <src path="modules/rmi/src/main/java" />
+            <src path="modules/security-kernel/src/main/java" />
+            <src path="modules/security/src/main/java/${hy.os.family}" />
+            <src path="modules/security/src/main/java/common" />
+            <src path="modules/sound/src/main/java" />
+            <src path="modules/sql/src/main/java" />
+            <src path="modules/suncompat/src/main/java" />
+            <src path="modules/swing/src/main/java/${hy.os.family}" />
+            <src path="modules/swing/src/main/java/common" />
+            <src path="modules/text/src/main/java" />
+            <src path="modules/x-net/src/main/java/" />
+
+            <classpath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                    <exclude name="**/*-src.jar" />
+                </fileset>
+            </classpath>
 
-          runs the clean target in build-java.xml
-         ================================= -->
-    <target name="clean-java" depends="-init-hdk-for-clean"
-            description="Removes the compiled java code" >
-        <ant antfile="make/build-java.xml" inheritall="false" target="clean" >
-            <property name="keep.working" value="${keep.working}" />
-        </ant>
+            <!-- We need to set some BCP to avoid the compiler picking
+                 up the JRE's JARs -->
+            <bootclasspath>
+                <fileset dir="${depends.jars}">
+                    <!-- FIXME: picked mx4j arbitrarily, needs to be non-empty set -->
+                    <include name="**/mx4j.jar" />
+                </fileset>
+            </bootclasspath>
+        </hy.javac>
     </target>
 
-    <!-- ================================
-	 target : rebuild-native
-	     
-	 builds native source with a clean first
-	 ================================= -->
-    <target name="rebuild-native" depends="clean-native,build-native"
-            description="Like 'rebuild' but for native code only" />
-
-    <!-- ================================= 
-          target: build-native             
-
-          runs the build target in build-native.xml
-         ================================= -->
-    <target name="build-native" depends="-init-hdk"
-            description="Compiles the native code only" >
-        <echo>
-========================================
-Building native libs and executables...
-========================================
-        </echo>
-        <ant antfile="make/build-native.xml" inheritall="false" target="build"/>
+    <target name="-build-modules" depends="-svn-info">
+        <poll-modules target="-build-no-check" />
     </target>
 
-    <!-- ================================= 
-          target: clean-native              
+    <target name="-clean-modules">
+        <poll-modules target="clean" />
+    </target>
+
+    <target name="-layout-java" depends="check-depends">
+
+        <!-- Create the structure -->
+        <mkdir dir="${hy.jdk}/jre/bin" />
+        <mkdir dir="${hy.jdk}/jre/lib/boot" />
+        <mkdir dir="${hy.jdk}/jre/lib/ext" />
+        <mkdir dir="${hy.jdk}/jre/lib/security" />
+
+        <!-- Copy across the required files -->
+        <copy file="LICENSE" todir="${hy.hdk}" verbose="yes" />
+        <copy file="NOTICE" todir="${hy.hdk}" verbose="yes" />
+
+        <!-- Copy across the boot dependency jars --><!-- TOFIX clean these? -->
+        <copy todir="${hy.jdk}/jre/lib/boot">
+            <fileset dir="${depends.jars}">
+                <patternset includes="icu4j_4.2.1/*.jar" />
+                <patternset includes="xalan-j_2.7.0/xalan.jar" />
+                <patternset includes="xerces_2.9.1/*.jar" />
+            </fileset>
+            <fileset dir="${depends.manifests}"/>
+        </copy>
+
+        <!-- Copy across the extension dependency jars -->
+        <copy tofile="${hy.jdk}/jre/lib/ext/bcprov.jar" verbose="true"
+              flatten="yes" overwrite="true">
+            <fileset file="${bcprov.jar}" />
+        </copy>
+
+        <!-- Copy across the support files -->
+        <copy todir="${hy.jdk}/jre/lib">
+            <fileset dir="${depends.files}">
+                <include name="content-types.properties" />
+            </fileset>
+        </copy>
+
+        <copy todir="${hy.jdk}/jre/lib/boot">
+            <fileset dir="${depends.files}">
+                <include name="bootclasspath.properties" />
+            </fileset>
+        </copy>
+        <fixcrlf srcdir="${hy.jdk}/jre/lib/boot"
+            includes="bootclasspath.properties" />
+
+        <copy todir="${hy.jdk}/jre/lib/security">
+             <fileset dir="${depends.files}">
+                 <include name="java.policy" />
+                 <include name="java.security" />
+             </fileset>
+         </copy>
+
+        <copy todir="${hy.jdk}/jre/lib">
+            <fileset dir="${depends.files}">
+                <include name="net.properties" />
+            </fileset>
+        </copy>
+
+        <copy todir="${hy.jdk}/jre/lib">
+            <fileset dir="${depends.files}">
+                <include name="rowset.properties" />
+            </fileset>
+        </copy>
+
+    </target>
+
+    <target name="-clean-check" unless="skip.java.build"
+            depends="-clean-java-catch-all-test,
+                     -clean-java-catch-all,
+                     -clean-java-layout"
+            description="Checks that the module clean worked correctly" />
+
+    <target name="-clean-java-catch-all-test">
+        <!-- without this test the pathconvert in the catch all clean
+             target fails -->
+        <available property="catch.all.required"
+                   file="${build.output}" type="dir" />
+    </target>
+
+    <target name="-clean-java-catch-all" if="catch.all.required">
+        <fileset id="built.files" dir="${build.output}">
+            <include name="**/**" />
+        </fileset>
+        <pathconvert property="built.files.list"
+                     refid="built.files"
+                     pathsep="${line.separator}" />
+        <condition property="built.files.exist">
+            <not>
+                <equals arg1="${built.files.list}" arg2="" />
+            </not>
+        </condition>
+
+        <delete includeemptydirs="true" failonerror="false">
+            <fileset refid="built.files" />
+        </delete>
+
+        <condition property="continue">
+            <equals arg1="${keep.working}" arg2="true" />
+        </condition>
+
+        <fail if="built.files.exist" unless="continue">
+...
+
+Built files still exist after module clean targets have run.  This
+probably means that one or more patternsets are incomplete.  The
+remaining files are:
+
+${built.files.list}
+
+        </fail>
+    </target>
+
+    <target name="-clean-java-layout">
+        <delete includeemptydirs="true" failonerror="false">
+            <fileset dir="${hy.jdk}">
+                <exclude name="jre/bin/default/**" />
+                <exclude name="jre/bin/**" />
+                <exclude name="jre/lib/ext/**" />
+            </fileset>
+            <fileset dir="${hy.hdk}">
+                <include name="LICENSE" />
+                <include name="NOTICE" />
+            </fileset>
+        </delete>
+    </target>
 
-          runs the clean target in build-native.xml
-         ================================= -->
-    <target name="clean-native" depends="-init-hdk-for-clean"
-        description="Removes the compiled native code" >
+    <target name="-build-native" unless="skip.native.build"
+            depends="-init-hdk,-svn-info,-layout-natives"
+            description="Compiles the native code only" >
 
-        <ant antfile="make/build-native.xml" inheritall="false" target="clean" />
+        <!-- these must be run in a specific order due to dependencies -->
+    	<ant dir="modules/portlib" target="-build-native" />
+        <ant dir="modules/luni" target="-build-native-core" />
+    	<ant dir="modules/archive" target="-build-native" />
+    	<ant dir="modules/luni" target="-build-native-secondary" />
+
+    </target>
+
+    <target name="-layout-natives" unless="skip.native.build"
+            depends="check-depends,-layout.windows,-layout.vme.v3.hack"
+        description="Construct the correct directory structure for native binaries">
+
+    	<!-- Create the target directory structure -->
+        <mkdir dir="${hy.jdk}/jre/bin" />
+        <mkdir dir="${hy.jdk}/include" />
+    	<mkdir dir="${hy.hdk}/lib"/>
+
+    	<!-- NLS catalog files -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${depends.files}">
+                <include name="harmony*.properties" />
+            </fileset>
+        </copy>
+
+    </target>
+
+    <target name="-layout.windows" unless="skip.native.build"
+            if="is.windows">
+        <!-- workaround until msdll is moved. -->
+        <copy file="${msvcr.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
+        <copy file="${msvcp.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
+    </target>
+
+    <target name="-layout.vme.v3.hack" unless="skip.native.build"
+            if="needs.vme.v3.hack">
+        <echo>Deploying empty ICU dynamic library stub</echo>
+        <copy todir="${hy.jdk}/jre/bin" verbose="true">
+            <fileset dir="${depends.files}">
+                <include name="hyempty.dll" if="is.windows" />
+            </fileset>
+            <globmapper from="*hyempty.dll" to="*ICUInterface34.dll" />
+        </copy>
+        <copy todir="${hy.jdk}/jre/bin" verbose="true">
+            <fileset dir="${depends.files}">
+                <include name="libhyempty.so" if="is.linux" />
+            </fileset>
+            <globmapper from="*libhyempty.so" to="*libICUInterface34.so" />
+        </copy>
+    </target>
+
+    <target name="-clean-native" unless="skip.native.build"
+            depends="-init-hdk-for-clean"
+            description="Removes the compiled native code" >
+    	<delete dir="${hy.hdk}/lib" />
+
+        <delete dir="${hy.hdk}/include" />
+        <delete dir="${hy.hdk}/jdk/include" />
+
+        <delete includeemptydirs="true" failonerror="false">
+            <fileset dir="${hy.jdk}">
+                <include name="**/bin/java${exe.suffix}" />
+                <include name="**/bin/javaw${exe.suffix}" />
+                <include name="**/bin/*${shlib.suffix}*" />
+                <include name="**/bin/*.pdb" />
+            	<include name="**/bin/harmony*.properties" />
+            </fileset>
+        </delete>
     </target>
 
-    <target name="clean-test" depends="-init-hdk-for-clean"
-            description="Removes the generated tests" >
-        <ant antfile="make/build-test.xml" inheritall="false" target="clean" />
+    <target name="test"
+            depends="-test-init-hdk,clean-test-output"
+            description="Runs all tests">
+        <ant dir="${hy.hdk}/build/test" inheritall="false" target="test">
+            <property name="tests.output" value="${tests.output}"/>
+        </ant>
     </target>
 
-    <target name="test" depends="-init-hdk"
-            description="Runs all tests">
-        <echo>
-========================================
-Testing class libraries...
-========================================
-</echo>
-        <ant antfile="make/build-test.xml" inheritall="false" target="test-all"/>
+    <target name="-build-test" unless="skip.test.build"
+            depends="-test-init-hdk,-support-jar"
+            description="Compile and archive all tests" />
+
+    <target name="-clean-test" unless="skip.test.build"
+            depends="-init-hdk-for-clean"
+            description="Removes the generated tests" >
+        <delete dir="${tests.support.output}" />
+        <delete dir="${hy.hdk}/build/test" />
     </target>
 
-    <target name="build-test" depends="-init-hdk,support-jar"
-            description="Compile and archive all tests">
-        <echo>
-========================================
-Compiling and archiving test classes ...
-========================================
-</echo>
-        <ant antfile="make/build-test.xml" inheritall="false" target="test-jar-modules"/>
+    <target name="clean-test-output">
+        <delete dir="${tests.output}" />
     </target>
 
-    <target name="findbugs" depends="-init-hdk"
+    <target name="findbugs" depends="check-depends"
             description="Runs FindBugs on all modules">
         <echo>
 ========================================
 Finding bugs in all class libraries...
 ========================================
 </echo>
-        <ant antfile="make/build-test.xml" inheritall="false" target="findbugs"/>
+        <poll-modules target="findbugs" />
     </target>
 
     <!-- ================================= 
@@ -225,7 +439,7 @@ Generating HTML using Doxygen...
     <!-- ================================= 
           target: -properties
          ================================= -->
-    <target name="-properties" depends="svn-prop">
+    <target name="-properties" depends="-svn-prop">
         <property name="deploy.file.prefix"
                   value="harmony-classlib-r${svn.revision}" />
         <property name="deploy.tar"
@@ -253,15 +467,17 @@ Generating snapshot tar
             <tarfileset dir="${basedir}" prefix="Harmony">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
-                <include name="deploy/build/**" />
-                <include name="deploy/include/**" />
-                <include name="deploy/jdk/**" />
-                <exclude name="deploy/jdk/jre/bin/default/**" /> 
-                <exclude name="deploy/jdk/jre/bin/java" /> 
-                <include name="deploy/lib/**" />
             </tarfileset>
-            <tarfileset dir="${basedir}" prefix="Harmony" mode="755">
-                <include name="deploy/jdk/jre/bin/java" />
+            <tarfileset dir="${hy.hdk}" prefix="Harmony">
+                <include name="build/**" />
+                <include name="include/**" />
+                <include name="jdk/**" />
+                <exclude name="jdk/jre/bin/default/**" /> 
+                <exclude name="jdk/jre/bin/java" /> 
+                <include name="lib/**" />
+            </tarfileset>
+            <tarfileset dir="${hy.hdk}" prefix="Harmony" mode="755">
+                <include name="jdk/jre/bin/java" />
             </tarfileset>
             <tarfileset dir="${basedir}/make/resources"
                 includes="README-snapshot.txt"
@@ -284,12 +500,14 @@ Generating snapshot zip
             <zipfileset dir="${basedir}" prefix="Harmony">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
-                <include name="deploy/build/**" />
-                <include name="deploy/include/**" />
-                <include name="deploy/jdk/**" />
-                <exclude name="deploy/jdk/jre/bin/default/**" /> 
-                <exclude name="deploy/jdk/jre/bin/java" /> 
-                <include name="deploy/lib/**" />
+            </zipfileset>
+            <zipfileset dir="${hy.hdk}" prefix="Harmony">
+                <include name="build/**" />
+                <include name="include/**" />
+                <include name="jdk/**" />
+                <exclude name="jdk/jre/bin/default/**" /> 
+                <exclude name="jdk/jre/bin/java" /> 
+                <include name="lib/**" />
             </zipfileset>
             <zipfileset dir="${basedir}/make/resources"
                 includes="README-snapshot.txt"
@@ -299,12 +517,15 @@ Generating snapshot zip
         <chksum file="${deploy.zip}" type="sha" />
     </target>
 
-    <target name="check-depends" depends="-init-hdk"
+    <target name="check-depends" depends="-init-hdk,-check-depends"
             description="Report on whether the dependencies are met">
-        <ant antfile="make/depends.xml" inheritall="false" target="check" />
         <poll-modules target="check-depends" />
     </target>
 
+    <target name="-check-depends" description="Check top-level dependencies">
+        <ant antfile="make/depends.xml" inheritall="false" target="check" />
+    </target>
+
     <target name="fetch-depends" depends="-init-hdk"
         description="Fetches dependencies. Note: Some of Harmony's dependencies are licensed under terms other than the Apache License v2.">
         <ant antfile="make/depends.xml" inheritall="false" target="download" />
@@ -315,6 +536,67 @@ Generating snapshot zip
         description="Display the properties that are use in the ant build files"
             />
 
+    <!-- test support -->
+    <target name="-support-jar" unless="skip.test.build"
+            depends="-compile-support">
+        <mkdir dir="${hy.hdk}/build/test" />
+        <hy.jar.bin destfile="${hy.hdk}/build/test/support.jar"
+                    manifest="support/META-INF/MANIFEST.MF">
+            <fileset dir="${tests.support.output}" />
+        </hy.jar.bin>
+        <copy todir="${hy.hdk}/build/test"> 
+            <fileset dir="${jetty.dir}">
+                <include name="*.jar" />
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="-compile-support" unless="skip.test.build"
+            depends="-copy-test-resources,-check-depends"
+            description="Compile the unit test source">
+        <ensure-javac/>
+        <mkdir dir="${tests.support.output}" />
+        <hy.javac destdir="${tests.support.output}">
+            <src path="support/src/test/java" />
+            <classpath location="${junit.jar}" />
+            <classpath location="${tests.support.output}" />
+            <classpath>
+                <fileset dir="${jetty.dir}">
+                    <include name="*.jar" />
+                </fileset>
+            </classpath>
+            <bootclasspath location="${build.output}" />
+            <bootclasspath>
+                <fileset dir="${hy.hdk}/jdk/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </hy.javac>
+    </target>
+    
+    <target name="-copy-test-resources" unless="skip.test.build"
+            description="Copy non-Java files from test support tree to the support output tree">
+        <mkdir dir="${tests.support.output}" />
+        <copy todir="${tests.support.output}" includeemptydirs="false">
+            <fileset dir="support/src/test/java">
+                <exclude name="**/*.java" />
+            </fileset>
+            <fileset file="support/src/test/resources/hyts_Foo.c"/>
+        </copy>
+        <copy file="support/src/test/resources/config/testing.policy" 
+              todir="${hy.hdk}/build/test" outputencoding="UTF-8" />
+    </target>
+
+    <target name="-test-init-hdk" unless="skip.test.build"
+            depends="-init-hdk">
+        <copy file="make/test.properties"
+              tofile="${hy.hdk}/build/test/test.properties"/>
+        <copy file="make/run-test.xml"
+              tofile="${hy.hdk}/build/test/build.xml"/>
+    </target>
+
+    <!-- hdk initialisation -->
+
     <target name="-init-hdk">
         <init-hdk />
     </target>

Modified: harmony/enhanced/java/trunk/classlib/make/depends-common.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/make/depends-common.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/make/depends-common.xml (original)
+++ harmony/enhanced/java/trunk/classlib/make/depends-common.xml Wed May  5 21:29:16 2010
@@ -185,4 +185,72 @@ But @{src} doesn't exist.
         <symlink resource="${src}" link="${basedir}/${dest}" />
     </target>
 
+    <macrodef name="fetch">
+        <attribute name="dep" />
+        <sequential>
+            <dirname file="${@{dep}}" property="@{dep}.dir"/>
+            <mkdir dir="${@{dep}.dir}"/>
+            <download-one-file dest="${@{dep}}" 
+                src="${@{dep}.url}" md5="${@{dep}.md5}"/>
+            <unzip-one-file dep="@{dep}"/>
+        </sequential>
+    </macrodef>
+
+    <target name="-really-unzip" unless="unzipped" if="unzip.path">
+        <tempfile destdir="${dest}" property="tmp"/>
+        <unzip src="${src}" dest="${tmp}" >
+            <patternset includes="${unzip.path}"/>
+        </unzip>
+        <touch>
+            <fileset dir="${tmp}">
+                <patternset includes="${unzip.path}"/>
+            </fileset>
+        </touch>
+        <move todir="${dest}" flatten="yes" failonerror="no">
+            <fileset dir="${tmp}">
+                <patternset includes="${unzip.path}"/>
+            </fileset>
+        </move>
+        <delete dir="${tmp}" />
+    </target>
+
+    <macrodef name="unzip-one-file">
+        <attribute name="dep" />
+        <sequential>
+            <dirname file="${@{dep}}" property="@{dep}.dir"/>
+            <!-- quite tricky way to detect if unzip operation is pending,
+                still not very robust ...
+                Life could be simpler if unzip supported nested mappers
+            -->
+            <basename file="${@{dep}}" property="@{dep}.basename"/>
+            <basename file="${@{dep}.unzip.path}" property="@{dep}.unzip.basename"/>
+            <pathconvert property="@{dep}.matching.list" setonempty="no">
+                <path><fileset dir="${@{dep}.dir}" includes="${@{dep}.unzip.basename}"/></path>
+            </pathconvert>
+            <pathconvert property="@{dep}.uptodate.list" setonempty="no">
+                <path>
+                    <fileset dir="${@{dep}.dir}" includes="${@{dep}.unzip.basename}">
+                        <depend targetdir="${@{dep}.dir}">
+                            <mapper type="merge" to="${@{dep}.basename}"/>
+                        </depend>
+                    </fileset>
+                </path>
+            </pathconvert>
+            <condition property="@{dep}.unzipped">
+                <equals arg1="${@{dep}.uptodate.list}" arg2="${@{dep}.matching.list}"/>
+                <!--uptodate srcfile="${@{dep}}"
+                        targetfile="${@{dep}.dir}/${@{dep}.unzip.basename}"/-->
+            </condition>
+
+            <antcall target="-really-unzip">
+                <param name="src" value="${@{dep}}" />
+                <param name="dest" value="${@{dep}.dir}" />
+                <propertyset>
+                  <propertyref prefix="@{dep}.unzip"/>
+                  <globmapper from="@{dep}.*" to="*"/>
+                </propertyset>
+            </antcall>
+        </sequential>
+    </macrodef>
+
 </project>

Modified: harmony/enhanced/java/trunk/classlib/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/make/depends.properties?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/make/depends.properties (original)
+++ harmony/enhanced/java/trunk/classlib/make/depends.properties Wed May  5 21:29:16 2010
@@ -15,6 +15,10 @@
 
 depends.dir=depends
 depends.jars=${depends.dir}/jars
+depends.oss=${depends.dir}/oss
+depends.libs=${depends.dir}/libs/${hy.platform}
+depends.files=${depends.dir}/files
+depends.manifests=${depends.dir}/manifests
 maven2.base=http://repo1.maven.org/maven2
 
 xalan.dir=${depends.jars}/xalan-j_2.7.0

Modified: harmony/enhanced/java/trunk/classlib/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/make/properties.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/make/properties.xml (original)
+++ harmony/enhanced/java/trunk/classlib/make/properties.xml Wed May  5 21:29:16 2010
@@ -290,6 +290,18 @@
         <istrue value="${hy.select}" />
     </condition>
     <property name="exclude.module" value="nothing" />
+    <property name="build.java" value="true" />
+    <property name="build.native" value="true" />
+    <property name="build.test" value="true" />
+    <condition property="skip.java.build" value="true">
+        <equals arg1="${build.java}" arg2="false" />
+    </condition>
+    <condition property="skip.native.build" value="true">
+        <equals arg1="${build.native}" arg2="false" />
+    </condition>
+    <condition property="skip.test.build" value="true">
+        <equals arg1="${build.test}" arg2="false" />
+    </condition>
 
     <!-- flags -->
     <property name="hy.no.thr" value="false" />
@@ -353,7 +365,7 @@
 
     <property name="findBugs.report" location="../../build/findbugs_report" />
 
-    <target name="echo" depends="svn-prop, svn-info, test-jre-vm-info"
+    <target name="echo" depends="-svn-prop, -svn-info, test-jre-vm-info"
             description="Display the properties defined by this ant file" >
         <echo>
 Harmony release configuration property:
@@ -412,13 +424,13 @@ Harmony platform properties:
   hy.jdk = ${hy.jdk}
   hy.jre = ${hy.jre}
 
-The following property is only set if the "svn-prop" target has been
+The following property is only set if the "-svn-prop" target has been
 called:
 
   svn.revision = ${svn.revision}
 
 
-The following property is only set if the "svn-info" target has been
+The following property is only set if the "-svn-info" target has been
 called:
 
   svn.info = ${svn.info}
@@ -432,7 +444,7 @@ properties in preference to these:
         </echo>
     </target>
 
-    <target name="svn-prop">
+    <target name="-svn-prop" unless="svn.revision">
         <exec executable="svn">
             <arg value="--non-interactive" />
             <arg value="info" />
@@ -449,7 +461,7 @@ properties in preference to these:
         </exec>
     </target>
 
-    <target name="svn-info">
+    <target name="-svn-info" unless="svn.info">
         <exec executable="svn"
               failifexecutionfails="false"
               resultproperty="svn.rc">
@@ -546,7 +558,9 @@ properties in preference to these:
                 <!-- TODO: modules probably need to work these properties
                      out for themselves in order to reduce coupling -->
                 <property name="hy.test.vm.name" value="${hy.test.vm.name}"/>
-                <property name="depends.oss" value="${depends.oss}"/>
+                <property name="hy.hdk" value="${hy.hdk}"/>
+                <property name="svn.revision" value="${svn.revision}"/>
+                <property name="svn.info" value="${svn.info}"/>
                 <fileset dir="@{dir}" includes="@{includes}" excludes="@{excludes}">
                     <containsregexp expression="&lt;target[^&gt;]*name=&quot;@{target}&quot;"/>
                 </fileset>
@@ -680,6 +694,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"
@@ -700,11 +720,38 @@ 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}" />
             </manifest>
             <metainf refid="hy.required.metainf-files"/>
         </jar>
     </presetdef>
    
+    <macrodef name="compile-classes">
+        <attribute name="description" default="" />
+        <attribute name="destdir" default="../../build/classes" />
+        <element name="javac-elements" />
+        <sequential>
+            <echo message="Compiling @{description}" />
+            
+            <mkdir dir="@{destdir}" />
+
+            <hy.javac sourcepath="" destdir="@{destdir}">
+                <javac-elements />
+                <compilerarg line="${build.compilerarg}" />
+                <bootclasspath>
+                    <fileset dir="${hy.jre}/lib/boot">
+                        <include name="**/*.jar" />
+                    </fileset>
+                </bootclasspath>
+            </hy.javac>
+        </sequential>
+    </macrodef>
+
     <macrodef name="compile-tests">
         <attribute name="description" default="" />
         <attribute name="destdir" default="bin/test" />

Modified: harmony/enhanced/java/trunk/classlib/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/accessibility/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/accessibility/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/accessibility/build.xml Wed May  5 21:29:16 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,70 +41,62 @@
     </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/accessibility.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/accessibility-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/accessibility.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/accessibility.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
+    <target name="-build-jar" unless="skip.java.build"
+            depends="-svn-info,-compile-java,-class-patternset">
         <mkdir dir="${hy.jdk}/jre/lib/boot"/>
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/accessibility.jar"
+        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
                     manifest="META-INF/MANIFEST.MF">
             <fileset refid="classes" />
             <fileset refid="resources" />
         </hy.jar.bin>
 
-        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/accessibility-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
 
     </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}/accessibility_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -119,8 +112,8 @@
 
     </target>
 
-    <target name="compile-tests">
-        <compile-tests description="accessibility api tests">
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} api tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/java/common" />
@@ -129,11 +122,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/trunk/classlib/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/annotation/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/annotation/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/annotation/build.xml Wed May  5 21:29:16 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/annotation.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/annotation-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/annotation.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/annotation.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/annotation.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/annotation-src.jar">
+        <hy.jar.src destfile="${hy.jdk}/jre/lib/boot/${hy.module}-src.jar">
             <fileset dir="src/main/java" />
         </hy.jar.src>
     </target>
 
-    <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}/annotation_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="annotation api tests">
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} api 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/trunk/classlib/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/applet/build.xml?rev=941503&r1=941502&r2=941503&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/applet/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/applet/build.xml Wed May  5 21:29:16 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,69 +41,61 @@
     </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/applet.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/applet-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/applet.jar"
+            jarFile="${hy.jdk}/jre/lib/boot/${hy.module}.jar"
             excludeFilter="make/findbugs-exclude-filter.xml"
-            outputFile="${findBugs.report}/applet.xml"/>
+            outputFile="${findBugs.report}/${hy.module}.xml"/>
     </target>
 
-    <target name="build-jar" depends="svn-info,class-patternset">
-        <hy.jar.bin destfile="${hy.jdk}/jre/lib/boot/applet.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/applet-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}/applet_tests.jar">
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
         </hy.jar.bin>
 
@@ -117,8 +110,8 @@
         </copy>
      </target>
 
-    <target name="compile-tests">
-        <compile-tests description="applet tests">
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java" />
@@ -127,11 +120,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>