harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r1029056 [4/5] - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/build/ classlib/depends/libs/ classlib/make/ classlib/modules/accessibility/ classlib/modules/accessibility/make/ classlib/modules/activation/ classlib...
Date Sat, 30 Oct 2010 13:11:19 GMT
Modified: harmony/enhanced/java/branches/java6/classlib/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/sql/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/sql/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/sql/build.xml Sat Oct 30 13:11:14 2010
@@ -19,11 +19,10 @@
 <project name="SQL Build" default="build" basedir=".">
     <description>Build for SQL component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="sql" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
     <import file="${hy.hdk}/build/ant/depends.xml" />
 
     <property file="../../make/depends.properties" />
@@ -108,7 +107,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>

Modified: harmony/enhanced/java/branches/java6/classlib/modules/sql/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/sql/make/depends.properties?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/sql/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/sql/make/depends.properties Sat Oct 30 13:11:14 2010
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-depends.jars=${depends.dir}/jars
+depends.jars=${hy.depends}/jars
 derby.dir=${depends.jars}/derby-10.3.1.4
 derby.jar=${derby.dir}/derby.jar
 derby.url=${maven2.base}/org/apache/derby/derby/10.3.1.4/derby-10.3.1.4.jar

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

Modified: harmony/enhanced/java/branches/java6/classlib/modules/stax/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/stax/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/stax/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/stax/build.xml Sat Oct 30 13:11:14 2010
@@ -21,10 +21,10 @@
 <project name="STAX Build" default="build" basedir=".">
     <description>Build for stax component</description>
 
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="hy.jdk" location="${hy.hdk}/jdk" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.component" value="classlib" />
+    <property name="hy.module" value="stax" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
     <import file="${hy.hdk}/build/ant/depends.xml" />
 
     <target name="build" depends="check-depends" />

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

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

Modified: harmony/enhanced/java/branches/java6/classlib/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/swing/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/swing/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/swing/build.xml Sat Oct 30 13:11:14 2010
@@ -19,13 +19,13 @@
 <project name="SWING Build" default="build" basedir=".">
     <description>Build for SWING component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="swing" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
 
     <!-- List of private classes that cannot be mapped by above mappers -->
-    <fileset id="hidden.classes" dir="../../build/classes">
+    <fileset id="hidden.classes" dir="${hy.build.top}/java">
         <include name="javax/swing/text/html/parser/ModelElement.class"/>
         <include name="javax/swing/text/html/parser/Asn1ModelElement.class"/>
         <include name="javax/swing/text/html/parser/Asn1ModelElement$1.class"/>
@@ -66,7 +66,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -108,7 +108,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test/injected" />
+            <fileset dir="${hy.build.mod}/test/injected" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>
@@ -128,7 +128,7 @@
 
     <target name="-compile-tests" unless="skip.test.build">
         <compile-tests description="${hy.module} tests"
-                       destdir="bin/test/injected">
+                       destdir="${hy.build.mod}/test/injected">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/java" />

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

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

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

Modified: harmony/enhanced/java/branches/java6/classlib/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/x-net/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/x-net/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/x-net/build.xml Sat Oct 30 13:11:14 2010
@@ -19,10 +19,10 @@
 <project name="X-NET Build" default="build" basedir=".">
     <description>Build for X-NET component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="x-net" />
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
 
@@ -57,7 +57,7 @@
 
     <target name="-clean-test" unless="skip.test.build">
         <delete dir="${tests.hdk.dir}" failonerror="false" />
-        <delete failonerror="false" dir="bin"/>
+        <delete failonerror="false" dir="${hy.build.mod}/test"/>
     </target>
 
     <target name="-compile-java" unless="skip.java.build">
@@ -95,19 +95,19 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_test_support.jar">
-            <fileset dir="bin/test/support" />
+            <fileset dir="${hy.build.mod}/test/support" />
         </hy.jar.bin>
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_api_tests.jar">
-            <fileset dir="bin/test/api" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_impl_boot_tests.jar">
-            <fileset dir="bin/test/impl.injected" />
+            <fileset dir="${hy.build.mod}/test/impl.injected" />
         </hy.jar.bin>
 
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_impl_tests.jar">
-            <fileset dir="bin/test/impl" />
+            <fileset dir="${hy.build.mod}/test/impl" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}" />
@@ -128,7 +128,7 @@
     <target name="-compile-tests" unless="skip.test.build">
 
         <compile-tests description="${hy.module} test support files"
-                       destdir="bin/test/support">
+                       destdir="${hy.build.mod}/test/support">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/support/common/java" />
@@ -139,9 +139,9 @@
         </compile-tests>
         
         <compile-tests description="${hy.module} api tests"
-                       destdir="bin/test/api">
+                       destdir="${hy.build.mod}/test/api">
             <javac-elements>
-                <classpath location="bin/test/support" />
+                <classpath location="${hy.build.mod}/test/support" />
                 <src path="src/test/api/java"/>
                 <src path="src/test/java"/>
                 <include name="**/*Test.java" />
@@ -149,16 +149,16 @@
         </compile-tests>
 
         <compile-tests description="${hy.module} impl injected tests"
-                       destdir="bin/test/impl.injected">
+                       destdir="${hy.build.mod}/test/impl.injected">
             <javac-elements>
-                <classpath location="bin/test/support" />
+                <classpath location="${hy.build.mod}/test/support" />
                 <src path="src/test/impl/java.injected"/>
                 <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
         
         <compile-tests description="${hy.module} impl tests"
-                       destdir="bin/test/impl">
+                       destdir="${hy.build.mod}/test/impl">
             <javac-elements>
                 <src path="src/test/impl/java"/>
                 <include name="**/*Test.java" />

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

Modified: harmony/enhanced/java/branches/java6/classlib/modules/x-tools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/x-tools/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/x-tools/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/x-tools/build.xml Sat Oct 30 13:11:14 2010
@@ -19,10 +19,10 @@
 <project name="ANNOTATION Build" default="build" basedir=".">
     <description>Build for X-Tools component</description>
 
+    <property name="hy.component" value="classlib" />
     <property name="hy.module" value="x-tools" />
-    <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" />
@@ -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">
@@ -106,7 +106,7 @@
         <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
         
         <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
-            <fileset dir="bin/test" />
+            <fileset dir="${hy.build.mod}/test/api" />
         </hy.jar.bin>
 
         <mkdir dir="${tests.excludes.hdk.dir}"/>

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

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

