Return-Path: 
 <commits-return-64497-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 43769 invoked from network); 26 Oct 2010 07:14:50 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 26 Oct 2010 07:14:50 -0000
Received: (qmail 6851 invoked by uid 500); 26 Oct 2010 07:14:50 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 6823 invoked by uid 500); 26 Oct 2010 07:14:50 -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 6816 invoked by uid 99); 26 Oct 2010 07:14:50 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Oct 2010 07:14:50 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
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; Tue, 26 Oct 2010 07:14:46 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id F12902388865; Tue, 26 Oct 2010 07:13:34 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1027390 [5/6] - in /harmony/enhanced/java/trunk: ./
 classlib/
 classlib/depends/build/ classlib/make/ classlib/modules/accessibility/
 classlib/modules/accessibility/make/ classlib/modules/annotation/
 classlib/modules/annotation/make/ classl...
Date: Tue, 26 Oct 2010 07:13:30 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101026071342.F12902388865@eris.apache.org>

Modified: harmony/enhanced/java/trunk/common_resources/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/make/properties.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/make/properties.xml (original)
+++ harmony/enhanced/java/trunk/common_resources/make/properties.xml Tue Oct 26 07:13:24 2010
@@ -26,17 +26,40 @@
 
     <property file="${user.home}/.harmony.properties" />
     <dirname property="common.basedir"
-             file="${ant.file.Common property definitions}/.."/>
+             file="${ant.file.Common property definitions}"/>
 
-    <import file="${common.basedir}/make/platform.xml"/>
-    <import file="${common.basedir}/make/svn.xml"/>
+    <import file="${common.basedir}/platform.xml"/>
+    <import file="${common.basedir}/svn.xml"/>
 
+    <fail message="Property 'hy.target' is not defined">
+        <condition>
+            <not><isset property="hy.target" /></not>
+        </condition>
+    </fail>
+    <fail message="Property 'hy.component' is not defined">
+        <condition>
+            <not><isset property="hy.component" /></not>
+        </condition>
+    </fail>
+    <fail message="Property 'hy.module' is not defined">
+        <condition>
+            <not><isset property="hy.module" /></not>
+        </condition>
+    </fail>
+    <property name="hy.hdk" location="${hy.target}/hdk" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
+    <property name="hy.build.root" location="${hy.target}/build" />
+    <property name="hy.build" location="${hy.build.root}/${hy.component}" />
+    <property name="hy.build.top" location="${hy.build}/toplevel" />
+    <property name="hy.build.mod" location="${hy.build}/${hy.module}" />
 
-    <!-- Root directory of the common dependemcy pool -->
-    <property name="base.dep.dir" location="${common.basedir}/depends"/>
+    <!-- Root directory of the common dependency pool -->
+    <property name="hy.depends" location="${hy.target}/depends" />
 
     <!-- Debug or release version -->
     <property name="hy.cfg" value="debug" />
+    <property name="hy.specification.version" value="1.5" />
 
     <!-- Javac properties -->
     <!-- Explicitly set to ECJ as the default compiler. -->
@@ -45,18 +68,20 @@
     <property name="hy.javac.source" value="1.5" />
     <property name="hy.javac.target" value="1.5" />
     <property name="hy.javac.maxmem" value="384M" />
+    <property name="build.compilerarg" value="-nowarn" />
 
     <!-- Temporarily always include class file debug info -->
     <condition property="hy.javac.debug" value="on" else="on">
         <equals arg1="${hy.cfg}" arg2="debug" />
     </condition>
 
-    <!-- Local variable tables should be available in debug, and
-         omitted in release modes. -->
-    <condition property="build.compilerarg" value="-nowarn -g"
-               else="-nowarn -g:lines,source">
+    <!-- Include only stack trace information into release build -->
+    <condition property="hy.javac.debuglevel" value="lines,vars,source"
+               else="lines,source">
         <equals arg1="${hy.cfg}" arg2="debug" />
     </condition>
+    <property name="hy.jar.compress" value="true" />
+
 
     <!-- During packaging, these files must be copied into the meta-inf dir -->
     <fileset id="hy.required.metainf-files" dir="${hy.hdk}">
@@ -68,34 +93,14 @@
     <property name="hy.test.forkmode" value="once" />
     <property name="hy.test.timeout" value="900000" />
     <property name="hy.test.vmargs" value="" />
-
-    <condition property="hy.platform.suffix" value=".libstdc++5">
-        <isset property="use.libstdc++5"/>
-    </condition>
-    <condition property="hy.platform.suffix" value=".8x">
-        <!-- matches would be better but debian stable has ant 1.6.5
-             and matches was only added to 1.7.0 and above -->
-        <and>
-            <equals arg1="FreeBSD" arg2="${os.name}" casesensitive="false" /> 
-            <contains substring="8." string="${os.version}"/>
-        </and>
-    </condition>
-    <condition property="hy.platform.suffix" value=".7x">
-        <!-- matches would be better but debian stable has ant 1.6.5
-             and matches was only added to 1.7.0 and above -->
-        <and>
-            <equals arg1="FreeBSD" arg2="${os.name}" casesensitive="false" /> 
-            <contains substring="7." string="${os.version}"/>
-        </and>
+    <condition property="hy.run.impl.tests" value="true">
+        <istrue value="${hy.test.impl}" />
     </condition>
-    <property name="hy.platform.suffix" value="" />
-    <property name="hy.platform.variant"
-              value="${hy.platform}${hy.platform.suffix}" />
 
     <condition property="png.home" value="/usr/local">
         <isset property="is.freebsd"/>
     </condition>
-    <condition property="png.home" value="/sw">
+    <condition property="png.home" value="/opt/local">
         <isset property="is.macosx"/>
     </condition>
     <property name="png.home" value="/usr" />
@@ -103,7 +108,7 @@
     <condition property="lcms.home" value="/usr/local">
         <isset property="is.freebsd"/>
     </condition>
-    <condition property="lcms.home" value="/sw">
+    <condition property="lcms.home" value="/opt/local">
         <isset property="is.macosx"/>
     </condition>
     <property name="lcms.home" value="/usr" />
@@ -111,45 +116,125 @@
     <condition property="jpeg.home" value="/usr/local">
         <isset property="is.freebsd"/>
     </condition>
-    <condition property="jpeg.home" value="/sw">
+    <condition property="jpeg.home" value="/opt/local">
         <isset property="is.macosx"/>
     </condition>
     <property name="jpeg.home" value="/usr" />
     
-    <!-- default property for call-modules macro - i.e. all modules -->
+    <condition property="is.select" value="true">
+        <istrue value="${hy.select}" />
+    </condition>
+    <condition property="is.not.select" value="true">
+        <not><istrue value="${hy.select}" /></not>
+    </condition>
+
+    <!-- default property for poll-modules macro - i.e. all modules -->
     <property name="build.module" value="*" />
+    <condition property="exclude.module"
+            value="accessibility,applet,awt,imageio,orb,print,rmi,sound,swing">
+        <istrue value="${hy.select}" />
+    </condition>
     <property name="exclude.module" value="nothing" />
-
-    <!-- names of exclude lists, used by prepare-exclude-list macro -->
-    <property name="common.exclude.file" value="exclude.common" />
-    <property name="common.exclude.interm" value="exclude.interm" />
-    <property name="platform.exclude.file"
-              value="exclude.${hy.platform}.${hy.test.vm.name}" />
-    <property name="platform.exclude.interm"
-              value="exclude.${hy.platform}.${hy.test.vm.name}.interm" />
+    <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" />
     <condition property="hy.skip.thr" value="true">
-        <not>
-            <equals arg1="${hy.no.thr}" arg2="false" />
-        </not>
+        <istrue value="${hy.no.thr}" />
+    </condition>
+
+    <property name="hy.thr.no.deploy" value="false" />
+    <condition property="hy.thr.deploy" value="true">
+        <equals arg1="${hy.thr.no.deploy}" arg2="false" />
     </condition>
 
     <property name="hy.local.zlib" value="false" />
     <condition property="hy.skip.zlib" value="true">
-        <not>
-            <equals arg1="${hy.local.zlib}" arg2="false" />
-        </not>
+        <istrue value="${hy.local.zlib}" />
     </condition>
 
     <property name="hy.zip.api" value="false" />
     <condition property="hy.skip.zip.api" value="true">
-        <not>
-            <equals arg1="${hy.zip.api}" arg2="true" />
-        </not>
+        <isfalse value="${hy.zip.api}" />
      </condition>
 
