harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r1027390 [2/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 GMT
Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/oglwrapper/windows/makefile Tue Oct 26 07:13:24 2010
@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\awt\native\oglwrapper\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=oglwrapper
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -22,7 +23,7 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHAREDSUB)include
 
-BUILDFILES = $(SHAREDSUB)org_apache_harmony_awt_gl_opengl_GL.obj
+BUILDFILES = $(HY_BIN)org_apache_harmony_awt_gl_opengl_GL.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/win32wrapper/windows/makefile Tue Oct 26 07:13:24 2010
@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\awt\native\win32wrapper\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=Win32Wrapper
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -21,12 +22,12 @@ LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  Callback.obj \
-  org_apache_harmony_awt_nativebridge_windows_Win32.obj \
-  org_apache_harmony_awt_nativebridge_windows_WGL.obj \
-  WinDataTransfer.obj \
-  WinManagement.obj \
-  nativelib_common.obj
+  $(HY_BIN)Callback.obj \
+  $(HY_BIN)org_apache_harmony_awt_nativebridge_windows_Win32.obj \
+  $(HY_BIN)org_apache_harmony_awt_nativebridge_windows_WGL.obj \
+  $(HY_BIN)WinDataTransfer.obj \
+  $(HY_BIN)WinManagement.obj \
+  $(HY_BIN)nativelib_common.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/winfont/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/winfont/windows/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/winfont/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/winfont/windows/makefile Tue Oct 26 07:13:24 2010
@@ -15,7 +15,8 @@
 
 TARGETOS = WINNT # Need _WIN32_WINNT=0x0500 to get GLYPHSET defined.
 APPVER = 5.0 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\awt\native\winfont\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=fontlib
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -25,7 +26,7 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 HYCFLAGS = $(HYCFLAGS) /Iinclude /I..\..\gl\windows\include /I..\..\fontlib\shared /I..\..\fontlib\windows \
   -DUNICODE -D_UNICODE
 
-BUILDFILES = winFont.obj
+BUILDFILES = $(HY_BIN)winFont.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib gdi32.lib GdiPlus.lib advapi32.lib 

Modified: harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile Tue Oct 26 07:13:24 2010
@@ -13,12 +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/awt/native/x11wrapper/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 INCLUDES += -I$(SHARED)common -I/usr/X11R6/include
 
-BUILDFILES = \
-  org_apache_harmony_awt_nativebridge_linux_ErrorHandler.o \
+BUILDFILES = org_apache_harmony_awt_nativebridge_linux_ErrorHandler.o \
   org_apache_harmony_awt_nativebridge_linux_GLX.o \
   org_apache_harmony_awt_nativebridge_linux_X11.o \
   org_apache_harmony_awt_nativebridge_linux_Xft.o
@@ -28,4 +28,4 @@ OSLIBS += $(STDCLIBS) $(XLIBS)
 DLLNAME=$(DLLPATH)libX11Wrapper$(HY_SHLIB_SUFFIX)
 EXPNAME=HYX11WRAPPER_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/trunk/classlib/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/beans/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/beans/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/beans/build.xml Tue Oct 26 07:13:24 2010
@@ -19,10 +19,10 @@
 <project name="BEANS Build" default="build" basedir=".">
     <description>Build for BEANS component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="beans" />
-    <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,15 +95,15 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_test_support.jar">
-            <fileset dir="bin/test_support" />
+            <fileset dir="${hy.build.mod}/test/support" />
         </hy.jar.bin>
 
         <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}_impl_tests.jar">
-            <fileset dir="bin/test-internal" />
+            <fileset dir="${hy.build.mod}/test/internal" />
         </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} test support"
-                       destdir="bin/test_support">
+                       destdir="${hy.build.mod}/test/support">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/support/java" />
@@ -136,12 +136,12 @@
             </javac-elements>
         </compile-tests>
         <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" />
                 </src>
-                <classpath location="bin/test_support" />
+                <classpath location="${hy.build.mod}/test/support" />
             </javac-elements>
         </compile-tests>
         <compile-tests description="${hy.module} api tests">
@@ -149,7 +149,7 @@
                 <src>
                     <pathelement location="src/test/java" />
                 </src>
