Return-Path: 
 <commits-return-62583-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 91952 invoked from network); 5 Jun 2010 22:18:52 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 5 Jun 2010 22:18:52 -0000
Received: (qmail 314 invoked by uid 500); 5 Jun 2010 22:18:52 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 298 invoked by uid 500); 5 Jun 2010 22:18:52 -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 291 invoked by uid 99); 5 Jun 2010 22:18:52 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 05 Jun 2010 22:18:52 +0000
X-ASF-Spam-Status: No, hits=-1801.0 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; Sat, 05 Jun 2010 22:18:47 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id A69482388A67; Sat,  5 Jun 2010 22:18:27 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r951779 [2/3] - in /harmony/enhanced/java/branches/mrh:
 ./
 classlib/ classlib/depends/build/ classlib/make/
 classlib/modules/accessibility/ classlib/modules/annotation/
 classlib/modules/applet/ classlib/modules/archive/ classlib/modules/arc...
Date: Sat, 05 Jun 2010 22:18:26 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100605221827.A69482388A67@eris.apache.org>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="ImageIO Build" default="build" basedir=".">
     <description>Build for ImageIO component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="imageio" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
@@ -123,7 +123,7 @@ ${line.separator}For Fedora try: yum ins
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -178,7 +178,7 @@ ${line.separator}For Fedora try: yum ins
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${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/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile Sat Jun  5 22:18:24 2010
@@ -13,11 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/imageio/native/jpegencoder/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)include
 
-BUILDFILES = $(SHAREDSUB)JpegEncoder.o
+BUILDFILES = JpegEncoder.o
 
 ifneq ($(HY_OS),zos)
 OSLIBS += -ljpeg
@@ -28,4 +29,4 @@ endif
 DLLNAME=$(DLLPATH)libjpegencoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYJPEGENCODER_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile Sat Jun  5 22:18:24 2010
@@ -13,11 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/imageio/native/pngencoder/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)include
 
-BUILDFILES = $(SHAREDSUB)pngencoder.o
+BUILDFILES = pngencoder.o
 
 ifneq ($(HY_OS),zos)
 OSLIBS += -lpng
@@ -33,4 +34,4 @@ endif
 DLLNAME=$(DLLPATH)libpngencoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYPNGENCODER_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="INSTRUMENT Build" default="build" basedir=".">
     <description>Build for INSTRUMENT component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="instrument" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -67,7 +67,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -105,7 +105,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/branches/mrh/classlib/modules/instrument/src/main/native/instrument/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/unix/makefile Sat Jun  5 22:18:24 2010
@@ -17,10 +17,10 @@
 # Makefile for module 'instrument'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/instrument/native/instrument/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
-BUILDFILES = \
-	../shared/instrument.o ../shared/inst_agt.o 
+BUILDFILES = instrument.o inst_agt.o 
 
 ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES += $(LIBPATH)libhyzip.a 
@@ -31,4 +31,4 @@ MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINK
 DLLNAME = $(DLLPATH)libhyinstrument$(HY_SHLIB_SUFFIX)
 EXPNAME = HYINSTRUMENT_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/jmx/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/jmx/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/jmx/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/jmx/build.xml Sat Jun  5 22:18:24 2010
@@ -21,10 +21,10 @@
 <project name="JMX Build" default="build" basedir=".">
     <description>Build for JMX component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="jmx" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <target name="build" depends="check-depends" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="JNDI Build" default="build" basedir=".">
     <description>Build for JNDI component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="jndi" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -57,7 +57,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -95,7 +95,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/branches/mrh/classlib/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="LANG-MANAGEMENT Build" default="build" basedir=".">
     <description>Build for LANG-MANAGEMENT component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="lang-management" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -57,7 +57,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -94,11 +94,11 @@
         <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/api" />
+            <fileset dir="${hy.build.mod}/api" />
         </hy.jar.bin>
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_impl_tests.jar">
-            <fileset dir="bin/impl" />
+            <fileset dir="${hy.build.mod}/impl" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>
@@ -114,7 +114,7 @@
 
     <target name="-compile-tests" unless="skip.test.build">
         <compile-tests description="${hy.module} api tests"
-                       destdir="bin/api">
+                       destdir="${hy.build.mod}/api">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/java" />
@@ -122,7 +122,7 @@
             </javac-elements>
         </compile-tests>
         <compile-tests description="${hy.module} impl tests"
-                       destdir="bin/impl">
+                       destdir="${hy.build.mod}/impl">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/impl/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="LOGGING Build" default="build" basedir=".">
     <description>Build for LOGGING component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="logging" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -58,7 +58,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -107,10 +107,10 @@
         <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>
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_boot_tests.jar">
-            <fileset dir="bin/test-internal" />
+            <fileset dir="${hy.build.mod}/test/internal" />
         </hy.jar.bin>
 
         <copy file="../../support/src/test/resources/config/testing.policy"
@@ -133,7 +133,7 @@
 
     <target name="-compile-tests" unless="skip.test.build">
         <compile-tests description="${hy.module} internal tests"
-                       destdir="bin/test-internal">
+                       destdir="${hy.build.mod}/test/internal">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java-internal" />
@@ -143,7 +143,7 @@
         <compile-tests description="${hy.module} api tests">
             <javac-elements>
                 <bootclasspath>
-                    <pathelement path="bin/test-internal"/>
+                    <pathelement path="${hy.build.mod}/test/internal"/>
                 </bootclasspath>
                 <src>
                     <pathelement location="src/test/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni-kernel/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni-kernel/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni-kernel/build.xml Sat Jun  5 22:18:24 2010
