harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951779 [1/3] - in /harmony/enhanced/java/branches/mrh: ./ classlib/ classlib/depends/build/ classlib/make/ classlib/modules/accessibility/ classlib/modules/annotation/ classlib/modules/applet/ classlib/modules/archive/ classlib/modules/arc...
Date Sat, 05 Jun 2010 22:18:26 GMT
Author: hindessm
Date: Sat Jun  5 22:18:24 2010
New Revision: 951779

URL: http://svn.apache.org/viewvc?rev=951779&view=rev
Log:
Work-in-progress:
  change classlib to build to a target/hdk tree
  change classlib to build all artifacts to target/build
  change classlib to download dependencies to target/depends
  change classlib modules to build to target/build/classlib/<module>
  simplifiy classlib native makefiles
  change federated build to supply target location to classlib
todo:
  change jdktools
  change drlvm
  fix clean targets to make use of the new structure:
    clean is just delete directory
    real clean removes target/depends too
  make built dependencies - zlib, fdlibm, and apr - consistent
    (at the moment zlib & fdlibm binaries are deleted by clean, apr is not)
  changes for windows (currently unix only)


Modified:
    harmony/enhanced/java/branches/mrh/build.xml
    harmony/enhanced/java/branches/mrh/classlib/   (props changed)
    harmony/enhanced/java/branches/mrh/classlib/build.xml
    harmony/enhanced/java/branches/mrh/classlib/depends/build/defines.mk
    harmony/enhanced/java/branches/mrh/classlib/depends/build/rules.mk
    harmony/enhanced/java/branches/mrh/classlib/make/depends.xml
    harmony/enhanced/java/branches/mrh/classlib/make/properties.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/annotation/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zip/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zlib/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/auth/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/auth/src/main/native/auth/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/linuxfont/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/jpegencoder/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/imageio/src/main/native/pngencoder/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/instrument/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/instrument/src/main/native/instrument/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/jmx/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/jndi/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/logging/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/luni-kernel/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/fdlibm/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/hyzip/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/launcher/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/luni/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmi/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/main/native/vmls/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/math/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/misc/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/misc/src/main/native/accessors/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/nio/src/main/native/nio/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/src/main/native/niochar/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/orb/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/pack200/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/a2e/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/common/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/pool/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/port/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/thread/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/portlib/src/main/native/thrstub/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/prefs/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/print/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/regex/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/rmi/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/security-kernel/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/security/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/security/src/main/native/security/unix/makefile
    harmony/enhanced/java/branches/mrh/classlib/modules/sound/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/sql/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/suncompat/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/swing/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/text/build.xml
    harmony/enhanced/java/branches/mrh/classlib/modules/x-net/build.xml

Modified: harmony/enhanced/java/branches/mrh/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/build.xml Sat Jun  5 22:18:24 2010
@@ -33,7 +33,7 @@ Thanks.
     </fail>
 
     <!-- name of the target directory to use for building and final assembly -->
-    <property name="target.dir" value="target" />
+    <property name="hy.target" value="target" />
 
     <!-- release property file which is added to source release -->
     <property file="release.properties" />
@@ -41,7 +41,7 @@ Thanks.
     <!-- debug or release version -->
     <property name="hy.cfg" value="release" />
 
-    <property name="hy.hdk" location="target/hdk" />
+    <property name="hy.hdk" location="${hy.target}/hdk" />
 
     <!-- property to identify when components are being built by the 
          federated build -->
@@ -138,10 +138,10 @@ Usage:
             <classpath path="${rat.home}/apache-rat-core/target/apache-rat-core-0.7-SNAPSHOT.jar" />
             <classpath path="${rat.home}/apache-rat/target/apache-rat-0.7-SNAPSHOT.jar" />
         </typedef>
-        <delete file="target/rat.report.txt" />
+        <delete file="${hy.target}/rat.report.txt" />
         <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
-                    reportFile="target/rat.report.txt" >
-            <fileset dir="target/src" excludesfile="rat.excludes" />
+                    reportFile="${hy.target}/rat.report.txt" >
+            <fileset dir="${hy.target}/src" excludesfile="rat.excludes" />
         </rat:report>
     </target>
 
@@ -180,8 +180,8 @@ Usage:
 
         <!-- create the tar file and then md5 checksum using harmony-hdk-rev as the root,
              and setting exec bits as needed -->
-        <tar tarfile="${target.dir}/${deploy.hdk.tar}" compression="gzip">
-            <tarfileset dir="${target.dir}/hdk"
+        <tar tarfile="${hy.target}/${deploy.hdk.tar}" compression="gzip">
+            <tarfileset dir="${hy.target}/hdk"
                         prefix="${archive.dir.prefix}hdk-${harmony.version}"
                         mode="755">
                 <include name="jdk/jre/bin/java"/>
@@ -191,7 +191,7 @@ Usage:
                 <include name="jdk/jre/bin/unpack200"/>
                 <include name="jdk/bin/*"/>
             </tarfileset>
-            <tarfileset dir="${target.dir}/hdk"
+            <tarfileset dir="${hy.target}/hdk"
                         prefix="${archive.dir.prefix}hdk-${harmony.version}">
                 <include name="**"/>
                 <exclude name="jdk/jre/bin/java"/>
@@ -202,22 +202,22 @@ Usage:
                 <exclude name="jdk/bin/*"/>
                 <exclude name="jdk/jre/README"/>
             </tarfileset>
-            <tarfileset dir="${target.dir}/hdk/jdk/jre"
+            <tarfileset dir="${hy.target}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}hdk-${harmony.version}">
                 <include name="README"/>
             </tarfileset>
         </tar>
 
-        <chksum dir="${target.dir}" file="${deploy.hdk.tar}" />
-        <chksum dir="${target.dir}" file="${deploy.hdk.tar}" type="sha" />
+        <chksum dir="${hy.target}" file="${deploy.hdk.tar}" />
+        <chksum dir="${hy.target}" file="${deploy.hdk.tar}" type="sha" />
 
     </target>
 
     <target name="bundle-hdk-zip" depends="init" unless="is.unix">
         <!-- create the tar file and then md5 checksum using harmony-hdk-rev as the root,
              and setting exec bits as needed -->
-        <zip destfile="${target.dir}/${deploy.hdk.zip}" >
-            <zipfileset dir="${target.dir}/hdk"
+        <zip destfile="${hy.target}/${deploy.hdk.zip}" >
+            <zipfileset dir="${hy.target}/hdk"
                         prefix="${archive.dir.prefix}hdk-${harmony.version}"
                         filemode="755">
                 <include name="jdk/jre/bin/java.exe"/>
@@ -228,7 +228,7 @@ Usage:
                 <include name="jdk/jre/bin/unpack200.exe"/>
                 <include name="jdk/bin/*"/>
             </zipfileset>
-            <zipfileset dir="${target.dir}/hdk"
+            <zipfileset dir="${hy.target}/hdk"
                         prefix="${archive.dir.prefix}hdk-${harmony.version}">
                 <include name="**"/>
                 <exclude name="jdk/jre/bin/java.exe"/>
@@ -240,14 +240,14 @@ Usage:
                 <exclude name="jdk/bin/*"/>
                 <exclude name="jdk/jre/README"/>
             </zipfileset>