-                <classpath location="bin/test_support" />
+                <classpath location="${hy.build.mod}/test/support" />
             </javac-elements>
         </compile-tests>
     </target>

Modified: harmony/enhanced/java/trunk/classlib/modules/beans/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/beans/make/run-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/beans/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/beans/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="classlib" />
+    <property name="hy.module" value="beans" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/concurrent/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/concurrent/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/concurrent/build.xml Tue Oct 26 07:13:24 2010
@@ -19,10 +19,10 @@
 <project name="CONCURRENT Build" default="build" basedir=".">
     <description>Build for CONCURRENT component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="concurrent" />
-    <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,7 +94,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/classlib/modules/concurrent/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/concurrent/make/run-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/concurrent/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/concurrent/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="classlib" />
+    <property name="hy.module" value="concurrent" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/crypto/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/crypto/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/crypto/build.xml Tue Oct 26 07:13:24 2010
@@ -19,10 +19,10 @@
 <project name="CRYPTO Build" default="build" basedir=".">
     <description>Build for CRYPTO component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="crypto" />
-    <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,21 +95,21 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_test_support.jar">
-            <fileset dir="bin/test/support" />
+            <fileset dir="${hy.build.mod}/test/support" />
         </hy.jar.bin>
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_api_tests.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}_api_boot_tests.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}_impl_tests.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}_impl_boot_tests.jar">
-            <fileset dir="bin/test/impl.injected" />
+            <fileset dir="${hy.build.mod}/test/impl.injected" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}" />
@@ -130,7 +130,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"/>
@@ -144,29 +144,29 @@
         </compile-tests>
 
         <compile-tests description="${hy.module} api tests"
-                       destdir="bin/test/api">
+                       destdir="${hy.build.mod}/test/api">
             <javac-elements>
                 <src path="src/test/api/java"/>
                 <include name="**/*Test.java" />
                 <classpath>
-                    <pathelement path="bin/test/support" />
+                    <pathelement path="${hy.build.mod}/test/support" />
                 </classpath>
             </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>
-                    <pathelement path="bin/test/support" />
+                    <pathelement path="${hy.build.mod}/test/support" />
                 </classpath>
             </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 path="src/test/impl/java.injected"/>
                 <include name="**/*Test.java" />
@@ -174,12 +174,12 @@
         </compile-tests>
 
         <compile-tests description="${hy.module} impl tests"
-                       destdir="bin/test/impl">
+                       destdir="${hy.build.mod}/test/impl">
             <javac-elements>
                 <src path="src/test/impl/java"/>
                 <include name="**/*Test.java" />
                 <classpath>
-                    <pathelement path="bin/test/support" />
+                    <pathelement path="${hy.build.mod}/test/support" />
                 </classpath>
             </javac-elements>
         </compile-tests>

Modified: harmony/enhanced/java/trunk/classlib/modules/crypto/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/crypto/make/run-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/crypto/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/crypto/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="classlib" />
+    <property name="hy.module" value="crypto" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/build.xml Tue Oct 26 07:13: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">
@@ -179,7 +179,7 @@ ${line.separator}For Fedora try: yum ins
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <metainf dir="src/test/java/META-INF" />
-            <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/classlib/modules/imageio/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/make/depends.properties?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/make/depends.properties (original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/make/depends.properties Tue Oct 26 07:13:24 2010
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-depends.dir=depends
-depends.lib.dir=${depends.dir}/libs/${hy.platform}
+hy.depends=depends
+depends.lib.dir=${hy.depends}/libs/${hy.platform}
 awt.base=http://people.apache.org/~hindessm/classlib-depends/${hy.platform}
 jpeg.ver=6b
 jpeg.dir=${depends.lib.dir}/jpeg-${jpeg.ver}

Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/make/run-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/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="classlib" />
+    <property name="hy.module" value="imageio" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile Tue Oct 26 07:13: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/trunk/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/jpegencoder/windows/makefile Tue Oct 26 07:13:24 2010
@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\imageio\native\jpegencoder\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 JPEG_DIR=$(HY_JPEG_DIR)\# avoid continuation
 
@@ -35,7 +36,7 @@ HYCFLAGS = $(HYCFLAGS) -DHY_ZIP_API
 !ENDIF
 
 
-BUILDFILES = $(SHAREDSUB)JpegEncoder.obj
+BUILDFILES = $(HY_BIN)JpegEncoder.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
@@ -48,7 +49,7 @@ CLEANFILES=jconfig.h
 
 !include <$(HY_HDK)\build\make\rules.mak>
 
-$(SHAREDSUB)JpegEncoder.obj: jconfig.h
+$(HY_BIN)JpegEncoder.obj: jconfig.h
 
 jconfig.h: $(JPEG_DIR)jconfig.vc
 	copy $(JPEG_DIR)jconfig.vc $@

Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile Tue Oct 26 07:13: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/trunk/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/native/pngencoder/windows/makefile Tue Oct 26 07:13:24 2010
@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\imageio\native\pngencoder\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 PNG_DIR=$(HY_PNG_DIR)\# avoid continuation
 
@@ -25,7 +26,7 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)include /I$(SHAREDSUB) \
            /I$(PNG_DIR) /Iinclude
 