@@ -21,9 +21,10 @@
 
     <description>Build for luni kernel stub jar</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="luni-kernel" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
 
     <property name="stub.jar"
               location="${hy.jdk}/jre/lib/boot/${hy.module}-stubs.jar" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml Sat Jun  5 22:18:24 2010
@@ -19,15 +19,16 @@
 <project name="LUNI Build" default="build" basedir=".">
     <description>Build for LUNI component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="luni" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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 name="fdlibm.dist" location="src/main/native/fdlibm_dist"/>
+    <property name="fdlibm.dist"
+              location="${hy.target}/depends/native/fdlibm_dist"/>
 
     <target name="build" depends="-build-no-check"/>
     <target name="-build-no-check" depends="-build-jar,-test-jar" />
@@ -79,14 +80,12 @@
              runtime the libvmi.so provided by the VM
              implementation is loaded
           -->
-        <copy todir="${hy.hdk}/lib" failonerror="false"
-              preservelastmodified="true">
-            <fileset dir="src/main/native/vmi">
+        <copy todir="${hy.hdk}/lib" flatten="true" preservelastmodified="true">
+            <fileset dir="${hy.build.mod}/native/vmi">
                 <include name="libvmi${shlib.suffix}"/>
-            </fileset>
-            <!-- Copy link exports file on z/OS -->
-            <fileset dir="src/main/native/vmi/${hy.os.family}">
-                <include name="*${linklib.suffix}" if="is.zos" />
+                <!-- Copy link exports file on z/OS -->
+                <include name="${hy.os.family}/*${linklib.suffix}"
+                         if="is.zos" />
             </fileset>
         </copy>
     </target>
@@ -121,6 +120,7 @@
 
     <!-- Overlay OSS packages into their required locations -->
     <target name="-unzip-oss" unless="skip.native.build">
+        <mkdir dir="${fdlibm.dist}"/>
         <untar src="${fdlibm.tar}" compression="gzip" dest="${fdlibm.dist}">
             <patternset>
                 <exclude name="fdlibm53"/>
@@ -228,7 +228,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -267,11 +267,11 @@
               tofile="${tests.hdk.dir}/build.xml" />
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_api.jar">
-            <fileset dir="bin/test/api" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_impl.jar">
-            <fileset dir="bin/test/impl" />
+            <fileset dir="${hy.build.mod}/test/impl" />
         </hy.jar.bin>
 
         <copy todir="${tests.resources.hdk.dir}">
@@ -308,7 +308,7 @@
     <!-- compile both api tests and impl tests-->
     <target name="-compile-tests" unless="skip.test.build">
         <compile-tests description="${hy.module} api tests"
-                       destdir="bin/test/api">
+                       destdir="${hy.build.mod}/test/api">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/common" />
@@ -318,7 +318,7 @@
             </javac-elements>
         </compile-tests>
         <compile-tests description="${hy.module} impl tests"
-                       destdir="bin/test/impl">
+                       destdir="${hy.build.mod}/test/impl">
             <javac-elements>
                 <src>
                    <pathelement location="src/test/impl/common" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/fdlibm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/fdlibm/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/fdlibm/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/fdlibm/unix/makefile Sat Jun  5 22:18:24 2010
@@ -17,32 +17,24 @@
 # Makefile for module 'fdlibm'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/luni/native/fdlibm/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
-FDLIBM_DIST=../../fdlibm_dist/
+OSS_DIST=$(HY_TARGET)/depends/native/fdlibm_dist/# Path to fdlibm
 
 BUILDFILES = \