Modified: harmony/enhanced/java/branches/java6/classlib/modules/xmlsec/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/xmlsec/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/xmlsec/build.xml (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/xmlsec/build.xml Sat Oct 30 13:11:14 2010
@@ -21,10 +21,10 @@
 <project name="XML-SEC Build" default="build" basedir=".">
     <description>Build for xml security component</description>
 
-    <property name="hy.hdk" location="${basedir}/../../deploy" />
-    <property name="hy.jdk" location="${hy.hdk}/jdk" />
-    <property name="depends.dir" location="${basedir}/../../depends" />
-    <import file="${hy.hdk}/build/ant/properties.xml" />
+    <property name="hy.component" value="classlib" />
+    <property name="hy.module" value="xmlsec" />
+    <property name="hy.target" location="${basedir}/../../target" />
+    <import file="${hy.target}/hdk/build/ant/properties.xml" />
     <import file="${hy.hdk}/build/ant/depends.xml" />
 
     <target name="build" depends="check-depends" />

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

Modified: harmony/enhanced/java/branches/java6/common_resources/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/depends.properties?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/depends.properties (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/depends.properties Sat Oct 30 13:11:14 2010
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-depends.jars=${base.dep.dir}/jars
-depends.oss=${base.dep.dir}/oss
+depends.jars=${hy.depends}/jars
+depends.oss=${hy.depends}/oss
 
 depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
 eclipse.base=http://download.eclipse.org/eclipse/downloads/drops
@@ -44,7 +44,7 @@ icuhdr=${depends.oss}/icu4c/icu4c-3.4-ha
 icuhdr.url=${depends.url}/oss/icu4c-3.4-harmony-includes.zip
 icuhdr.md5=46dbe39e5f6c4ea206a9daad9e29f8b0
 
-icudll=${base.dep.dir}/libs/${hy.platform.variant}/icu-3.4/icu-3.4.zip
+icudll=${hy.depends}/libs/${hy.platform.variant}/icu-3.4/icu-3.4.zip
 icudll.url=${depends.url}/libs/${hy.platform.variant}/icu-3.4.zip
 icuuc.linkname@windows@=icuuc.lib
 icuuc.linkname@unix@=libicuuc.so.34
@@ -78,13 +78,7 @@ xerces.zip=${xerces.dir}/xerces.zip
 xerces.url=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.10.0.zip
 xerces.md5=8da14a7b2848eff131b7cc10668887e8
 
-bcprov.ver=bcprov-jdk15-138
-bcprov.dir=${depends.jars}/${bcprov.ver}
-bcprov.jar=${bcprov.dir}/bcprov.noidea.jar
-bcprov.url=${depends.url}/jars/bcprov/${bcprov.ver}/bcprov.noidea.jar
-bcprov.md5=7e2cf5f39012b303b4246e33a66bf078
-
-msvcr.dir.x86=${depends.dir}/libs/windows.x86
+msvcr.dir.x86=${hy.depends}/libs/windows.x86
 msvcr.dll.x86=${msvcr.dir.x86}/msvcr71.dll
 msvcr.url.x86=file:///${hyenv.SystemRoot}/system32/msvcr71.dll
 # This is the md5 hash for the VS2003 version, 7.10.3052.4
@@ -92,7 +86,7 @@ msvcr_VS2003.md5.x86=86f1895ae8c5e8b17d9
 # This is the md5 hash for the VS2003 SP1 version, 7.10.6030.0
 msvcr_VS2003SP1.md5.x86=ca2f560921b7b8be1cf555a5a18d54c3
 
-msvcp.dir.x86=${depends.dir}/libs/windows.x86
+msvcp.dir.x86=${hy.depends}/libs/windows.x86
 msvcp.dll.x86=${msvcr.dir.x86}/msvcp71.dll
 msvcp.url.x86=file:///${hyenv.SystemRoot}/system32/msvcp71.dll
 # This is the md5 hash for the VS2003 version, 7.10.3077.0
@@ -100,13 +94,13 @@ msvcp_VS2003.md5.x86=561fa2abb31dfa8fab7
 # This is the md5 hash for the VS2003 SP1 version, 7.10.6030.0
 msvcp_VS2003SP1.md5.x86=a94dc60a90efd7a35c36d971e3ee7470
 
-msvcr.dir.x86_64=${depends.dir}/libs/windows.x86_64
+msvcr.dir.x86_64=${hy.depends}/libs/windows.x86_64
 msvcr.dll.x86_64=${msvcr.dir.x86_64}/msvcr80.dll
 msvcr.url.x86_64=file:///C:/Program%20Files%20(x86)/Microsoft%20Visual%20Studio%208/VC/redist/amd64/Microsoft.VC80.CRT/msvcr80.dll
 # VS2005 version 8.00.50727.42
 msvcr.md5.x86_64=465cebd7da2ceaba5e552fc9118a1415
 
-msvcp.dir.x86_64=${depends.dir}/libs/windows.x86_64
+msvcp.dir.x86_64=${hy.depends}/libs/windows.x86_64
 msvcp.dll.x86_64=${msvcp.dir.x86_64}/msvcp80.dll
 msvcp.url.x86_64=file:///C:/Program%20Files%20(x86)/Microsoft%20Visual%20Studio%208/VC/redist/amd64/Microsoft.VC80.CRT/msvcp80.dll
 # VS2005 version 8.00.50727.42
@@ -119,26 +113,6 @@ mx4j.md5=443bd83ee36414de4b8fc5722b038b0
 mx4j.jar=${mx4j.dir}/mx4j.jar
 mx4j.remote.jar=${mx4j.dir}/mx4j-remote.jar
 
-yoko.dir=${depends.jars}/yoko-1.0-SNAPSHOT-20080304
-yoko.jar=${yoko.dir}/yoko.jar
-yoko.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-spec-corba/1.0-SNAPSHOT/yoko-spec-corba-1.0-20080304.193341-1.jar
-yoko.md5=884ac35840a92d13efa155812bfe54a9
-
-yoko-core.dir=${depends.jars}/yoko-1.0-SNAPSHOT-20080304
-yoko-core.jar=${yoko.dir}/yoko-core.jar
-yoko-core.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-core/1.0-SNAPSHOT/yoko-core-1.0-20080304.193341-1.jar
-yoko-core.md5=03638ebf8c1da647ad64412a2c5fb2f4
-
-yoko-rmi-impl.dir=${depends.jars}/yoko-1.0-SNAPSHOT-20080304
-yoko-rmi-impl.jar=${yoko-rmi-impl.dir}/yoko-rmi-impl.jar
-yoko-rmi-impl.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-rmi-impl/1.0-SNAPSHOT/yoko-rmi-impl-1.0-20080304.193341-1.jar
-yoko-rmi-impl.md5=4a45c7a0308227a46fd3ef675c6fde6c
-
-yoko-rmi-spec.dir=${depends.jars}/yoko-1.0-SNAPSHOT-20080304
-yoko-rmi-spec.jar=${yoko-rmi-spec.dir}/yoko-rmi-spec.jar
-yoko-rmi-spec.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-rmi-spec/1.0-SNAPSHOT/yoko-rmi-spec-1.0-20080304.193341-1.jar
-yoko-rmi-spec.md5=8ef16849448ecccabc0f1aac8b840e9c
-
 # bcel is needed by yoko-rmi
 bcel.version=5.2
 bcel.base=bcel-${bcel.version}
@@ -161,23 +135,23 @@ servlet-api.md5=c27c02fb0a00cc3a7d05ea99
 servlet-api.url=${maven2.base}/jetty/servlet-api/2.5-6.0.0/servlet-api-2.5-6.0.0.jar
 
 awtdeps.base.x86=http://people.apache.org/~geirm/harmony/
-awtdeps.dir.x86=${depends.dir}/libs/windows.x86
+awtdeps.dir.x86=${hy.depends}/libs/windows.x86
 awtdeps.tar.x86=${awtdeps.dir.x86}/swing_awt_deps_winxp_2006-09-28.tgz
 awtdeps.url.x86=${awtdeps.base.x86}swing_awt_deps_winxp_2006-09-28.tgz
 awtdeps.md5.x86=d61a27e4b305d9fcabaaacf34f8f534a
-awtdeps.extract.dir.x86=${depends.dir}/libs/build
+awtdeps.extract.dir.x86=${hy.depends}/libs/build
 awtdeps.testfile.x86=${awtdeps.extract.dir.x86}/winxp_2006-09-28.txt
 
 awtdeps.base.x86_64=http://people.apache.org/~ayza/harmony/64bit/
-awtdeps.dir.x86_64=${depends.dir}/libs/windows.x86_64
+awtdeps.dir.x86_64=${hy.depends}/libs/windows.x86_64
 awtdeps.tar.x86_64=${awtdeps.dir.x86_64}/swing_awt_deps_win64_2007-02-08.tgz
 awtdeps.url.x86_64=${awtdeps.base.x86_64}swing_awt_deps_win64_2007-02-08.tgz
 awtdeps.md5.x86_64=f2bbb1f4f23100393783fd02a77fcc68
-awtdeps.extract.dir.x86_64=${depends.dir}/libs/build
+awtdeps.extract.dir.x86_64=${hy.depends}/libs/build
 awtdeps.testfile.x86_64=${awtdeps.extract.dir.x86_64}/win64_2007-02-08.txt
 
-dejavu-fonts.dir=${depends.dir}/dejavu-fonts
-dejavu-fonts.fonts.dir=${depends.dir}/dejavu-fonts/dejavu-ttf-2.18
+dejavu-fonts.dir=${hy.depends}/dejavu-fonts
+dejavu-fonts.fonts.dir=${hy.depends}/dejavu-fonts/dejavu-ttf-2.18
 dejavu-fonts.zip=${dejavu-fonts.dir}/dejavu-ttf-2.18-1.zip
 dejavu-fonts.url=http://downloads.sourceforge.net/sourceforge/dejavu/dejavu-ttf-2.18-1.zip?use_mirror=autoselect
 dejavu-fonts.md5=72e0a87ec1f9c5c26c66eabcf1e2018e

Modified: harmony/enhanced/java/branches/java6/common_resources/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/depends.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/depends.xml (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/depends.xml Sat Oct 30 13:11:14 2010
@@ -38,126 +38,17 @@
       </filterchain>
     </loadproperties>
 
-    <macrodef name="poll-modules" 
-        description="directory-based macros for polling sub-builds">
-        <attribute name="target" />
-        <attribute name="dir" />
-        <attribute name="includes" default="${build.module}"/>
-        <attribute name="excludes" default="${exclude.module}"/>
-        <attribute name="antfile" default="*.xml"/>
-        <sequential>
-            <!-- convert dirset pattern to fileset pattern-->
-            <property name="@{dir}.loc" location="@{dir}"/>
-            <pathconvert property="list.@{dir}.@{target}" 
-                pathsep="${file.separator}@{antfile}," setonempty="no">
-                <path>
-                    <dirset dir="@{dir}"
-                            includes="@{includes}"
-                            excludes="@{excludes}">
-                        <exclude name=".*" />
-                    </dirset>
-                </path>
-                <map from="${@{dir}.loc}${file.separator}" to=""/>
-            </pathconvert>
-            <!-- append antfile suffix to last item in the list, if any -->
-            <condition property="poll.@{dir}.@{target}"
-                value="${list.@{dir}.@{target}}${file.separator}@{antfile}" 
-                else="">
-                <isset property="list.@{dir}.@{target}"/>
-            </condition>
-            <poll-build target="@{target}" dir="@{dir}" 
-                includes="${poll.@{dir}.@{target}}"/>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="poll-build"
-        description="plain-filter macros for polling sub-builds">
-        <attribute name="target" />
-        <attribute name="dir" />
-        <attribute name="includes" default="**/*.xml"/>
-        <attribute name="excludes" default=""/>
-        <sequential>
-            <echo message="polling @{includes}"/>
-            <subant target="@{target}">
-                <fileset dir="@{dir}" includes="@{includes}" excludes="@{excludes}">
-                    <containsregexp expression="&lt;target[^&gt;]*name=&quot;@{target}&quot;"/>
-                </fileset>
-            </subant>
-        </sequential>
-    </macrodef>
-
-    <target name="fetch">
-        <fetch dep="${dependency}"/>
-    </target>
-    
-    <macrodef name="fetch">
-        <attribute name="dep" />
-        <sequential>
-            <dirname file="${@{dep}}" property="@{dep}.dir"/>
-            <mkdir dir="${@{dep}.dir}"/>
-            <download-one-file dest="${@{dep}}" 
-                src="${@{dep}.url}" md5="${@{dep}.md5}"/>
-            <unzip-one-file dep="@{dep}"/>
-        </sequential>
-    </macrodef>
-    
-    <target name="-really-unzip" unless="unzipped" if="unzip.path">
-        <tempfile destdir="${dest}" property="tmp"/>
-        <unzip src="${src}" dest="${tmp}" >
-            <patternset includes="${unzip.path}"/>
-        </unzip>
-        <touch>
-            <fileset dir="${tmp}">
-                <patternset includes="${unzip.path}"/>
-            </fileset>
-        </touch>
-        <move todir="${dest}" flatten="yes" failonerror="no">
-            <fileset dir="${tmp}">
-                <patternset includes="${unzip.path}"/>
-            </fileset>
-        </move>
-        <delete dir="${tmp}" />
-    </target>
-    
-    <macrodef name="unzip-one-file">
-        <attribute name="dep" />
-        <sequential>
-            <dirname file="${@{dep}}" property="@{dep}.dir"/>
-            <!-- quite tricky way to detect if unzip operation is pending,
-                still not very robust ...
-                Life could be simpler if unzip supported nested mappers
-            -->
-            <basename file="${@{dep}}" property="@{dep}.basename"/>
-            <basename file="${@{dep}.unzip.path}" property="@{dep}.unzip.basename"/>
-            <pathconvert property="@{dep}.matching.list" setonempty="no">
-                <path><fileset dir="${@{dep}.dir}" includes="${@{dep}.unzip.basename}"/></path>
-            </pathconvert>
-            <pathconvert property="@{dep}.uptodate.list" setonempty="no">
-                <path>
-                    <fileset dir="${@{dep}.dir}" includes="${@{dep}.unzip.basename}">
-                        <depend targetdir="${@{dep}.dir}">
-                            <mapper type="merge" to="${@{dep}.basename}"/>
-                        </depend>
-                    </fileset>
-                </path>
-            </pathconvert>
-            <condition property="@{dep}.unzipped">
-                <equals arg1="${@{dep}.uptodate.list}" arg2="${@{dep}.matching.list}"/>
-                <!--uptodate srcfile="${@{dep}}"
-                        targetfile="${@{dep}.dir}/${@{dep}.unzip.basename}"/-->
-            </condition>
+    <loadproperties srcfile="${basedir}/make/depends.properties">
+      <filterchain>
+        <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
+            <param type="token" name="${hy.arch}" value=""/>
+            <param type="token" name="${hy.os.family}" value=""/>
+            <param type="token" name="${hy.platform}" value=""/>
+            <param type="token" name="${hy.platform.variant}" value=""/>
+        </filterreader>
+      </filterchain>
+    </loadproperties>
 
-            <antcall target="-really-unzip">
-                <param name="src" value="${@{dep}}" />
-                <param name="dest" value="${@{dep}.dir}" />
-                <propertyset>
-                  <propertyref prefix="@{dep}.unzip"/>
-                  <globmapper from="@{dep}.*" to="*"/>
-                </propertyset>
-            </antcall>
-        </sequential>
-    </macrodef>
-    
     <macrodef name="download-one-file">
         <attribute name="src" />
         <attribute name="dest" />
@@ -238,6 +129,32 @@ than the Apache License v2.
         </sequential>
     </macrodef>
 
+    <macrodef name="check-os-file">
+        <attribute name="src" />
+        <attribute name="message" />
+        <sequential>
+            <echo level="info">Checking for system file @{src}</echo>
+            <available file="@{src}" type="file"
+                       property="@{src}.exists" />
+            <fail>
+                <condition>
+                    <not>
+                        <isset property="@{src}.exists" />
+                    </not>
+                </condition>
+...
+
+Missing dependency.  The system file:
+
+  @{src}
+
+is missing.
+
+@{message}
+            </fail>
+        </sequential>
+    </macrodef>
+
     <macrodef name="check-one-link">
         <attribute name="src" />
         <attribute name="dest" />
@@ -284,15 +201,76 @@ But @{src} doesn't exist.
         <symlink resource="${src}" link="${dest}" />
     </target>
 
+    <target name="fetch">
+        <fetch dep="${dependency}"/>
+    </target>
+    
+    <macrodef name="fetch">
+        <attribute name="dep" />
+        <sequential>
+            <dirname file="${@{dep}}" property="@{dep}.dir"/>
+            <mkdir dir="${@{dep}.dir}"/>
+            <download-one-file dest="${@{dep}}" 
+                src="${@{dep}.url}" md5="${@{dep}.md5}"/>
+            <unzip-one-file dep="@{dep}"/>
+        </sequential>
+    </macrodef>
     
-    <!--macrodef name="chksum">
-        <attribute name="file" />
-        <attribute name="type" default="md5" />
+    <target name="-really-unzip" unless="unzipped" if="unzip.path">
+        <tempfile destdir="${dest}" property="tmp"/>
+        <unzip src="${src}" dest="${tmp}" >
+            <patternset includes="${unzip.path}"/>
+        </unzip>
+        <touch>
+            <fileset dir="${tmp}">
+                <patternset includes="${unzip.path}"/>
+            </fileset>
+        </touch>
+        <move todir="${dest}" flatten="yes" failonerror="no">
+            <fileset dir="${tmp}">
+                <patternset includes="${unzip.path}"/>
+            </fileset>
+        </move>
+        <delete dir="${tmp}" />
+    </target>
+
+    <macrodef name="unzip-one-file">
+        <attribute name="dep" />
         <sequential>
-            <checksum property="@{file}.@{type}" file="@{file}"
-                      algorithm="@{type}" />
-            <echo file="@{file}.@{type}"
-                  message="${@{file}.@{type}}  @{file}${line.separator}" />
+            <dirname file="${@{dep}}" property="@{dep}.dir"/>
+            <!-- quite tricky way to detect if unzip operation is pending,
+                still not very robust ...
+                Life could be simpler if unzip supported nested mappers
+            -->
+            <basename file="${@{dep}}" property="@{dep}.basename"/>
+            <basename file="${@{dep}.unzip.path}" property="@{dep}.unzip.basename"/>
+            <pathconvert property="@{dep}.matching.list" setonempty="no">
+                <path><fileset dir="${@{dep}.dir}" includes="${@{dep}.unzip.basename}"/></path>
+            </pathconvert>
+            <pathconvert property="@{dep}.uptodate.list" setonempty="no">
+                <path>
+                    <fileset dir="${@{dep}.dir}" includes="${@{dep}.unzip.basename}">
+                        <depend targetdir="${@{dep}.dir}">
+                            <mapper type="merge" to="${@{dep}.basename}"/>
+                        </depend>
+                    </fileset>
+                </path>
+            </pathconvert>
+            <condition property="@{dep}.unzipped">
+                <equals arg1="${@{dep}.uptodate.list}" arg2="${@{dep}.matching.list}"/>
+                <!--uptodate srcfile="${@{dep}}"
+                        targetfile="${@{dep}.dir}/${@{dep}.unzip.basename}"/-->
+            </condition>
+
+            <antcall target="-really-unzip">
+                <param name="src" value="${@{dep}}" />
+                <param name="dest" value="${@{dep}.dir}" />
+                <propertyset>
+                  <propertyref prefix="@{dep}.unzip"/>
+                  <globmapper from="@{dep}.*" to="*"/>
+                </propertyset>
+            </antcall>
         </sequential>
-    </macrodef-->
+    </macrodef>
+
 </project>

Modified: harmony/enhanced/java/branches/java6/common_resources/make/platform.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/platform.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/platform.xml (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/platform.xml Sat Oct 30 13:11:14 2010
@@ -183,7 +183,29 @@
         <isset property="is.ppc32" />
     </condition>
     <property name="hy.arch" value="${os.arch}" />
-    
+
+    <condition property="hy.arch.family" value="x86">
+        <or>
+            <isset property="is.x86" />
+            <isset property="is.x86_64" />
+        </or>
+    </condition>
+    <condition property="hy.arch.family" value="ia64">
+        <isset property="is.ia64" />
+    </condition>
+    <condition property="hy.arch.family" value="ppc">
+        <or>
+            <isset property="is.ppc32" />
+            <isset property="is.ppc64" />
+        </or>
+    </condition>
+    <condition property="hy.arch.family" value="s390">
+        <or>
+            <isset property="is.s390" />
+            <isset property="is.s390x" />
+        </or>
+    </condition>
+
     <!-- Normalized platform name -->
     <property name="hy.platform" value="${hy.os}.${hy.arch}"/>
     <property name="hy.platform.path" value="${hy.os}/${hy.arch}"/>
@@ -254,8 +276,19 @@
         <or>
             <isset property="is.aix"/>
             <isset property="is.freebsd"/>
+            <isset property="is.zos"/>
         </or>
     </condition>
     <property name="make.command" value="make" />
 
+    <condition property="make.arg" value="/nologo">
+        <isset property="is.windows"/>
+    </condition>
+    <property name="make.arg" value="-r" />
+
+    <condition property="make.suffix" value="mak">
+        <isset property="is.windows"/>
+    </condition>
+    <property name="make.suffix" value="mk" />
+
 </project>

Modified: harmony/enhanced/java/branches/java6/common_resources/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/properties.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/properties.xml (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/properties.xml Sat Oct 30 13:11:14 2010
@@ -26,17 +26,40 @@
 
     <property file="${user.home}/.harmony.properties" />
     <dirname property="common.basedir"
-             file="${ant.file.Common property definitions}/.."/>
+             file="${ant.file.Common property definitions}"/>
 
-    <import file="${common.basedir}/make/platform.xml"/>
-    <import file="${common.basedir}/make/svn.xml"/>
+    <import file="${common.basedir}/platform.xml"/>
+    <import file="${common.basedir}/svn.xml"/>
 
+    <fail message="Property 'hy.target' is not defined">
+        <condition>
+            <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.root" location="${hy.target}/build" />
+    <property name="hy.build" location="${hy.build.root}/${hy.component}" />
+    <property name="hy.build.top" location="${hy.build}/toplevel" />
+    <property name="hy.build.mod" location="${hy.build}/${hy.module}" />
 
-    <!-- Root directory of the common dependemcy pool -->
-    <property name="base.dep.dir" location="${common.basedir}/depends"/>
+    <!-- Root directory of the common dependency pool -->
+    <property name="hy.depends" location="${hy.target}/depends" />
 
     <!-- Debug or release version -->
     <property name="hy.cfg" value="debug" />
+    <property name="hy.specification.version" value="1.5" />
 
     <!-- Javac properties -->
     <!-- Explicitly set to ECJ as the default compiler. -->
@@ -45,18 +68,20 @@
     <property name="hy.javac.source" value="1.5" />
     <property name="hy.javac.target" value="1.5" />
     <property name="hy.javac.maxmem" value="384M" />
+    <property name="build.compilerarg" value="-nowarn" />
 
     <!-- Temporarily always include class file debug info -->
     <condition property="hy.javac.debug" value="on" else="on">
         <equals arg1="${hy.cfg}" arg2="debug" />
     </condition>
 
-    <!-- Local variable tables should be available in debug, and
-         omitted in release modes. -->
-    <condition property="build.compilerarg" value="-nowarn -g"
-               else="-nowarn -g:lines,source">
+    <!-- Include only stack trace information into release build -->
+    <condition property="hy.javac.debuglevel" value="lines,vars,source"
+               else="lines,source">
         <equals arg1="${hy.cfg}" arg2="debug" />
     </condition>
+    <property name="hy.jar.compress" value="true" />
+
 
     <!-- During packaging, these files must be copied into the meta-inf dir -->
     <fileset id="hy.required.metainf-files" dir="${hy.hdk}">
@@ -68,34 +93,14 @@
     <property name="hy.test.forkmode" value="once" />
     <property name="hy.test.timeout" value="900000" />
     <property name="hy.test.vmargs" value="" />
-
-    <condition property="hy.platform.suffix" value=".libstdc++5">
-        <isset property="use.libstdc++5"/>
-    </condition>
-    <condition property="hy.platform.suffix" value=".8x">
-        <!-- matches would be better but debian stable has ant 1.6.5
-             and matches was only added to 1.7.0 and above -->
-        <and>
-            <equals arg1="FreeBSD" arg2="${os.name}" casesensitive="false" /> 
-            <contains substring="8." string="${os.version}"/>
-        </and>
-    </condition>
-    <condition property="hy.platform.suffix" value=".7x">
-        <!-- matches would be better but debian stable has ant 1.6.5
-             and matches was only added to 1.7.0 and above -->
-        <and>
-            <equals arg1="FreeBSD" arg2="${os.name}" casesensitive="false" /> 
-            <contains substring="7." string="${os.version}"/>
-        </and>
+    <condition property="hy.run.impl.tests" value="true">
+        <istrue value="${hy.test.impl}" />
     </condition>
-    <property name="hy.platform.suffix" value="" />
-    <property name="hy.platform.variant"
-              value="${hy.platform}${hy.platform.suffix}" />
 
     <condition property="png.home" value="/usr/local">
         <isset property="is.freebsd"/>
     </condition>
-    <condition property="png.home" value="/sw">
+    <condition property="png.home" value="/opt/local">
         <isset property="is.macosx"/>
     </condition>
     <property name="png.home" value="/usr" />
@@ -103,7 +108,7 @@
     <condition property="lcms.home" value="/usr/local">
         <isset property="is.freebsd"/>
     </condition>
-    <condition property="lcms.home" value="/sw">
+    <condition property="lcms.home" value="/opt/local">
         <isset property="is.macosx"/>
     </condition>
     <property name="lcms.home" value="/usr" />
@@ -111,45 +116,125 @@
     <condition property="jpeg.home" value="/usr/local">
         <isset property="is.freebsd"/>
     </condition>
-    <condition property="jpeg.home" value="/sw">
+    <condition property="jpeg.home" value="/opt/local">
         <isset property="is.macosx"/>
     </condition>
     <property name="jpeg.home" value="/usr" />
     
-    <!-- default property for call-modules macro - i.e. all modules -->
+    <condition property="is.select" value="true">
+        <istrue value="${hy.select}" />
+    </condition>
+    <condition property="is.not.select" value="true">
+        <not><istrue value="${hy.select}" /></not>
+    </condition>
+
+    <!-- default property for poll-modules macro - i.e. all modules -->
     <property name="build.module" value="*" />
+    <condition property="exclude.module"
+            value="accessibility,applet,awt,imageio,orb,print,rmi,sound,swing">
+        <istrue value="${hy.select}" />
+    </condition>
     <property name="exclude.module" value="nothing" />
-
-    <!-- names of exclude lists, used by prepare-exclude-list macro -->
-    <property name="common.exclude.file" value="exclude.common" />
-    <property name="common.exclude.interm" value="exclude.interm" />
-    <property name="platform.exclude.file"
-              value="exclude.${hy.platform}.${hy.test.vm.name}" />
-    <property name="platform.exclude.interm"
-              value="exclude.${hy.platform}.${hy.test.vm.name}.interm" />
+    <property name="build.java" value="true" />
+    <property name="build.native" value="true" />
+    <property name="build.test" value="true" />
+    <condition property="skip.java.build" value="true">
+        <equals arg1="${build.java}" arg2="false" />
+    </condition>
+    <condition property="skip.native.build" value="true">
+        <equals arg1="${build.native}" arg2="false" />
+    </condition>
+    <condition property="skip.test.build" value="true">
+        <equals arg1="${build.test}" arg2="false" />
+    </condition>
 
     <!-- flags -->
     <property name="hy.no.thr" value="false" />
     <condition property="hy.skip.thr" value="true">
-        <not>
-            <equals arg1="${hy.no.thr}" arg2="false" />
-        </not>
+        <istrue value="${hy.no.thr}" />
+    </condition>
+
+    <property name="hy.thr.no.deploy" value="false" />
+    <condition property="hy.thr.deploy" value="true">
+        <equals arg1="${hy.thr.no.deploy}" arg2="false" />
     </condition>
 
     <property name="hy.local.zlib" value="false" />
     <condition property="hy.skip.zlib" value="true">
-        <not>
-            <equals arg1="${hy.local.zlib}" arg2="false" />
-        </not>
+        <istrue value="${hy.local.zlib}" />
     </condition>
 
     <property name="hy.zip.api" value="false" />
     <condition property="hy.skip.zip.api" value="true">
-        <not>
-            <equals arg1="${hy.zip.api}" arg2="true" />
-        </not>
+        <isfalse value="${hy.zip.api}" />
      </condition>
 
+    <condition property="hy.portlib.stubs" value="true">
+        <or>
+            <equals arg1="${hy.os}" arg2="aix" />
+            <equals arg1="${hy.os}" arg2="zos" />
+        </or>
+    </condition>
+    <property name="hy.portlib.stubs" value="false" />
+
+    <condition property="hy.platform.suffix" value=".libstdc++5">
+        <isset property="use.libstdc++5"/>
+    </condition>
+    <condition property="hy.platform.suffix" value=".8x">
+        <!-- matches would be better but debian stable has ant 1.6.5
+             and matches was only added to 1.7.0 and above -->
+        <and>
+            <equals arg1="FreeBSD" arg2="${os.name}" casesensitive="false" /> 
+            <contains substring="8." string="${os.version}"/>
+        </and>
+    </condition>
+    <condition property="hy.platform.suffix" value=".7x">
+        <!-- matches would be better but debian stable has ant 1.6.5
+             and matches was only added to 1.7.0 and above -->
+        <and>
+            <equals arg1="FreeBSD" arg2="${os.name}" casesensitive="false" /> 
+            <contains substring="7." string="${os.version}"/>
+        </and>
+    </condition>
+    <property name="hy.platform.suffix" value="" />
+    <property name="hy.platform.variant"
+              value="${hy.platform}${hy.platform.suffix}" />
+
+    <!-- fileset to represent classes built by a module. -->
+    <fileset id="classes" dir="${hy.build.top}/java">
+        <includesfile name="${hy.hdk}/build/ant/patternsets/${hy.module}.txt" />
+    </fileset>
+
+    <!-- fileset for resources of a module. -->
+    <fileset id="resources" dir="src/main/java">
+        <exclude name="**/*.java" />
+    </fileset>
+
+    <!-- fileset for resources of a module with platform-dependent code. -->
+    <fileset id="common.resources" dir="src/main/java/common">
+        <exclude name="**/*.java" />
+    </fileset>
+
+    <!-- test properties -->
+    <property name="tests.output" location="../../build/test_report" />
+    <property name="tests.hdk.dir" value="${hy.hdk}/build/test/${hy.module}" />
+    <property name="tests.excludes.hdk.dir" value="${tests.hdk.dir}/excludes" />
+    <property name="tests.resources.hdk.dir"
+              value="${tests.hdk.dir}/resources" />
+
+    <property name="findBugs.report" location="../../build/findbugs_report" />
+
+    <propertyset id="module.props">
+        <propertyref name="hy.component" />
+        <propertyref name="hy.cfg" />
+        <propertyref name="hy.test.vm.name" />
+        <propertyref name="svn.revision" />
+        <propertyref name="svn.info" />
+        <propertyref name="hy.no.thr" />
+        <propertyref name="hy.zip.api" />
+        <propertyref name="hy.select" />
+    </propertyset>
+
     <target name="echo" depends="-svn-info, test-jre-vm-info"
             description="Display the properties defined by this ant file" >
         <echo>
@@ -172,6 +257,7 @@ Harmony test properties:
     hy.test.timeout = ${hy.test.timeout}
     hy.test.vm.name = ${hy.test.vm.name}
     hy.test.vmargs = ${hy.test.vmargs}
+    findbugs.available = ${findbugs.available}
 
 Harmony platform properties:
 
@@ -205,7 +291,8 @@ Harmony platform properties:
   make.command = ${make.command}
 
   hy.hdk = ${hy.hdk}
-
+  hy.jdk = ${hy.jdk}
+  hy.jre = ${hy.jre}
 
 The following properties are only set if the "-svn-info" target has been
 called:
@@ -232,14 +319,14 @@ properties in preference to these:
         </condition>
         <!-- FIXME current behavior relies on the fact that J9 VM doesn't
              support -version parameter -->
-        <condition property="hy.test.vm.name" value="drl" else="ibm" >
-            <contains string="${test.vm.info.tmp}" substring="harmony" />
+        <condition property="hy.test.vm.name" value="ibm" else="drl" >
+            <contains string="${test.vm.info.tmp}" substring="IBM" casesensitive="false" />
         </condition>
         <echo level="info" message="hy.test.vm.name = ${hy.test.vm.name}" />
     </target>
 
     <target name="-get-test-vm-output">
-        <condition property="test.jre.home" value="${hy.jdk}/jre">
+        <condition property="test.jre.home" value="${hy.jre}">
             <not><isset property="test.jre.home" /></not>
         </condition>
         <exec executable="${test.jre.home}/bin/java" failifexecutionfails="false">
@@ -248,35 +335,83 @@ properties in preference to these:
         </exec>
     </target>
 
-    <macrodef name="call-modules">
+    <macrodef name="poll-modules" 
+        description="directory-based macros for polling sub-builds">
         <attribute name="target" />
+        <attribute name="dir" default="modules" />
+        <attribute name="includes" default="${build.module}"/>
+        <attribute name="excludes" default="${exclude.module}"/>
+        <attribute name="antfile" default="*.xml"/>
         <sequential>
+            <!-- convert dirset pattern to fileset pattern-->
+            <property name="@{dir}.loc" location="@{dir}"/>
+            <pathconvert property="list.@{dir}.@{target}" 
+                pathsep="${file.separator}@{antfile}," setonempty="no">
+                <path>
+                    <dirset dir="@{dir}"
+                            includes="@{includes}"
+                            excludes="@{excludes}">
+                        <exclude name=".*" />
+                    </dirset>
+                </path>
+                <map from="${@{dir}.loc}${file.separator}" to=""/>
+            </pathconvert>
+            <!-- append antfile suffix to last item in the list, if any -->
+            <condition property="poll.@{dir}.@{target}"
+                value="${list.@{dir}.@{target}}${file.separator}@{antfile}" 
+                else="">
+                <isset property="list.@{dir}.@{target}"/>
+            </condition>
+            <poll-build target="@{target}" dir="@{dir}" 
+                includes="${poll.@{dir}.@{target}}"/>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="poll-build"
+        description="plain-filter macros for polling sub-builds">
+        <attribute name="target" />
+        <attribute name="dir" />
+        <attribute name="includes" default="**/*.xml"/>
+        <attribute name="excludes" default=""/>
+        <sequential>
+            <echo message="polling @{includes}"/>
             <subant target="@{target}">
-                <property name="hy.test.vm.name" value="${hy.test.vm.name}"/>
-                <dirset dir="modules"
-                        includes="${build.module}"
-                        excludes="${exclude.module}">
-                    <exclude name=".*" />
-                </dirset>
+                <!-- TODO: modules probably need to work these properties
+                     out for themselves in order to reduce coupling -->
+                <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>
             </subant>
         </sequential>
     </macrodef>
 
-    <condition property="make.arg" value="/nologo">
-        <isset property="is.windows"/>
-    </condition>
-    <property name="make.arg" value="" />
-
     <macrodef name="make">
         <attribute name="dir" />
         <attribute name="target" default="" />
         <element name="make-elements" optional="true" />
         <sequential>
             <echo>Making "@{target}" in @{dir}</echo>
+            <echo file="${hy.hdk}/build/make/properties.${make.suffix}">
+HY_ZIP_API=${hy.zip.api}
+HY_PORTLIB_STUBS=${hy.portlib.stubs}
+HY_CFG=${hy.cfg}
+HY_ARCH=${hy.arch}
+HY_ARCH_FAMILY=${hy.arch.family}
+HY_OS=${hy.os}
+HY_PLATFORM=${hy.platform}
+HY_NO_THR=${hy.no.thr}
+HY_THR_NO_DEPLOY=${hy.thr.no.deploy}
+HY_LOCAL_ZLIB=${hy.local.zlib}
+HY_SHLIB_SUFFIX=${shlib.suffix}
+HY_LINKLIB_SUFFIX=${linklib.suffix}
+            </echo>                
             <exec failonerror="true"
                   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 />
@@ -305,6 +440,14 @@ properties in preference to these:
     </macrodef>
     <convert-test from="test.case" to="converted.tc" />
     
+    <!-- names of exclude lists, used by prepare-exclude-list macro -->
+    <property name="common.exclude.file" value="exclude.common" />
+    <property name="common.exclude.interm" value="exclude.interm" />
+    <property name="platform.exclude.file"
+              value="exclude.${hy.platform}.${hy.test.vm.name}" />
+    <property name="platform.exclude.interm"
+              value="exclude.${hy.platform}.${hy.test.vm.name}.interm" />
+
     <!-- Concatenate several exclude lists into single list -->
     <macrodef name="prepare-exclude-list">
        <attribute name="moduleName"/>
@@ -396,9 +539,383 @@ Alternatively, you can switch to another
                 <attribute name="Implementation-URL"
                            value="http://harmony.apache.org"/>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
+                <attribute name="Specification-Vendor"
+                           value="Sun Microsystems, Inc." />
+                <attribute name="Specification-Title"
+                           value="Java Platform API Specification" />
+                <attribute name="Specification-Version"
+                           value="${hy.specification.version}" />
             </manifest>
             <metainf refid="hy.required.metainf-files"/>
         </jar>
     </presetdef>
+   
+    <macrodef name="compile-classes">
+        <attribute name="description" default="" />
+        <attribute name="destdir" default="${hy.build.top}/java" />
+        <element name="javac-elements" />
+        <sequential>
+            <echo message="Compiling @{description}" />
+            
+            <mkdir dir="@{destdir}" />
+
+            <hy.javac sourcepath="" destdir="@{destdir}">
+                <javac-elements />
+                <compilerarg line="${build.compilerarg}" />
+                <bootclasspath>
+                    <fileset dir="${hy.jre}/lib/boot">
+                        <include name="**/*.jar" />
+                    </fileset>
+                </bootclasspath>
+            </hy.javac>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="compile-tests">
+        <attribute name="description" default="" />
+        <attribute name="destdir" default="${hy.build.mod}/test/api" />
+        <element name="javac-elements" />
+        <sequential>
+            <echo message="Compiling @{description}" />
+            
+            <mkdir dir="@{destdir}" />
+
+            <mkdir dir="${hy.hdk}/build/test" />
+            <copy file="${junit.jar}"
+                  tofile="${hy.hdk}/build/test/junit.jar" />
+            <copy file="${hamcrest-library.jar}"
+                  tofile="${hy.hdk}/build/test/hamcrest-library.jar" />
+            
+            <hy.javac destdir="@{destdir}">
+
+                <javac-elements />
+
+                <compilerarg line="${build.compilerarg}" />
+
+                <bootclasspath>
+                    <fileset dir="${hy.jre}/lib/boot">
+                        <include name="**/*.jar" />
+                    </fileset>
+                </bootclasspath>
+
+                <classpath location="${hy.build.top}/java" />
+                <classpath location="${hy.hdk}/build/test/junit.jar" />
+                <classpath
+                     location="${hy.hdk}/build/test/hamcrest-library.jar" />
+                <classpath location="${hy.hdk}/build/test/support.jar" />
+            </hy.javac>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="run-hdk-tests">
+        <attribute name="module" />
+        <attribute name="jar" />
+        <element name="junit-elements" optional="true"/>
+        <element name="excludeorinclude" optional="true"/>
+        <sequential>
+            <echo message="Running @{module} Unit Test from @{jar}" />
+            <echo message="Tested jre: ${test.jre.home}/bin/java" />
+            <property name="test.module.dir" value="${hy.test.root}/@{module}" />
+            <property name="test.excludes.dir" value="${test.module.dir}/excludes" />
+            <property name="test.resources.dir" value="${test.module.dir}/resources" />
+            <property name="module.work.dir" location="${work.dir}/@{module}" />
+            <property name="test.exclude.file" value="${module.work.dir}/test.exclude" />
+
+            <property name="module.temp.dir"
+                      location="${work.dir}/@{module}/temp" />
+            <property name="junit.tempdir"
+                      location="${module.temp.dir}/ant" />
+            <property name="junit.java.io.tmpdir"
+                      location="${module.temp.dir}/tmpdir" />
+            <property name="junit.user.home"
+                      location="${module.temp.dir}/user" />
+            
+            <mkdir dir="${tests.output}" /> 
+            <mkdir dir="${junit.tempdir}" />
+            <mkdir dir="${junit.java.io.tmpdir}" />
+            <mkdir dir="${junit.user.home}" />
+
+            <prepare-exclude-list moduleName="@{module}" dir="${test.excludes.dir}" result="${test.exclude.file}" />
+            <junit fork="yes" 
+                   forkmode="${hy.test.forkmode}" 
+                   timeout="${hy.test.timeout}" 
+                   printsummary="withOutAndErr" 
+                   errorproperty="test.errors" 
+                   failureproperty="test.failures" 
+                   showoutput="on" 
+                   dir="${work.dir}/@{module}" 
+                   tempdir="${junit.tempdir}"
+                   jvm="${test.jre.home}/bin/java">
+
+                <jvmarg line="-Djava.io.tmpdir=${junit.java.io.tmpdir}" />
+                <jvmarg line="-Duser.home=${junit.user.home}" />
+
+                <classpath>
+                    <fileset dir="${hy.test.root}">
+                        <include name="*.jar" />
+                    </fileset>
+                    <pathelement path="${test.resources.dir}/" />
+                    <pathelement path="${test.module.dir}/" />
+                    <pathelement location="${test.module.dir}/@{jar}" />
+                </classpath>
+
+                <junit-elements />
+
+                <batchtest todir="${tests.output}" haltonfailure="no">
+                    <zipfileset src="${test.module.dir}/@{jar}" encoding="UTF-8">
+                        <exclude name="Test.class" />
+                        <exclude name="**/*$*" />
+
+                        <!-- if ${test.case}     -->
+                        <include name="${converted.tc.class}" if="test.case" />
+                        <!-- unless ${test.case} -->
+                        <include name="**/*Test.class" unless="test.case" />
+                        <excludesfile name="${test.exclude.file}" unless="test.case"/>
+                        <excludeorinclude/>
+                    </zipfileset>
+                </batchtest>
+
+                <assertions enableSystemAssertions="true">
+                    <enable />
+                </assertions>
+
+                <jvmarg line="${hy.test.vmargs}" />
+                <!-- Used by Support_Exec.execJava() -->
+                <jvmarg value="-Dhy.test.vmargs=${hy.test.vmargs}" />
+
+                <formatter type="xml" />
+            </junit>
+
+            <delete dir="${module.temp.dir}"
+                    includeemptydirs="true" failonerror="false" />
+
+            <antcall target="touch-failures-file">
+                <param name="module" value="@{module}" />
+            </antcall>
+            <antcall target="touch-errors-file">
+                <param name="module" value="@{module}" />
+            </antcall>
+
+        </sequential>
+    </macrodef>
+
+    <!-- TOFIX: Can't seem to override the line:
+             <include name="**/*Test.class" unless="test.case" />
+         so this is just run-hdk-tests without that line -->
+    <macrodef name="run-selected-hdk-tests">
+        <attribute name="module" />
+        <attribute name="jar" />
+        <element name="junit-elements" optional="true"/>
+        <element name="excludeorinclude" optional="true"/>
+        <sequential>
+            <echo message="Running @{module} Unit Test from @{jar}" />
+            <echo message="Tested jre: ${test.jre.home}/bin/java" />
+            <property name="test.module.dir" value="${hy.test.root}/@{module}" />
+            <property name="test.excludes.dir" value="${test.module.dir}/excludes" />
+            <property name="test.resources.dir" value="${test.module.dir}/resources" />
+            <property name="module.work.dir" location="${work.dir}/@{module}" />
+            <property name="test.exclude.file" value="${module.work.dir}/test.exclude" />
+
+            <property name="module.temp.dir"
+                      location="${work.dir}/@{module}/temp" />
+            <property name="junit.tempdir"
+                      location="${module.temp.dir}/ant" />
+            <property name="junit.java.io.tmpdir"
+                      location="${module.temp.dir}/tmpdir" />
+            <property name="junit.user.home"
+                      location="${module.temp.dir}/user" />
+            
+            <mkdir dir="${tests.output}" /> 
+            <mkdir dir="${junit.tempdir}" />
+            <mkdir dir="${junit.java.io.tmpdir}" />
+            <mkdir dir="${junit.user.home}" />
+
+            <prepare-exclude-list moduleName="@{module}" dir="${test.excludes.dir}" result="${test.exclude.file}" />
+            <junit fork="yes" 
+                   forkmode="${hy.test.forkmode}" 
+                   timeout="${hy.test.timeout}" 
+                   printsummary="withOutAndErr" 
+                   errorproperty="test.errors" 
+                   failureproperty="test.failures" 
+                   showoutput="on" 
+                   dir="${work.dir}/@{module}" 
+                   tempdir="${junit.tempdir}"
+                   jvm="${test.jre.home}/bin/java">
+
+                <jvmarg line="-Djava.io.tmpdir=${junit.java.io.tmpdir}" />
+                <jvmarg line="-Duser.home=${junit.user.home}" />
+
+                <classpath>
+                    <fileset dir="${hy.test.root}">
+                        <include name="*.jar" />
+                    </fileset>
+                    <pathelement path="${test.resources.dir}/" />
+                    <pathelement path="${test.module.dir}/" />
+                    <pathelement location="${test.module.dir}/@{jar}" />
+                </classpath>
+
+                <junit-elements />
+
+                <batchtest todir="${tests.output}" haltonfailure="no">
+                    <zipfileset src="${test.module.dir}/@{jar}" encoding="UTF-8">
+                        <exclude name="Test.class" />
+                        <exclude name="**/*$*" />
+
+                        <!-- if ${test.case}     -->
+                        <include name="${converted.tc.class}" if="test.case" />
+                        <!-- unless ${test.case} -->
+                        <excludesfile name="${test.exclude.file}" unless="test.case"/>
+                        <excludeorinclude/>
+                    </zipfileset>
+                </batchtest>
+
+                <assertions enableSystemAssertions="true">
+                    <enable />
+                </assertions>
+
+                <jvmarg line="${hy.test.vmargs}" />
+                <!-- Used by Support_Exec.execJava() -->
+                <jvmarg value="-Dhy.test.vmargs=${hy.test.vmargs}" />
+
+                <formatter type="xml" />
+            </junit>
+
+            <delete dir="${module.temp.dir}"
+                    includeemptydirs="true" failonerror="false" />
+
+            <antcall target="touch-failures-file">
+                <param name="module" value="@{module}" />
+            </antcall>
+            <antcall target="touch-errors-file">
+                <param name="module" value="@{module}" />
+            </antcall>
+
+        </sequential>
+    </macrodef>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${tests.output}/test.failures"
+            append="true">${module}${line.separator}</echo>
+    </target>
+
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${tests.output}/test.errors"
+            append="true">${module}${line.separator}</echo>
+    </target>
+
+    <!-- To use with -Dtest.case=... option                   -->
+    <!-- if ${test.case} is provided in package+class form    -->
+    <!-- it is converted to dir+filename form                 -->
+    <macrodef name="convert-test-as-class">
+        <attribute name="from" />
+        <attribute name="to" />
+        <sequential>
+            <pathconvert property="@{to}" setonempty="no">
+                <path path="${@{from}}" />
+                <chainedmapper>
+                    <filtermapper>
+                        <replaceregex pattern="\.java$$" />
+                    </filtermapper>
+                    <unpackagemapper from="${basedir}${file.separator}*" to="*.class" />
+                </chainedmapper>
+            </pathconvert>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="make-patternset">
+        <attribute name="source" default="src/main" />
+        <attribute name="module" />
+        <attribute name="file"
+                   default="${hy.hdk}/build/ant/patternsets/@{module}.txt" />
+        <sequential>
+            <dirname file="@{file}" property="@{file}.dir" />
+            <mkdir dir="${@{file}.dir}" />
+            <property name="@{source}.loc" location="@{source}"/>
+
+            <pathconvert targetos="unix" property="@{file}.content"
+                         pathsep="${line.separator}">
+                <fileset dir="${@{source}.loc}" includes="java*/**/*.java" />
+                <map from="${@{source}.loc}/java/unix/" to="" />
+                <map from="${@{source}.loc}/java/windows/" to="" />
+                <map from="${@{source}.loc}/java/common/" to="" />
+                <map from="${@{source}.loc}/java5/" to="" />
+                <map from="${@{source}.loc}/java/" to="" />
+                <compositemapper>
+                    <mapper type="regexp" from="^(.*)\.java$$" to="\1.*"/>
+                    <mapper type="regexp" from="^(.*)\.java$$" to="\1$*.*"/>
+                </compositemapper>
+            </pathconvert>
+            <echo message="${@{file}.content}${line.separator}"
+                  file="@{file}" />
+        </sequential>
+    </macrodef>
+
+    <macrodef name="delete-patternset">
+        <attribute name="module" />
+        <sequential>
+            <delete file="${hy.hdk}/build/ant/patternsets/@{module}.txt" />
+        </sequential>
+    </macrodef>
+
+    <macrodef name="run-findBugs">
+       <attribute name="outputFile"/>
+       <attribute name="excludeFilter"/>
+       <attribute name="jarFile"/>
+       <sequential>
+           <!-- Find and define findbugs task -->
+           <property name="findbugs.home" location="${basedir}/../../depends/oss/findbugs-1.3.9"/>
+           <available
+               classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
+               classpath="${findbugs.home}/lib/findbugs-ant.jar"
+               property="findbugs.available"/>
+           <taskdef
+               name="findbugs"
+               classname="edu.umd.cs.findbugs.anttask.FindBugsTask"
+               classpath="${findbugs.home}/lib/findbugs-ant.jar"
+               onerror="ignore"/>
+          <fail message="FindBugs is unavailable" unless="findbugs.available"/>
+
+          <!-- Run findbugs using the attributes given -->
+          <dirname file="@{outputFile}" property="@{outputFile}.dir" />
+          <mkdir dir="${@{outputFile}.dir}" />
+          <findbugs home="${findbugs.home}"
+            output="xml"
+            outputFile="@{outputFile}"
+            excludeFilter="@{excludeFilter}"
+            jvmargs="-Xmx512M"
+            workhard="true">
+            <auxClasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </auxClasspath>
+            <sourcePath path="src/main/java" />
+            <sourcePath path="src/main/java5" />
+            <sourcePath path="src/main/java/common" />
+            <sourcePath path="src/main/java/${hy.os.family}" />
+            <class location="@{jarFile}" />
+        </findbugs>
+       </sequential>
+    </macrodef>
+
+    <macrodef name="init-hdk">
+        <sequential>
+            <mkdir dir="${hy.hdk}/build/ant" />
+            <copy file="${common.resources}/make/depends.xml"
+                  tofile="${hy.hdk}/build/ant/depends.xml"
+                  outputencoding="UTF-8" />
+            <copy file="${common.resources}/make/depends.properties"
+                  tofile="${hy.hdk}/build/ant/depends.properties"
+                  outputencoding="UTF-8" />
+
+	    <mkdir dir="${hy.hdk}/build/make" />
+	    <copy todir="${hy.hdk}/build/make" overwrite="yes">
+                <fileset dir="${common.resources}/depends/build">
+                    <include name="**" />
+                </fileset>
+            </copy>
+
+        </sequential>
+    </macrodef>
 
 </project>

Modified: harmony/enhanced/java/branches/java6/common_resources/make/svn.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/common_resources/make/svn.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/common_resources/make/svn.xml (original)
+++ harmony/enhanced/java/branches/java6/common_resources/make/svn.xml Sat Oct 30 13:11:14 2010
@@ -48,62 +48,6 @@
         </tstamp>
     </target>
     
-    <target name="fetch-svn">
-        <setup-svn dep="${dependency}"/>
-        <antcall target="svn-co" inheritAll="false">
-            <propertyset>
-                <propertyref prefix="${dependency}."/>
-                <mapper type="glob" from="${dependency}.*" to="dep.*"/>
-            </propertyset>
-        </antcall>
-    </target>
-
-    <target name="svn-co" unless="dep.svn.dir.uptodate">
-        <exec executable="svn" failonerror="true">
-            <arg line="co -r ${dep.svn.revision} ${dep.svn.url} ${dep.svn.dir}" />
-        </exec>
-    </target>
-
-    <target name="check-svn">
-        <check-svn dep="${dependency}"/>
-    </target>
-    
-    <macrodef name="check-svn">
-        <attribute name="dep" />
-        <sequential>
-            <setup-svn dep="@{dep}"/>
-            <echo message="Checking @{dep} SVN workspace at ${@{dep}.svn.dir}"/>
-            <fail unless="@{dep}.svn.dir.uptodate">
-                ...
-Dependency is not available or out of date: ${dependency}.
-It should be checked out
-    from SVN repository: ${@{dep}.svn.url} 
-    revision: ${@{dep}.svn.revision}
-    to: ${@{dep}.svn.dir}
-    
-Run "ant fetch-depends" to automatically fetch dependencies.
-Note: Some of Harmony's dependencies are licensed under terms other
-than the Apache License v2.                
-            </fail>
-        </sequential>
-    </macrodef>
-
-    <macrodef name="setup-svn">
-        <attribute name="dep" />
-        <sequential>
-            <property name="@{dep}.svn.dir" value="${depends.oss}/@{dep}"/>
-            <property name="@{dep}.svn.revision" value="HEAD"/>
-            <svn-info dir="${@{dep}.svn.dir}" prefix="@{dep}"/>
-
-            <condition property="@{dep}.svn.dir.uptodate">
-                <and>
-                    <equals arg1="${@{dep}.svn.revision}" arg2="${@{dep}.entry.revision}"/>
-                    <equals arg1="${@{dep}.svn.url}" arg2="${@{dep}.entry.url}"/>
-                </and>
-            </condition>
-        </sequential>
-    </macrodef>
-    
     <macrodef name="svn-info">
         <attribute name="dir" />
         <attribute name="prefix" default=""/>

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

Modified: harmony/enhanced/java/branches/java6/drlvm/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/build.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/build.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/build.xml Sat Oct 30 13:11:14 2010
@@ -21,6 +21,16 @@
     	Build contributed source and lay out results in the required format 
     </description>
     
+    <property name="hy.target" location="target" />
+    <property name="hy.component" value="drlvm" />
+    <property name="hy.module" value="toplevel" />
+
+    <fail message="Property 'common.resources' is not defined">
+        <condition>
+            <not><isset property="common.resources" /></not>
+        </condition>
+    </fail>
+
     <import file="make/properties.xml"/>
 
     <target name="help">
@@ -111,67 +121,100 @@ Usage:
 
     <target name="build-extra" depends=""
         description="Compiles external dependencies">
-        <ant antfile="make/extra/apr.xml"/>
+        <ant antfile="make/extra/apr.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="encoder">
-        <ant antfile="make/vm/encoder.xml"/>
+        <ant antfile="make/vm/encoder.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="port" depends="build-extra">
-        <ant antfile="make/vm/port.xml"/>
+        <ant antfile="make/vm/port.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="port_ch" depends="port">
-        <ant antfile="make/vm/port_ch.xml"/>
+        <ant antfile="make/vm/port_ch.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="hythr" depends="port">
-        <ant antfile="make/vm/hythr.xml"/>
+        <ant antfile="make/vm/hythr.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="verifier">
-        <ant antfile="make/vm/verifier.xml"/>
+        <ant antfile="make/vm/verifier.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
-    <target name="verifier-ext" description="Build a verifier extentions library">
-        <ant antfile="make/vm/verifier-ext.xml"/>
+    <target name="verifier-ext"
+            description="Build a verifier extentions library">
+        <ant antfile="make/vm/verifier-ext.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
-    <target name="clean-verifier-ext" description="Clean a verifier extentions library">
-        <ant antfile="make/vm/verifier-ext.xml" target="clean"/>
+    <target name="clean-verifier-ext"
+            description="Clean a verifier extentions library">
+        <ant antfile="make/vm/verifier-ext.xml" target="clean"
+             inheritall="false">
+            <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="vmcore" depends="encoder, port, port_ch, hythr, verifier">
-        <ant antfile="make/vm/vmcore.xml"/>
+        <ant antfile="make/vm/vmcore.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="em" depends="vmcore">
-        <ant antfile="make/vm/em.xml"/>
+        <ant antfile="make/vm/em.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="interpreter" depends="vmcore">
-        <ant antfile="make/vm/interpreter.xml"/>
+        <ant antfile="make/vm/interpreter.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="kernel">
-        <ant antfile="make/vm/kernel.xml"/>
+        <ant antfile="make/vm/kernel.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="vmi" depends="vmcore">
-        <ant antfile="make/vm/vmi.xml"/>
+        <ant antfile="make/vm/vmi.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="jitrino" depends="vmcore">
-        <ant antfile="make/vm/jitrino.xml"/>
+        <ant antfile="make/vm/jitrino.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="gc_gen" depends="vmcore,kernel">
-        <ant antfile="make/vm/gc_gen.xml"/>
+        <ant antfile="make/vm/gc_gen.xml" inheritall="false">
+             <propertyset refid="module.props" />
+        </ant>
     </target>
 
     <target name="-init-hdk">
-        <copy todir="${hy.hdk}/jdk/include">
+        <copy todir="${hy.hdk}/jdk/include" preservelastmodified="true">
             <fileset dir="vm/include">
                 <include name="jvmti.h" />
                 <include name="jvmti_types.h" />
@@ -202,7 +245,8 @@ Usage:
             deploy the rest of product
          ================================================================-->
     <target name="deploy">
-        <copy todir="${drlvm.deploy.dir}/jdk/include">
+        <copy todir="${drlvm.deploy.dir}/jdk/include"
+              preservelastmodified="true">
             <fileset dir="${vm.home}/include">
                 <include name="jni_types.h" />
                 <include name="jvmti_types.h" />
@@ -223,7 +267,8 @@ Usage:
         </delete>
         
         <!-- launcher should use our hythr -->
-        <copy todir="${drlvm.deploy.dir}/jdk/jre/bin" overwrite="yes">
+        <copy todir="${drlvm.deploy.dir}/jdk/jre/bin"
+              preservelastmodified="true" overwrite="yes">
             <fileset dir="${drlvm.bin.dir}">
                 <include name="*hythr*"/>
             </fileset>

Modified: harmony/enhanced/java/branches/java6/drlvm/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/drlvm/make/build-java.xml?rev=1029056&r1=1029055&r2=1029056&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/drlvm/make/build-java.xml (original)
+++ harmony/enhanced/java/branches/java6/drlvm/make/build-java.xml Sat Oct 30 13:11:14 2010
@@ -41,7 +41,7 @@
     </macrodef>
 
     <macrodef name="make-java">
-        <attribute name="component" default="${component}"/>
+        <attribute name="component" default="${hy.module}"/>
         <attribute name="src"/>
         <attribute name="manifest"/>
         <element name="javac-elements" implicit="yes" optional="yes"/>



Mime
View raw message