harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r1029056 [5/5] - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/build/ classlib/depends/libs/ classlib/make/ classlib/modules/accessibility/ classlib/modules/accessibility/make/ classlib/modules/activation/ classlib...
Date Sat, 30 Oct 2010 13:11:19 GMT
Modified: harmony/enhanced/java/branches/java6/drlvm/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/build-native.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/build-native.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/build-native.xml Sat Oct 30 13:11:14 2010
@@ -21,7 +21,7 @@
     <import file="${bn.imported.basedir}/properties.xml"/>
     
     <macrodef name="clean-native">
-        <attribute name="component" default="${component}"/>
+        <attribute name="component" default="${hy.module}"/>
         <sequential>
             <delete quiet="true" dir="${drlvm.semi.dir}/@{component}" />
         </sequential>
@@ -118,7 +118,7 @@
         </presetdef>
 
         <macrodef name="init-native">
-            <attribute name="component" default="${component}"/>
+            <attribute name="component" default="${hy.module}"/>
             <sequential>
                 <echo message="## Building '@{component}'" />
                 
@@ -144,7 +144,7 @@
         </presetdef>
 
         <macrodef name="make-native">
-            <attribute name="libname" default="${component}"/>
+            <attribute name="libname" default="${hy.module}"/>
             <attribute name="type" />
             <element name="cc-elements" implicit="yes" optional="yes"/>
             <sequential>
@@ -172,7 +172,7 @@
         </macrodef>
         
         <macrodef name="link-lib">
-            <attribute name="name" default="${component}"/>
+            <attribute name="name" default="${hy.module}"/>
             <attribute name="type" />
             <element name="link-elements" implicit="yes" optional="yes"/>
             <sequential>    
@@ -189,7 +189,7 @@
             <attribute name="from" default="component.bin.dir"/>
             <sequential>
                 <mkdir dir="${drlvm.lib.dir}" />
-                <copy todir="${drlvm.lib.dir}">
+                <copy todir="${drlvm.lib.dir}" preservelastmodified="true">
                     <fileset dir="${@{from}}">
                         <include name="*${linklib.suffix}" unless="shlib.is.linklib"/>
                         <include name="*.exp" if="is.windows"/>
@@ -197,7 +197,7 @@
                     </fileset>
                 </copy>
                 <mkdir dir="${drlvm.bin.dir}" />
-                <copy todir="${drlvm.bin.dir}">
+                <copy todir="${drlvm.bin.dir}" preservelastmodified="true">
                     <fileset dir="${@{from}}">
                         <include name="*${shlib.suffix}"/>
                         <include name="*.pdb" if="is.windows"/>

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

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

Modified: harmony/enhanced/java/branches/java6/drlvm/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/properties.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/properties.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/properties.xml Sat Oct 30 13:11:14 2010
@@ -46,21 +46,8 @@
     </condition>
     <property name="hy.cpp.compiler" value="gcc"/>
         
-    
-    <!-- set the path root for the external resources  -->
-    <property name="common.resources.loc" value="${drlvm.base.dir}/../common_resources" />
-    <property name="common.resources" location="${common.resources.loc}" />
-    <fail>
-        <condition>
-            <not><available file="${common.resources}/make/properties.xml"/></not>
-        </condition>
-        Primary dependency is missing: common_resources.
-        You need to check it out from SVN repository or specify it's location:
-        ant -Dcommon.resources.loc=path
-    </fail>
-    
-    <import file="${common.resources}/make/properties.xml"/>
-    <import file="${common.resources}/make/depends.xml"/>
+    <import file="${hy.target}/hdk/build/ant/properties.xml"/>
+    <import file="${hy.target}/hdk/build/ant/depends.xml"/>
 
     <!-- define drlvm-specific resources -->
     <loadproperties srcfile="${prop.imported.basedir}/depends.properties">
@@ -87,7 +74,7 @@
     </condition>
 
     <property name="vm.home" location="${drlvm.base.dir}/vm" />        
-    <property name="drlvm.build.dir" location="${drlvm.base.dir}/build/${hy.os}_${hy.arch}_${hy.cpp.compiler}_${hy.cfg}" />
+    <property name="drlvm.build.dir" location="${hy.target}/build/drlvm/all" />
     <property name="drlvm.deploy.dir" location="${drlvm.build.dir}/deploy" />
     <property name="drlvm.semi.dir" location="${drlvm.build.dir}/semis" />
     <property name="drlvm.bin.dir" location="${drlvm.deploy.dir}/jdk/jre/bin/default"/>