-	$(FDLIBM_DIST)e_acos.o $(FDLIBM_DIST)e_acosh.o $(FDLIBM_DIST)e_asin.o $(FDLIBM_DIST)e_atan2.o \
-	$(FDLIBM_DIST)e_atanh.o $(FDLIBM_DIST)e_cosh.o $(FDLIBM_DIST)e_exp.o $(FDLIBM_DIST)e_fmod.o \
-	$(FDLIBM_DIST)e_gamma.o $(FDLIBM_DIST)e_gamma_r.o $(FDLIBM_DIST)e_hypot.o $(FDLIBM_DIST)e_j0.o \
-	$(FDLIBM_DIST)e_j1.o $(FDLIBM_DIST)e_jn.o $(FDLIBM_DIST)e_lgamma.o $(FDLIBM_DIST)e_lgamma_r.o \
-	$(FDLIBM_DIST)e_log.o $(FDLIBM_DIST)e_log10.o $(FDLIBM_DIST)e_pow.o $(FDLIBM_DIST)e_rem_pio2.o \
-	$(FDLIBM_DIST)e_remainder.o $(FDLIBM_DIST)e_scalb.o $(FDLIBM_DIST)e_sinh.o $(FDLIBM_DIST)e_sqrt.o \
-	$(FDLIBM_DIST)k_cos.o $(FDLIBM_DIST)k_rem_pio2.o $(FDLIBM_DIST)k_sin.o $(FDLIBM_DIST)k_standard.o \
-	$(FDLIBM_DIST)k_tan.o $(FDLIBM_DIST)s_asinh.o $(FDLIBM_DIST)s_atan.o $(FDLIBM_DIST)s_cbrt.o $(FDLIBM_DIST)s_ceil.o \
-	$(FDLIBM_DIST)s_copysign.o $(FDLIBM_DIST)s_cos.o $(FDLIBM_DIST)s_erf.o $(FDLIBM_DIST)s_expm1.o \
-	$(FDLIBM_DIST)s_fabs.o $(FDLIBM_DIST)s_finite.o $(FDLIBM_DIST)s_floor.o $(FDLIBM_DIST)s_frexp.o \
-	$(FDLIBM_DIST)s_ilogb.o $(FDLIBM_DIST)s_isnan.o $(FDLIBM_DIST)s_ldexp.o \
-	$(SHAREDSUB)s_lib_version.o \
-	$(FDLIBM_DIST)s_log1p.o $(FDLIBM_DIST)s_logb.o $(FDLIBM_DIST)s_matherr.o $(FDLIBM_DIST)s_modf.o \
-	$(FDLIBM_DIST)s_nextafter.o $(FDLIBM_DIST)s_rint.o $(FDLIBM_DIST)s_scalbn.o $(FDLIBM_DIST)s_signgam.o \
-	$(FDLIBM_DIST)s_significand.o $(FDLIBM_DIST)s_sin.o $(FDLIBM_DIST)s_tan.o $(FDLIBM_DIST)s_tanh.o \
-	$(FDLIBM_DIST)w_acos.o $(FDLIBM_DIST)w_acosh.o $(FDLIBM_DIST)w_asin.o $(FDLIBM_DIST)w_atan2.o \
-	$(FDLIBM_DIST)w_atanh.o $(FDLIBM_DIST)w_cosh.o $(FDLIBM_DIST)w_exp.o $(FDLIBM_DIST)w_fmod.o \
-	$(FDLIBM_DIST)w_gamma.o $(FDLIBM_DIST)w_gamma_r.o $(FDLIBM_DIST)w_hypot.o $(FDLIBM_DIST)w_j0.o \
-	$(FDLIBM_DIST)w_j1.o $(FDLIBM_DIST)w_jn.o $(FDLIBM_DIST)w_lgamma.o $(FDLIBM_DIST)w_lgamma_r.o \
-	$(FDLIBM_DIST)w_log.o $(FDLIBM_DIST)w_log10.o $(FDLIBM_DIST)w_pow.o $(FDLIBM_DIST)w_remainder.o \
-	$(FDLIBM_DIST)w_scalb.o $(FDLIBM_DIST)w_sinh.o $(FDLIBM_DIST)w_sqrt.o
+  e_acos.o e_acosh.o e_asin.o e_atan2.o e_atanh.o e_cosh.o e_exp.o e_fmod.o \
+  e_gamma.o e_gamma_r.o e_hypot.o e_j0.o e_j1.o e_jn.o e_lgamma.o \
+  e_lgamma_r.o e_log.o e_log10.o e_pow.o e_rem_pio2.o e_remainder.o e_scalb.o \
+  e_sinh.o e_sqrt.o \
+  k_cos.o k_rem_pio2.o k_sin.o k_standard.o k_tan.o \
+  s_asinh.o s_atan.o s_cbrt.o s_ceil.o s_copysign.o s_cos.o s_erf.o s_expm1.o \
+  s_fabs.o s_finite.o s_floor.o s_frexp.o s_ilogb.o s_isnan.o s_ldexp.o \
+  s_lib_version.o s_log1p.o s_logb.o s_matherr.o s_modf.o s_nextafter.o \
+  s_rint.o s_scalbn.o s_signgam.o s_significand.o s_sin.o s_tan.o s_tanh.o \
+  w_acos.o w_acosh.o w_asin.o w_atan2.o w_atanh.o w_cosh.o w_exp.o w_fmod.o \
+  w_gamma.o w_gamma_r.o w_hypot.o w_j0.o w_j1.o w_jn.o w_lgamma.o w_lgamma_r.o \
+  w_log.o w_log10.o w_pow.o w_remainder.o w_scalb.o w_sinh.o w_sqrt.o
 
 DEFINES += -D_IEEE_LIBM
 
@@ -56,4 +48,4 @@ endif
 endif
 PLATFORM := $(subst -fpic,-fPIC,$(PLATFORM))
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/hyzip/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/hyzip/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/hyzip/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/hyzip/unix/makefile Sat Jun  5 22:18:24 2010
@@ -17,14 +17,14 @@
 # Makefile for module 'hyzip'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/luni/native/hyzip/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 INCLUDES += -I../../include/shared
-BUILDFILES = $(SHAREDSUB)hyzip.o $(SHAREDSUB)zcpool.o $(SHAREDSUB)zipalloc.o \
-	$(SHAREDSUB)zipcache.o $(SHAREDSUB)zipsup.o pool.o pool_cap.o
+BUILDFILES = hyzip.o zcpool.o zipalloc.o zipcache.o zipsup.o pool.o pool_cap.o
 LIBNAME = $(LIBPATH)libhyzip.a
 
-%.o: $(LIBPATH)libhypool.a(%.o)
-	ar $(ARFLAGS) xo $(LIBPATH)libhypool.a $@
+$(HY_BIN)%.o: $(LIBPATH)libhypool.a(%.o)
+	( cd $(HY_BIN) && ar $(ARFLAGS) xo $(LIBPATH)libhypool.a $@ )
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/launcher/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/launcher/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/launcher/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/launcher/unix/makefile Sat Jun  5 22:18:24 2010
@@ -17,11 +17,11 @@
 # Makefile for 'launcher'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/luni/native/launcher/
+include $(HY_TARGET)/hdk/build/make/defines.mk
+
+BUILDFILES = main.o cmain.o launcher_copyright.o strbuf.o libhlp.o
 
-BUILDFILES = $(SHAREDSUB)main.o $(SHAREDSUB)cmain.o \
-	$(SHAREDSUB)launcher_copyright.o $(SHAREDSUB)strbuf.o \
-	$(SHAREDSUB)libhlp.o
 ifeq ($(HY_NO_THR),false)
 MDLLIBFILES += $(DLLPATH)libhyprt$(HY_LINKLIB_SUFFIX)
 else
