harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r1027390 [3/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/nio/src/main/native/nio/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/windows/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/nio/src/main/native/nio/windows/makefile Tue Oct 26 07:13:24 2010
@@ -17,7 +17,8 @@
 # Makefile for module 'nio'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\nio\native\nio\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hynio
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -25,8 +26,7 @@ LIBNAME=$(LIBPATH)$(LIBBASE).lib
 HYCFLAGS = $(HYCFLAGS) /I$(SHAREDSUB) /I$(SHARED)common /I$(SHARED)fdlibm
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
-BUILDFILES = \
-  $(SHAREDSUB)DirectBufferUtil.obj $(SHAREDSUB)AddressUtil.obj
+BUILDFILES = $(HY_BIN)DirectBufferUtil.obj $(HY_BIN)AddressUtil.obj
 VIRTFILES = hynio.res
 
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib

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

Modified: harmony/enhanced/java/trunk/classlib/modules/nio_char/src/main/native/niochar/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/nio_char/src/main/native/niochar/unix/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/nio_char/src/main/native/niochar/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/nio_char/src/main/native/niochar/unix/makefile Tue Oct 26 07:13: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/trunk/classlib/modules/nio_char/src/main/native/niochar/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/nio_char/src/main/native/niochar/windows/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/nio_char/src/main/native/niochar/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/nio_char/src/main/native/niochar/windows/makefile Tue Oct 26 07:13:24 2010
@@ -17,7 +17,8 @@
 # Makefile for module 'nio_char'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\nio_char\native\niochar\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyniochar
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -27,100 +28,100 @@ HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE)
 ADDITIONAL = $(SHAREDSUB)\additional\#
 
 BUILDFILES = \