+    <condition property="hy.portlib.stubs" value="true">
+        <or>
+            <equals arg1="${hy.os}" arg2="aix" />
+            <equals arg1="${hy.os}" arg2="zos" />
+        </or>
+    </condition>
+    <property name="hy.portlib.stubs" value="false" />
+
+    <condition property="hy.platform.suffix" value=".libstdc++5">
+        <isset property="use.libstdc++5"/>
+    </condition>
+    <condition property="hy.platform.suffix" value=".8x">
+        <!-- matches would be better but debian stable has ant 1.6.5
+             and matches was only added to 1.7.0 and above -->
+        <and>
+            <equals arg1="FreeBSD" arg2="${os.name}" casesensitive="false" /> 
+            <contains substring="8." string="${os.version}"/>
+        </and>
+    </condition>
+    <condition property="hy.platform.suffix" value=".7x">
+        <!-- matches would be better but debian stable has ant 1.6.5
+             and matches was only added to 1.7.0 and above -->
+        <and>
+            <equals arg1="FreeBSD" arg2="${os.name}" casesensitive="false" /> 
+            <contains substring="7." string="${os.version}"/>
+        </and>
+    </condition>
+    <property name="hy.platform.suffix" value="" />
+    <property name="hy.platform.variant"
+              value="${hy.platform}${hy.platform.suffix}" />
+
+    <!-- fileset to represent classes built by a module. -->
+    <fileset id="classes" dir="${hy.build.top}/java">
+        <includesfile name="${hy.hdk}/build/ant/patternsets/${hy.module}.txt" />
+    </fileset>
+
+    <!-- fileset for resources of a module. -->
+    <fileset id="resources" dir="src/main/java">
+        <exclude name="**/*.java" />
+    </fileset>
+
+    <!-- fileset for resources of a module with platform-dependent code. -->
+    <fileset id="common.resources" dir="src/main/java/common">
+        <exclude name="**/*.java" />
+    </fileset>
+
+    <!-- test properties -->
+    <property name="tests.output" location="../../build/test_report" />
+    <property name="tests.hdk.dir" value="${hy.hdk}/build/test/${hy.module}" />
+    <property name="tests.excludes.hdk.dir" value="${tests.hdk.dir}/excludes" />
+    <property name="tests.resources.hdk.dir"
+              value="${tests.hdk.dir}/resources" />
+
+    <property name="findBugs.report" location="../../build/findbugs_report" />
+
+    <propertyset id="module.props">
+        <propertyref name="hy.component" />
+        <propertyref name="hy.cfg" />
+        <propertyref name="hy.test.vm.name" />
+        <propertyref name="svn.revision" />
+        <propertyref name="svn.info" />
+        <propertyref name="hy.no.thr" />
+        <propertyref name="hy.zip.api" />
+        <propertyref name="hy.select" />
+    </propertyset>
+
     <target name="echo" depends="-svn-info, test-jre-vm-info"
             description="Display the properties defined by this ant file" >
         <echo>
@@ -172,6 +257,7 @@ Harmony test properties:
     hy.test.timeout = ${hy.test.timeout}
     hy.test.vm.name = ${hy.test.vm.name}
     hy.test.vmargs = ${hy.test.vmargs}
+    findbugs.available = ${findbugs.available}
 
 Harmony platform properties:
 
@@ -205,7 +291,8 @@ Harmony platform properties:
   make.command = ${make.command}
 
   hy.hdk = ${hy.hdk}
-
+  hy.jdk = ${hy.jdk}
+  hy.jre = ${hy.jre}
 
 The following properties are only set if the "-svn-info" target has been
 called:
@@ -232,14 +319,14 @@ properties in preference to these:
         </condition>
         <!-- FIXME current behavior relies on the fact that J9 VM doesn't
              support -version parameter -->
-        <condition property="hy.test.vm.name" value="drl" else="ibm" >
-            <contains string="${test.vm.info.tmp}" substring="harmony" />
+        <condition property="hy.test.vm.name" value="ibm" else="drl" >
+            <contains string="${test.vm.info.tmp}" substring="IBM" casesensitive="false" />
         </condition>
         <echo level="info" message="hy.test.vm.name = ${hy.test.vm.name}" />
     </target>
 
     <target name="-get-test-vm-output">
-        <condition property="test.jre.home" value="${hy.jdk}/jre">
+        <condition property="test.jre.home" value="${hy.jre}">
             <not><isset property="test.jre.home" /></not>
         </condition>
         <exec executable="${test.jre.home}/bin/java" failifexecutionfails="false">
@@ -248,35 +335,83 @@ properties in preference to these:
         </exec>
     </target>
 
-    <macrodef name="call-modules">
+    <macrodef name="poll-modules" 
+        description="directory-based macros for polling sub-builds">
         <attribute name="target" />
+        <attribute name="dir" default="modules" />
+        <attribute name="includes" default="${build.module}"/>
+        <attribute name="excludes" default="${exclude.module}"/>
+        <attribute name="antfile" default="*.xml"/>
         <sequential>
+            <!-- convert dirset pattern to fileset pattern-->
+            <property name="@{dir}.loc" location="@{dir}"/>
+            <pathconvert property="list.@{dir}.@{target}" 
+                pathsep="${file.separator}@{antfile}," setonempty="no">
+                <path>
+                    <dirset dir="@{dir}"
+                            includes="@{includes}"
+                            excludes="@{excludes}">
+                        <exclude name=".*" />
+                    </dirset>
+                </path>
+                <map from="${@{dir}.loc}${file.separator}" to=""/>
+            </pathconvert>
+            <!-- append antfile suffix to last item in the list, if any -->
+            <condition property="poll.@{dir}.@{target}"
+                value="${list.@{dir}.@{target}}${file.separator}@{antfile}" 
+                else="">
+                <isset property="list.@{dir}.@{target}"/>
+            </condition>
+            <poll-build target="@{target}" dir="@{dir}" 
+                includes="${poll.@{dir}.@{target}}"/>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="poll-build"
+        description="plain-filter macros for polling sub-builds">
+        <attribute name="target" />
+        <attribute name="dir" />
+        <attribute name="includes" default="**/*.xml"/>
+        <attribute name="excludes" default=""/>
+        <sequential>
+            <echo message="polling @{includes}"/>
             <subant target="@{target}">
-                <property name="hy.test.vm.name" value="${hy.test.vm.name}"/>
-                <dirset dir="modules"
-                        includes="${build.module}"
-                        excludes="${exclude.module}">
-                    <exclude name=".*" />
-                </dirset>
+                <!-- TODO: modules probably need to work these properties
+                     out for themselves in order to reduce coupling -->
+                <property name="hy.target" location="${hy.target}"/>
+                <propertyset refid="module.props" />
+                <fileset dir="@{dir}" includes="@{includes}" excludes="@{excludes}">
+                    <containsregexp expression="&lt;target[^&gt;]*name=&quot;@{target}&quot;"/>
+                </fileset>
             </subant>
         </sequential>
     </macrodef>
 
-    <condition property="make.arg" value="/nologo">
-        <isset property="is.windows"/>
-    </condition>
-    <property name="make.arg" value="" />
-
     <macrodef name="make">
         <attribute name="dir" />
         <attribute name="target" default="" />
         <element name="make-elements" optional="true" />
         <sequential>
             <echo>Making "@{target}" in @{dir}</echo>
+            <echo file="${hy.hdk}/build/make/properties.${make.suffix}">
+HY_ZIP_API=${hy.zip.api}
+HY_PORTLIB_STUBS=${hy.portlib.stubs}
+HY_CFG=${hy.cfg}
+HY_ARCH=${hy.arch}
+HY_ARCH_FAMILY=${hy.arch.family}
+HY_OS=${hy.os}
+HY_PLATFORM=${hy.platform}
+HY_NO_THR=${hy.no.thr}
+HY_THR_NO_DEPLOY=${hy.thr.no.deploy}
+HY_LOCAL_ZLIB=${hy.local.zlib}
+HY_SHLIB_SUFFIX=${shlib.suffix}
+HY_LINKLIB_SUFFIX=${linklib.suffix}
+            </echo>                
             <exec failonerror="true"
                   executable="${make.command}"
                   dir="@{dir}">
                 <env key="HY_HDK" value="${hy.hdk}" />
+                <env key="HY_TARGET" value="${hy.target}" />
                 <arg line="${make.arg}" />
                 <arg line="@{target}" />
                 <make-elements />
@@ -305,6 +440,14 @@ properties in preference to these:
     </macrodef>
     <convert-test from="test.case" to="converted.tc" />
     
+    <!-- names of exclude lists, used by prepare-exclude-list macro -->
+    <property name="common.exclude.file" value="exclude.common" />
+    <property name="common.exclude.interm" value="exclude.interm" />
+    <property name="platform.exclude.file"
+              value="exclude.${hy.platform}.${hy.test.vm.name}" />
+    <property name="platform.exclude.interm"
+              value="exclude.${hy.platform}.${hy.test.vm.name}.interm" />
+
     <!-- Concatenate several exclude lists into single list -->
     <macrodef name="prepare-exclude-list">
        <attribute name="moduleName"/>