@@ -34,4 +34,4 @@ ifeq ($(HY_OS),zos)
 MDLLIBFILES = $(LIBPATH)libhya2e.a $(LIBPATH)libhycommon.a
 endif
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/unix/makefile Sat Jun  5 22:18:24 2010
@@ -17,7 +17,8 @@
 # Makefile for module 'luni'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/luni/native/luni/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 # CFLAGS += -fpic -Wall -Werror 
 ifneq ($(HY_OS),zos)
@@ -27,25 +28,17 @@ endif
 endif
 
 BUILDFILES = \
-	$(SHAREDSUB)luni_copyright.o $(SHAREDSUB)file.o procimpl.o \
-	$(SHAREDSUB)nethelp.o \
-	$(SHAREDSUB)floatbits.o \
-	helpers.o $(SHAREDSUB)math.o $(SHAREDSUB)luniglob.o \
-	$(SHAREDSUB)proxy.o \
-	$(SHAREDSUB)cbigint.o $(SHAREDSUB)dblparse.o $(SHAREDSUB)fltparse.o \
-	$(SHAREDSUB)netif.o $(SHAREDSUB)process.o $(SHAREDSUB)bigint.o \
-	$(SHAREDSUB)osc.o $(SHAREDSUB)socket.o $(SHAREDSUB)inetadds.o \
-	$(SHAREDSUB)filedesc.o $(SHAREDSUB)timezone.o \
-	$(SHAREDSUB)OSFileSystem.o OSFileSystemLinux32.o \
-	$(SHAREDSUB)OSMemory.o OSMemoryLinux32.o $(SHAREDSUB)OSNetworkSystem.o \
-	OSNetworkSystemLinux.o hyenv.o 
+  luni_copyright.o file.o procimpl.o nethelp.o floatbits.o helpers.o math.o \
+  luniglob.o proxy.o cbigint.o dblparse.o fltparse.o netif.o process.o \
+  bigint.o osc.o socket.o inetadds.o filedesc.o timezone.o OSFileSystem.o \
+  OSFileSystemLinux32.o OSMemory.o OSMemoryLinux32.o OSNetworkSystem.o \
+  OSNetworkSystemLinux.o hyenv.o 
 