@@ -118,7 +105,7 @@
         <echo message="    hy.local.zlib = ${hy.local.zlib}" />
         <echo message=" common resources = ${common.resources}" />
         <echo message="         HDK root = ${hy.hdk}" />
-        <echo message="       target dir = ${drlvm.deploy.dir}" />
+        <echo message="       deploy dir = ${drlvm.deploy.dir}" />
     </target>
 
     <target name="debug-echo">

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

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

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

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

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/em.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/em.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/em.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/em.xml Sat Oct 30 13:11:14 2010
@@ -18,7 +18,8 @@
 
 <project name="em" default="build" basedir="../..">
     
-    <property name="component" value="em"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="em"/>
     <import file="common-vm.xml"/>
     
     <target name="build" depends="-common-vm">        

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/encoder.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/encoder.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/encoder.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/encoder.xml Sat Oct 30 13:11:14 2010
@@ -18,7 +18,8 @@
 
 <project name="encoder" default="build" basedir="../..">
     
-    <property name="component" value="encoder"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="encoder"/>
     <import file="common-vm.xml"/>
     
     <target name="build" depends="-common-vm">        

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

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

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/interpreter.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/interpreter.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/interpreter.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/interpreter.xml Sat Oct 30 13:11:14 2010
@@ -18,7 +18,8 @@
 
 <project name="interpreter" default="build" basedir="../..">
         
-    <property name="component" value="interpreter"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="interpreter"/>
     <import file="common-vm.xml"/>
         
     <target name="build" depends="-common-vm">        

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/jitrino.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/jitrino.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/jitrino.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/jitrino.xml Sat Oct 30 13:11:14 2010
@@ -16,7 +16,8 @@
 -->
 <project name="jitrino" default="build" basedir="../..">
     
-    <property name="component" value="jitrino"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="jitrino"/>
     <import file="common-vm.xml"/>
 
     <target name="clean" >

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/kernel.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/kernel.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/kernel.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/kernel.xml Sat Oct 30 13:11:14 2010
@@ -18,6 +18,8 @@
 
 <project name="kernel" default="build" basedir="../..">
     
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="kernel"/>
     <import file="../build-java.xml"/>
     
     <target name="fetch-depends">

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/port.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/port.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/port.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/port.xml Sat Oct 30 13:11:14 2010
@@ -18,7 +18,8 @@
 
 <project name="portlib" default="build" basedir="../..">
     
-    <property name="component" value="portlib"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="portlib"/>
     
     <import file="common-vm.xml"/>
     

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/port_ch.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/port_ch.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/port_ch.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/port_ch.xml Sat Oct 30 13:11:14 2010
@@ -18,7 +18,8 @@
 
 <project name="port_ch" default="build" basedir="../..">
 
-    <property name="component" value="port_ch"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="port_ch"/>
 
     <import file="common-vm.xml"/>
 

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

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/verifier.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/verifier.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/verifier.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/verifier.xml Sat Oct 30 13:11:14 2010
@@ -18,7 +18,8 @@
 
 <project name="verifier" default="build" basedir="../..">
     
-    <property name="component" value="verifier"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="verifier"/>
     <import file="common-vm.xml"/>
     
     <target name="build" depends="-common-vm">        

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/vmcore.xml Sat Oct 30 13:11:14 2010
@@ -18,7 +18,8 @@
 
 <project name="vmcore" default="build" basedir="../..">
 
-    <property name="component" value="vmcore"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="vmcore"/>
     <import file="common-vm.xml"/>
 
     <target name="fetch-depends">

Modified: harmony/enhanced/java/branches/java6/drlvm/make/vm/vmi.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/vm/vmi.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/vm/vmi.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/vm/vmi.xml Sat Oct 30 13:11:14 2010
@@ -18,7 +18,8 @@
 
 <project name="vmi" default="build" basedir="../..">
     