-            <zipfileset dir="${target.dir}/hdk/jdk/jre"
+            <zipfileset dir="${hy.target}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}hdk-${harmony.version}">
                 <include name="README"/>
             </zipfileset>
         </zip>
 
-        <chksum dir="${target.dir}" file="${deploy.hdk.zip}" />
-        <chksum dir="${target.dir}" file="${deploy.hdk.zip}" type="sha" />
+        <chksum dir="${hy.target}" file="${deploy.hdk.zip}" />
+        <chksum dir="${hy.target}" file="${deploy.hdk.zip}" type="sha" />
     </target>
 
     <!-- ============================================================== -->
@@ -260,8 +260,8 @@ Usage:
 
     <target name="bundle-jdk-tgz" depends="init" if="is.unix">
 
-        <tar tarfile="${target.dir}/${deploy.jdk.tar}" compression="gzip" >
-            <tarfileset dir="${target.dir}/hdk/jdk"
+        <tar tarfile="${hy.target}/${deploy.jdk.tar}" compression="gzip" >
+            <tarfileset dir="${hy.target}/hdk/jdk"
                         prefix="${archive.dir.prefix}jdk-${harmony.version}"
                         mode="755">
                 <include name="jre/bin/java"/>
@@ -271,7 +271,7 @@ Usage:
                 <include name="jre/bin/unpack200"/>
                 <include name="bin/*"/>
             </tarfileset>
-            <tarfileset dir="${target.dir}/hdk/jdk"
+            <tarfileset dir="${hy.target}/hdk/jdk"
                         prefix="${archive.dir.prefix}jdk-${harmony.version}">
                 <include name="**"/>
                 <exclude name="jre/bin/java"/>
@@ -282,20 +282,20 @@ Usage:
                 <exclude name="bin/*"/>
                 <exclude name="jre/README"/>
             </tarfileset>
-            <tarfileset dir="${target.dir}/hdk/jdk/jre"
+            <tarfileset dir="${hy.target}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}jdk-${harmony.version}">
                 <include name="README"/>
             </tarfileset>
         </tar>
 
-        <chksum dir="${target.dir}" file="${deploy.jdk.tar}" />
-        <chksum dir="${target.dir}" file="${deploy.jdk.tar}" type="sha" />
+        <chksum dir="${hy.target}" file="${deploy.jdk.tar}" />
+        <chksum dir="${hy.target}" file="${deploy.jdk.tar}" type="sha" />
 
     </target>
 
     <target name="bundle-jdk-zip" depends="init" unless="is.unix">
-        <zip destfile="${target.dir}/${deploy.jdk.zip}">
-            <zipfileset dir="${target.dir}/hdk/jdk"
+        <zip destfile="${hy.target}/${deploy.jdk.zip}">
+            <zipfileset dir="${hy.target}/hdk/jdk"
                         prefix="${archive.dir.prefix}jdk-${harmony.version}"
                         filemode="755">
                 <include name="jre/bin/java.exe"/>
@@ -306,7 +306,7 @@ Usage:
                 <include name="jre/bin/unpack200.exe"/>
                 <include name="bin/*"/>
             </zipfileset>
-            <zipfileset dir="${target.dir}/hdk/jdk"
+            <zipfileset dir="${hy.target}/hdk/jdk"
                         prefix="${archive.dir.prefix}jdk-${harmony.version}">
                 <include name="**"/>
                 <exclude name="jre/bin/java.exe"/>
@@ -318,13 +318,13 @@ Usage:
                 <exclude name="bin/*"/>
                 <exclude name="jre/README"/>
             </zipfileset>
-            <zipfileset dir="${target.dir}/hdk/jdk/jre"
+            <zipfileset dir="${hy.target}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}jdk-${harmony.version}">
                 <include name="README"/>
             </zipfileset>
         </zip>
-        <chksum dir="${target.dir}" file="${deploy.jdk.zip}" />
-        <chksum dir="${target.dir}" file="${deploy.jdk.zip}" type="sha" />
+        <chksum dir="${hy.target}" file="${deploy.jdk.zip}" />
+        <chksum dir="${hy.target}" file="${deploy.jdk.zip}" type="sha" />
     </target>
 
     <!-- ============================================================== -->
@@ -338,8 +338,8 @@ Usage:
 
     <target name="bundle-jre-tgz" depends="init" if="is.unix">
 
-        <tar tarfile="${target.dir}/${deploy.jre.tar}" compression="gzip" >
-            <tarfileset dir="${target.dir}/hdk/jdk/jre"
+        <tar tarfile="${hy.target}/${deploy.jre.tar}" compression="gzip" >
+            <tarfileset dir="${hy.target}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}jre-${harmony.version}"
                         mode="755">
                 <include name="bin/java"/>
@@ -348,7 +348,7 @@ Usage:
                 <include name="bin/policytool"/>
                 <include name="bin/unpack200"/>
             </tarfileset>
-            <tarfileset dir="${target.dir}/hdk/jdk/jre"
+            <tarfileset dir="${hy.target}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}jre-${harmony.version}">
                 <include name="**"/>
                 <exclude name="bin/java"/>
@@ -359,14 +359,14 @@ Usage:
             </tarfileset>
         </tar>
 
-        <chksum dir="${target.dir}" file="${deploy.jre.tar}" />
-        <chksum dir="${target.dir}" file="${deploy.jre.tar}" type="sha" />
+        <chksum dir="${hy.target}" file="${deploy.jre.tar}" />
+        <chksum dir="${hy.target}" file="${deploy.jre.tar}" type="sha" />
 
     </target>
 
     <target name="bundle-jre-zip" depends="init" unless="is.unix">
-        <zip destfile="${target.dir}/${deploy.jre.zip}">
-            <zipfileset dir="${target.dir}/hdk/jdk/jre"
+        <zip destfile="${hy.target}/${deploy.jre.zip}">
+            <zipfileset dir="${hy.target}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}jre-${harmony.version}"
                         filemode="755">
                 <include name="bin/java.exe"/>
@@ -376,7 +376,7 @@ Usage:
                 <include name="bin/policytool.exe"/>
                 <include name="bin/unpack200.exe"/>
             </zipfileset>
-            <zipfileset dir="${target.dir}/hdk/jdk/jre"
+            <zipfileset dir="${hy.target}/hdk/jdk/jre"
                         prefix="${archive.dir.prefix}jre-${harmony.version}">
                 <include name="**"/>
                 <exclude name="bin/java.exe"/>
@@ -387,8 +387,8 @@ Usage:
                 <exclude name="bin/unpack200.exe"/>
             </zipfileset>
         </zip>
-        <chksum dir="${target.dir}" file="${deploy.jre.zip}" />
-        <chksum dir="${target.dir}" file="${deploy.jre.zip}" type="sha" />
+        <chksum dir="${hy.target}" file="${deploy.jre.zip}" />
+        <chksum dir="${hy.target}" file="${deploy.jre.zip}" type="sha" />
     </target>
 
 
@@ -401,12 +401,12 @@ Usage:
                  chmod-stuff"/>
 
     <target name="chmod-stuff" if="is.unix">