-  $(SHAREDSUB)CP_1250.obj \
-  $(SHAREDSUB)CP_1251.obj \
-  $(SHAREDSUB)CP_1252.obj \
-  $(SHAREDSUB)CP_1253.obj \
-  $(SHAREDSUB)CP_1254.obj \
-  $(SHAREDSUB)CP_1257.obj \
-  $(SHAREDSUB)ISO_8859_1.obj \
-  $(SHAREDSUB)ISO_8859_2.obj \
-  $(SHAREDSUB)ISO_8859_4.obj \
-  $(SHAREDSUB)ISO_8859_5.obj \
-  $(SHAREDSUB)ISO_8859_7.obj \
-  $(SHAREDSUB)ISO_8859_9.obj \
-  $(SHAREDSUB)ISO_8859_13.obj \
-  $(SHAREDSUB)ISO_8859_15.obj \
-  $(SHAREDSUB)KOI8_R.obj \
-  $(SHAREDSUB)US_ASCII.obj \
-  $(SHAREDSUB)IBM866.obj \
-  $(ADDITIONAL)IBM00858.obj \
-  $(ADDITIONAL)IBM01140.obj \
-  $(ADDITIONAL)IBM01141.obj \
-  $(ADDITIONAL)IBM01142.obj \
-  $(ADDITIONAL)IBM01143.obj \
-  $(ADDITIONAL)IBM01144.obj \
-  $(ADDITIONAL)IBM01145.obj \
-  $(ADDITIONAL)IBM01146.obj \
-  $(ADDITIONAL)IBM01147.obj \
-  $(ADDITIONAL)IBM01148.obj \
-  $(ADDITIONAL)IBM01149.obj \
-  $(ADDITIONAL)IBM037.obj \
-  $(ADDITIONAL)IBM1026.obj \
-  $(ADDITIONAL)IBM1047.obj \
-  $(ADDITIONAL)IBM273.obj \
-  $(ADDITIONAL)IBM277.obj \
-  $(ADDITIONAL)IBM278.obj \
-  $(ADDITIONAL)IBM280.obj \
-  $(ADDITIONAL)IBM284.obj \
-  $(ADDITIONAL)IBM285.obj \
-  $(ADDITIONAL)IBM297.obj \
-  $(ADDITIONAL)IBM420.obj \
-  $(ADDITIONAL)IBM424.obj \
-  $(ADDITIONAL)IBM437.obj \
-  $(ADDITIONAL)IBM500.obj \
-  $(ADDITIONAL)IBM775.obj \
-  $(ADDITIONAL)IBM850.obj \
-  $(ADDITIONAL)IBM852.obj \
-  $(ADDITIONAL)IBM855.obj \
-  $(ADDITIONAL)IBM857.obj \
-  $(ADDITIONAL)IBM860.obj \
-  $(ADDITIONAL)IBM861.obj \
-  $(ADDITIONAL)IBM862.obj \
-  $(ADDITIONAL)IBM863.obj \
-  $(ADDITIONAL)IBM864.obj \
-  $(ADDITIONAL)IBM865.obj \
-  $(ADDITIONAL)IBM868.obj \
-  $(ADDITIONAL)IBM869.obj \
-  $(ADDITIONAL)IBM870.obj \
-  $(ADDITIONAL)IBM871.obj \
-  $(ADDITIONAL)IBM918.obj \
-  $(ADDITIONAL)IBM_Thai.obj \
-  $(ADDITIONAL)ISO_8859_3.obj \
-  $(ADDITIONAL)ISO_8859_6.obj \
-  $(ADDITIONAL)ISO_8859_8.obj \
-  $(ADDITIONAL)windows_1255.obj \
-  $(ADDITIONAL)windows_1256.obj \
-  $(ADDITIONAL)x_IBM1006.obj \
-  $(ADDITIONAL)x_IBM1025.obj \
-  $(ADDITIONAL)x_IBM1097.obj \
-  $(ADDITIONAL)x_IBM1098.obj \
-  $(ADDITIONAL)x_IBM1112.obj \
-  $(ADDITIONAL)x_IBM1122.obj \
-  $(ADDITIONAL)x_IBM1123.obj \
-  $(ADDITIONAL)x_IBM1124.obj \
-  $(ADDITIONAL)x_IBM737.obj \
-  $(ADDITIONAL)x_IBM856.obj \
-  $(ADDITIONAL)x_IBM874.obj \
-  $(ADDITIONAL)x_IBM875.obj \
-  $(ADDITIONAL)x_IBM922.obj \
-  $(ADDITIONAL)x_MacCyrillic.obj \
-  $(ADDITIONAL)x_MacGreek.obj \
-  $(ADDITIONAL)x_MacTurkish.obj \
-  $(ADDITIONAL)Big5.obj \
-  $(ADDITIONAL)Big5_HKSCS.obj \
-  $(ADDITIONAL)EUC_KR.obj \
-  $(ADDITIONAL)GB2312.obj \
-  $(ADDITIONAL)GBK.obj \
-  $(ADDITIONAL)GB18030.obj \
-  $(ADDITIONAL)windows_31j.obj \
-  $(ADDITIONAL)x_MS950_HKSCS.obj \
-  $(ADDITIONAL)x_windows_949.obj 
+  $(HY_BIN)CP_1250.obj \
+  $(HY_BIN)CP_1251.obj \
+  $(HY_BIN)CP_1252.obj \
+  $(HY_BIN)CP_1253.obj \
+  $(HY_BIN)CP_1254.obj \
+  $(HY_BIN)CP_1257.obj \
+  $(HY_BIN)ISO_8859_1.obj \
+  $(HY_BIN)ISO_8859_2.obj \
+  $(HY_BIN)ISO_8859_4.obj \
+  $(HY_BIN)ISO_8859_5.obj \
+  $(HY_BIN)ISO_8859_7.obj \
+  $(HY_BIN)ISO_8859_9.obj \
+  $(HY_BIN)ISO_8859_13.obj \
+  $(HY_BIN)ISO_8859_15.obj \
+  $(HY_BIN)KOI8_R.obj \
+  $(HY_BIN)US_ASCII.obj \
+  $(HY_BIN)IBM866.obj \
+  $(HY_BIN)IBM00858.obj \
+  $(HY_BIN)IBM01140.obj \
+  $(HY_BIN)IBM01141.obj \
+  $(HY_BIN)IBM01142.obj \
+  $(HY_BIN)IBM01143.obj \
+  $(HY_BIN)IBM01144.obj \
+  $(HY_BIN)IBM01145.obj \
+  $(HY_BIN)IBM01146.obj \
+  $(HY_BIN)IBM01147.obj \
+  $(HY_BIN)IBM01148.obj \
+  $(HY_BIN)IBM01149.obj \
+  $(HY_BIN)IBM037.obj \
+  $(HY_BIN)IBM1026.obj \
+  $(HY_BIN)IBM1047.obj \
+  $(HY_BIN)IBM273.obj \
+  $(HY_BIN)IBM277.obj \
+  $(HY_BIN)IBM278.obj \
+  $(HY_BIN)IBM280.obj \
+  $(HY_BIN)IBM284.obj \
+  $(HY_BIN)IBM285.obj \
+  $(HY_BIN)IBM297.obj \
+  $(HY_BIN)IBM420.obj \
+  $(HY_BIN)IBM424.obj \
+  $(HY_BIN)IBM437.obj \
+  $(HY_BIN)IBM500.obj \
+  $(HY_BIN)IBM775.obj \
+  $(HY_BIN)IBM850.obj \
+  $(HY_BIN)IBM852.obj \
+  $(HY_BIN)IBM855.obj \
+  $(HY_BIN)IBM857.obj \
+  $(HY_BIN)IBM860.obj \
+  $(HY_BIN)IBM861.obj \
+  $(HY_BIN)IBM862.obj \
+  $(HY_BIN)IBM863.obj \
+  $(HY_BIN)IBM864.obj \
+  $(HY_BIN)IBM865.obj \
+  $(HY_BIN)IBM868.obj \
+  $(HY_BIN)IBM869.obj \
+  $(HY_BIN)IBM870.obj \
+  $(HY_BIN)IBM871.obj \
+  $(HY_BIN)IBM918.obj \
+  $(HY_BIN)IBM_Thai.obj \
+  $(HY_BIN)ISO_8859_3.obj \
+  $(HY_BIN)ISO_8859_6.obj \
+  $(HY_BIN)ISO_8859_8.obj \
+  $(HY_BIN)windows_1255.obj \
+  $(HY_BIN)windows_1256.obj \
+  $(HY_BIN)x_IBM1006.obj \
+  $(HY_BIN)x_IBM1025.obj \
+  $(HY_BIN)x_IBM1097.obj \
+  $(HY_BIN)x_IBM1098.obj \
+  $(HY_BIN)x_IBM1112.obj \
+  $(HY_BIN)x_IBM1122.obj \
+  $(HY_BIN)x_IBM1123.obj \
+  $(HY_BIN)x_IBM1124.obj \
+  $(HY_BIN)x_IBM737.obj \
+  $(HY_BIN)x_IBM856.obj \
+  $(HY_BIN)x_IBM874.obj \
+  $(HY_BIN)x_IBM875.obj \
+  $(HY_BIN)x_IBM922.obj \
+  $(HY_BIN)x_MacCyrillic.obj \
+  $(HY_BIN)x_MacGreek.obj \
+  $(HY_BIN)x_MacTurkish.obj \
+  $(HY_BIN)Big5.obj \
+  $(HY_BIN)Big5_HKSCS.obj \
+  $(HY_BIN)EUC_KR.obj \
+  $(HY_BIN)GB2312.obj \
+  $(HY_BIN)GBK.obj \
+  $(HY_BIN)GB18030.obj \
+  $(HY_BIN)windows_31j.obj \
+  $(HY_BIN)x_MS950_HKSCS.obj \
+  $(HY_BIN)x_windows_949.obj 
 
 VIRTFILES = hynio_char.res
 
 MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)vmi$(HY_LINKLIB_SUFFIX)