-    <property name="component" value="vmi"/>
+    <property name="hy.component" value="drlvm"/>
+    <property name="hy.module" value="vmi"/>
     <import file="common-vm.xml"/>
     
     <target name="build" depends="-common-vm">        

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 30 13:11:14 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832,1022846,1022963,1024556,1025578
+/harmony/enhanced/java/trunk/jdktools:929253-997624,997759,997980,997986,998010,998030,998619,998628,998759,998804,998822,999260,999286,999306,999591,999601,999623,999715-999716,999724,999793,1000005,1000169,1000213,1000229,1000231,1000233,1000240,1000245,1000248,1000265,1000527,1000689,1000696,1000699-1000700,1000705,1000708,1001065,1001080,1001153,1001187,1001490,1001609,1001638,1001652,1001723,1001741,1001744-1001745,1001751,1002080,1002189,1002476,1002480,1002488,1002506,1002511,1002592,1002736,1002971,1002988,1002990,1003089,1003094-1003095,1003109,1003513,1003744,1004471,1004624,1004837,1004906,1004908,1005084,1005391,1005441-1005442,1005648,1005651,1006115,1021745,1022064,1022390,1022493,1022832,1022846,1022963,1024556,1025578,1027390
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147

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

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

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

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

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

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jpda/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jpda/build.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jpda/build.xml Sat Oct 30 13:11:14 2010
@@ -19,11 +19,10 @@
 <project name="JPDA Build" default="build" basedir=".">
     <description>Build for JPDA component</description>
 
+    <property name="hy.component" value="jdktools" />
     <property name="hy.module" value="jpda" />
-    <property name="hy.hdk" location="../../deploy" />
-    <import file="../../make/properties.xml" />
-    <property name="depends.dir" location="${common.resources}/depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
     <import file="${hy.hdk}/build/ant/depends.xml" />
     <property file="../../make/depends.properties" />
     <property file="${common.resources}/make/depends.properties" />
@@ -75,8 +74,8 @@
         <delete file="${hy.jdk}/lib/jdtstub-src.jar" />
 
         <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="bin/main" />
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/main" />
+            <fileset dir="${hy.build.mod}/test" />
         </delete>
     </target>
 
@@ -112,17 +111,17 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin/test"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
         <echo message="Compiling ${hy.module} classes" />
         <ensure-javac/>
-        <mkdir dir="bin/main" />
+        <mkdir dir="${hy.build.mod}/java" />
 
         <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="bin/main">
+               destdir="${hy.build.mod}/java">
 
             <!-- HDK class library -->
             <classpath>
@@ -146,7 +145,7 @@
 
         <hy.jar.bin destfile="${hy.jdk}/lib/jdtstub.jar"
                     manifest="META-INF/MANIFEST.MF">
-            <fileset dir="bin/main" />
+            <fileset dir="${hy.build.mod}/java" />
         </hy.jar.bin>
 
         <hy.jar.src destfile="${hy.jdk}/lib/jdtstub-src.jar">
@@ -211,7 +210,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" />
             <fileset dir="src/test/resources" />
         </hy.jar.bin>
  

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

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/unix/agent/makefile Sat Oct 30 13:11:14 2010
@@ -17,7 +17,8 @@
 # Makefile for module jdwp
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/jdktools/jpda/native/agent/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 DLL_LD=$(CXX)
 COMMON=../../common/
@@ -26,33 +27,16 @@ CMNAGENT=$(COMMON)agent/
 INCLUDES := -I../../../include -I$(CMNAGENT)commands -I$(CMNAGENT)core \
             -I$(COMMON)generic -Icore $(INCLUDES)
 