-MDLLIBFILES += $(LIBPATH)libhyfdlibm.a \
-	$(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
+MDLLIBFILES += $(LIBPATH)libhyfdlibm.a $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
 OSLIBS += -lm
 
 DLLNAME = $(DLLPATH)libhyluni$(HY_SHLIB_SUFFIX)
 EXPNAME = HYLUNI_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmi/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmi/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmi/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmi/unix/makefile Sat Jun  5 22:18:24 2010
@@ -17,13 +17,14 @@
 # Makefile for module 'vmi stubs'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/luni/native/vmi/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
-BUILDFILES = $(SHAREDSUB)vmi_copyright.o $(SHAREDSUB)vmi.o
+BUILDFILES = vmi_copyright.o vmi.o
 MDLLIBFILES =
 
-DLLNAME = ../libvmi$(HY_SHLIB_SUFFIX)
+DLLNAME = $(HY_BIN)libvmi$(HY_SHLIB_SUFFIX)
 EXPNAME = VMI_0.1
 HY_CAN_LINK_DEBUG=no
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmls/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmls/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmls/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmls/unix/makefile Sat Jun  5 22:18:24 2010
@@ -14,13 +14,14 @@
 #  limitations under the License.
 
 #
-# Makefile for module 'common'
+# Makefile for module 'vmls'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/luni/native/vmls/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 INCLUDES += -I../../include/shared
-BUILDFILES = $(SHAREDSUB)vmls.o
+BUILDFILES = vmls.o
 LIBNAME = $(LIBPATH)libhyvmls.a
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="MATH Build" default="build" basedir=".">
     <description>Build for MATH component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="math" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -57,7 +57,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -95,7 +95,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/branches/mrh/classlib/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="MISC Build" default="build" basedir=".">
     <description>Build for MISC component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="misc" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -61,7 +61,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -103,7 +103,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/branches/mrh/classlib/modules/misc/src/main/native/accessors/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/misc/src/main/native/accessors/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/misc/src/main/native/accessors/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/misc/src/main/native/accessors/unix/makefile Sat Jun  5 22:18:24 2010
@@ -13,18 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/misc/native/accessors/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 INCLUDES += -I$(SHARED)common
 
 BUILDFILES = \
-  $(SHAREDSUB)org_apache_harmony_misc_accessors_ArrayAccessorImpl.o \
-  $(SHAREDSUB)org_apache_harmony_misc_accessors_Malloc.o \
-  $(SHAREDSUB)org_apache_harmony_misc_accessors_MemoryAccessorNativeImpl.o \
-  $(SHAREDSUB)org_apache_harmony_misc_accessors_ObjectAccessorImpl.o \
-  $(SHAREDSUB)org_apache_harmony_misc_accessors_StringAccessorImpl.o
+  org_apache_harmony_misc_accessors_ArrayAccessorImpl.o \
+  org_apache_harmony_misc_accessors_Malloc.o \
+  org_apache_harmony_misc_accessors_MemoryAccessorNativeImpl.o \
+  org_apache_harmony_misc_accessors_ObjectAccessorImpl.o \
+  org_apache_harmony_misc_accessors_StringAccessorImpl.o
 
 DLLNAME=$(DLLPATH)libaccessors$(HY_SHLIB_SUFFIX)
 EXPNAME=HYMISC_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="NIO Build" default="build" basedir=".">
     <description>Build for NIO component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="nio" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -108,7 +108,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/branches/mrh/classlib/modules/nio/src/main/native/nio/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/native/nio/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/native/nio/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/native/nio/unix/makefile Sat Jun  5 22:18:24 2010
@@ -17,10 +17,10 @@
 # Makefile for module 'nio'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/nio/native/nio/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
-BUILDFILES = \
-	../shared/DirectBufferUtil.o ../shared/AddressUtil.o
+BUILDFILES = DirectBufferUtil.o AddressUtil.o
 ifeq ($(HY_OS),linux)
 BUILDFILES += EpollSelectorImpl.o
 endif
@@ -30,4 +30,4 @@ MDLLIBFILES = $(LIBPATH)libhycommon.a
 DLLNAME = $(DLLPATH)libhynio$(HY_SHLIB_SUFFIX)
 EXPNAME = HYNIO_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="NIO_CHAR Build" default="build" basedir=".">
     <description>Build for NIO_CHAR component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="nio_char" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -67,7 +67,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -113,7 +113,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/branches/mrh/classlib/modules/nio_char/src/main/native/niochar/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/src/main/native/niochar/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/src/main/native/niochar/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/src/main/native/niochar/unix/makefile Sat Jun  5 22:18:24 2010
@@ -17,104 +17,32 @@
 # Makefile for module 'nio_char'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/nio_char/native/nio_char/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 # TODO: Fix the warnings see HARMONY-4959 and
 # http://www.mail-archive.com/dev@harmony.apache.org/msg10469.html 
 WARNFLAGS :=
 
-BUILDFILES = \
-  ../shared/CP_1250.o \
-  ../shared/CP_1251.o \
-  ../shared/CP_1252.o \
-  ../shared/CP_1253.o \
-  ../shared/CP_1254.o \
-  ../shared/CP_1257.o \
-  ../shared/ISO_8859_1.o \
-  ../shared/ISO_8859_2.o \
-  ../shared/ISO_8859_4.o \
-  ../shared/ISO_8859_5.o \
-  ../shared/ISO_8859_7.o \
-  ../shared/ISO_8859_9.o \
-  ../shared/ISO_8859_13.o \
-  ../shared/ISO_8859_15.o \
-  ../shared/KOI8_R.o \
-  ../shared/US_ASCII.o \
-  ../shared/IBM866.o \
-  ../shared/additional/IBM00858.o \
-  ../shared/additional/IBM01140.o \
-  ../shared/additional/IBM01141.o \
-  ../shared/additional/IBM01142.o \
-  ../shared/additional/IBM01143.o \
-  ../shared/additional/IBM01144.o \
-  ../shared/additional/IBM01145.o \
-  ../shared/additional/IBM01146.o \
-  ../shared/additional/IBM01147.o \
-  ../shared/additional/IBM01148.o \
-  ../shared/additional/IBM01149.o \
-  ../shared/additional/IBM037.o \
-  ../shared/additional/IBM1026.o \
-  ../shared/additional/IBM1047.o \
-  ../shared/additional/IBM273.o \
-  ../shared/additional/IBM277.o \
-  ../shared/additional/IBM278.o \
-  ../shared/additional/IBM280.o \
-  ../shared/additional/IBM284.o \
-  ../shared/additional/IBM285.o \
-  ../shared/additional/IBM297.o \
-  ../shared/additional/IBM420.o \
-  ../shared/additional/IBM424.o \
-  ../shared/additional/IBM437.o \
-  ../shared/additional/IBM500.o \
-  ../shared/additional/IBM775.o \
-  ../shared/additional/IBM850.o \
-  ../shared/additional/IBM852.o \
-  ../shared/additional/IBM855.o \
-  ../shared/additional/IBM857.o \
-  ../shared/additional/IBM860.o \
-  ../shared/additional/IBM861.o \
-  ../shared/additional/IBM862.o \
-  ../shared/additional/IBM863.o \
-  ../shared/additional/IBM864.o \
-  ../shared/additional/IBM865.o \
-  ../shared/additional/IBM868.o \
-  ../shared/additional/IBM869.o \
-  ../shared/additional/IBM870.o \
-  ../shared/additional/IBM871.o \
-  ../shared/additional/IBM918.o \
-  ../shared/additional/IBM_Thai.o \
-  ../shared/additional/ISO_8859_3.o \
-  ../shared/additional/ISO_8859_6.o \
-  ../shared/additional/ISO_8859_8.o \
-  ../shared/additional/windows_1255.o \
-  ../shared/additional/windows_1256.o \
-  ../shared/additional/x_IBM1006.o \
-  ../shared/additional/x_IBM1025.o \
-  ../shared/additional/x_IBM1097.o \
-  ../shared/additional/x_IBM1098.o \
-  ../shared/additional/x_IBM1112.o \
-  ../shared/additional/x_IBM1122.o \
-  ../shared/additional/x_IBM1123.o \
-  ../shared/additional/x_IBM1124.o \
-  ../shared/additional/x_IBM737.o \
-  ../shared/additional/x_IBM856.o \
-  ../shared/additional/x_IBM874.o \
-  ../shared/additional/x_IBM875.o \
-  ../shared/additional/x_IBM922.o \
-  ../shared/additional/x_MacCyrillic.o \
-  ../shared/additional/x_MacGreek.o \
-  ../shared/additional/x_MacTurkish.o \
-  ../shared/additional/Big5.o \
-  ../shared/additional/Big5_HKSCS.o \
-  ../shared/additional/EUC_KR.o \
-  ../shared/additional/GB2312.o \
-  ../shared/additional/GBK.o \
-  ../shared/additional/GB18030.o \
-  ../shared/additional/windows_31j.o \
-  ../shared/additional/x_MS950_HKSCS.o \
-  ../shared/additional/x_windows_949.o 
+BUILDFILES = CP_1250.o CP_1251.o CP_1252.o CP_1253.o CP_1254.o CP_1257.o \
+  ISO_8859_1.o ISO_8859_2.o ISO_8859_4.o ISO_8859_5.o ISO_8859_7.o \
+  ISO_8859_9.o ISO_8859_13.o ISO_8859_15.o KOI8_R.o US_ASCII.o IBM866.o
+
+#additional
+BUILDFILES += IBM00858.o IBM01140.o IBM01141.o IBM01142.o IBM01143.o \
+  IBM01144.o IBM01145.o IBM01146.o IBM01147.o IBM01148.o IBM01149.o \
+  IBM037.o IBM1026.o IBM1047.o IBM273.o IBM277.o IBM278.o IBM280.o \
+  IBM284.o IBM285.o IBM297.o IBM420.o IBM424.o IBM437.o IBM500.o IBM775.o \
+  IBM850.o IBM852.o IBM855.o IBM857.o IBM860.o IBM861.o IBM862.o IBM863.o \
+  IBM864.o IBM865.o IBM868.o IBM869.o IBM870.o IBM871.o IBM918.o IBM_Thai.o \
+  ISO_8859_3.o ISO_8859_6.o ISO_8859_8.o windows_1255.o windows_1256.o \
+  x_IBM1006.o x_IBM1025.o x_IBM1097.o x_IBM1098.o x_IBM1112.o x_IBM1122.o \
+  x_IBM1123.o x_IBM1124.o x_IBM737.o x_IBM856.o x_IBM874.o x_IBM875.o \
+  x_IBM922.o x_MacCyrillic.o x_MacGreek.o x_MacTurkish.o Big5.o Big5_HKSCS.o \
+  EUC_KR.o GB2312.o GBK.o GB18030.o windows_31j.o x_MS950_HKSCS.o \
+  x_windows_949.o
 
 DLLNAME = $(DLLPATH)libhyniochar$(HY_SHLIB_SUFFIX)
 MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/orb/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/orb/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/orb/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/orb/build.xml Sat Jun  5 22:18:24 2010
@@ -21,10 +21,10 @@
 <project name="ORB Build" default="build" basedir=".">
     <description>Build for ORB component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="orb" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <target name="build" depends="check-depends,-build-no-check"/>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="PACK200 Build" default="build" basedir=".">
     <description>Build for PACK200 component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="pack200" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
@@ -75,18 +75,18 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
         <echo message="Compiling ${hy.module} classes" />
 
-        <mkdir dir="../../build/classes" />
+        <mkdir dir="${hy.build.top}/java" />
 
     	<!-- Ordinary classes -->
         <hy.javac sourcepath=""
                   srcdir="src/main/java"
-                  destdir="../../build/classes"
+                  destdir="${hy.build.top}/java"
                   source="1.4"
                   target="1.4">
 
@@ -140,7 +140,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}"/>
@@ -159,7 +159,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <mkdir dir="bin/test" />
+        <mkdir dir="${hy.build.mod}/test/api" />
 
         <mkdir dir="${hy.hdk}/build/test" />
         <copy file="${junit.jar}"