-        <chmod file="${target.dir}/hdk/jdk/bin/*" perm="ugo+x" />
-        <chmod file="${target.dir}/hdk/jdk/jre/bin/java*" perm="ugo+x" />
-        <chmod file="${target.dir}/hdk/jdk/jre/bin/keytool*" perm="ugo+x" />
-        <chmod file="${target.dir}/hdk/jdk/jre/bin/policytool*" perm="ugo+x" />
-        <chmod file="${target.dir}/hdk/jdk/jre/bin/unpack200*" perm="ugo+x" />
-        <chmod file="${target.dir}/hdk/jdk/jre/bin/pack200*" perm="ugo+x" />
+        <chmod file="${hy.target}/hdk/jdk/bin/*" perm="ugo+x" />
+        <chmod file="${hy.target}/hdk/jdk/jre/bin/java*" perm="ugo+x" />
+        <chmod file="${hy.target}/hdk/jdk/jre/bin/keytool*" perm="ugo+x" />
+        <chmod file="${hy.target}/hdk/jdk/jre/bin/policytool*" perm="ugo+x" />
+        <chmod file="${hy.target}/hdk/jdk/jre/bin/unpack200*" perm="ugo+x" />
+        <chmod file="${hy.target}/hdk/jdk/jre/bin/pack200*" perm="ugo+x" />
     </target>
 
     <!-- ============================================================== -->
@@ -414,7 +414,7 @@ Usage:
     <!-- ============================================================== -->
     <target name="assemble-hdk-doc">
 
-        <copy todir="${target.dir}/hdk" overwrite="true">
+        <copy todir="${hy.target}/hdk" overwrite="true">
             <fileset dir=".">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
@@ -428,7 +428,7 @@ Usage:
     <!-- ============================================================== -->
     <target name="assemble-jre-doc">
 
-        <copy todir="${target.dir}/hdk/jdk/jre" overwrite="true">
+        <copy todir="${hy.target}/hdk/jdk/jre" overwrite="true">
             <fileset dir=".">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
@@ -437,7 +437,7 @@ Usage:
     </target>
 
     <target name="assemble-jdk-doc">
-        <copy todir="${target.dir}/hdk/jdk/" overwrite="true">
+        <copy todir="${hy.target}/hdk/jdk/" overwrite="true">
             <fileset dir=".">
                 <include name="LICENSE" />
                 <include name="NOTICE" />
@@ -468,6 +468,7 @@ Usage:
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
         <!-- hack to make sure the federated build doesn't use the classlib
              LICENSE/NOTICE files as they don't cover ICU4C
@@ -485,6 +486,7 @@ Usage:
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -494,6 +496,7 @@ Usage:
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -503,6 +506,7 @@ Usage:
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -512,6 +516,7 @@ Usage:
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -520,6 +525,7 @@ Usage:
              target="-init-hdk-for-clean" inheritAll="false" >
             <propertyset refid="required.props" />
             <property name="keep.working" value="true" />
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -535,6 +541,7 @@ Usage:
             <property name="deploy.canonical.flag" value="false"/>
             <property name="drlvm.deploy.dir" location="${hy.hdk}"/>
             <property name="import.hdk" value="false"/>
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -543,6 +550,7 @@ Usage:
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -552,6 +560,7 @@ Usage:
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -561,6 +570,7 @@ Usage:
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -573,6 +583,7 @@ Usage:
             <property name="deploy.canonical.flag" value="false"/>
             <property name="drlvm.deploy.dir" location="${hy.hdk}"/>
             <property name="import.hdk" value="false"/>
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -587,6 +598,7 @@ Usage:
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -596,6 +608,7 @@ Usage:
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -605,6 +618,7 @@ Usage:
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -618,6 +632,7 @@ Usage:
             <property name="common.resources" location="common_resources" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -625,6 +640,7 @@ Usage:
         <ant target="fetch-jdktools-libs" inheritall="false" >
             <propertyset refid="required.props" />
             <property name="common.resources" location="common_resources" />
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -633,6 +649,7 @@ Usage:
              inheritall="false" >
             <propertyset refid="required.props" />
             <property name="common.resources" location="common_resources" />
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -641,6 +658,7 @@ Usage:
              inheritall="false" >
             <propertyset refid="required.props" />
             <property name="common.resources" location="common_resources" />
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -650,6 +668,7 @@ Usage:
             <property name="common.resources" location="common_resources" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
+            <property name="hy.target" location="${hy.target}"/>
         </ant>
     </target>
 
@@ -657,8 +676,8 @@ Usage:
     <!-- recreates distribution dir                                     -->
     <!-- ============================================================== -->
     <target name="setup" depends="init, properties">
-        <delete dir="${target.dir}"/>
-        <mkdir dir="${target.dir}"/>
+        <delete dir="${hy.target}"/>
+        <mkdir dir="${hy.target}"/>
     </target>
 
 
@@ -668,7 +687,7 @@ Usage:
                  clean-classlib,
                  clean-vm,
                  clean-tests" >
-        <delete dir="${target.dir}" failonerror="false" />
+        <delete dir="${hy.target}" failonerror="false" />
     </target>
 
     <!-- ============================================================== -->
@@ -750,7 +769,7 @@ Usage:
             ant os name/arch :  ${os.name}/${os.arch}
             hosting Java     :  ${java.version} (${java.vendor})
             build mode       :  ${hy.cfg}
-            output location  :  ${target.dir}
+            output location  :  ${hy.target}
             SVN root         :  ${svn.root}
             archive.dir      :  ${archive.dir.prefix}
             archive.name     :  ${deploy.file.prefix}
@@ -760,68 +779,69 @@ Usage:
 
     <target name="bundle-src-tgz" depends="init" if="is.unix">
 
-        <tar tarfile="${target.dir}/${deploy.src.tar}" compression="gzip"
+        <tar tarfile="${hy.target}/${deploy.src.tar}" compression="gzip"
              longfile="gnu" >
-            <tarfileset dir="${target.dir}/src" prefix="${deploy.file.prefix}src-r${harmony.version}" mode="755">
+            <tarfileset dir="${hy.target}/src" prefix="${deploy.file.prefix}src-r${harmony.version}" mode="755">
                 <include name="debian/rules"/>
             </tarfileset>
-            <tarfileset dir="${target.dir}/src" prefix="${deploy.file.prefix}src-r${harmony.version}">
+            <tarfileset dir="${hy.target}/src" prefix="${deploy.file.prefix}src-r${harmony.version}">
                 <include name="**"/>
                 <exclude name="debian/rules"/>
             </tarfileset>
         </tar>
 
-        <chksum dir="${target.dir}" file="${deploy.src.tar}" />
-        <chksum dir="${target.dir}" file="${deploy.src.tar}" type="sha" />
+        <chksum dir="${hy.target}" file="${deploy.src.tar}" />
+        <chksum dir="${hy.target}" file="${deploy.src.tar}" type="sha" />
 
     </target>
 
     <target name="bundle-src-zip" depends="init" unless="is.unix">
-        <zip destfile="${target.dir}/${deploy.src.zip}">
-            <zipfileset dir="${target.dir}/src"
+        <zip destfile="${hy.target}/${deploy.src.zip}">
+            <zipfileset dir="${hy.target}/src"
                         prefix="${deploy.file.prefix}src-r${harmony.version}"
                         filemode="755">
                 <include name="debian/rules"/>
             </zipfileset>