-BUILDFILES = \
-    $(CMNAGENT)commands/ArrayReference.o \
-    $(CMNAGENT)commands/ArrayType.o \
-    $(CMNAGENT)commands/ClassLoaderReference.o \
-    $(CMNAGENT)commands/ClassObjectReference.o \
-    $(CMNAGENT)commands/ClassType.o \
-    $(CMNAGENT)commands/EventRequest.o \
-    $(CMNAGENT)commands/Method.o \
-    $(CMNAGENT)commands/ObjectReference.o \
-    $(CMNAGENT)commands/ReferenceType.o \
-    $(CMNAGENT)commands/StackFrame.o \
-    $(CMNAGENT)commands/StringReference.o \
-    $(CMNAGENT)commands/ThreadGroupReference.o \
-    $(CMNAGENT)commands/ThreadReference.o \
-    $(CMNAGENT)commands/VirtualMachine.o \
-    $(CMNAGENT)core/Agent.o $(CMNAGENT)core/AgentEventRequest.o \
-    $(CMNAGENT)core/AgentMonitor.o $(CMNAGENT)core/ClassManager.o \
-    $(CMNAGENT)core/CommandDispatcher.o $(CMNAGENT)core/CommandHandler.o \
-    $(CMNAGENT)core/EventDispatcher.o $(CMNAGENT)core/LogManager.o \
-    $(CMNAGENT)core/MemoryManager.o $(CMNAGENT)core/ObjectManager.o \
-    $(CMNAGENT)core/OptionParser.o $(CMNAGENT)core/PacketDispatcher.o \
-    $(CMNAGENT)core/PacketParser.o $(CMNAGENT)core/RequestManager.o \
-    $(CMNAGENT)core/RequestModifier.o $(CMNAGENT)core/ThreadManager.o \
-    $(CMNAGENT)core/TransportManager.o $(CMNAGENT)core/AgentManager.o \
-    $(CMNAGENT)core/CallBacks.o $(CMNAGENT)core/ExceptionManager.o\
-    core/TransportManager_pd.o
-
+BUILDFILES = ArrayReference.o ArrayType.o ClassLoaderReference.o \
+  ClassObjectReference.o ClassType.o EventRequest.o Method.o \
+  ObjectReference.o ReferenceType.o StackFrame.o StringReference.o \
+  ThreadGroupReference.o ThreadReference.o VirtualMachine.o \
+  Agent.o AgentEventRequest.o AgentMonitor.o ClassManager.o \
+  CommandDispatcher.o CommandHandler.o EventDispatcher.o LogManager.o \
+  MemoryManager.o ObjectManager.o OptionParser.o PacketDispatcher.o \
+  PacketParser.o RequestManager.o RequestModifier.o ThreadManager.o \
+  TransportManager.o AgentManager.o CallBacks.o ExceptionManager.o \
+  TransportManager_pd.o
 
 ifneq ($(HY_OS),zos)
   # !zOS
@@ -89,3 +73,15 @@ ifneq ($(HY_OS),zos)
 endif
 
 include $(HY_HDK)/build/make/rules.mk
+
+$(HY_BIN)%.o: core/%.cpp
+	@mkdir -p ${@D}
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(CMNAGENT)core/%.cpp
+	@mkdir -p ${@D}
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(CMNAGENT)commands/%.cpp
+	@mkdir -p ${@D}
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/unix/transport/dt_socket/makefile Sat Oct 30 13:11:14 2010
@@ -17,7 +17,8 @@
 # Makefile for module jdwp - transport
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/jdktools/jpda/native/dt_socket/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 DLL_LD=$(CXX)
 COMMON=../../../common/
@@ -26,9 +27,7 @@ CMNTRANS=$(COMMON)transport/
 INCLUDES := -I../../../../include -I$(CMNTRANS)common -I$(CMNTRANS)dt_socket \
             -I$(COMMON)generic -I. $(INCLUDES)
 
-BUILDFILES = \
-    $(CMNTRANS)common/LastTransportError.o \
-    $(CMNTRANS)dt_socket/SocketTransport.o 
+BUILDFILES = LastTransportError.o SocketTransport.o
 
 ifneq ($(HY_OS),zos)
   # !zOS
@@ -65,3 +64,11 @@ ifneq ($(HY_OS),zos)
 endif
 
 include $(HY_HDK)/build/make/rules.mk