-  
+
 DLLBASE=0x13200000
 
 !include <$(HY_HDK)\build\make\rules.mak>

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

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

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

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

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

Modified: harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/port/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/port/unix/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/port/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/port/unix/makefile Tue Oct 26 07:13: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/trunk/classlib/modules/portlib/src/main/native/port/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/port/windows/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/port/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/port/windows/makefile Tue Oct 26 07:13:24 2010
@@ -17,7 +17,8 @@
 # Makefile for module 'port'
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\classlib\portlib\native\port\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=hyprt
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -27,14 +28,16 @@ HYCFLAGS = $(HYCFLAGS) -DHYPORT_LIBRARY_
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-  $(SHAREDSUB)port_copyright.obj hycpu.obj $(SHAREDSUB)hyerror.obj \
-  hyerrorhelpers.obj $(SHAREDSUB)hyexit.obj hyfile.obj hyfiletext.obj \
-  $(SHAREDSUB)hygp.obj hyipcmutex.obj hymem.obj hymmap.obj \
-  $(SHAREDSUB)hynls.obj hynlshelpers.obj hyosdump.obj $(SHAREDSUB)hyport.obj \
-  $(SHAREDSUB)hyportcontrol.obj hyportptb.obj hyshmem.obj hyshsem.obj \
-  hysl.obj hysock.obj $(SHAREDSUB)hystr.obj \
-  $(SHAREDSUB)hystrftime.obj $(SHAREDSUB)hystsl.obj hysysinfo.obj hytime.obj \
-  $(SHAREDSUB)hytlshelpers.obj hytty.obj hyvmem.obj
+  $(HY_BIN)port_copyright.obj $(HY_BIN)hycpu.obj $(HY_BIN)hyerror.obj \
+  $(HY_BIN)hyerrorhelpers.obj $(HY_BIN)hyexit.obj $(HY_BIN)hyfile.obj \
+  $(HY_BIN)hyfiletext.obj $(HY_BIN)hygp.obj $(HY_BIN)hyipcmutex.obj \
+  $(HY_BIN)hymem.obj $(HY_BIN)hymmap.obj $(HY_BIN)hynls.obj \
+  $(HY_BIN)hynlshelpers.obj $(HY_BIN)hyosdump.obj $(HY_BIN)hyport.obj \
+  $(HY_BIN)hyportcontrol.obj $(HY_BIN)hyportptb.obj $(HY_BIN)hyshmem.obj \
+  $(HY_BIN)hyshsem.obj $(HY_BIN)hysl.obj $(HY_BIN)hysock.obj \
+  $(HY_BIN)hystr.obj $(HY_BIN)hystrftime.obj $(HY_BIN)hystsl.obj \
+  $(HY_BIN)hysysinfo.obj $(HY_BIN)hytime.obj $(HY_BIN)hytlshelpers.obj \
+  $(HY_BIN)hytty.obj $(HY_BIN)hyvmem.obj
 
 MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hythr$(HY_LINKLIB_SUFFIX)
 VIRTFILES = hyprt.res