@@ -396,9 +539,383 @@ 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="${hy.build.top}/java" />
+        <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="${hy.build.mod}/test/api" />
+        <element name="javac-elements" />
+        <sequential>
+            <echo message="Compiling @{description}" />
+            
+            <mkdir dir="@{destdir}" />
+
+            <mkdir dir="${hy.hdk}/build/test" />
+            <copy file="${junit.jar}"
+                  tofile="${hy.hdk}/build/test/junit.jar" />
+            <copy file="${hamcrest-library.jar}"
+                  tofile="${hy.hdk}/build/test/hamcrest-library.jar" />
+            
+            <hy.javac destdir="@{destdir}">
+
+                <javac-elements />
+
+                <compilerarg line="${build.compilerarg}" />
+
+                <bootclasspath>
+                    <fileset dir="${hy.jre}/lib/boot">
+                        <include name="**/*.jar" />
+                    </fileset>
+                </bootclasspath>
+
+                <classpath location="${hy.build.top}/java" />
+                <classpath location="${hy.hdk}/build/test/junit.jar" />
+                <classpath
+                     location="${hy.hdk}/build/test/hamcrest-library.jar" />
+                <classpath location="${hy.hdk}/build/test/support.jar" />
+            </hy.javac>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="run-hdk-tests">
+        <attribute name="module" />
+        <attribute name="jar" />
+        <element name="junit-elements" optional="true"/>
+        <element name="excludeorinclude" optional="true"/>
+        <sequential>
+            <echo message="Running @{module} Unit Test from @{jar}" />
+            <echo message="Tested jre: ${test.jre.home}/bin/java" />
+            <property name="test.module.dir" value="${hy.test.root}/@{module}" />
+            <property name="test.excludes.dir" value="${test.module.dir}/excludes" />
+            <property name="test.resources.dir" value="${test.module.dir}/resources" />
+            <property name="module.work.dir" location="${work.dir}/@{module}" />
+            <property name="test.exclude.file" value="${module.work.dir}/test.exclude" />
+
+            <property name="module.temp.dir"
+                      location="${work.dir}/@{module}/temp" />
+            <property name="junit.tempdir"
+                      location="${module.temp.dir}/ant" />
+            <property name="junit.java.io.tmpdir"
+                      location="${module.temp.dir}/tmpdir" />
+            <property name="junit.user.home"
+                      location="${module.temp.dir}/user" />
+            
+            <mkdir dir="${tests.output}" /> 
+            <mkdir dir="${junit.tempdir}" />
+            <mkdir dir="${junit.java.io.tmpdir}" />
+            <mkdir dir="${junit.user.home}" />
+
+            <prepare-exclude-list moduleName="@{module}" dir="${test.excludes.dir}" result="${test.exclude.file}" />
+            <junit fork="yes" 
+                   forkmode="${hy.test.forkmode}" 
+                   timeout="${hy.test.timeout}" 
+                   printsummary="withOutAndErr" 
+                   errorproperty="test.errors" 
+                   failureproperty="test.failures" 
+                   showoutput="on" 
+                   dir="${work.dir}/@{module}" 
+                   tempdir="${junit.tempdir}"
+                   jvm="${test.jre.home}/bin/java">
+
+                <jvmarg line="-Djava.io.tmpdir=${junit.java.io.tmpdir}" />
+                <jvmarg line="-Duser.home=${junit.user.home}" />
+
+                <classpath>
+                    <fileset dir="${hy.test.root}">
+                        <include name="*.jar" />
+                    </fileset>
+                    <pathelement path="${test.resources.dir}/" />
+                    <pathelement path="${test.module.dir}/" />
+                    <pathelement location="${test.module.dir}/@{jar}" />
+                </classpath>
+
+                <junit-elements />
+
+                <batchtest todir="${tests.output}" haltonfailure="no">
+                    <zipfileset src="${test.module.dir}/@{jar}" encoding="UTF-8">
+                        <exclude name="Test.class" />
+                        <exclude name="**/*$*" />
+
+                        <!-- if ${test.case}     -->
+                        <include name="${converted.tc.class}" if="test.case" />
+                        <!-- unless ${test.case} -->
+                        <include name="**/*Test.class" unless="test.case" />
+                        <excludesfile name="${test.exclude.file}" unless="test.case"/>
+                        <excludeorinclude/>
+                    </zipfileset>
+                </batchtest>
+
+                <assertions enableSystemAssertions="true">
+                    <enable />
+                </assertions>
+
+                <jvmarg line="${hy.test.vmargs}" />
+                <!-- Used by Support_Exec.execJava() -->
+                <jvmarg value="-Dhy.test.vmargs=${hy.test.vmargs}" />
+
+                <formatter type="xml" />
+            </junit>
+
+            <delete dir="${module.temp.dir}"
+                    includeemptydirs="true" failonerror="false" />
+
+            <antcall target="touch-failures-file">
+                <param name="module" value="@{module}" />
+            </antcall>
+            <antcall target="touch-errors-file">
+                <param name="module" value="@{module}" />
+            </antcall>
+
+        </sequential>
+    </macrodef>
+
+    <!-- TOFIX: Can't seem to override the line:
+             <include name="**/*Test.class" unless="test.case" />
+         so this is just run-hdk-tests without that line -->
+    <macrodef name="run-selected-hdk-tests">
+        <attribute name="module" />
+        <attribute name="jar" />
+        <element name="junit-elements" optional="true"/>
+        <element name="excludeorinclude" optional="true"/>
+        <sequential>
+            <echo message="Running @{module} Unit Test from @{jar}" />
+            <echo message="Tested jre: ${test.jre.home}/bin/java" />
+            <property name="test.module.dir" value="${hy.test.root}/@{module}" />
+            <property name="test.excludes.dir" value="${test.module.dir}/excludes" />
+            <property name="test.resources.dir" value="${test.module.dir}/resources" />
+            <property name="module.work.dir" location="${work.dir}/@{module}" />
+            <property name="test.exclude.file" value="${module.work.dir}/test.exclude" />
+
+            <property name="module.temp.dir"
+                      location="${work.dir}/@{module}/temp" />
+            <property name="junit.tempdir"
+                      location="${module.temp.dir}/ant" />
+            <property name="junit.java.io.tmpdir"
+                      location="${module.temp.dir}/tmpdir" />
+            <property name="junit.user.home"
+                      location="${module.temp.dir}/user" />
+            
+            <mkdir dir="${tests.output}" /> 
+            <mkdir dir="${junit.tempdir}" />
+            <mkdir dir="${junit.java.io.tmpdir}" />
+            <mkdir dir="${junit.user.home}" />
+
+            <prepare-exclude-list moduleName="@{module}" dir="${test.excludes.dir}" result="${test.exclude.file}" />
+            <junit fork="yes" 
+                   forkmode="${hy.test.forkmode}" 
+                   timeout="${hy.test.timeout}" 
+                   printsummary="withOutAndErr" 
+                   errorproperty="test.errors" 
+                   failureproperty="test.failures" 
+                   showoutput="on" 
+                   dir="${work.dir}/@{module}" 
+                   tempdir="${junit.tempdir}"
+                   jvm="${test.jre.home}/bin/java">
+
+                <jvmarg line="-Djava.io.tmpdir=${junit.java.io.tmpdir}" />
+                <jvmarg line="-Duser.home=${junit.user.home}" />
+
+                <classpath>
+                    <fileset dir="${hy.test.root}">
+                        <include name="*.jar" />
+                    </fileset>
+                    <pathelement path="${test.resources.dir}/" />
+                    <pathelement path="${test.module.dir}/" />
+                    <pathelement location="${test.module.dir}/@{jar}" />
+                </classpath>
+
+                <junit-elements />
+
+                <batchtest todir="${tests.output}" haltonfailure="no">
+                    <zipfileset src="${test.module.dir}/@{jar}" encoding="UTF-8">
+                        <exclude name="Test.class" />
+                        <exclude name="**/*$*" />
+
+                        <!-- if ${test.case}     -->
+                        <include name="${converted.tc.class}" if="test.case" />
+                        <!-- unless ${test.case} -->
+                        <excludesfile name="${test.exclude.file}" unless="test.case"/>
+                        <excludeorinclude/>
+                    </zipfileset>
+                </batchtest>
+
+                <assertions enableSystemAssertions="true">
+                    <enable />
+                </assertions>
+
+                <jvmarg line="${hy.test.vmargs}" />
+                <!-- Used by Support_Exec.execJava() -->
+                <jvmarg value="-Dhy.test.vmargs=${hy.test.vmargs}" />
+
+                <formatter type="xml" />
+            </junit>
+
+            <delete dir="${module.temp.dir}"
+                    includeemptydirs="true" failonerror="false" />
+
+            <antcall target="touch-failures-file">
+                <param name="module" value="@{module}" />
+            </antcall>
+            <antcall target="touch-errors-file">
+                <param name="module" value="@{module}" />
+            </antcall>
+
+        </sequential>
+    </macrodef>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${tests.output}/test.failures"
+            append="true">${module}${line.separator}</echo>
+    </target>
+
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${tests.output}/test.errors"
+            append="true">${module}${line.separator}</echo>
+    </target>
+
+    <!-- To use with -Dtest.case=... option                   -->
+    <!-- if ${test.case} is provided in package+class form    -->
+    <!-- it is converted to dir+filename form                 -->
+    <macrodef name="convert-test-as-class">
+        <attribute name="from" />
+        <attribute name="to" />
+        <sequential>
+            <pathconvert property="@{to}" setonempty="no">
+                <path path="${@{from}}" />
+                <chainedmapper>
+                    <filtermapper>
+                        <replaceregex pattern="\.java$$" />
+                    </filtermapper>
+                    <unpackagemapper from="${basedir}${file.separator}*" to="*.class" />
+                </chainedmapper>
+            </pathconvert>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="make-patternset">
+        <attribute name="source" default="src/main" />
+        <attribute name="module" />
+        <attribute name="file"
+                   default="${hy.hdk}/build/ant/patternsets/@{module}.txt" />
+        <sequential>
+            <dirname file="@{file}" property="@{file}.dir" />
+            <mkdir dir="${@{file}.dir}" />
+            <property name="@{source}.loc" location="@{source}"/>
+
+            <pathconvert targetos="unix" property="@{file}.content"
+                         pathsep="${line.separator}">
+                <fileset dir="${@{source}.loc}" includes="java*/**/*.java" />
+                <map from="${@{source}.loc}/java/unix/" to="" />
+                <map from="${@{source}.loc}/java/windows/" to="" />
+                <map from="${@{source}.loc}/java/common/" to="" />
+                <map from="${@{source}.loc}/java5/" to="" />
+                <map from="${@{source}.loc}/java/" to="" />
+                <compositemapper>
+                    <mapper type="regexp" from="^(.*)\.java$$" to="\1.*"/>
+                    <mapper type="regexp" from="^(.*)\.java$$" to="\1$*.*"/>
+                </compositemapper>
+            </pathconvert>
+            <echo message="${@{file}.content}${line.separator}"
+                  file="@{file}" />
+        </sequential>
+    </macrodef>
+
+    <macrodef name="delete-patternset">
+        <attribute name="module" />
+        <sequential>
+            <delete file="${hy.hdk}/build/ant/patternsets/@{module}.txt" />
+        </sequential>
+    </macrodef>
+
+    <macrodef name="run-findBugs">
+       <attribute name="outputFile"/>
+       <attribute name="excludeFilter"/>
+       <attribute name="jarFile"/>
+       <sequential>
+           <!-- Find and define findbugs task -->
+           <property name="findbugs.home" location="${basedir}/../../depends/oss/findbugs-1.3.9"/>
+           <available
+               classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
+               classpath="${findbugs.home}/lib/findbugs-ant.jar"
+               property="findbugs.available"/>
+           <taskdef
+               name="findbugs"
+               classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
+               classpath="${findbugs.home}/lib/findbugs-ant.jar"
+               onerror="ignore"/>
+          <fail message="FindBugs is unavailable" unless="findbugs.available"/>
+
+          <!-- Run findbugs using the attributes given -->
+          <dirname file="@{outputFile}" property="@{outputFile}.dir" />
+          <mkdir dir="${@{outputFile}.dir}" />
+          <findbugs home="${findbugs.home}"
+            output="xml"
+            outputFile="@{outputFile}"
+            excludeFilter="@{excludeFilter}"
+            jvmargs="-Xmx512M"
+            workhard="true">
+            <auxClasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </auxClasspath>
+            <sourcePath path="src/main/java" />
+            <sourcePath path="src/main/java5" />
+            <sourcePath path="src/main/java/common" />
+            <sourcePath path="src/main/java/${hy.os.family}" />
+            <class location="@{jarFile}" />
+        </findbugs>
+       </sequential>
+    </macrodef>
+
+    <macrodef name="init-hdk">
+        <sequential>
+            <mkdir dir="${hy.hdk}/build/ant" />
+            <copy file="${common.resources}/make/depends.xml"
+                  tofile="${hy.hdk}/build/ant/depends.xml"
+                  outputencoding="UTF-8" />
+            <copy file="${common.resources}/make/depends.properties"
+                  tofile="${hy.hdk}/build/ant/depends.properties"
+                  outputencoding="UTF-8" />
+
+	    <mkdir dir="${hy.hdk}/build/make" />
+	    <copy todir="${hy.hdk}/build/make" overwrite="yes">
+                <fileset dir="${common.resources}/depends/build">
+                    <include name="**" />
+                </fileset>
+            </copy>
+
+        </sequential>
+    </macrodef>
 
 </project>