+
+$(HY_BIN)%.o: $(CMNTRANS)common/%.cpp
+	@mkdir -p ${@D}
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(CMNTRANS)dt_socket/%.cpp
+	@mkdir -p ${@D}
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/windows/agent/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/windows/agent/makefile?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/windows/agent/makefile (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/windows/agent/makefile Sat Oct 30 13:11:14 2010
@@ -17,7 +17,8 @@
 # Makefile for module jdwp
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\jdktools\jpda\native\jdwp\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 COMMON=..\..\common\# comment to avoid \ being treated as continuation
 CMNAGENT=$(COMMON)agent\# comment to avoid \ being treated as continuation
@@ -45,28 +46,23 @@ HYCFLAGS = -I..\..\..\include $(HYCFLAGS
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
 BUILDFILES = \
-    $(CMNAGENT)commands\ArrayReference.obj \
-    $(CMNAGENT)commands\ArrayType.obj \
-    $(CMNAGENT)commands\ClassLoaderReference.obj \
-    $(CMNAGENT)commands\ClassObjectReference.obj \
-    $(CMNAGENT)commands\ClassType.obj \
-    $(CMNAGENT)commands\EventRequest.obj \
-    $(CMNAGENT)commands\Method.obj \
-    $(CMNAGENT)commands\ObjectReference.obj \
-    $(CMNAGENT)commands\ReferenceType.obj \
-    $(CMNAGENT)commands\StackFrame.obj \
-    $(CMNAGENT)commands\StringReference.obj \
-    $(CMNAGENT)commands\ThreadGroupReference.obj \
-    $(CMNAGENT)commands\ThreadReference.obj \
-    $(CMNAGENT)commands\VirtualMachine.obj \
-    $(CMNAGENT)core\Agent.obj $(CMNAGENT)core\AgentEventRequest.obj $(CMNAGENT)core\AgentMonitor.obj \
-    $(CMNAGENT)core\ClassManager.obj $(CMNAGENT)core\CommandDispatcher.obj $(CMNAGENT)core\CommandHandler.obj \
-    $(CMNAGENT)core\EventDispatcher.obj $(CMNAGENT)core\LogManager.obj $(CMNAGENT)core\MemoryManager.obj \
-    $(CMNAGENT)core\ObjectManager.obj $(CMNAGENT)core\OptionParser.obj $(CMNAGENT)core\PacketDispatcher.obj \
-    $(CMNAGENT)core\PacketParser.obj $(CMNAGENT)core\RequestManager.obj $(CMNAGENT)core\RequestModifier.obj \
-    $(CMNAGENT)core\ThreadManager.obj $(CMNAGENT)core\TransportManager.obj $(CMNAGENT)core\AgentManager.obj \
-    $(CMNAGENT)core\CallBacks.obj $(CMNAGENT)core\ExceptionManager.obj\
-    core\TransportManager_pd.obj
+  $(HY_BIN)ArrayReference.obj $(HY_BIN)ArrayType.obj \
+  $(HY_BIN)ClassLoaderReference.obj $(HY_BIN)ClassObjectReference.obj \
+  $(HY_BIN)ClassType.obj $(HY_BIN)EventRequest.obj $(HY_BIN)Method.obj \
+  $(HY_BIN)ObjectReference.obj $(HY_BIN)ReferenceType.obj \
+  $(HY_BIN)StackFrame.obj $(HY_BIN)StringReference.obj \
+  $(HY_BIN)ThreadGroupReference.obj $(HY_BIN)ThreadReference.obj \
+  $(HY_BIN)VirtualMachine.obj $(HY_BIN)Agent.obj \
+  $(HY_BIN)AgentEventRequest.obj $(HY_BIN)AgentMonitor.obj \
+  $(HY_BIN)ClassManager.obj $(HY_BIN)CommandDispatcher.obj \
+  $(HY_BIN)CommandHandler.obj $(HY_BIN)EventDispatcher.obj \
+  $(HY_BIN)LogManager.obj $(HY_BIN)MemoryManager.obj \
+  $(HY_BIN)ObjectManager.obj $(HY_BIN)OptionParser.obj \
+  $(HY_BIN)PacketDispatcher.obj $(HY_BIN)PacketParser.obj \
+  $(HY_BIN)RequestManager.obj $(HY_BIN)RequestModifier.obj \
+  $(HY_BIN)ThreadManager.obj $(HY_BIN)TransportManager.obj \
+  $(HY_BIN)AgentManager.obj $(HY_BIN)TransportManager_pd.obj \
+  $(HY_BIN)CallBacks.obj $(HY_BIN)ExceptionManager.obj
 
 HYRCFLAGS = -I../../../include
 
@@ -75,8 +71,20 @@ VIRTFILES = jdwp.res
 SYSLIBFILES = 
 
 MDLLIBFILES = $(LIBPATH)vmi.lib $(LIBPATH)hythr$(HY_LINKLIB_SUFFIX)
-  
+
 DLLBASE=0x13200000
 COMMENT=/comment:"JDWP agent native code. (c) Copyright 2005 - 2009 The Apache Software Foundation or its licensors, as applicable."
 
 !include <$(HY_HDK)\build\make\rules.mak>
+
+{core}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(CMNAGENT)core}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(CMNAGENT)commands}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_shmem/makefile Sat Oct 30 13:11:14 2010
@@ -17,7 +17,8 @@
 # Makefile for module jdwp - dt_shmem transport
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\jdktools\jpda\native\dt_shmem\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 COMMON=..\..\..\common\# comment to avoid \ being treated as continuation
 CMNTRANS=$(COMMON)transport\# comment to avoid \ being treated as continuation