@@ -169,7 +169,7 @@
 
         <echo message="Compiling ${hy.module} tests" />
         <hy.javac srcdir="src/test/java"
-                  destdir="bin/test"
+                  destdir="${hy.build.mod}/test/api"
                   sourcepath=""
                   source="1.4" 
                   target="1.4">

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="PORTLIB Build" default="build" basedir=".">
     <description>Build for PORTLIB component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="portlib" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -161,7 +161,7 @@
     <target name="-build-copy-thread" if="hy.thr.deploy"
             unless="skip.native.build">
         <copy todir="${hy.jdk}/jre/bin" preservelastmodified="true">
-            <fileset dir="src/main/native/thread">
+            <fileset dir="${hy.build.mod}/native/thread">
                 <include name="*${shlib.suffix}*" />
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/a2e/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/a2e/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/a2e/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/a2e/unix/makefile Sat Jun  5 22:18:24 2010
@@ -17,7 +17,8 @@
 # Makefile for module 'a2e'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/portlib/native/a2e/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 INCLUDES += -DHYPORT_LIBRARY_DEFINE
 
@@ -28,4 +29,4 @@ MDLLIBFILES =
 DLLNAME = $(DLLPATH)libhya2e$(HY_SHLIB_SUFFIX)
 LIBNAME = $(LIBPATH)libhya2e.a
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/common/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/common/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/common/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/common/unix/makefile Sat Jun  5 22:18:24 2010
@@ -17,11 +17,12 @@
 # Makefile for module 'common'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/portlib/native/common/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
-BUILDFILES = $(SHAREDSUB)libglob.o $(SHAREDSUB)iohelp.o \
-	$(SHAREDSUB)exceptions.o $(SHAREDSUB)strhelp.o \
-	$(SHAREDSUB)utf8encode.o $(SHAREDSUB)utf8decode.o
+BUILDFILES = \
+  libglob.o iohelp.o exceptions.o strhelp.o utf8encode.o utf8decode.o
 LIBNAME = $(LIBPATH)libhycommon.a
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk
+

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/pool/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/pool/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/pool/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/pool/unix/makefile Sat Jun  5 22:18:24 2010
@@ -17,9 +17,10 @@
 # Makefile for module 'pool'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/portlib/native/pool/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
-BUILDFILES = $(SHAREDSUB)pool.o $(SHAREDSUB)pool_cap.o
+BUILDFILES = pool.o pool_cap.o
 LIBNAME = $(LIBPATH)libhypool.a
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/port/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/port/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/port/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/port/unix/makefile Sat Jun  5 22:18:24 2010
@@ -17,26 +17,18 @@
 # Makefile for module 'port'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/portlib/native/port/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 INCLUDES += -DHYPORT_LIBRARY_DEFINE -I$(HY_PLATFORM)
 
 BUILDFILES = \