-            <zipfileset dir="${target.dir}/src"
+            <zipfileset dir="${hy.target}/src"
                         prefix="${deploy.file.prefix}src-r${harmony.version}">
                 <include name="**"/>
                 <exclude name="debian/rules"/>
             </zipfileset>
         </zip>
-        <chksum dir="${target.dir}" file="${deploy.src.zip}" />
-        <chksum dir="${target.dir}" file="${deploy.src.zip}" type="sha" />
+        <chksum dir="${hy.target}" file="${deploy.src.zip}" />
+        <chksum dir="${hy.target}" file="${deploy.src.zip}" type="sha" />
     </target>
 
     <target name="copy-src" depends="init">
         <exec executable="svn">
             <arg value="export" />
             <arg value="." />
-            <arg value="${target.dir}/src" />
+            <arg value="${hy.target}/src" />
         </exec>
-        <echo file="${target.dir}/src/release.properties">
+        <echo file="${hy.target}/src/release.properties">
 harmony.version=${harmony.version}
 harmony.long.version=${harmony.long.version}
 harmony.deploy.suffix=${harmony.deploy.suffix}
 harmony.java.version=${harmony.java.version}
         </echo>
-        <chmod file="${target.dir}/src/debian/rules" perm="ugo+x" />
+        <chmod file="${hy.target}/src/debian/rules" perm="ugo+x" />
     </target>
 
     <target name="test" depends="clean-tests">
-        <ant antfile="target/hdk/build/test/build.xml"
+        <ant antfile="${hy.target}/hdk/build/test/build.xml"
              target="test" inheritAll="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
             <property name="keep.working" value="true" />
-            <property name="tests.output" location="target/test_report" />
-            <property name="test.jre.home" location="target/hdk/jdk/jre" />
+            <property name="tests.output" location="${hy.target}/test_report"/>
+            <property name="test.jre.home"
+                      location="${hy.target}/hdk/jdk/jre" />
         </ant>
     </target>
 
     <target name="clean-tests">
-        <delete dir="target/test_report" />
+        <delete dir="${hy.target}/test_report" />
     </target>
 
     <!-- ============================================================== -->

Propchange: harmony/enhanced/java/branches/mrh/classlib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jun  5 22:18:24 2010
@@ -1,8 +1 @@
-deploy
-components
 target
-VME_LICENSE
-VME_COPYRIGHT.txt
-VME_README.txt
-VME_THIRD_PARTY_NOTICES.txt
-build

Modified: harmony/enhanced/java/branches/mrh/classlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/build.xml Sat Jun  5 22:18:24 2010
@@ -31,7 +31,7 @@ Usage:
 
   ant build
     Compiles the java and native code to produce a jdk in
-    "deploy/jdk".
+    "target/hdk/jdk".
 
   ant clean
     Removes all the files generated by a build.
@@ -72,15 +72,20 @@ module:
 
     <property file="${user.home}/.harmony-classlib.properties" />
 
-    <property name="hy.hdk" location="deploy" />
-
-    <property name="build.output" location="build/classes" />
-    <property name="tests.output" location="build/test_report" />
-    <property name="tests.support.output" location="build/test_support" />
-    <property name="tests.report.dir" value="${tests.output}/html"/>
+    <property name="hy.target" location="target" />
+    <property name="hy.component" value="classlib" />
+    <property name="hy.module" value="toplevel" />
 
     <!-- import properties for snapshot targets -->
     <import file="make/properties.xml" />
+
+    <property name="build.output" location="${hy.build.top}/java" />
+    <property name="tests.output" location="${hy.target}/test_report" />
+    <property name="tests.support.output" location="${hy.build.top}/test" />
+    <property name="tests.report.dir" value="${tests.output}/html"/>
+    <property name="depends.files" location="depends/files"/>
+    <property name="depends.manifests" location="depends/manifests"/>
+
     <import file="make/depends.xml" />
     <property file="make/depends.properties" />
 
@@ -91,6 +96,12 @@ module:
         </or>
     </condition>
 
+    <propertyset id="toplevel.props">
+        <propertyref name="hy.target" />
+        <propertyref name="hy.component" />
+        <propertyref name="hy.module" />
+    </propertyset>
+
     <!-- ================================
 	 target : rebuild
 	     
@@ -314,11 +325,29 @@ ${built.files.list}
             description="Compiles the native code only" >
 
         <!-- these must be run in a specific order due to dependencies -->
-    	<ant dir="modules/portlib" target="-build-native" />
-        <ant dir="modules/luni" target="-build-native-core" />
-    	<ant dir="modules/archive" target="-build-native" />
-    	<ant dir="modules/luni" target="-build-native-secondary" />
+    	<ant dir="modules/portlib" target="-build-native"
+             inheritall="false">
+            <property name="hy.target" location="${hy.target}"/>
+            <propertyset refid="module.props" />
+        </ant>
 
+        <ant dir="modules/luni" target="-build-native-core"
+             inheritall="false">
+            <property name="hy.target" location="${hy.target}"/>
+            <propertyset refid="module.props" />
+        </ant>
+
+    	<ant dir="modules/archive" target="-build-native"
+             inheritall="false">
+            <property name="hy.target" location="${hy.target}"/>
+            <propertyset refid="module.props" />
+        </ant>
+
+    	<ant dir="modules/luni" target="-build-native-secondary"
+             inheritall="false">
+            <property name="hy.target" location="${hy.target}"/>
+            <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="-layout-natives" unless="skip.native.build"
@@ -525,12 +554,17 @@ Generating snapshot zip
     </target>
 
     <target name="-check-depends" description="Check top-level dependencies">
-        <ant antfile="make/depends.xml" inheritall="false" target="check" />
+        <ant antfile="make/depends.xml" inheritall="false" target="check">
+            <propertyset refid="toplevel.props" />
+        </ant>
     </target>
 
     <target name="fetch-depends" depends="-init-hdk"
         description="Fetches dependencies. Note: Some of Harmony's dependencies are licensed under terms other than the Apache License v2.">
-        <ant antfile="make/depends.xml" inheritall="false" target="download" />
+        <ant antfile="make/depends.xml" inheritall="false" target="download">
+            <propertyset refid="toplevel.props" />
+        </ant>
+
         <poll-modules target="fetch-depends" />
     </target>
 

Modified: harmony/enhanced/java/branches/mrh/classlib/depends/build/defines.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/depends/build/defines.mk?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/depends/build/defines.mk (original)
+++ harmony/enhanced/java/branches/mrh/classlib/depends/build/defines.mk Sat Jun  5 22:18:24 2010
@@ -17,6 +17,7 @@
 # Configuration Makefile
 #
 
+HY_HDK=$(HY_TARGET)/hdk
 include $(HY_HDK)/build/make/properties.mk
 
 CXX = $(CC)

Modified: harmony/enhanced/java/branches/mrh/classlib/depends/build/rules.mk
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/depends/build/rules.mk?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/depends/build/rules.mk (original)
+++ harmony/enhanced/java/branches/mrh/classlib/depends/build/rules.mk Sat Jun  5 22:18:24 2010
@@ -19,7 +19,9 @@
 
 CFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(PLATFORM) $(CFLAGS) $(WARNFLAGS)
 CXXFLAGS := $(DEFINES) $(INCLUDES) $(OPT) $(PLATFORM) $(CXXFLAGS) $(WARNFLAGS)