@@ -35,9 +36,7 @@ HYCFLAGS = $(HYCFLAGS) $(INCLUDES) -GX -
 
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
-BUILDFILES = \
-    $(CMNTRANS)common\LastTransportError.obj \
-    SharedMemTransport.obj
+BUILDFILES = $(HY_BIN)LastTransportError.obj $(HY_BIN)SharedMemTransport.obj
 
 VIRTFILES = 
 
@@ -49,3 +48,11 @@ DLLBASE=0x13200000
 COMMENT=/comment:"JDWP shmem transport native code. (c) Copyright 2008 The Apache Software Foundation or its licensors, as applicable."
 
 !include <$(HY_HDK)\build\make\rules.mak>
+
+{$(CMNTRANS)common}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(CMNTRANS)dt_shmem}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jpda/src/main/native/jdwp/windows/transport/dt_socket/makefile Sat Oct 30 13:11:14 2010
@@ -17,7 +17,8 @@
 # Makefile for module jdwp - socket transport
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\jdktools\jpda\native\dt_socket\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
 COMMON=..\..\..\common\# comment to avoid \ being treated as continuation
 CMNTRANS=$(COMMON)transport\# comment to avoid \ being treated as continuation
@@ -45,10 +46,8 @@ HYCFLAGS = -I..\..\..\..\include $(HYCFL
 
 HYLDFLAGS = $(HYLDFLAGS) -def:$(LIBBASE).def
 
-BUILDFILES = \
-    $(CMNTRANS)common\LastTransportError.obj \
-    $(CMNTRANS)dt_socket\SocketTransport.obj \
-    SocketTransport_pd.obj
+BUILDFILES = $(HY_BIN)LastTransportError.obj $(HY_BIN)SocketTransport.obj \
+             $(HY_BIN)SocketTransport_pd.obj
 
 HYRCFLAGS = -I..\..\..\..\include
 
@@ -57,8 +56,16 @@ VIRTFILES = dt_socket.res
 SYSLIBFILES = 
 
 MDLLIBFILES = $(LIBPATH)vmi.lib $(LIBPATH)hythr$(HY_LINKLIB_SUFFIX)
-  
+
 DLLBASE=0x13200000
 COMMENT=/comment:"JDWP socket transport native code. (c) Copyright 2005 - 2009 The Apache Software Foundation or its licensors, as applicable."
 
 !include <$(HY_HDK)\build\make\rules.mak>
+
+{$(CMNTRANS)common}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<
+
+{$(CMNTRANS)dt_socket}.cpp{$(HY_BIN)}.obj:
+        -mkdir $(*D)
+        $(cc) $(cflags) $(HYCFLAGS) -Fo$*.obj $<

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jretools/build.xml Sat Oct 30 13:11:14 2010
@@ -19,11 +19,10 @@
 <project name="JRE Tools Build" default="build" basedir=".">
     <description>Build for JRE Tools component</description>
 
+    <property name="hy.component" value="jdktools" />
     <property name="hy.module" value="jretools" />
-    <property name="hy.hdk" location="../../deploy" />
-    <import file="../../make/properties.xml" />
-    <property name="depends.dir" location="${common.resources}/depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
     <import file="${hy.hdk}/build/ant/depends.xml" />
     <property file="../../make/depends.properties" />
     <property file="${common.resources}/make/depends.properties" />
@@ -60,22 +59,22 @@
     <target name="-clean-java" unless="skip.java.build">
         <delete file="${hy.jre}/lib/tools.jar" />
         <delete file="${hy.jre}/lib/tools-src.jar" />
-        <delete dir="bin/main" includeemptydirs="true" failonerror="false" />
+        <delete dir="${hy.build.mod}/java" includeemptydirs="true" failonerror="false" />
     </target>
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin/test"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
         <echo message="Compiling ${hy.module} classes" />
         <ensure-javac/>
-        <mkdir dir="bin/main" />
+        <mkdir dir="${hy.build.mod}/java" />
 
         <hy.javac sourcepath=""
                srcdir="src/main/java"
-               destdir="bin/main">
+               destdir="${hy.build.mod}/java">
 
             <compilerarg line="${build.compilerarg}" />
 
@@ -107,7 +106,7 @@
 
         <hy.jar.bin destfile="${hy.jre}/lib/tools.jar"
              manifest="META-INF/MANIFEST.MF">
-            <fileset dir="bin/main" />
+            <fileset dir="${hy.build.mod}/java" />
             <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
@@ -125,7 +124,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/jretools/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/jretools/make/run-test.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/jretools/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/jretools/make/run-test.xml Sat Oct 30 13:11:14 2010
@@ -23,7 +23,9 @@
     <property file="../test.properties" />
 
     <property name="work.dir" value=".." />
-    <property name="target.dir" value=".." />
+    <property name="hy.test.root" value=".." />
+    <property name="hy.component" value="jdktools" />
+    <property name="hy.module" value="jretools" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/samsa/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/samsa/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/samsa/build.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/samsa/build.xml Sat Oct 30 13:11:14 2010
@@ -19,10 +19,10 @@
 <project name="Samsa Build" default="build" basedir=".">
     <description>Build for samsa program</description>
 
+    <property name="hy.component" value="jdktools" />
     <property name="hy.module" value="samsa" />
-    <property name="hy.hdk" location="../../deploy" />
-    <import file="../../make/properties.xml" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
 
     <target name="build" depends="build-native,-test-jar"
             unless="skip.native.build"/>

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/samsa/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/samsa/make/run-test.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/samsa/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/samsa/make/run-test.xml Sat Oct 30 13:11:14 2010
@@ -23,7 +23,9 @@
     <property file="../test.properties" />
 
     <property name="work.dir" value=".." />
-    <property name="target.dir" value=".." />
+    <property name="hy.test.root" value=".." />
+    <property name="hy.component" value="jdktools" />
+    <property name="hy.module" value="samsa" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />
 

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/unix/makefile?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/unix/makefile (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/unix/makefile Sat Oct 30 13:11:14 2010
@@ -17,9 +17,10 @@
 # Makefile for 'samsa'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/jdktools/samsa/native/samsa/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
-BUILDFILES = ../samsa.o
+BUILDFILES = samsa.o
 
 EXENAME = $(LIBPATH)samsa
 
@@ -30,3 +31,7 @@ MDLLIBFILES = 
 endif
 
 include $(HY_HDK)/build/make/rules.mk
+
+$(HY_BIN)%.o: ../%.c
+	@mkdir -p ${@D}
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javae
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javae?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javae (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javae Sat Oct 30 13:11:14 2010
@@ -17,11 +17,13 @@
 # Makefile for module samsa
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\jdktools\samsa\native\samsa\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
+SHAREDSUB=..\# trailing slash not continuation
 EXEBASE = samsa
 EXENAME = $(LIBPATH)$(EXEBASE).exe
-BUILDFILES = ..\samsa.obj
+BUILDFILES = $(HY_BIN)samsa.obj
 EXEFLAGS=$(conlflags) -subsystem:console
 EXEDLLFILES=$(conlibsdll)
 

Modified: harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javaw
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javaw?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javaw (original)
+++ harmony/enhanced/java/branches/java6/jdktools/modules/samsa/src/main/native/samsa/windows/makefile.javaw Sat Oct 30 13:11:14 2010
@@ -17,11 +17,13 @@
 # Makefile for javaw
 #
 
-!include <$(HY_HDK)\build\make\defines.mak>
+HY_BIN=$(HY_TARGET)\build\jdktools\samsa\native\samsa\# trailing slash
+!include <$(HY_TARGET)\hdk\build\make\defines.mak>
 
+SHAREDSUB=..\# trailing slash not continuation
 EXEBASE = samsaw
 EXENAME = $(LIBPATH)$(EXEBASE).exe
-BUILDFILES = javaw.obj ..\samsa.obj
+BUILDFILES = $(HY_BIN)javaw.obj $(HY_BIN)samsa.obj
 EXEFLAGS=$(conlflags) -subsystem:windows
 EXEDLLFILES=$(guilibsdll)
 



Mime
View raw message