Modified: harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/thread/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/thread/unix/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/thread/unix/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/thread/unix/makefile Tue Oct 26 07:13: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/trunk/classlib/modules/portlib/src/main/native/thread/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/thread/windows/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/thread/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/portlib/src/main/native/thread/windows/makefile Tue Oct 26 07:13:24 2010
@@ -17,6 +17,7 @@
 # Makefile for module 'thread'
 #
 
+HY_BIN=$(HY_TARGET)\build\classlib\portlib\native\thread\# trailing slash
 !include <$(HY_HDK)\build\make\defines.mak>
 
 LIBBASE=hythr
@@ -24,9 +25,10 @@ DLLNAME=..\$(LIBBASE).dll
 LIBNAME=$(LIBPATH)$(LIBBASE).lib
 
 BUILDFILES = \
-  $(SHAREDSUB)thread_copyright.obj $(HY_PLATFORM)\thrhelp.obj $(HY_PLATFORM)\thrspinlock.obj \
-  $(SHAREDSUB)hythread.obj $(SHAREDSUB)hythreadinspect.obj $(SHAREDSUB)rwmutex.obj thrdsup.obj \
-  $(SHAREDSUB)thrprof.obj $(HY_PLATFORM)\locklbl.obj lock386.obj
+  $(HY_BIN)thread_copyright.obj $(HY_BIN)thrhelp.obj $(HY_BIN)thrspinlock.obj \
+  $(HY_BIN)hythread.obj $(HY_BIN)hythreadinspect.obj $(HY_BIN)rwmutex.obj \
+  $(HY_BIN)thrdsup.obj $(HY_BIN)thrprof.obj \
+  $(HY_BIN)locklbl.obj $(HY_BIN)lock386.obj
 
 # TOFIX $(LIBBASE).def should be a dependency on all libs
 VIRTFILES = $(LIBBASE).res

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

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

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

Modified: harmony/enhanced/java/trunk/classlib/modules/print/src/main/native/print/windows/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/print/src/main/native/print/windows/makefile?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/print/src/main/native/print/windows/makefile (original)
+++ harmony/enhanced/java/trunk/classlib/modules/print/src/main/native/print/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\print\native\print\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 LIBBASE=print
 DLLNAME=$(DLLPATH)$(LIBBASE).dll
@@ -29,10 +30,8 @@ HYCFLAGS = \
   $(VMDEBUG) /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I. \
   -I$(SHAREDSUB)\include
 
-BUILDFILES = print.obj \
-ui.obj \
-win_printer_factory.obj \
-devmode_struct_wrapper.obj
+BUILDFILES = $(HY_BIN)print.obj $(HY_BIN)ui.obj \
+  $(HY_BIN)win_printer_factory.obj $(HY_BIN)devmode_struct_wrapper.obj
 
 VIRTFILES = $(LIBBASE).res
 SYSLIBFILES = ws2_32.lib Iphlpapi.lib

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

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

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

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

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

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

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

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

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