-	$(SHAREDSUB)port_copyright.o $(SHAREDSUB)hyerror.o \
-	hyerrorhelpers.o $(SHAREDSUB)hyexit.o hyfile.o hyfiletext.o \
-	$(SHAREDSUB)hygp.o hymem.o \
-	$(HY_OS)/hymmap.o $(SHAREDSUB)hynls.o hynlshelpers.o hyosdump.o \
-	$(SHAREDSUB)hyport.o $(SHAREDSUB)hyportcontrol.o hyportptb.o \
-	hysharedhelper.o $(HY_OS)/hysl.o hysock.o \
-	$(SHAREDSUB)hystr.o $(SHAREDSUB)hystrftime.o $(SHAREDSUB)hystsl.o \
-	hysysinfo.o hytime.o $(SHAREDSUB)hytlshelpers.o hytty.o
+  port_copyright.o hyerror.o hyerrorhelpers.o hyexit.o hyfile.o hyfiletext.o \
+  hygp.o hymem.o /hymmap.o hynls.o hynlshelpers.o hyosdump.o hyport.o \
+  hyportcontrol.o hyportptb.o hysharedhelper.o hysl.o hysock.o hystr.o \
+  hystrftime.o hystsl.o hysysinfo.o hytime.o hytlshelpers.o hytty.o hycpu.o \
+  hyipcmutex.o hyshmem.o hyshsem.o hyvmem.o
 
-ifeq ($(HY_PORTLIB_STUBS),true)
-BUILDFILES += stubs/hycpu.o stubs/hyipcmutex.o stubs/hyshmem.o \
-              stubs/hyshsem.o stubs/hyvmem.o
-else
-BUILDFILES += hycpu.o hyipcmutex.o hyshmem.o hyshsem.o $(HY_OS)/hyvmem.o
-endif
 
 ifeq ($(HY_NO_THR),true)
 MDLLIBFILES += $(LIBPATH)libhythr$(HY_LINKLIB_SUFFIX)
@@ -44,4 +36,9 @@ endif
 DLLNAME = $(DLLPATH)libhyprt$(HY_SHLIB_SUFFIX)
 EXPNAME = HYPRT_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk
+
+ifeq ($(HY_PORTLIB_STUBS),true)
+$(HY_BIN)%.o: $(SHAREDSUB)%.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+endif

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/thread/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/thread/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/thread/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/thread/unix/makefile Sat Jun  5 22:18:24 2010
@@ -17,17 +17,17 @@
 # Makefile for module 'thread'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/portlib/native/thread/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
-BUILDFILES = \
-	$(SHAREDSUB)thread_copyright.o $(HY_ARCH)/thrhelp.o $(HY_ARCH)/thrspinlock.o \
-	$(SHAREDSUB)hythread.o $(SHAREDSUB)hythreadinspect.o linuxonexit.o priority.o \
-	rasthrsup.o $(SHAREDSUB)rwmutex.o thrcreate.o thrdsup.o $(SHAREDSUB)thrprof.o
+BUILDFILES = thread_copyright.o thrhelp.o thrspinlock.o hythread.o \
+  hythreadinspect.o linuxonexit.o priority.o rasthrsup.o rwmutex.o \
+  thrcreate.o thrdsup.o thrprof.o
 
 OSLIBS += -lpthread
 MDLLIBFILES = $(LIBPATH)libhypool.a $(LIBPATH)libhycommon.a
-DLLNAME = ../libhythr$(HY_SHLIB_SUFFIX)
+DLLNAME = $(HY_BIN)libhythr$(HY_SHLIB_SUFFIX)
 EXPNAME = HYTHR_0.1
 HY_CAN_LINK_DEBUG=no
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/thrstub/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/thrstub/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/thrstub/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/thrstub/unix/makefile Sat Jun  5 22:18:24 2010
@@ -14,15 +14,16 @@
 #  limitations under the License.
 
 #
-# Makefile for module 'thread'
+# Makefile for module 'thrstub'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/portlib/native/thrstub/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
-BUILDFILES = $(SHAREDSUB)hythread.o
+BUILDFILES = hythread.o
 
 DLLNAME = $(LIBPATH)libhythr$(HY_SHLIB_SUFFIX)
 DBGPATH = $(LIBPATH)
 EXPNAME = HYTHR_0.2
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/prefs/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/prefs/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/prefs/build.xml Sat Jun  5 22:18:24 2010
@@ -21,10 +21,10 @@
 <project name="PREFS Build" default="build" basedir=".">
     <description>Build for PREFS component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="prefs" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -72,7 +72,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -110,7 +110,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/branches/mrh/classlib/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="Print Build" default="build" basedir=".">
     <description>Build for Print component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="print" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -62,7 +62,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -122,7 +122,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/branches/mrh/classlib/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/regex/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/regex/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/regex/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="REGEX Build" default="build" basedir=".">
     <description>Build for REGEX component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="regex" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -57,7 +57,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -95,7 +95,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/branches/mrh/classlib/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/rmi/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/rmi/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/rmi/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="RMI Build" default="build" basedir=".">
     <description>Build for RMI component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="rmi" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -57,7 +57,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -95,7 +95,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/api" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>
@@ -116,7 +116,7 @@
 
     <target name="-compile-tests" unless="skip.test.build">
         <compile-tests description="${hy.module} api tests"
-                       destdir="bin/test/api">
+                       destdir="${hy.build.mod}/test/api">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/java"/>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/security-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/security-kernel/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/security-kernel/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/security-kernel/build.xml Sat Jun  5 22:18:24 2010
@@ -21,9 +21,10 @@
 
     <description>Build for security kernel stub jar</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="security-kernel" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
 
     <property name="stub.jar"
               location="${hy.jdk}/jre/lib/boot/${hy.module}-stubs.jar" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/security/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/security/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/security/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="SECURITY Build" default="build" basedir=".">
     <description>Build for SECURITY component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="security" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -66,7 +66,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -108,19 +108,19 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_api.jar">
