From 02faa11ed0486843b0d8947f3f47bce766a6e5a2 Mon Sep 17 00:00:00 2001
From: Mark Hindess <hindessm@apache.org>
Date: Tue, 26 Oct 2010 07:13:24 +0000
Subject: [PATCH] Merging some changes tested in mrh branch.  As mentioned on
 dev list.

git-svn-id: https://svn.apache.org/repos/asf/harmony/enhanced/java/trunk@1027390 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml               | 18 +++++++++---------
 make/depends.properties |  2 +-
 make/run-test.xml       |  4 +++-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/build.xml b/build.xml
index be7fb27..4e3abf0 100644
--- a/build.xml
+++ b/build.xml
@@ -19,10 +19,10 @@
 <project name="PACK200 Build" default="build" basedir=".">
     <description>Build for PACK200 component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="pack200" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
     <import file="${hy.hdk}/build/ant/depends.xml" />
 
     <property file="../../make/depends.properties" />
@@ -75,18 +75,18 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
         <echo message="Compiling ${hy.module} classes" />
 
-        <mkdir dir="../../build/classes" />
+        <mkdir dir="${hy.build.top}/java" />
 
     	<!-- Ordinary classes -->
         <hy.javac sourcepath=""
                   srcdir="src/main/java"
-                  destdir="../../build/classes"
+                  destdir="${hy.build.top}/java"
                   source="1.4"
                   target="1.4">
 
@@ -140,7 +140,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>
@@ -159,7 +159,7 @@
     </target>
 
     <target name="-compile-tests" unless="skip.test.build">
-        <mkdir dir="bin/test" />
+        <mkdir dir="${hy.build.mod}/test/api" />
 
         <mkdir dir="${hy.hdk}/build/test" />
         <copy file="${junit.jar}"
@@ -169,7 +169,7 @@
 
         <echo message="Compiling ${hy.module} tests" />
         <hy.javac srcdir="src/test/java"
-                  destdir="bin/test"
+                  destdir="${hy.build.mod}/test/api"
                   sourcepath=""
                   source="1.4" 
                   target="1.4">
diff --git a/make/depends.properties b/make/depends.properties
index 636c440..379b6fb 100644
--- a/make/depends.properties
+++ b/make/depends.properties
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-depends.jars=${depends.dir}/jars
+depends.jars=${hy.depends}/jars
 asm.ver=asm-3.1
 asm.dir=${depends.jars}/${asm.ver}
 asm.jar=${asm.dir}/${asm.ver}.jar
diff --git a/make/run-test.xml b/make/run-test.xml
index 8268be3..f79be31 100644
--- a/make/run-test.xml
+++ b/make/run-test.xml
@@ -23,7 +23,9 @@
     <property file="../test.properties" />
 
     <property name="work.dir" value=".." />
-    <property name="target.dir" value=".." />
+    <property name="hy.test.root" value=".." />
+    <property name="hy.component" value="classlib" />
+    <property name="hy.module" value="pack200" />
     <property name="tests.output" location="../report" />
     <property name="junit.jar" location="../junit.jar" />