-EXPFILE = $(notdir $(basename $(DLLNAME))).exp
+EXPFILE = $(HY_BIN)$(notdir $(basename $(DLLNAME))).exp
+
+BUILDFILES := $(addprefix $(HY_BIN),$(BUILDFILES))
 
 ifneq ($(HY_OS),zos)
 # Convert $(LIBPATH)libblah.so to -L$(LIBPATH) ... -lblah, also for $(DLLPATH)
@@ -34,7 +36,7 @@ MDLLIBARGS := \
   $(MDLLIBPREFIX) $(MDLLIBFILES) $(MDLLIBSUFFIX)
 endif
 
-all: $(DLLNAME) $(EXENAME) $(LIBNAME)
+all: $(HY_BIN) $(DLLNAME) $(EXENAME) $(LIBNAME)
 
 $(LIBNAME): $(BUILDFILES)
 	$(AR) $(ARFLAGS) $(ARCREATE) $@ $(BUILDFILES)
@@ -75,3 +77,59 @@ $(EXENAME): $(BUILDFILES) $(MDLLIBFILES)
 clean:
 	-rm -f $(BUILDFILES) $(DLLNAME) $(EXENAME) $(LIBNAME) $(EXPFILE) \
 	       $(CLEANFILES) $(DBGPATH)$(notdir $(DLLNAME)).dbg
+
+$(HY_BIN):
+	mkdir -p $(HY_BIN)
+
+# C rules
+$(HY_BIN)%.o: $(HY_PLATFORM)/%.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(HY_ARCH)/%.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(HY_OS)/%.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(SHAREDSUB)%.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(SHAREDSUB)additional/%.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: %.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(OSS_DIST)%.c # for zlib_dist / fdlibm_dist
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+# C++ rules
+$(HY_BIN)%.o: $(HY_ARCH)/%.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(HY_OS)/%.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: $(SHAREDSUB)%.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+$(HY_BIN)%.o: %.cpp
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c -o $@ $<
+
+
+# assembler rules
+$(HY_BIN)%.o: $(HY_PLATFORM)/%.s
+	$(AS) $(ASFLAGS) -o $@ $<
+
+$(HY_BIN)%.o: $(HY_ARCH)/%.s
+	$(AS) $(ASFLAGS) -o $@ $<
+
+$(HY_BIN)%.o: $(HY_OS)/%.s
+	$(AS) $(ASFLAGS) -o $@ $<
+
+$(HY_BIN)%.o: $(SHAREDSUB)%.s
+	$(AS) $(ASFLAGS) -o $@ $<
+
+$(HY_BIN)%.o: %.s
+	$(AS) $(ASFLAGS) -o $@ $<
+

Modified: harmony/enhanced/java/branches/mrh/classlib/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/depends.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/depends.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/depends.xml Sat Jun  5 22:18:24 2010
@@ -25,8 +25,6 @@
     where possible.
     </description>
 
-    <property name="hy.hdk" location="${basedir}/deploy" />
-
     <import file="${basedir}/make/properties.xml" />
     <import file="${basedir}/make/depends-common.xml" />
 

Modified: harmony/enhanced/java/branches/mrh/classlib/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/make/properties.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/make/properties.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/make/properties.xml Sat Jun  5 22:18:24 2010
@@ -22,18 +22,33 @@
 <project name="Top-Level property definitions" default="echo" basedir="..">
     <description>
         Ant file of common properties to be imported by other ant files.
-        Property "hy.hdk" must be defined before this file is imported.
+        Property "hy.target" must be defined before this file is imported.
     </description>
 
     <property file="${user.home}/.harmony-classlib.properties" />
 
-    <fail message="Property 'hy.hdk' is not defined">
+    <fail message="Property 'hy.target' is not defined">
         <condition>
-            <not><isset property="hy.hdk" /></not>
+            <not><isset property="hy.target" /></not>
         </condition>
     </fail>
+    <fail message="Property 'hy.component' is not defined">
+        <condition>
+            <not><isset property="hy.component" /></not>
+        </condition>
+    </fail>
+    <fail message="Property 'hy.module' is not defined">
+        <condition>
+            <not><isset property="hy.module" /></not>
+        </condition>
+    </fail>
+    <property name="hy.hdk" location="${hy.target}/hdk" />
     <property name="hy.jdk" location="${hy.hdk}/jdk" />
     <property name="hy.jre" location="${hy.jdk}/jre" />
+    <property name="hy.build" location="${hy.target}/build/${hy.component}" />
+    <property name="hy.build.top" location="${hy.build}/toplevel" />
+    <property name="hy.build.mod" location="${hy.build}/${hy.module}" />
+    <property name="depends.dir" location="${hy.target}/depends" />
 
     <!-- Debug or release version -->
     <property name="hy.cfg" value="debug" />
@@ -41,7 +56,8 @@
 
     <!-- Javac properties -->
     <!-- Explicitly set to ECJ as the default compiler. -->
-    <property name="hy.javac.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
+    <property name="hy.javac.compiler"
+              value="org.eclipse.jdt.core.JDTCompilerAdapter" />
     <property name="hy.javac.source" value="1.5" />
     <property name="hy.javac.target" value="1.5" />
     <property name="hy.javac.maxmem" value="384M" />
@@ -353,7 +369,7 @@
               value="${hy.platform}${hy.libstdc++.suffix}" />
 
     <!-- fileset to represent classes built by a module. -->
-    <fileset id="classes" dir="../../build/classes">
+    <fileset id="classes" dir="${hy.build.top}/java">
         <includesfile name="${hy.hdk}/build/ant/patternsets/${hy.module}.txt" />
     </fileset>
 
@@ -376,6 +392,16 @@
 
     <property name="findBugs.report" location="../../build/findbugs_report" />
 
+    <propertyset id="module.props">
+        <propertyref name="hy.component" />
+        <propertyref name="hy.test.vm.name" />
+        <propertyref name="svn.revision" />
+        <propertyref name="svn.info" />
+        <propertyref name="hy.no.thr" />
+        <propertyref name="hy.zip.api" />
+    </propertyset>
+
+
     <target name="echo" depends="-svn-prop, -svn-info, test-jre-vm-info"
             description="Display the properties defined by this ant file" >
         <echo>
@@ -568,12 +594,8 @@ properties in preference to these:
             <subant target="@{target}">
                 <!-- TODO: modules probably need to work these properties
                      out for themselves in order to reduce coupling -->
-                <property name="hy.test.vm.name" value="${hy.test.vm.name}"/>
-                <property name="hy.hdk" value="${hy.hdk}"/>
-                <property name="svn.revision" value="${svn.revision}"/>
-                <property name="svn.info" value="${svn.info}"/>
-                <property name="hy.no.thr" value="${hy.no.thr}"/>
-                <property name="hy.zip.api" value="${hy.zip.api}"/>
+                <property name="hy.target" location="${hy.target}"/>
+                <propertyset refid="module.props" />
                 <fileset dir="@{dir}" includes="@{includes}" excludes="@{excludes}">
                     <containsregexp expression="&lt;target[^&gt;]*name=&quot;@{target}&quot;"/>
                 </fileset>