Modified: harmony/enhanced/java/trunk/common_resources/make/svn.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/make/svn.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/make/svn.xml (original)
+++ harmony/enhanced/java/trunk/common_resources/make/svn.xml Tue Oct 26 07:13:24 2010
@@ -48,62 +48,6 @@
         </tstamp>
     </target>
     
-    <target name="fetch-svn">
-        <setup-svn dep="${dependency}"/>
-        <antcall target="svn-co" inheritAll="false">
-            <propertyset>
-                <propertyref prefix="${dependency}."/>
-                <mapper type="glob" from="${dependency}.*" to="dep.*"/>
-            </propertyset>
-        </antcall>
-    </target>
-
-    <target name="svn-co" unless="dep.svn.dir.uptodate">
-        <exec executable="svn" failonerror="true">
-            <arg line="co -r ${dep.svn.revision} ${dep.svn.url} ${dep.svn.dir}" />
-        </exec>
-    </target>
-
-    <target name="check-svn">
-        <check-svn dep="${dependency}"/>
-    </target>
-    
-    <macrodef name="check-svn">
-        <attribute name="dep" />
-        <sequential>
-            <setup-svn dep="@{dep}"/>
-            <echo message="Checking @{dep} SVN workspace at ${@{dep}.svn.dir}"/>
-            <fail unless="@{dep}.svn.dir.uptodate">
-                ...
-Dependency is not available or out of date: ${dependency}.
-It should be checked out
-    from SVN repository: ${@{dep}.svn.url} 
-    revision: ${@{dep}.svn.revision}
-    to: ${@{dep}.svn.dir}
-    
-Run "ant fetch-depends" to automatically fetch dependencies.
-Note: Some of Harmony's dependencies are licensed under terms other
-than the Apache License v2.                
-            </fail>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="setup-svn">
-        <attribute name="dep" />
-        <sequential>
-            <property name="@{dep}.svn.dir" value="${depends.oss}/@{dep}"/>
-            <property name="@{dep}.svn.revision" value="HEAD"/>
-            <svn-info dir="${@{dep}.svn.dir}" prefix="@{dep}"/>
-
-            <condition property="@{dep}.svn.dir.uptodate">
-                <and>
-                    <equals arg1="${@{dep}.svn.revision}" arg2="${@{dep}.entry.revision}"/>
-                    <equals arg1="${@{dep}.svn.url}" arg2="${@{dep}.entry.url}"/>
-                </and>
-            </condition>
-        </sequential>
-    </macrodef>
-    
     <macrodef name="svn-info">
         <attribute name="dir" />
         <attribute name="prefix" default=""/>

Modified: harmony/enhanced/java/trunk/drlvm/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/build.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/build.xml Tue Oct 26 07:13:24 2010
@@ -21,6 +21,16 @@
     	Build contributed source and lay out results in the required format 
     </description>
     
+    <property name="hy.target" location="target" />
+    <property name="hy.component" value="drlvm" />
+    <property name="hy.module" value="toplevel" />
+
+    <fail message="Property 'common.resources' is not defined">
+        <condition>
+            <not><isset property="common.resources" /></not>
+        </condition>
+    </fail>
+
     <import file="make/properties.xml"/>
 
     <target name="help">
@@ -111,67 +121,100 @@ Usage:
 
     <target name="build-extra" depends=""
         description="Compiles external dependencies">