Modified: harmony/enhanced/java/trunk/classlib/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/text/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/text/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/text/build.xml Tue Oct 26 07:13: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}"/>

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

Modified: harmony/enhanced/java/trunk/classlib/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/x-net/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/x-net/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/x-net/build.xml Tue Oct 26 07:13:24 2010
@@ -19,10 +19,10 @@
 <project name="X-NET Build" default="build" basedir=".">
     <description>Build for X-NET component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="x-net" />
-    <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,19 +95,19 @@
         <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}_impl_boot_tests.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}_impl_tests.jar">
-            <fileset dir="bin/test/impl" />
+            <fileset dir="${hy.build.mod}/test/impl" />
         </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 files"
-                       destdir="bin/test/support">
+                       destdir="${hy.build.mod}/test/support">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/support/common/java" />
@@ -139,9 +139,9 @@
         </compile-tests>
         
         <compile-tests description="${hy.module} api tests"
-                       destdir="bin/test/api">
+                       destdir="${hy.build.mod}/test/api">
             <javac-elements>
-                <classpath location="bin/test/support" />
+                <classpath location="${hy.build.mod}/test/support" />
                 <src path="src/test/api/java"/>
                 <src path="src/test/java"/>
                 <include name="**/*Test.java" />
@@ -149,16 +149,16 @@
         </compile-tests>
 
         <compile-tests description="${hy.module} impl injected tests"
-                       destdir="bin/test/impl.injected">
+                       destdir="${hy.build.mod}/test/impl.injected">
             <javac-elements>
-                <classpath location="bin/test/support" />
+                <classpath location="${hy.build.mod}/test/support" />
                 <src path="src/test/impl/java.injected"/>
                 <include name="**/*Test.java" />
             </javac-elements>
         </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" />

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

Modified: harmony/enhanced/java/trunk/classlib/modules/xml/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/xml/build.xml?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/xml/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/xml/build.xml Tue Oct 26 07:13:24 2010
@@ -21,10 +21,10 @@
 <project name="XML Build" default="build" basedir=".">
     <description>Build for XML component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="xml" />
-    <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/xml/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/xml/make/depends.properties?rev=1027390&r1=1027389&r2=1027390&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/xml/make/depends.properties (original)
+++ harmony/enhanced/java/trunk/classlib/modules/xml/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
 
 xalan.version=2.7.0
 xalan.base=xalan-j_${xalan.version}

Propchange: harmony/enhanced/java/trunk/common_resources/
            ('svn:ignore' removed)