@@ -607,6 +629,7 @@ HY_LINKLIB_SUFFIX=${linklib.suffix}
                   executable="${make.command}"
                   dir="@{dir}">
                 <env key="HY_HDK" value="${hy.hdk}" />
+                <env key="HY_TARGET" value="${hy.target}" />
                 <arg line="${make.arg}" />
                 <arg line="@{target}" />
                 <make-elements />
@@ -748,7 +771,7 @@ Alternatively, you can switch to another
    
     <macrodef name="compile-classes">
         <attribute name="description" default="" />
-        <attribute name="destdir" default="../../build/classes" />
+        <attribute name="destdir" default="${hy.build.top}/java" />
         <element name="javac-elements" />
         <sequential>
             <echo message="Compiling @{description}" />
@@ -769,7 +792,7 @@ Alternatively, you can switch to another
 
     <macrodef name="compile-tests">
         <attribute name="description" default="" />
-        <attribute name="destdir" default="bin/test" />
+        <attribute name="destdir" default="${hy.build.mod}/test/api" />
         <element name="javac-elements" />
         <sequential>
             <echo message="Compiling @{description}" />
@@ -794,7 +817,7 @@ Alternatively, you can switch to another
                     </fileset>
                 </bootclasspath>
 
-                <classpath location="../../build/classes" />
+                <classpath location="${hy.build.top}/java" />
                 <classpath location="${hy.hdk}/build/test/junit.jar" />
                 <classpath
                      location="${hy.hdk}/build/test/hamcrest-library.jar" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/accessibility/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="ACCESSIBILITY Build" default="build" basedir=".">
     <description>Build for ACCESSIBILITY component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="accessibility" />
-    <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">
@@ -97,7 +97,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>

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

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/applet/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="APPLET Build" default="build" basedir=".">
     <description>Build for APPLET component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="applet" />
-    <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">
@@ -96,7 +96,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/build.xml Sat Jun  5 22:18:24 2010
@@ -19,15 +19,18 @@
 <project name="ARCHIVE Build" default="build" basedir=".">
     <description>Build for ARCHIVE component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="archive" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
     <import file="${hy.hdk}/build/ant/depends.xml" />
 
     <property file="../../make/depends.properties" />
     <property file="make/depends.properties" />
 
+    <property name="zlib.dist"
+              location="${hy.target}/depends/native/zlib_dist"/>
+
     <target name="build" depends="check-depends,-build-no-check"/>
     <target name="-build-no-check" depends="-build-jar,-test-jar" />
     
@@ -50,7 +53,7 @@
     <target name="-copy-zlib-include" unless="hy.skip.zlib">
         <!-- TOFIX: should add property for: unless="skip.native.build" -->
         <copy todir="${hy.hdk}/include" preservelastmodified="true">
-            <fileset dir="src/main/native/zlib_dist">
+            <fileset dir="${zlib.dist}">
                 <include name="zlib.h" />
                 <include name="zconf.h" />
             </fileset>
@@ -73,7 +76,7 @@
     <target name="-extract-props" unless="hy.skip.zlib">
         <uptodate property="zlib.extracted"
                   srcfile="${zlib.tar}"
-                  targetfile="src/main/native/zlib_dist/README" />
+                  targetfile="${zlib.dist}/README" />
         <condition property="zlib.uptodate" value="true">
             <or>
                 <isset property="hy.skip.zlib" />
@@ -83,31 +86,31 @@
     </target>
 
     <target name="-unzip-oss" unless="zlib.uptodate">
-        <mkdir dir="src/main/native/zlib_dist" />
-        <untar src="${zlib.tar}" dest="src/main/native/zlib_dist"
+        <mkdir dir="${zlib.dist}" />
+        <untar src="${zlib.tar}" dest="${zlib.dist}"
                compression="gzip">
             <mapper type="flatten"/>
         </untar>
-        <chmod dir="src/main/native/zlib_dist" perm="ugo+r" />
-        <touch file="src/main/native/zlib_dist/README" />
+        <chmod dir="${zlib.dist}" perm="ugo+r" />
+        <touch file="${zlib.dist}/README" />
     </target>
 
     <target name="-ascii2ebcdic-conversion" if="is.zos" unless="zlib.uptodate">
-        <move todir="src/main/native/zlib_dist_ascii">
-            <fileset dir="src/main/native/zlib_dist">
+        <move todir="${zlib.dist}_ascii">
+            <fileset dir="${zlib.dist}">
                 <include name="**/*" />
                 <exclude name="**/*.o" />
             </fileset>
         </move>
-        <copy todir="src/main/native/zlib_dist" outputencoding="IBM-1047" >
-            <fileset dir="src/main/native/zlib_dist_ascii">
+        <copy todir="${zlib.dist}" outputencoding="IBM-1047" >
+            <fileset dir="${zlib.dist}_ascii">
                 <include name="**/*" />
                 <exclude name="**/*.o" />
             </fileset>               
         </copy>
-        <fixcrlf srcdir="src/main/native/zlib_dist"
+        <fixcrlf srcdir="${zlib.dist}"
                  includes="**/*" excludes="**/*.o" eol="unix" />
-        <delete dir="src/main/native/zlib_dist_ascii" />
+        <delete dir="${zlib.dist}_ascii" />
     </target>
     
     <!-- Build native code -->
@@ -152,7 +155,7 @@
     </target>
 
     <target name="-clean-overlay-oss" unless="hy.skip.zlib" >
-        <delete dir="src/main/native/zlib_dist" quiet="true" />
+        <delete dir="${zlib.dist}" quiet="true" />
     </target>
     
     <target name="test" depends="-test-module">
@@ -181,7 +184,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">
@@ -219,11 +222,11 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_internal_tests.jar">
-            <fileset dir="bin/test-internal" />
+            <fileset dir="${hy.build.mod}/test/internal" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>
@@ -239,7 +242,7 @@
 
     <target name="-compile-tests" unless="skip.test.build">
         <compile-tests description="${hy.module} internal tests"
-                       destdir="bin/test-internal">
+                       destdir="${hy.build.mod}/test/internal">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java-internal" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/archive/unix/makefile Sat Jun  5 22:18:24 2010
@@ -17,13 +17,13 @@
 # Makefile for module 'archive'
 #
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/archive/native/archive/
+include $(HY_TARGET)/hdk/build/make/defines.mk
+ZLIB_DIST = $(HY_TARGET)/depends/native/zlib_dist/
+INCLUDES += -I$(SHARED)common -I$(ZLIB_DIST) -I../../include/shared
 
-INCLUDES += -I$(SHARED)common -I../../zlib_dist -I../../include/shared
-
-BUILDFILES = $(SHAREDSUB)archive_copyright.o $(SHAREDSUB)jclcrc32.o \
-	$(SHAREDSUB)zip.o $(SHAREDSUB)adler32.o $(SHAREDSUB)inflater.o \
-	$(SHAREDSUB)jarfile.o $(SHAREDSUB)deflater.o $(SHAREDSUB)archiveglob.o
+BUILDFILES = archive_copyright.o jclcrc32.o zip.o adler32.o inflater.o \
+  jarfile.o deflater.o archiveglob.o
 
 ifneq ($(HY_ZIP_API),true)
 MDLLIBFILES +=	$(LIBPATH)libhyzip.a