-        <ant antfile="make/extra/apr.xml"/>
+        <ant antfile="make/extra/apr.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="encoder">
-        <ant antfile="make/vm/encoder.xml"/>
+        <ant antfile="make/vm/encoder.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="port" depends="build-extra">
-        <ant antfile="make/vm/port.xml"/>
+        <ant antfile="make/vm/port.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="port_ch" depends="port">
-        <ant antfile="make/vm/port_ch.xml"/>
+        <ant antfile="make/vm/port_ch.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="hythr" depends="port">
-        <ant antfile="make/vm/hythr.xml"/>
+        <ant antfile="make/vm/hythr.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="verifier">
-        <ant antfile="make/vm/verifier.xml"/>
+        <ant antfile="make/vm/verifier.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
-    <target name="verifier-ext" description="Build a verifier extentions library">
-        <ant antfile="make/vm/verifier-ext.xml"/>
+    <target name="verifier-ext"
+            description="Build a verifier extentions library">
+        <ant antfile="make/vm/verifier-ext.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
-    <target name="clean-verifier-ext" description="Clean a verifier extentions library">
-        <ant antfile="make/vm/verifier-ext.xml" target="clean"/>
+    <target name="clean-verifier-ext"
+            description="Clean a verifier extentions library">
+        <ant antfile="make/vm/verifier-ext.xml" target="clean"
+             inheritall="false">
+            <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="vmcore" depends="encoder, port, port_ch, hythr, verifier">
-        <ant antfile="make/vm/vmcore.xml"/>
+        <ant antfile="make/vm/vmcore.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="em" depends="vmcore">
-        <ant antfile="make/vm/em.xml"/>
+        <ant antfile="make/vm/em.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="interpreter" depends="vmcore">
-        <ant antfile="make/vm/interpreter.xml"/>
+        <ant antfile="make/vm/interpreter.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="kernel">
-        <ant antfile="make/vm/kernel.xml"/>
+        <ant antfile="make/vm/kernel.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="vmi" depends="vmcore">
-        <ant antfile="make/vm/vmi.xml"/>
+        <ant antfile="make/vm/vmi.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="jitrino" depends="vmcore">
-        <ant antfile="make/vm/jitrino.xml"/>
+        <ant antfile="make/vm/jitrino.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="gc_gen" depends="vmcore,kernel">
-        <ant antfile="make/vm/gc_gen.xml"/>
+        <ant antfile="make/vm/gc_gen.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="-init-hdk">
-        <copy todir="${hy.hdk}/jdk/include">
+        <copy todir="${hy.hdk}/jdk/include" preservelastmodified="true">
             <fileset dir="vm/include">
                 <include name="jvmti.h" />
                 <include name="jvmti_types.h" />
@@ -202,7 +245,8 @@ Usage:
             deploy the rest of product
          ================================================================-->
     <target name="deploy">
-        <copy todir="${drlvm.deploy.dir}/jdk/include">
+        <copy todir="${drlvm.deploy.dir}/jdk/include"
+              preservelastmodified="true">
             <fileset dir="${vm.home}/include">
                 <include name="jni_types.h" />
                 <include name="jvmti_types.h" />
@@ -223,7 +267,8 @@ Usage:
         </delete>
         
         <!-- launcher should use our hythr -->
-        <copy todir="${drlvm.deploy.dir}/jdk/jre/bin" overwrite="yes">
+        <copy todir="${drlvm.deploy.dir}/jdk/jre/bin"
+              preservelastmodified="true" overwrite="yes">
             <fileset dir="${drlvm.bin.dir}">
                 <include name="*hythr*"/>
             </fileset>

Modified: harmony/enhanced/java/trunk/drlvm/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/build-java.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/build-java.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/build-java.xml Tue Oct 26 07:13:24 2010
@@ -41,7 +41,7 @@
     </macrodef>
 
     <macrodef name="make-java">
-        <attribute name="component" default="${component}"/>
+        <attribute name="component" default="${hy.module}"/>
         <attribute name="src"/>
         <attribute name="manifest"/>
         <element name="javac-elements" implicit="yes" optional="yes"/>

Modified: harmony/enhanced/java/trunk/drlvm/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/build-native.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/build-native.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/build-native.xml Tue Oct 26 07:13:24 2010
@@ -21,7 +21,7 @@
     <import file="${bn.imported.basedir}/properties.xml"/>
     
     <macrodef name="clean-native">
-        <attribute name="component" default="${component}"/>
+        <attribute name="component" default="${hy.module}"/>
         <sequential>
             <delete quiet="true" dir="${drlvm.semi.dir}/@{component}" />
         </sequential>
@@ -118,7 +118,7 @@
         </presetdef>
 
         <macrodef name="init-native">
-            <attribute name="component" default="${component}"/>
+            <attribute name="component" default="${hy.module}"/>
             <sequential>
                 <echo message="## Building '@{component}'" />
                 
@@ -144,7 +144,7 @@
         </presetdef>
 
         <macrodef name="make-native">
-            <attribute name="libname" default="${component}"/>
+            <attribute name="libname" default="${hy.module}"/>
             <attribute name="type" />
             <element name="cc-elements" implicit="yes" optional="yes"/>
             <sequential>
@@ -172,7 +172,7 @@
         </macrodef>
         
         <macrodef name="link-lib">
-            <attribute name="name" default="${component}"/>
+            <attribute name="name" default="${hy.module}"/>
             <attribute name="type" />
             <element name="link-elements" implicit="yes" optional="yes"/>
             <sequential>    
@@ -189,7 +189,7 @@
             <attribute name="from" default="component.bin.dir"/>
             <sequential>
                 <mkdir dir="${drlvm.lib.dir}" />
-                <copy todir="${drlvm.lib.dir}">
+                <copy todir="${drlvm.lib.dir}" preservelastmodified="true">
                     <fileset dir="${@{from}}">
                         <include name="*${linklib.suffix}" unless="shlib.is.linklib"/>
                         <include name="*.exp" if="is.windows"/>
@@ -197,7 +197,7 @@
                     </fileset>
                 </copy>
                 <mkdir dir="${drlvm.bin.dir}" />
-                <copy todir="${drlvm.bin.dir}">
+                <copy todir="${drlvm.bin.dir}" preservelastmodified="true">
                     <fileset dir="${@{from}}">
                         <include name="*${shlib.suffix}"/>
                         <include name="*.pdb" if="is.windows"/>

Modified: harmony/enhanced/java/trunk/drlvm/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/depends.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/depends.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/depends.xml Tue Oct 26 07:13:24 2010
@@ -26,10 +26,7 @@
         <fail>
             <condition>
                 <not>
-                    <and>
-                    <available file="${hy.hdk}/include"/>
-                    <available file="${hy.hdk}/lib"/>
-                    </and>
+                    <available file="${hy.hdk}/build/ant"/>
                 </not>
             </condition>
 ...

Modified: harmony/enhanced/java/trunk/drlvm/make/extra/apr.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/extra/apr.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/extra/apr.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/extra/apr.xml Tue Oct 26 07:13:24 2010
@@ -18,7 +18,8 @@
 
 <project name="apr-dep" default="build">
     
-    <property name="component" value="apr"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="apr"/>
     <import file="../build-native.xml"/>
 
     <target name="fetch-depends">
@@ -67,7 +68,7 @@
 
     <target name="build" depends="-make-apr-unix,-build-win">
         <mkdir dir="${drlvm.include.dir}" />
-        <copy todir="${drlvm.include.dir}">
+        <copy todir="${drlvm.include.dir}" preservelastmodified="true">
             <fileset dir="${apr.src}/include" includes="*.h" />
         </copy>
     </target>
@@ -75,11 +76,13 @@
     <target name="-make-apr-unix" if="is.unix" depends="apr-configure">
         <!-- simply invoke make to let it build as the APR people suggest  -->
         <exec executable="make" dir="${apr.src}" failonerror="true"/>
-    	<copy file="${apr.src}/.libs/libapr-1.a" todir="${drlvm.lib.dir}" />
+    	<copy file="${apr.src}/.libs/libapr-1.a" preservelastmodified="true"
+              todir="${drlvm.lib.dir}" />
     </target>
     
     <target name="-build-win" if="is.windows" depends="get-src, setup-native-build" >
-        <copy file="${apr.src}/include/apr.hw" tofile="${apr.src}/include/apr.h"/>
+        <copy file="${apr.src}/include/apr.hw" preservelastmodified="true"
+              tofile="${apr.src}/include/apr.h"/>
         
         <init-native />
         <make-native libname="apr-1" type="static">

Added: harmony/enhanced/java/trunk/drlvm/make/extra/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/extra/make/depends.properties?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/extra/make/depends.properties (added)
+++ harmony/enhanced/java/trunk/drlvm/make/extra/make/depends.properties Tue Oct 26 07:13:24 2010
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+