-BUILDFILES = $(SHAREDSUB)pngencoder.obj
+BUILDFILES = $(HY_BIN)pngencoder.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib

Modified: harmony/enhanced/java/trunk/classlib/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/instrument/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/instrument/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/instrument/build.xml Tue Oct 26 07:13: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/trunk/classlib/modules/instrument/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/instrument/make/run-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/instrument/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/instrument/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="classlib" />
+    <property name="hy.module" value="instrument" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/unix/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/unix/makefile Tue Oct 26 07:13: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 
@@ -35,4 +35,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/trunk/classlib/modules/instrument/src/main/native/instrument/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/windows/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/instrument/src/main/native/instrument/windows/makefile Tue Oct 26 07:13:24 2010
@@ -17,7 +17,8 @@
 # Makefile for module 'instrument'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\instrument\native\instrument\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyinstrument
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -26,7 +27,7 @@ HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  $(SHAREDSUB)instrument.obj $(SHAREDSUB)inst_agt.obj 
+  $(HY_BIN)instrument.obj $(HY_BIN)inst_agt.obj 
 
 VIRTFILES = hyinstrument.res
 

Modified: harmony/enhanced/java/trunk/classlib/modules/jmx/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/jmx/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/jmx/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/jmx/build.xml Tue Oct 26 07:13: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/trunk/classlib/modules/jmx/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/jmx/make/depends.properties?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/jmx/make/depends.properties (original)
+++ harmony/enhanced/java/trunk/classlib/modules/jmx/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
 
 mx4j.version=3.0.2
 mx4j.dir=${depends.jars}/mx4j_${mx4j.version}

Modified: harmony/enhanced/java/trunk/classlib/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/jndi/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/jndi/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/jndi/build.xml Tue Oct 26 07:13: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/trunk/classlib/modules/jndi/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/jndi/make/run-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/jndi/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/jndi/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="classlib" />
+    <property name="hy.module" value="jndi" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/lang-management/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/lang-management/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/lang-management/build.xml Tue Oct 26 07:13: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/trunk/classlib/modules/lang-management/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/lang-management/make/run-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/lang-management/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/lang-management/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="classlib" />
+    <property name="hy.module" value="lang-management" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/logging/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/logging/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/logging/build.xml Tue Oct 26 07:13: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/trunk/classlib/modules/logging/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/logging/make/run-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/logging/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/logging/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="classlib" />
+    <property name="hy.module" value="logging" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/luni-kernel/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni-kernel/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni-kernel/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni-kernel/build.xml Tue Oct 26 07:13: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/trunk/classlib/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/build.xml Tue Oct 26 07:13: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" />
@@ -71,14 +72,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>
@@ -113,6 +112,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"/>
@@ -125,13 +125,15 @@
             <fileset dir="${fdlibm.dist}" >
                 <include name="fdlibm.h"/>
                 <include name="s_lib_version.c"/>
-                <include name="configure*"/>
-                <include name="Makefile*"/>
+                <include name="configure"/>
+                <include name="configure.in"/>
+                <include name="Makefile"/>
+                <include name="Makefile.in"/>
             </fileset>
             <mapper type="glob" from="*" to="*.orig" />
         </move>
 