@@ -42,4 +42,4 @@ MDLLIBFILES += \
 DLLNAME=$(DLLPATH)libhyarchive$(HY_SHLIB_SUFFIX)
 EXPNAME=HYARCHIVE_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

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

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zlib/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zlib/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/main/native/zlib/unix/makefile Sat Jun  5 22:18:24 2010
@@ -20,7 +20,8 @@
 # We don't need to debug into zlib
 HY_CFG=release
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/archive/native/zlib/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 HYRELEASECFLAGS = -O2
 
@@ -29,12 +30,11 @@ ifneq (,$(findstring x86,$(HY_ARCH)))
 HYRELEASECFLAGS += -DUNALIGNED_OK
 endif
 
-ZLIB_DIST=../../zlib_dist/# Path to zlib
+OSS_DIST=$(HY_TARGET)/depends/native/zlib_dist/# Path to zlib
 
 BUILDFILES = \
-	$(SHAREDSUB)zlib_copyright.o $(ZLIB_DIST)adler32.o $(ZLIB_DIST)compress.o \
-	$(ZLIB_DIST)crc32.o $(ZLIB_DIST)deflate.o $(ZLIB_DIST)infback.o $(ZLIB_DIST)inffast.o \
-	$(ZLIB_DIST)inflate.o $(ZLIB_DIST)inftrees.o $(ZLIB_DIST)trees.o $(ZLIB_DIST)uncompr.o $(ZLIB_DIST)zutil.o
+  zlib_copyright.o adler32.o compress.o crc32.o deflate.o infback.o \
+  inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
 
 DLLNAME = $(DLLPATH)libhyzlib$(HY_SHLIB_SUFFIX)
 EXPNAME = HYZLIB_0.1
@@ -51,4 +51,4 @@ ifeq ($(HY_OS),zos)
 OPT += -DSTDC
 endif
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

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

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

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="AWT Build" default="build" basedir=".">
     <description>Build for AWT component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="awt" />
-    <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" />
@@ -163,7 +163,7 @@ ${line.separator}For Fedora try: yum ins
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -298,15 +298,15 @@ ${line.separator}For Fedora try: yum ins
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_boot_tests.jar">
-            <fileset dir="bin/test/boot">
+            <fileset dir="${hy.build.mod}/test/boot">
                 <exclude name="**/*Headless*Test.class" />
             </fileset>
         </hy.jar.bin>
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test/classes" />
+            <fileset dir="${hy.build.mod}/test/classes" />
         </hy.jar.bin>
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_headless_tests.jar">
-            <fileset dir="bin/test/boot">
+            <fileset dir="${hy.build.mod}/test/boot">
                 <include name="**/*Headless*Test.class" />
             </fileset>
         </hy.jar.bin>
@@ -329,7 +329,7 @@ ${line.separator}For Fedora try: yum ins
 
     <target name="-compile-tests" unless="skip.test.build">
         <compile-tests description="${hy.module} boot tests"
-                       destdir="bin/test/boot">
+                       destdir="${hy.build.mod}/test/boot">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/impl/boot" />
@@ -337,7 +337,7 @@ ${line.separator}For Fedora try: yum ins
             </javac-elements>
         </compile-tests>
         <compile-tests description="${hy.module} tests"
-                       destdir="bin/test/classes">
+                       destdir="${hy.build.mod}/test/classes">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/java" />

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/fontlib/unix/makefile Sat Jun  5 22:18:24 2010
@@ -13,28 +13,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/awt/native/fontlib/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)include
 
-BUILDFILES = \
-  $(SHAREDSUB)fljni.o \
-  $(SHAREDSUB)EncodedValue.o \
-  $(SHAREDSUB)Environment.o \
-  $(SHAREDSUB)Font.o \
-  $(SHAREDSUB)Glyph.o \
-  $(SHAREDSUB)Outline.o \
-  $(SHAREDSUB)ParsingTables.o \
-  $(SHAREDSUB)T1Font.o \
-  $(SHAREDSUB)T1Glyph.o \
-  $(SHAREDSUB)TTCurve.o \
-  $(SHAREDSUB)TTFont.o \
-  FontLibExports.o \
-  $(SHAREDSUB)TypeDefinition.o
+BUILDFILES = fljni.o EncodedValue.o Environment.o Font.o Glyph.o Outline.o \
+  ParsingTables.o T1Font.o T1Glyph.o TTCurve.o TTFont.o FontLibExports.o \
+  TypeDefinition.o
 
 OSLIBS += $(STDCLIBS)
 
 DLLNAME=$(DLLPATH)libFL$(HY_LINKLIB_SUFFIX)
 EXPNAME=HYFONTLIB_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/gl/unix/makefile Sat Jun  5 22:18:24 2010
@@ -13,24 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/awt/native/gl/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 # TODO: Fix the warnings see HARMONY-5885
 WARNFLAGS :=
 
-INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)/include \
+INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)include \
             -I/usr/X11R6/include -I/usr/include -Iinclude
 
-BUILDFILES = \
-  $(SHAREDSUB)/blitter.o \
-  $(SHAREDSUB)/gifdecoder.o \
-  $(SHAREDSUB)/LUTTables.o \
-  $(SHAREDSUB)/pngdecoder.o \
-  $(SHAREDSUB)/SurfaceDataStructure.o \
-  gl.o \
-  XBlitter.o \
-  XGraphics2D.o \
-  LockingKeys.o
+BUILDFILES = blitter.o gifdecoder.o LUTTables.o pngdecoder.o \
+  SurfaceDataStructure.o gl.o XBlitter.o XGraphics2D.o LockingKeys.o
 
 OSLIBS += -lpng
 
@@ -39,4 +32,4 @@ OSLIBS += $(STDCLIBS) $(XLIBS)
 DLLNAME=$(DLLPATH)libgl$(HY_SHLIB_SUFFIX)
 EXPNAME=HYGL_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/jpegdecoder/unix/makefile Sat Jun  5 22:18:24 2010
@@ -13,15 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/awt/native/jpegdecoder/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)include
 
-BUILDFILES = $(SHAREDSUB)JpegDecoder.o
+BUILDFILES = JpegDecoder.o
 
 OSLIBS += -ljpeg
 
 DLLNAME=$(DLLPATH)libjpegdecoder$(HY_SHLIB_SUFFIX)
 EXPNAME=HYJPEGDECODER_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/lcmm/unix/makefile Sat Jun  5 22:18:24 2010
@@ -13,20 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/awt/native/lcmm/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)/include $(LCMS_INCLUDES)
 
-BUILDFILES = \
-  $(SHAREDSUB)cmmerror.o \
-  $(SHAREDSUB)cmmio.o \
-  $(SHAREDSUB)cmmxforms.o \
-  $(SHAREDSUB)NativeCMM.o \
-  $(SHAREDSUB)NativeImageFormat.o
+BUILDFILES = cmmerror.o cmmio.o cmmxforms.o NativeCMM.o NativeImageFormat.o
 
 OSLIBS += -llcms
 
 DLLNAME=$(DLLPATH)liblcmm$(HY_SHLIB_SUFFIX)
 EXPNAME=HYLCMM_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/linuxfont/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/linuxfont/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/linuxfont/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/linuxfont/unix/makefile Sat Jun  5 22:18: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.mk