Propchange: harmony/enhanced/java/trunk/drlvm/make/extra/make/depends.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/java/trunk/drlvm/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/properties.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/properties.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/properties.xml Tue Oct 26 07:13:24 2010
@@ -46,21 +46,8 @@
     </condition>
     <property name="hy.cpp.compiler" value="gcc"/>
         
-    
-    <!-- set the path root for the external resources  -->
-    <property name="common.resources.loc" value="${drlvm.base.dir}/../common_resources" />
-    <property name="common.resources" location="${common.resources.loc}" />
-    <fail>
-        <condition>
-            <not><available file="${common.resources}/make/properties.xml"/></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"/>
+    <import file="${hy.target}/hdk/build/ant/properties.xml"/>
+    <import file="${hy.target}/hdk/build/ant/depends.xml"/>
 
     <!-- define drlvm-specific resources -->
     <loadproperties srcfile="${prop.imported.basedir}/depends.properties">
@@ -87,7 +74,7 @@
     </condition>
 
     <property name="vm.home" location="${drlvm.base.dir}/vm" />        
-    <property name="drlvm.build.dir" location="${drlvm.base.dir}/build/${hy.os}_${hy.arch}_${hy.cpp.compiler}_${hy.cfg}" />
+    <property name="drlvm.build.dir" location="${hy.target}/build/drlvm/all" />
     <property name="drlvm.deploy.dir" location="${drlvm.build.dir}/deploy" />
     <property name="drlvm.semi.dir" location="${drlvm.build.dir}/semis" />
     <property name="drlvm.bin.dir" location="${drlvm.deploy.dir}/jdk/jre/bin/default"/>
@@ -118,7 +105,7 @@
         <echo message="    hy.local.zlib = ${hy.local.zlib}" />
         <echo message=" common resources = ${common.resources}" />
         <echo message="         HDK root = ${hy.hdk}" />
-        <echo message="       target dir = ${drlvm.deploy.dir}" />
+        <echo message="       deploy dir = ${drlvm.deploy.dir}" />
     </target>
 
     <target name="debug-echo">

Modified: harmony/enhanced/java/trunk/drlvm/make/tests/ehwa-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/tests/ehwa-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/tests/ehwa-test.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/tests/ehwa-test.xml Tue Oct 26 07:13:24 2010
@@ -20,7 +20,7 @@
     <import file="test-common.xml"/>
     <property name="ehwa.test.dir" location="${base.test.dir}/ehwa"/>
     <property name="ehwa.test.summary" location="${ehwa.test.dir}/status.txt"/>
-    <property name="ECLIPSE_ARCHIVE.home" location="${base.dep.dir}/eclipse"/>
+    <property name="ECLIPSE_ARCHIVE.home" location="${hy.depends}/eclipse"/>
 
     <target name="ehwa" depends="-init-test,setup-ehwa, run-ehwa, check-ehwa-result"/>
 
@@ -101,7 +101,8 @@
     </target>
     
     <target name="touch-failures-file" if="test.failed">
-        <copy file="${ehwa.test.summary}" tofile="${base.test.dir}/ehwa.test.failed">
+        <copy file="${ehwa.test.summary}"
+              tofile="${base.test.dir}/ehwa.test.failed">
             <filterchain>
                 <linecontains>
                     <contains value="FAILED"/>

Modified: harmony/enhanced/java/trunk/drlvm/make/tests/kernel-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/tests/kernel-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/tests/kernel-test.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/tests/kernel-test.xml Tue Oct 26 07:13:24 2010
@@ -77,7 +77,8 @@
     </target>
     
     <target name="touch-failures-file" if="test.failed">
-        <copy file="${kernel.test.summary}" tofile="${base.test.dir}/kernel.test.failed">
+        <copy file="${kernel.test.summary}"
+              tofile="${base.test.dir}/kernel.test.failed">
             <filterchain>
                 <linecontains>
                     <contains value="FAILED"/>

Modified: harmony/enhanced/java/trunk/drlvm/make/tests/lazy-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/tests/lazy-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/tests/lazy-test.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/tests/lazy-test.xml Tue Oct 26 07:13:24 2010
@@ -76,7 +76,8 @@
     </target>
     
     <target name="touch-failures-file" if="test.failed">
-        <copy file="${lazy.test.summary}" tofile="${base.test.dir}/lazy.test.failed">
+        <copy file="${lazy.test.summary}"
+              tofile="${base.test.dir}/lazy.test.failed">
             <filterchain>
                 <linecontains>
                     <contains value="FAILED"/>

Added: harmony/enhanced/java/trunk/drlvm/make/tests/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/tests/make/depends.properties?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/tests/make/depends.properties (added)
+++ harmony/enhanced/java/trunk/drlvm/make/tests/make/depends.properties Tue Oct 26 07:13:24 2010
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+

Propchange: harmony/enhanced/java/trunk/drlvm/make/tests/make/depends.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/java/trunk/drlvm/make/tests/test-common.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/tests/test-common.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/tests/test-common.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/tests/test-common.xml Tue Oct 26 07:13:24 2010
@@ -16,7 +16,10 @@
      limitations under the License.
 -->
 <project name="test-common">
-    
+
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="test-common"/>
+
     <dirname property="tc.imported.basedir" file="${ant.file.test-common}"/>
     <import file="${tc.imported.basedir}/../build-java.xml"/>
 

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/em.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/em.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/em.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/em.xml Tue Oct 26 07:13:24 2010
@@ -18,7 +18,8 @@
 
 <project name="em" default="build" basedir="../..">
     
-    <property name="component" value="em"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="em"/>
     <import file="common-vm.xml"/>
     
     <target name="build" depends="-common-vm">        

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/encoder.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/encoder.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/encoder.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/encoder.xml Tue Oct 26 07:13:24 2010
@@ -18,7 +18,8 @@
 
 <project name="encoder" default="build" basedir="../..">
     
-    <property name="component" value="encoder"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="encoder"/>
     <import file="common-vm.xml"/>
     
     <target name="build" depends="-common-vm">        

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/gc_gen.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/gc_gen.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/gc_gen.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/gc_gen.xml Tue Oct 26 07:13:24 2010
@@ -17,16 +17,20 @@
 -->
 
 <project name="gc_gen" default="build" basedir="../..">
+
     
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="gc_gen"/>
+
     <import file="common-vm.xml"/>
     <import file="../build-java.xml"/>
     
     <target name="build">
         <antcall target="build-uncompressed">
-            <param name="component" value="gc_gen_uncomp"/>
+            <param name="hy.module" value="gc_gen_uncomp"/>
         </antcall>
         <antcall target="build-compressed">
-            <param name="component" value="gc_gen"/>
+            <param name="hy.module" value="gc_gen"/>
         </antcall>
         <make-java component="gc_gen" src="${vm.home}/gc_gen/javasrc"
             manifest="${vm.home}/gc_gen/resource/MANIFEST.MF">

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/hythr.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/hythr.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/hythr.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/hythr.xml Tue Oct 26 07:13:24 2010
@@ -18,7 +18,8 @@
 
 <project name="hythr" default="build" basedir="../..">
     
-    <property name="component" value="hythr"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="hythr"/>
     <import file="common-vm.xml"/>
     
     <condition property="hy.thr.ver" value="_0.1">

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/interpreter.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/interpreter.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/interpreter.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/interpreter.xml Tue Oct 26 07:13:24 2010
@@ -18,7 +18,8 @@
 
 <project name="interpreter" default="build" basedir="../..">
         
-    <property name="component" value="interpreter"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="interpreter"/>
     <import file="common-vm.xml"/>
         
     <target name="build" depends="-common-vm">        

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/jitrino.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/jitrino.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/jitrino.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/jitrino.xml Tue Oct 26 07:13:24 2010
@@ -16,7 +16,8 @@
 -->
 <project name="jitrino" default="build" basedir="../..">
     
-    <property name="component" value="jitrino"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="jitrino"/>
     <import file="common-vm.xml"/>
 
     <target name="clean" >

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/kernel.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/kernel.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/kernel.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/kernel.xml Tue Oct 26 07:13:24 2010
@@ -18,6 +18,8 @@
 
 <project name="kernel" default="build" basedir="../..">
     
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="kernel"/>
     <import file="../build-java.xml"/>
     
     <target name="fetch-depends">

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/port.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/port.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/port.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/port.xml Tue Oct 26 07:13:24 2010
@@ -18,7 +18,8 @@
 
 <project name="portlib" default="build" basedir="../..">
     