-        <chmod dir="src/main/native/fdlibm_dist" perm="ugo+r" />
+        <chmod dir="${fdlibm.dist}" perm="ugo+r" />
     </target>
 
     <target name="-ascii2ebcdic-conversion" unless="skip.native.build"
@@ -212,7 +214,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">
@@ -251,11 +253,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}">
@@ -292,7 +294,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" />
@@ -305,7 +307,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/trunk/classlib/modules/luni/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/make/depends.properties?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/make/depends.properties (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/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.
 
-fdlibm.dir=${depends.dir}/oss/fdlibm-5.3
+fdlibm.dir=${hy.depends}/oss/fdlibm-5.3
 fdlibm.tar=${fdlibm.dir}/fdlibm53.tar.gz
 fdlibm.url=http://www.validlab.com/software/fdlibm53.tar.gz
 fdlibm.md5=e56ca86c077dee87faf6a2c2cc1c10a5

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/make/run-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/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="classlib" />
+    <property name="hy.module" value="luni" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/fdlibm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/fdlibm/unix/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/fdlibm/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/fdlibm/unix/makefile Tue Oct 26 07:13: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/trunk/classlib/modules/luni/src/main/native/fdlibm/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/fdlibm/windows/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/fdlibm/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/fdlibm/windows/makefile Tue Oct 26 07:13:24 2010
@@ -17,50 +17,62 @@
 # Makefile for module 'fdlibm'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\luni\native\fdlibm\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBNAME=$(LIBPATH)hyfdlibm.lib
 
-FDLIBM_DIST=..\..\fdlibm_dist\# Comment to stop line continuation
+OSS_DIST=$(HY_TARGET)\depends\native\fdlibm_dist\# Path to fdlibm
 
 BUILDFILES = \
-  $(FDLIBM_DIST)e_acos.obj $(FDLIBM_DIST)e_acosh.obj $(FDLIBM_DIST)e_asin.obj $(FDLIBM_DIST)e_atan2.obj \
-  $(FDLIBM_DIST)e_atanh.obj $(FDLIBM_DIST)e_cosh.obj $(FDLIBM_DIST)e_exp.obj $(FDLIBM_DIST)e_fmod.obj \
-  $(FDLIBM_DIST)e_gamma.obj $(FDLIBM_DIST)e_gamma_r.obj $(FDLIBM_DIST)e_hypot.obj $(FDLIBM_DIST)e_j0.obj \
-  $(FDLIBM_DIST)e_j1.obj $(FDLIBM_DIST)e_jn.obj $(FDLIBM_DIST)e_lgamma.obj $(FDLIBM_DIST)e_lgamma_r.obj \
-  $(FDLIBM_DIST)e_log.obj $(FDLIBM_DIST)e_log10.obj $(FDLIBM_DIST)e_pow.obj $(FDLIBM_DIST)e_rem_pio2.obj \
-  $(FDLIBM_DIST)e_remainder.obj $(FDLIBM_DIST)e_scalb.obj $(FDLIBM_DIST)e_sinh.obj $(FDLIBM_DIST)e_sqrt.obj \
-  $(FDLIBM_DIST)k_cos.obj $(FDLIBM_DIST)k_rem_pio2.obj $(FDLIBM_DIST)k_sin.obj $(FDLIBM_DIST)k_standard.obj \
-  $(FDLIBM_DIST)k_tan.obj $(FDLIBM_DIST)s_asinh.obj $(FDLIBM_DIST)s_atan.obj $(FDLIBM_DIST)s_cbrt.obj \
-  $(FDLIBM_DIST)s_ceil.obj $(FDLIBM_DIST)s_copysign.obj $(FDLIBM_DIST)s_cos.obj $(FDLIBM_DIST)s_erf.obj \
-  $(FDLIBM_DIST)s_expm1.obj $(FDLIBM_DIST)s_fabs.obj $(FDLIBM_DIST)s_finite.obj $(FDLIBM_DIST)s_floor.obj \
-  $(FDLIBM_DIST)s_frexp.obj $(FDLIBM_DIST)s_ilogb.obj $(FDLIBM_DIST)s_isnan.obj $(FDLIBM_DIST)s_ldexp.obj \
-  $(SHAREDSUB)s_lib_version.obj \
-  $(FDLIBM_DIST)s_log1p.obj $(FDLIBM_DIST)s_logb.obj $(FDLIBM_DIST)s_matherr.obj \
-  $(FDLIBM_DIST)s_modf.obj $(FDLIBM_DIST)s_nextafter.obj $(FDLIBM_DIST)s_rint.obj $(FDLIBM_DIST)s_scalbn.obj \
-  $(FDLIBM_DIST)s_signgam.obj $(FDLIBM_DIST)s_significand.obj $(FDLIBM_DIST)s_sin.obj $(FDLIBM_DIST)s_tan.obj \
-  $(FDLIBM_DIST)s_tanh.obj $(FDLIBM_DIST)w_acos.obj $(FDLIBM_DIST)w_acosh.obj $(FDLIBM_DIST)w_asin.obj \
-  $(FDLIBM_DIST)w_atan2.obj $(FDLIBM_DIST)w_atanh.obj $(FDLIBM_DIST)w_cosh.obj $(FDLIBM_DIST)w_exp.obj \
-  $(FDLIBM_DIST)w_fmod.obj $(FDLIBM_DIST)w_gamma.obj $(FDLIBM_DIST)w_gamma_r.obj $(FDLIBM_DIST)w_hypot.obj \
-  $(FDLIBM_DIST)w_j0.obj $(FDLIBM_DIST)w_j1.obj $(FDLIBM_DIST)w_jn.obj $(FDLIBM_DIST)w_lgamma.obj \
-  $(FDLIBM_DIST)w_lgamma_r.obj $(FDLIBM_DIST)w_log.obj $(FDLIBM_DIST)w_log10.obj $(FDLIBM_DIST)w_pow.obj \
-  $(FDLIBM_DIST)w_remainder.obj $(FDLIBM_DIST)w_scalb.obj $(FDLIBM_DIST)w_sinh.obj $(FDLIBM_DIST)w_sqrt.obj
+  $(HY_BIN)e_acos.obj $(HY_BIN)e_acosh.obj $(HY_BIN)e_asin.obj \
+  $(HY_BIN)e_atan2.obj $(HY_BIN)e_atanh.obj $(HY_BIN)e_cosh.obj \
+  $(HY_BIN)e_exp.obj $(HY_BIN)e_fmod.obj $(HY_BIN)e_gamma.obj \
+  $(HY_BIN)e_gamma_r.obj $(HY_BIN)e_hypot.obj $(HY_BIN)e_j0.obj \
+  $(HY_BIN)e_j1.obj $(HY_BIN)e_jn.obj $(HY_BIN)e_lgamma.obj \
+  $(HY_BIN)e_lgamma_r.obj $(HY_BIN)e_log.obj $(HY_BIN)e_log10.obj \
+  $(HY_BIN)e_pow.obj $(HY_BIN)e_rem_pio2.obj $(HY_BIN)e_remainder.obj \
+  $(HY_BIN)e_scalb.obj $(HY_BIN)e_sinh.obj $(HY_BIN)e_sqrt.obj \
+  $(HY_BIN)k_cos.obj $(HY_BIN)k_rem_pio2.obj $(HY_BIN)k_sin.obj \
+  $(HY_BIN)k_standard.obj $(HY_BIN)k_tan.obj $(HY_BIN)s_asinh.obj \
+  $(HY_BIN)s_atan.obj $(HY_BIN)s_cbrt.obj $(HY_BIN)s_ceil.obj \
+  $(HY_BIN)s_copysign.obj $(HY_BIN)s_cos.obj $(HY_BIN)s_erf.obj \
+  $(HY_BIN)s_expm1.obj $(HY_BIN)s_fabs.obj $(HY_BIN)s_finite.obj \
+  $(HY_BIN)s_floor.obj $(HY_BIN)s_frexp.obj $(HY_BIN)s_ilogb.obj \
+  $(HY_BIN)s_isnan.obj $(HY_BIN)s_ldexp.obj $(HY_BIN)s_lib_version.obj \
+  $(HY_BIN)s_log1p.obj $(HY_BIN)s_logb.obj $(HY_BIN)s_matherr.obj \
+  $(HY_BIN)s_modf.obj $(HY_BIN)s_nextafter.obj $(HY_BIN)s_rint.obj \
+  $(HY_BIN)s_scalbn.obj $(HY_BIN)s_signgam.obj $(HY_BIN)s_significand.obj \
+  $(HY_BIN)s_sin.obj $(HY_BIN)s_tan.obj $(HY_BIN)s_tanh.obj \
+  $(HY_BIN)w_acos.obj $(HY_BIN)w_acosh.obj $(HY_BIN)w_asin.obj \
+  $(HY_BIN)w_atan2.obj $(HY_BIN)w_atanh.obj $(HY_BIN)w_cosh.obj \
+  $(HY_BIN)w_exp.obj $(HY_BIN)w_fmod.obj $(HY_BIN)w_gamma.obj \
+  $(HY_BIN)w_gamma_r.obj $(HY_BIN)w_hypot.obj $(HY_BIN)w_j0.obj \
+  $(HY_BIN)w_j1.obj $(HY_BIN)w_jn.obj $(HY_BIN)w_lgamma.obj \
+  $(HY_BIN)w_lgamma_r.obj $(HY_BIN)w_log.obj $(HY_BIN)w_log10.obj \
+  $(HY_BIN)w_pow.obj $(HY_BIN)w_remainder.obj $(HY_BIN)w_scalb.obj \
+  $(HY_BIN)w_sinh.obj $(HY_BIN)w_sqrt.obj
 
 HYCFLAGS = -Oityb1 -W3 -Fd$(LIBPATH)hyfdlibm.pdb -D_IEEE_LIBM \
-	   /I$(SHAREDSUB) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include
+	   /I$(SHAREDSUB) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include \
+	   /I$(OSS_DIST)
 
-.c.obj:
-        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $*.c
+all: $(HY_BIN) $(LIBNAME)
 
-$(LIBPATH)$(LIBNAME): $(BUILDFILES)
-	@echo /NOLOGO -out:$(LIBNAME) >templrf
-	@echo $(BUILDFILES) >>templrf
-	$(implib) @templrf
-	@del templrf
+$(HY_BIN):
+	-mkdir $(HY_BIN)
+
+{$(OSS_DIST)}.c{$(HY_BIN)}.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(SHAREDSUB)}.c{$(HY_BIN)}.obj:
+	$(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+$(LIBNAME): $(BUILDFILES)
+	$(implib) /NOLOGO -out:$(LIBNAME) $(BUILDFILES)
 
 clean:
 	-del *.obj dist\*.obj
 	-del $(LIBNAME)
 	-del $(LIBPATH)hyfdlibm.pdb
         -del $(SHAREDSUB)*.obj
-

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/unix/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/hyzip/unix/makefile Tue Oct 26 07:13: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) $(AREXTRACT) $(LIBPATH)libhypool.a $@
+$(HY_BIN)%.o: $(LIBPATH)libhypool.a(%.o)
+	( cd $(HY_BIN) && ar $(ARFLAGS) $(AREXTRACT) $(LIBPATH)libhypool.a $@ )
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/launcher/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/launcher/unix/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/launcher/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/launcher/unix/makefile Tue Oct 26 07:13: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/trunk/classlib/modules/luni/src/main/native/launcher/windows/makefile.javae
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/launcher/windows/makefile.javae?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/launcher/windows/makefile.javae (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/launcher/windows/makefile.javae Tue Oct 26 07:13:24 2010
@@ -17,18 +17,19 @@
 # Makefile for module 'launcher.java'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\luni\native\launcher\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 EXEBASE=java
 EXENAME=$(EXEPATH)$(EXEBASE).exe
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
-BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)cmain.obj \
-        $(SHAREDSUB)main.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
+BUILDFILES = $(HY_BIN)launcher_copyright.obj $(HY_BIN)cmain.obj \
+        $(HY_BIN)main.obj $(HY_BIN)strbuf.obj $(HY_BIN)libhlp.obj
 !IF "$(HY_NO_THR)" == "false"
 MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt$(HY_LINKLIB_SUFFIX)
 !ELSE