-            <fileset dir="bin/test/api" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_api_in.jar">
-            <fileset dir="bin/test/api.injected" />
+            <fileset dir="${hy.build.mod}/test/api.injected" />
         </hy.jar.bin>
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_impl.jar">
-            <fileset dir="bin/test/impl" />
+            <fileset dir="${hy.build.mod}/test/impl" />
         </hy.jar.bin>
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_impl_in.jar">
-            <fileset dir="bin/test/impl.injected" />
+            <fileset dir="${hy.build.mod}/test/impl.injected" />
         </hy.jar.bin>
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests_support.jar">
-            <fileset dir="bin/test/support" />
+            <fileset dir="${hy.build.mod}/test/support" />
         </hy.jar.bin>
 
         <copy todir="${tests.resources.hdk.dir}">
@@ -141,7 +141,7 @@
     <target name="-compile-tests" unless="skip.test.build">
 
         <compile-tests description="${hy.module} test support files"
-                       destdir="bin/test/support">
+                       destdir="${hy.build.mod}/test/support">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/support/common/java"/>
@@ -150,47 +150,47 @@
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="${hy.module} api tests" destdir="bin/test/api">
+        <compile-tests description="${hy.module} api tests" destdir="${hy.build.mod}/test/api">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/java"/>
                 </src>
 
                 <include name="**/*Test.java" />
-                <classpath location="bin/test/support" />
+                <classpath location="${hy.build.mod}/test/support" />
             </javac-elements>
         </compile-tests>
 
         <compile-tests description="${hy.module} api injected tests"
-                       destdir="bin/test/api.injected">
+                       destdir="${hy.build.mod}/test/api.injected">
             <javac-elements>
                 <src path="src/test/api/java.injected"/>
                 <include name="**/*Test.java" />
-                <classpath location="bin/test/support" />
+                <classpath location="${hy.build.mod}/test/support" />
             </javac-elements>
         </compile-tests>
 
         <compile-tests description="${hy.module} impl injected tests"
-                       destdir="bin/test/impl.injected">
+                       destdir="${hy.build.mod}/test/impl.injected">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/impl/java.injected"/>
                 </src>
 
                 <include name="**/*Test.java" />
-                <classpath location="bin/test/support" />
+                <classpath location="${hy.build.mod}/test/support" />
             </javac-elements>
         </compile-tests>
 
         <compile-tests description="${hy.module} impl tests"
-                       destdir="bin/test/impl">
+                       destdir="${hy.build.mod}/test/impl">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/impl/java"/>
                 </src>
 
                 <include name="**/*Test.java" />
-                <classpath location="bin/test/support" />
+                <classpath location="${hy.build.mod}/test/support" />
             </javac-elements>
         </compile-tests>
     </target>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/security/src/main/native/security/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/security/src/main/native/security/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/security/src/main/native/security/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/security/src/main/native/security/unix/makefile Sat Jun  5 22:18:24 2010
@@ -17,14 +17,14 @@
 # Makefile for module 'security'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/security/native/security/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
-BUILDFILES = \
-	$(SHAREDSUB)security_copyright.o getUnixSystemRandom.o
+BUILDFILES = security_copyright.o getUnixSystemRandom.o
 
 DLLNAME = $(DLLPATH)libhysecurity$(HY_SHLIB_SUFFIX)
 EXPNAME = HYSECURITY_0.1
 
 MDLLIBFILES += $(LIBPATH)libvmi$(HY_LINKLIB_SUFFIX)
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/sound/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/sound/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/sound/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="SOUND Build" default="build" basedir=".">
     <description>Build for SOUND component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="sound" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -57,7 +57,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -95,7 +95,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/branches/mrh/classlib/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/sql/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/sql/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/sql/build.xml Sat Jun  5 22:18:24 2010
@@ -19,11 +19,10 @@
 <project name="SQL Build" default="build" basedir=".">
     <description>Build for SQL component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="sql" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
@@ -108,7 +107,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/branches/mrh/classlib/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="Sun Compat Build" default="build" basedir=".">
     <description>Build for Sun Compat component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="suncompat" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -57,7 +57,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -95,7 +95,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/branches/mrh/classlib/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/build.xml Sat Jun  5 22:18:24 2010
@@ -19,13 +19,13 @@
 <project name="SWING Build" default="build" basedir=".">
     <description>Build for SWING component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="swing" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <!-- List of private classes that cannot be mapped by above mappers -->
-    <fileset id="hidden.classes" dir="../../build/classes">
+    <fileset id="hidden.classes" dir="${hy.build.top}/java">
         <include name="javax/swing/text/html/parser/ModelElement.class"/>
         <include name="javax/swing/text/html/parser/Asn1ModelElement.class"/>
         <include name="javax/swing/text/html/parser/Asn1ModelElement$1.class"/>
@@ -66,7 +66,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -108,7 +108,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/injected" />
+            <fileset dir="${hy.build.mod}/test/injected" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>
@@ -128,7 +128,7 @@
 
     <target name="-compile-tests" unless="skip.test.build">
         <compile-tests description="${hy.module} tests"
-                       destdir="bin/test/injected">
+                       destdir="${hy.build.mod}/test/injected">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/java.injected" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/text/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/text/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/text/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="TEXT Build" default="build" basedir=".">
     <description>Build for TEXT component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="text" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../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" />
 
     <property file="../../make/depends.properties" />
 
@@ -57,7 +57,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -95,7 +95,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}"/>