-    <property name="component" value="portlib"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="portlib"/>
     
     <import file="common-vm.xml"/>
     

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/port_ch.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/port_ch.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/port_ch.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/port_ch.xml Tue Oct 26 07:13:24 2010
@@ -18,7 +18,8 @@
 
 <project name="port_ch" default="build" basedir="../..">
 
-    <property name="component" value="port_ch"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="port_ch"/>
 
     <import file="common-vm.xml"/>
 

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/verifier-ext.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/verifier-ext.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/verifier-ext.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/verifier-ext.xml Tue Oct 26 07:13:24 2010
@@ -18,14 +18,16 @@
 
 <project name="verifier-ext" default="build" basedir="../..">
     
-    <property name="component" value="verifier-ext"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="verifier-ext"/>
     <property name="drlvm.verifier-ext.includes"
         value="${drlvm.deploy.dir}/include/verifier-ext"/> 
     <import file="common-vm.xml"/>
     
     <target name="build" depends="-common-vm">
         <mkdir dir="${drlvm.verifier-ext.includes}"/>
-        <copy todir="${drlvm.verifier-ext.includes}">
+        <copy todir="${drlvm.verifier-ext.includes}"
+              preservelastmodified="true">
             <fileset dir="${vm.home}/include">
                 <include name="open/common.h"/>
                 <include name="open/hycomp.h"/>

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/verifier.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/verifier.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/verifier.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/verifier.xml Tue Oct 26 07:13:24 2010
@@ -18,7 +18,8 @@
 
 <project name="verifier" default="build" basedir="../..">
     
-    <property name="component" value="verifier"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="verifier"/>
     <import file="common-vm.xml"/>
     
     <target name="build" depends="-common-vm">        

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/vmcore.xml Tue Oct 26 07:13:24 2010
@@ -18,7 +18,8 @@
 
 <project name="vmcore" default="build" basedir="../..">
 
-    <property name="component" value="vmcore"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="vmcore"/>
     <import file="common-vm.xml"/>
 
     <target name="fetch-depends">

Modified: harmony/enhanced/java/trunk/drlvm/make/vm/vmi.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/drlvm/make/vm/vmi.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/drlvm/make/vm/vmi.xml (original)
+++ harmony/enhanced/java/trunk/drlvm/make/vm/vmi.xml Tue Oct 26 07:13:24 2010
@@ -18,7 +18,8 @@
 
 <project name="vmi" default="build" basedir="../..">
     
-    <property name="component" value="vmi"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="vmi"/>
     <import file="common-vm.xml"/>
     
     <target name="build" depends="-common-vm">        

Modified: harmony/enhanced/java/trunk/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/build.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/build.xml Tue Oct 26 07:13:24 2010
@@ -67,10 +67,22 @@ module:
 
     <property file="${user.home}/.harmony-jdktools.properties" />
     <property name="common.resources" location="../common_resources" />
-    <import file="make/properties.xml" />
+    <property name="hy.target" location="target" />
+    <property name="hy.component" value="jdktools" />
+    <property name="hy.module" value="toplevel" />
+    <fail message="Property 'hy.target' is not defined">
+        <condition>
+            <not><isset property="hy.target" /></not>
+        </condition>
+    </fail>
+    <fail message="Property 'common.resources' is not defined">
+        <condition>
+            <not><isset property="common.resources" /></not>
+        </condition>
+    </fail>
 
     <!-- import properties for snapshot targets -->
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
 
     <!-- ================================
 	 target : rebuild

Modified: harmony/enhanced/java/trunk/jdktools/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/make/depends.properties?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/make/depends.properties (original)
+++ harmony/enhanced/java/trunk/jdktools/make/depends.properties Tue Oct 26 07:13:24 2010
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-depends.jars=${depends.dir}/jars
+depends.jars=${hy.depends}/jars
 
 icu.dir=${depends.jars}/eclipse-ICU4J
 icu=${icu.dir}/com.ibm.icu.base-3.3.zip

Modified: harmony/enhanced/java/trunk/jdktools/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/make/properties.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/make/properties.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/make/properties.xml Tue Oct 26 07:13:24 2010
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-  implied.  See the License for the specific language governing
-  permissions and limitations under the License.
-
- -->
-
-<project name="Top-Level jdktools property definitions">
-    <description>
-        Ant file of common properties to be imported by other ant files
-    </description>
-    
-    <fail message="Property 'hy.hdk' is not defined">
-        <condition>
-            <not><isset property="hy.hdk" /></not>
-        </condition>
-    </fail>
-
-    <fail message="Property 'common.resources' is not defined">
-        <condition>
-            <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>
-    </fail>
-
-</project>

Modified: harmony/enhanced/java/trunk/jdktools/modules/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jdktools/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jdktools/build.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jdktools/build.xml Tue Oct 26 07:13:24 2010
@@ -19,11 +19,10 @@
 <project name="JDK Tools Build" default="build" basedir=".">
     <description>Build for JDK Tools component</description>
 
+    <property name="hy.component" value="jdktools" />
     <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" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/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" />
@@ -81,22 +80,23 @@
         <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" />
+        <delete dir="${hy.build.mod}/java" includeemptydirs="true"
+                failonerror="false" />
     </target>
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin/test"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
         <echo message="Compiling ${hy.module} classes" />
         <ensure-javac/>
-        <mkdir dir="bin/main" />
+        <mkdir dir="${hy.build.mod}/java" />
 
         <hy.javac sourcepath=""
                   srcdir="src/main/java"
-                  destdir="bin/main">
+                  destdir="${hy.build.mod}/java">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -140,7 +140,7 @@
 
         <hy.jar.bin destfile="${hy.jdk}/lib/tools.jar"
                     manifest="META-INF/MANIFEST.MF">
-            <fileset dir="bin/main" />
+            <fileset dir="${hy.build.mod}/java" />
             <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
@@ -176,7 +176,7 @@
        
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>

Modified: harmony/enhanced/java/trunk/jdktools/modules/jdktools/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jdktools/make/run-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jdktools/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jdktools/make/run-test.xml Tue Oct 26 07:13:24 2010
@@ -23,7 +23,9 @@
     <property file="../test.properties" />
 
     <property name="work.dir" value=".." />
-    <property name="target.dir" value=".." />
+    <property name="hy.test.root" value=".." />
+    <property name="hy.component" value="jdktools" />
+    <property name="hy.module" value="jdktools" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/trunk/jdktools/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jpda/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jpda/build.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jpda/build.xml Tue Oct 26 07:13:24 2010
@@ -19,11 +19,10 @@
 <project name="JPDA Build" default="build" basedir=".">
     <description>Build for JPDA component</description>
 
+    <property name="hy.component" value="jdktools" />
     <property name="hy.module" value="jpda" />
-    <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" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/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" />
@@ -75,8 +74,8 @@
         <delete file="${hy.jdk}/lib/jdtstub-src.jar" />
 
         <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="bin/main" />
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/main" />
+            <fileset dir="${hy.build.mod}/test" />
         </delete>
     </target>
 
@@ -112,17 +111,17 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin/test"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
         <echo message="Compiling ${hy.module} classes" />
         <ensure-javac/>
-        <mkdir dir="bin/main" />
+        <mkdir dir="${hy.build.mod}/java" />
 
         <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="bin/main">
+               destdir="${hy.build.mod}/java">
 
             <!-- HDK class library -->
             <classpath>
@@ -146,7 +145,7 @@
 
         <hy.jar.bin destfile="${hy.jdk}/lib/jdtstub.jar"
                     manifest="META-INF/MANIFEST.MF">
-            <fileset dir="bin/main" />
+            <fileset dir="${hy.build.mod}/java" />
         </hy.jar.bin>
 
         <hy.jar.src destfile="${hy.jdk}/lib/jdtstub-src.jar">
@@ -205,7 +204,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
  
         <mkdir dir="${tests.excludes.hdk.dir}"/>

Modified: harmony/enhanced/java/trunk/jdktools/modules/jpda/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jpda/make/run-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jpda/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jpda/make/run-test.xml Tue Oct 26 07:13:24 2010
@@ -23,7 +23,9 @@
     <property file="../test.properties" />
 
     <property name="work.dir" value=".." />
-    <property name="target.dir" value=".." />
+    <property name="hy.test.root" value=".." />
+    <property name="hy.component" value="jdktools" />
+    <property name="hy.module" value="jpda" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile Tue Oct 26 07:13:24 2010
@@ -17,7 +17,8 @@
 # Makefile for module jdwp
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/jdktools/jpda/native/agent/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 COMMON=../../common/
 CMNAGENT=$(COMMON)agent/