-BUILDFILES = $(BUILDFILES) main_hlp.obj
+BUILDFILES = $(BUILDFILES) $(HY_BIN)main_hlp.obj
 !ENDIF
 
 VIRTFILES = java.res

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/launcher/windows/makefile.javaw
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/launcher/windows/makefile.javaw?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/launcher/windows/makefile.javaw (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/launcher/windows/makefile.javaw Tue Oct 26 07:13:24 2010
@@ -17,18 +17,19 @@
 # Makefile for module 'launcher.javaw'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\luni\native\launcher\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 EXEBASE=javaw
 EXENAME=$(EXEPATH)$(EXEBASE).exe
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 
-BUILDFILES = $(SHAREDSUB)launcher_copyright.obj $(SHAREDSUB)main.obj \
-        winmain.obj $(SHAREDSUB)strbuf.obj $(SHAREDSUB)libhlp.obj
+BUILDFILES = $(HY_BIN)launcher_copyright.obj $(HY_BIN)main.obj \
+             $(HY_BIN)winmain.obj $(HY_BIN)strbuf.obj $(HY_BIN)libhlp.obj
 !IF "$(HY_NO_THR)" == "false"
 MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hyprt$(HY_LINKLIB_SUFFIX)
 !ELSE
-BUILDFILES = $(BUILDFILES) main_hlp.obj
+BUILDFILES = $(BUILDFILES) $(HY_BIN)main_hlp.obj
 !ENDIF
 VIRTFILES = javaw.res
 EXEFLAGS=$(guilflags) -subsystem:windows

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/unix/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/unix/makefile Tue Oct 26 07:13: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/trunk/classlib/modules/luni/src/main/native/luni/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/windows/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/luni/windows/makefile Tue Oct 26 07:13:24 2010
@@ -17,7 +17,8 @@
 # Makefile for module 'luni'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\luni\native\luni\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyluni
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -26,17 +27,17 @@ HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB)
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  $(SHAREDSUB)luni_copyright.obj $(SHAREDSUB)file.obj procimpl.obj \
-  $(SHAREDSUB)nethelp.obj $(SHAREDSUB)floatbits.obj \
-  helpers.obj $(SHAREDSUB)math.obj \
-  $(SHAREDSUB)luniglob.obj $(SHAREDSUB)proxy.obj $(SHAREDSUB)netif.obj \
-  $(SHAREDSUB)cbigint.obj $(SHAREDSUB)dblparse.obj $(SHAREDSUB)fltparse.obj \
-  $(SHAREDSUB)process.obj $(SHAREDSUB)bigint.obj $(SHAREDSUB)osc.obj \
-  $(SHAREDSUB)socket.obj $(SHAREDSUB)inetadds.obj \
-  $(SHAREDSUB)filedesc.obj $(SHAREDSUB)timezone.obj \
-  OSFileSystemWin32.obj hyenv.obj\
-  $(SHAREDSUB)OSFileSystem.obj OSMemoryWin32.obj $(SHAREDSUB)OSMemory.obj \
-  $(SHAREDSUB)OSNetworkSystem.obj OSNetworkSystemWin32.obj
+  $(HY_BIN)luni_copyright.obj $(HY_BIN)file.obj $(HY_BIN)procimpl.obj \
+  $(HY_BIN)nethelp.obj $(HY_BIN)floatbits.obj \
+  $(HY_BIN)helpers.obj $(HY_BIN)math.obj \
+  $(HY_BIN)luniglob.obj $(HY_BIN)proxy.obj $(HY_BIN)netif.obj \
+  $(HY_BIN)cbigint.obj $(HY_BIN)dblparse.obj $(HY_BIN)fltparse.obj \
+  $(HY_BIN)process.obj $(HY_BIN)bigint.obj $(HY_BIN)osc.obj \
+  $(HY_BIN)socket.obj $(HY_BIN)inetadds.obj \
+  $(HY_BIN)filedesc.obj $(HY_BIN)timezone.obj \
+  $(HY_BIN)OSFileSystemWin32.obj $(HY_BIN)hyenv.obj\
+  $(HY_BIN)OSFileSystem.obj $(HY_BIN)OSMemoryWin32.obj $(HY_BIN)OSMemory.obj \
+  $(HY_BIN)OSNetworkSystem.obj $(HY_BIN)OSNetworkSystemWin32.obj
 
 VIRTFILES = hyluni.res
 

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmi/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmi/unix/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmi/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmi/unix/makefile Tue Oct 26 07:13: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/trunk/classlib/modules/luni/src/main/native/vmi/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmi/windows/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmi/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmi/windows/makefile Tue Oct 26 07:13:24 2010
@@ -17,14 +17,15 @@
 # Makefile for module 'vmi'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\luni\native\vmi\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=vmi
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYCFLAGS = $(HYCFLAGS) -DHYPORT_LIBRARY_DEFINE
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
-BUILDFILES = $(SHAREDSUB)vmi_copyright.obj $(SHAREDSUB)vmi.obj
+BUILDFILES = $(HY_BIN)vmi_copyright.obj $(HY_BIN)vmi.obj
 
 VIRTFILES = vmi.res
 