+HY_BIN=$(HY_TARGET)/build/classlib/awt/native/linuxfont/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 INCLUDES += -I$(SHARED)common -I/usr/X11R6/include -I/usr/include/freetype2 \
             -Iinclude -I../../fontlib/unix -I../../fontlib/shared # TOFIX move includes
@@ -33,4 +34,4 @@ OSLIBS += -lm $(XLIBS)
 DLLNAME=$(DLLPATH)liblinuxfont$(HY_SHLIB_SUFFIX)
 EXPNAME=HYLINUXFONT_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/oglwrapper/unix/makefile Sat Jun  5 22:18:24 2010
@@ -13,16 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/awt/native/oglwrapper/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 INCLUDES += -I$(SHARED)common -I$(SHAREDSUB)/include
 
-BUILDFILES = \
-  $(SHAREDSUB)/org_apache_harmony_awt_gl_opengl_GL.o
+BUILDFILES = org_apache_harmony_awt_gl_opengl_GL.o
 
 OSLIBS += $(STDCLIBS)
 
 DLLNAME=$(DLLPATH)liboglwrapper$(HY_SHLIB_SUFFIX)
 EXPNAME=HYOGLWRAPPER_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/awt/src/main/native/x11wrapper/unix/makefile Sat Jun  5 22:18:24 2010
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include $(HY_HDK)/build/make/defines.mk
+HY_BIN=$(HY_TARGET)/build/classlib/awt/native/x11wrapper/
+include $(HY_TARGET)/hdk/build/make/defines.mk
 
 INCLUDES += -I$(SHARED)common -I/usr/X11R6/include
 
-BUILDFILES = \
-  org_apache_harmony_awt_nativebridge_linux_ErrorHandler.o \
+BUILDFILES = org_apache_harmony_awt_nativebridge_linux_ErrorHandler.o \
   org_apache_harmony_awt_nativebridge_linux_GLX.o \
   org_apache_harmony_awt_nativebridge_linux_X11.o \
   org_apache_harmony_awt_nativebridge_linux_Xft.o
@@ -28,4 +28,4 @@ OSLIBS += $(STDCLIBS) $(XLIBS)
 DLLNAME=$(DLLPATH)libX11Wrapper$(HY_SHLIB_SUFFIX)
 EXPNAME=HYX11WRAPPER_0.1
 
-include $(HY_HDK)/build/make/rules.mk
+include $(HY_TARGET)/hdk/build/make/rules.mk

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/beans/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="BEANS Build" default="build" basedir=".">
     <description>Build for BEANS component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="beans" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
 
@@ -57,7 +57,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -95,15 +95,15 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_test_support.jar">
-            <fileset dir="bin/test_support" />
+            <fileset dir="${hy.build.mod}/test/support" />
         </hy.jar.bin>
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_impl_tests.jar">
-            <fileset dir="bin/test-internal" />
+            <fileset dir="${hy.build.mod}/test/internal" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>
@@ -128,7 +128,7 @@
 
     <target name="-compile-tests" unless="skip.test.build">
         <compile-tests description="${hy.module} test support"
-                       destdir="bin/test_support">
+                       destdir="${hy.build.mod}/test/support">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/support/java" />
@@ -136,12 +136,12 @@
             </javac-elements>
         </compile-tests>
         <compile-tests description="${hy.module} internal tests"
-                       destdir="bin/test-internal">
+                       destdir="${hy.build.mod}/test/internal">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/java-internal" />
                 </src>
-                <classpath location="bin/test_support" />
+                <classpath location="${hy.build.mod}/test/support" />
             </javac-elements>
         </compile-tests>
         <compile-tests description="${hy.module} api tests">
@@ -149,7 +149,7 @@
                 <src>
                     <pathelement location="src/test/java" />
                 </src>
-                <classpath location="bin/test_support" />
+                <classpath location="${hy.build.mod}/test/support" />
             </javac-elements>
         </compile-tests>
     </target>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="CONCURRENT Build" default="build" basedir=".">
     <description>Build for CONCURRENT component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="concurrent" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
 
@@ -57,7 +57,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -94,7 +94,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml?rev=951779&r1=951778&r2=951779&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/crypto/build.xml Sat Jun  5 22:18:24 2010
@@ -19,10 +19,10 @@
 <project name="CRYPTO Build" default="build" basedir=".">
     <description>Build for CRYPTO component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="crypto" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
 
@@ -57,7 +57,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -95,21 +95,21 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_test_support.jar">
-            <fileset dir="bin/test/support" />
+            <fileset dir="${hy.build.mod}/test/support" />
         </hy.jar.bin>
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_api_tests.jar">
-            <fileset dir="bin/test/api" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_api_boot_tests.jar">
-            <fileset dir="bin/test/api.injected" />
+            <fileset dir="${hy.build.mod}/test/api.injected" />
         </hy.jar.bin>
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_impl_tests.jar">
-            <fileset dir="bin/test/impl" />
+            <fileset dir="${hy.build.mod}/test/impl" />
         </hy.jar.bin>
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_impl_boot_tests.jar">
-            <fileset dir="bin/test/impl.injected" />
+            <fileset dir="${hy.build.mod}/test/impl.injected" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}" />
@@ -130,7 +130,7 @@
     <target name="-compile-tests" unless="skip.test.build">
 
         <compile-tests description="${hy.module} test support files"
-                       destdir="bin/test/support">
+                       destdir="${hy.build.mod}/test/support">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/support/common/java"/>
@@ -144,29 +144,29 @@
         </compile-tests>
 
         <compile-tests description="${hy.module} api tests"
-                       destdir="bin/test/api">
+                       destdir="${hy.build.mod}/test/api">
             <javac-elements>
                 <src path="src/test/api/java"/>
                 <include name="**/*Test.java" />
                 <classpath>
-                    <pathelement path="bin/test/support" />
+                    <pathelement path="${hy.build.mod}/test/support" />
                 </classpath>
             </javac-elements>
         </compile-tests>
 
         <compile-tests description="${hy.module} api injected tests"
-                       destdir="bin/test/api.injected">
+                       destdir="${hy.build.mod}/test/api.injected">
             <javac-elements>
                 <src path="src/test/api/java.injected"/>
                 <include name="**/*Test.java" />
                 <classpath>
-                    <pathelement path="bin/test/support" />
+                    <pathelement path="${hy.build.mod}/test/support" />
                 </classpath>
             </javac-elements>
         </compile-tests>
 
         <compile-tests description="${hy.module} impl injected tests"
-                       destdir="bin/test/impl.injected">
+                       destdir="${hy.build.mod}/test/impl.injected">
             <javac-elements>
                 <src path="src/test/impl/java.injected"/>
                 <include name="**/*Test.java" />
@@ -174,12 +174,12 @@
         </compile-tests>
 
         <compile-tests description="${hy.module} impl tests"
-                       destdir="bin/test/impl">
+                       destdir="${hy.build.mod}/test/impl">
             <javac-elements>
                 <src path="src/test/impl/java"/>
                 <include name="**/*Test.java" />
                 <classpath>
-                    <pathelement path="bin/test/support" />
+                    <pathelement path="${hy.build.mod}/test/support" />
                 </classpath>
             </javac-elements>
         </compile-tests>



Mime
View raw message