@@ -30,34 +31,30 @@ INCLUDES += -I$(CMNAGENT)commands -I$(CM
 
 LDFLAGS += $(STDCLIBS)
 
-BUILDFILES = \
-    $(CMNAGENT)commands/ArrayReference.o \
-    $(CMNAGENT)commands/ArrayType.o \
-    $(CMNAGENT)commands/ClassLoaderReference.o \
-    $(CMNAGENT)commands/ClassObjectReference.o \
-    $(CMNAGENT)commands/ClassType.o \
-    $(CMNAGENT)commands/EventRequest.o \
-    $(CMNAGENT)commands/Method.o \
-    $(CMNAGENT)commands/ObjectReference.o \
-    $(CMNAGENT)commands/ReferenceType.o \
-    $(CMNAGENT)commands/StackFrame.o \
-    $(CMNAGENT)commands/StringReference.o \
-    $(CMNAGENT)commands/ThreadGroupReference.o \
-    $(CMNAGENT)commands/ThreadReference.o \
-    $(CMNAGENT)commands/VirtualMachine.o \
-    $(CMNAGENT)core/Agent.o $(CMNAGENT)core/AgentEventRequest.o \
-    $(CMNAGENT)core/AgentMonitor.o $(CMNAGENT)core/ClassManager.o \
-    $(CMNAGENT)core/CommandDispatcher.o $(CMNAGENT)core/CommandHandler.o \
-    $(CMNAGENT)core/EventDispatcher.o $(CMNAGENT)core/LogManager.o \
-    $(CMNAGENT)core/MemoryManager.o $(CMNAGENT)core/ObjectManager.o \
-    $(CMNAGENT)core/OptionParser.o $(CMNAGENT)core/PacketDispatcher.o \
-    $(CMNAGENT)core/PacketParser.o $(CMNAGENT)core/RequestManager.o \
-    $(CMNAGENT)core/RequestModifier.o $(CMNAGENT)core/ThreadManager.o \
-    $(CMNAGENT)core/TransportManager.o $(CMNAGENT)core/AgentManager.o \
-    core/TransportManager_pd.o
+BUILDFILES = ArrayReference.o ArrayType.o ClassLoaderReference.o \
+  ClassObjectReference.o ClassType.o EventRequest.o Method.o \
+  ObjectReference.o ReferenceType.o StackFrame.o StringReference.o \
+  ThreadGroupReference.o ThreadReference.o VirtualMachine.o \
+  Agent.o AgentEventRequest.o AgentMonitor.o ClassManager.o \
+  CommandDispatcher.o CommandHandler.o EventDispatcher.o LogManager.o \
+  MemoryManager.o ObjectManager.o OptionParser.o PacketDispatcher.o \
+  PacketParser.o RequestManager.o RequestModifier.o ThreadManager.o \
+  TransportManager.o AgentManager.o TransportManager_pd.o
 
 MDLLIBFILES = 
 
 DLLNAME = $(TOOLSDLLPATH)libjdwp.so
 
 include $(HY_HDK)/build/make/rules.mk
+
+$(HY_BIN)%.o: core/%.cpp
+	@mkdir -p ${@D}
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(CMNAGENT)core/%.cpp
+	@mkdir -p ${@D}
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(CMNAGENT)commands/%.cpp
+	@mkdir -p ${@D}
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<

Modified: harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile Tue Oct 26 07:13:24 2010
@@ -21,7 +21,8 @@
 
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/jdktools/jpda/native/dt_socket/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 COMMON=../../../common/
 CMNTRANS=$(COMMON)transport/
@@ -35,12 +36,18 @@ INCLUDES += -I$(CMNTRANS)common -I$(CMNT
 
 LDFLAGS += $(STDCLIBS)
 
-BUILDFILES = \
-    $(CMNTRANS)common/LastTransportError.o \
-    $(CMNTRANS)dt_socket/SocketTransport.o
+BUILDFILES = LastTransportError.o SocketTransport.o
 
 MDLLIBFILES = 
 
 DLLNAME = $(TOOLSDLLPATH)libdt_socket.so
 
 include $(HY_HDK)/build/make/rules.mk
+
+$(HY_BIN)%.o: $(CMNTRANS)common/%.cpp
+	@mkdir -p ${@D}
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(CMNTRANS)dt_socket/%.cpp
+	@mkdir -p ${@D}
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<

Modified: harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/windows/agent/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/windows/agent/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/windows/agent/makefile (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jpda/src/main/native/jdwp/windows/agent/makefile Tue Oct 26 07:13:24 2010
@@ -17,7 +17,8 @@
 # Makefile for module jdwp
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\jdktools\jpda\native\jdwp\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 COMMON=..\..\common\# comment to avoid \ being treated as continuation
 CMNAGENT=$(COMMON)agent\# comment to avoid \ being treated as continuation
@@ -35,35 +36,42 @@ HYCFLAGS = $(HYCFLAGS) $(INCLUDES) -GX -
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-    $(CMNAGENT)commands\ArrayReference.obj \
-    $(CMNAGENT)commands\ArrayType.obj \
-    $(CMNAGENT)commands\ClassLoaderReference.obj \
-    $(CMNAGENT)commands\ClassObjectReference.obj \
-    $(CMNAGENT)commands\ClassType.obj \
-    $(CMNAGENT)commands\EventRequest.obj \
-    $(CMNAGENT)commands\Method.obj \
-    $(CMNAGENT)commands\ObjectReference.obj \
-    $(CMNAGENT)commands\ReferenceType.obj \
-    $(CMNAGENT)commands\StackFrame.obj \
-    $(CMNAGENT)commands\StringReference.obj \
-    $(CMNAGENT)commands\ThreadGroupReference.obj \
-    $(CMNAGENT)commands\ThreadReference.obj \
-    $(CMNAGENT)commands\VirtualMachine.obj \
-    $(CMNAGENT)core\Agent.obj $(CMNAGENT)core\AgentEventRequest.obj $(CMNAGENT)core\AgentMonitor.obj \
-    $(CMNAGENT)core\ClassManager.obj $(CMNAGENT)core\CommandDispatcher.obj $(CMNAGENT)core\CommandHandler.obj \
-    $(CMNAGENT)core\EventDispatcher.obj $(CMNAGENT)core\LogManager.obj $(CMNAGENT)core\MemoryManager.obj \
-    $(CMNAGENT)core\ObjectManager.obj $(CMNAGENT)core\OptionParser.obj $(CMNAGENT)core\PacketDispatcher.obj \
-    $(CMNAGENT)core\PacketParser.obj $(CMNAGENT)core\RequestManager.obj $(CMNAGENT)core\RequestModifier.obj \
-    $(CMNAGENT)core\ThreadManager.obj $(CMNAGENT)core\TransportManager.obj $(CMNAGENT)core\AgentManager.obj \
-    core\TransportManager_pd.obj
+  $(HY_BIN)ArrayReference.obj $(HY_BIN)ArrayType.obj \
+  $(HY_BIN)ClassLoaderReference.obj $(HY_BIN)ClassObjectReference.obj \
+  $(HY_BIN)ClassType.obj $(HY_BIN)EventRequest.obj $(HY_BIN)Method.obj \
+  $(HY_BIN)ObjectReference.obj $(HY_BIN)ReferenceType.obj \
+  $(HY_BIN)StackFrame.obj $(HY_BIN)StringReference.obj \
+  $(HY_BIN)ThreadGroupReference.obj $(HY_BIN)ThreadReference.obj \
+  $(HY_BIN)VirtualMachine.obj $(HY_BIN)Agent.obj \
+  $(HY_BIN)AgentEventRequest.obj $(HY_BIN)AgentMonitor.obj \
+  $(HY_BIN)ClassManager.obj $(HY_BIN)CommandDispatcher.obj \
+  $(HY_BIN)CommandHandler.obj $(HY_BIN)EventDispatcher.obj \
+  $(HY_BIN)LogManager.obj $(HY_BIN)MemoryManager.obj \
+  $(HY_BIN)ObjectManager.obj $(HY_BIN)OptionParser.obj \
+  $(HY_BIN)PacketDispatcher.obj $(HY_BIN)PacketParser.obj \
+  $(HY_BIN)RequestManager.obj $(HY_BIN)RequestModifier.obj \
+  $(HY_BIN)ThreadManager.obj $(HY_BIN)TransportManager.obj \
+  $(HY_BIN)AgentManager.obj $(HY_BIN)TransportManager_pd.obj
 
 VIRTFILES = 
 
 SYSLIBFILES = 
 
 MDLLIBFILES = 
-  
+
 DLLBASE=0x13200000
 COMMENT=/comment:"JDWP agent native code. (c) Copyright 2005 - 2006 The Apache Software Foundation or its licensors, as applicable."
 
 !include <$(HY_HDK)\build\make\rules.mak>
+
+{core}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(CMNAGENT)core}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(CMNAGENT)commands}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<