Modified: harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmls/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmls/unix/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmls/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmls/unix/makefile Tue Oct 26 07:13: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/trunk/classlib/modules/luni/src/main/native/vmls/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmls/windows/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmls/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/luni/src/main/native/vmls/windows/makefile Tue Oct 26 07:13:24 2010
@@ -17,12 +17,12 @@
 # Makefile for module 'vmls'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\luni\native\vmls\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBNAME=$(LIBPATH)hyvmls.lib
 
-BUILDFILES = \
-	$(SHAREDSUB)vmls.obj
+BUILDFILES = $(HY_BIN)vmls.obj
 
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I..\..\include\shared /I..\..\include\windows
 

Modified: harmony/enhanced/java/trunk/classlib/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/math/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/math/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/math/build.xml Tue Oct 26 07:13: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/trunk/classlib/modules/math/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/math/make/run-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/math/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/math/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="classlib" />
+    <property name="hy.module" value="math" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/misc/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/misc/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/misc/build.xml Tue Oct 26 07:13: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/trunk/classlib/modules/misc/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/misc/make/run-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/misc/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/misc/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="classlib" />
+    <property name="hy.module" value="misc" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/unix/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/unix/makefile Tue Oct 26 07:13: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/trunk/classlib/modules/misc/src/main/native/accessors/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/windows/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/misc/src/main/native/accessors/windows/makefile Tue Oct 26 07:13:24 2010
@@ -13,7 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\misc\native\accessors\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=accessors
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -21,11 +22,11 @@ LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  $(SHAREDSUB)org_apache_harmony_misc_accessors_ArrayAccessorImpl.obj \
-  $(SHAREDSUB)org_apache_harmony_misc_accessors_Malloc.obj \
-  $(SHAREDSUB)org_apache_harmony_misc_accessors_MemoryAccessorNativeImpl.obj \
-  $(SHAREDSUB)org_apache_harmony_misc_accessors_ObjectAccessorImpl.obj \
-  $(SHAREDSUB)org_apache_harmony_misc_accessors_StringAccessorImpl.obj
+  $(HY_BIN)org_apache_harmony_misc_accessors_ArrayAccessorImpl.obj \
+  $(HY_BIN)org_apache_harmony_misc_accessors_Malloc.obj \
+  $(HY_BIN)org_apache_harmony_misc_accessors_MemoryAccessorNativeImpl.obj \
+  $(HY_BIN)org_apache_harmony_misc_accessors_ObjectAccessorImpl.obj \
+  $(HY_BIN)org_apache_harmony_misc_accessors_StringAccessorImpl.obj
 VIRTFILES = accessors.res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib
 

Modified: harmony/enhanced/java/trunk/classlib/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/nio/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/nio/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/nio/build.xml Tue Oct 26 07:13: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/trunk/classlib/modules/nio/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/nio/make/run-test.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/nio/make/run-test.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/nio/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="classlib" />
+    <property name="hy.module" value="nio" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/unix/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/unix/makefile Tue Oct 26 07:13: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



Mime
View raw message