Added: harmony/enhanced/java/trunk/common_resources/depends/build/defines.mak
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/defines.mak?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/defines.mak (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/defines.mak Tue Oct 26 07:13:24 2010
@@ -0,0 +1,79 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#  
+#      http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+HY_HDK=$(HY_TARGET)\hdk
+!include <$(HY_HDK)\build\make\properties.mak>
+
+!ifndef APPVER
+APPVER=4.0 #Default Windows version
+!endif
+
+!ifndef TARGETOS
+TARGETOS=WIN95 #Compile for Win95 by default
+!endif
+
+_WIN32_IE=0x0500
+SEHMAP = TRUE
+!include <win32.mak>
+
+LIBPATH=$(HY_HDK)\lib\# comment to avoid \ being treated as continuation
+DLLPATH=$(HY_HDK)\jdk\jre\bin\# ditto
+EXEPATH=$(HY_HDK)\jdk\jre\bin\# ditto
+DBGPATH=$(HY_HDK)\jdk\lib\# ditto
+SHAREDSUB=..\shared\# ditto
+
+!IF "$(HY_OS)-$(HY_ARCH)" == "windows-x86_64" 
+WARNING_LEVEL=W0
+PLATFORM_64=-DHYX86_64
+!ELSE
+WARNING_LEVEL=WX
+!ENDIF
+
+HYCOMMONCFLAGS = \
+  -$(WARNING_LEVEL) -GF -Gs -MD -Zm400 $(PLATFORM_64) \
+  -D_CRT_SECURE_NO_DEPRECATE \
+  -D_CRT_SECURE_NO_WARNINGS \
+  -D_SCL_SECURE_NO_DEPRECATE \
+  -D_DLL -D_MT -D_WINSOCKAPI_ \
+  /I$(HY_HDK)\include /I$(HY_HDK)\jdk\include /I.
+
+!ifndef HYDEBUGCFLAGS
+HYDEBUGCFLAGS = \
+  -Zi -Od
+!endif
+
+!ifndef HYRELEASECFLAGS  
+HYRELEASECFLAGS = \
+  -Ogityb1 -DNDEBUG
+!endif
+
+!IF "$(HY_CFG)" == "debug"
+HYCFLAGS = $(HYDEBUGCFLAGS) $(HYCOMMONCFLAGS)
+!ELSE  
+HYCFLAGS = $(HYRELEASECFLAGS) $(HYCOMMONCFLAGS)
+!ENDIF
+  
+MDLLIBFILES = $(LIBPATH)hycommon.lib
+  
+!IF "$(HY_NO_THR)" == "false"
+MDLLIBFILES = $(MDLLIBFILES) $(LIBPATH)hythr.lib
+!ELSE
+HYCFLAGS = $(HYCFLAGS) -DHY_NO_THR
+!ENDIF
+  
+!IF "$(HY_ZIP_API)" == "true"
+HYCFLAGS = $(HYCFLAGS) -DHY_ZIP_API
+!ENDIF
+

Added: harmony/enhanced/java/trunk/common_resources/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/depends/build/defines.mk?rev=1027390&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/depends/build/defines.mk (added)
+++ harmony/enhanced/java/trunk/common_resources/depends/build/defines.mk Tue Oct 26 07:13:24 2010
@@ -0,0 +1,84 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#  
+#      http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
+#
+# Configuration Makefile
+#
+
+HY_HDK=$(HY_TARGET)/hdk
+include $(HY_HDK)/build/make/properties.mk
+
+CXX = $(CC)
+CPP = $(CC) -E
+AS = as
+AR = ar
+RANLIB=echo
+ARFLAGS =
+ARCREATE = rcv
+AREXTRACT = xo
+DLL_LD = $(CC)
+DLL_LDFLAGS = -shared -Wl,-soname=$(@F) -Wl,--version-script,$(EXPFILE)
+CXX_DLL_LD = $(CXX)
+STDCLIBS = -lstdc++
+OSLIBS = -lc
+XLIBS = -L/usr/X11R6/lib -lX11 -lXft -lXext -lXtst
+MDLLIBPREFIX = -Xlinker --start-group
+MDLLIBSUFFIX = -Xlinker --end-group
+EXELDFLAGS = $(LDFLAGS)
+EXERPATHPREFIX = -Xlinker -z -Xlinker origin -Xlinker -rpath \
+	-Xlinker \$$ORIGIN/ -Xlinker -rpath-link \
+	-Xlinker
+WARNFLAGS=-Werror
+
+PLATFORM = -fpic
+HYDEBUGCFLAGS = -ggdb -O0
+HYRELEASECFLAGS = -O1 -DNDEBUG
+
+LIBPATH=$(HY_HDK)/lib/
+DLLPATH=$(HY_HDK)/jdk/jre/bin/
+EXEPATH=$(HY_HDK)/jdk/jre/bin/
+DBGPATH=$(HY_HDK)/jdk/lib/
+SHAREDSUB=../shared/
+INCLUDES += -I$(HY_HDK)/include -I$(HY_HDK)/jdk/include -I. -I$(SHAREDSUB)
+
+include $(HY_HDK)/build/make/platform/$(HY_PLATFORM).mk
+
+DEFINES += -D_REENTRANT -D_FILE_OFFSET_BITS=64
+
+ifeq ($(HY_CFG),release)
+OPT += $(HYRELEASECFLAGS)
+else
+OPT += $(HYDEBUGCFLAGS)
+endif
+
+MDLLIBFILES = $(LIBPATH)libhycommon.a
+ifeq ($(HY_OS),zos)
+# On z/OS we need to link every module against the ascii2ebcdic library
+MDLLIBFILES += $(LIBPATH)libhya2e.x
+endif
+
+ifeq ($(HY_NO_THR),false)
+ifeq ($(HY_THR_NO_DEPLOY), true)
+MDLLIBFILES += $(HY_HDK)/../modules/portlib/src/main/native/thread/libhythr$(HY_LINKLIB_SUFFIX)
+else
+MDLLIBFILES += $(DLLPATH)libhythr$(HY_LINKLIB_SUFFIX)
+endif
+else
+DEFINES += -DHY_NO_THR
+endif
+
+ifeq ($(HY_ZIP_API),true)
+DEFINES += -DHY_ZIP_API
+endif



Mime
View raw message