Return-Path: 
 <commits-return-59255-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 60254 invoked from network); 11 Jul 2009 14:55:20 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 11 Jul 2009 14:55:20 -0000
Received: (qmail 36548 invoked by uid 500); 11 Jul 2009 14:55:30 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 36482 invoked by uid 500); 11 Jul 2009 14:55:30 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 36463 invoked by uid 99); 11 Jul 2009 14:55:30 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Jul 2009 14:55:30 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Jul 2009 14:55:17 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2DE0E23888C2; Sat, 11 Jul 2009 14:54:44 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r793176 [2/3] - in
 /harmony/enhanced/classlib/trunk/modules:
 accessibility/ accessibility/make/ annotation/ annotation/make/ applet/
 applet/make/ archive/ archive/make/ auth/ auth/make/ awt/ awt/make/ beans/
 beans/make/ concurrent/ concurre...
Date: Sat, 11 Jul 2009 14:54:42 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090711145444.2DE0E23888C2@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/build.xml Sat Jul 11 14:54:39 2009
@@ -21,17 +21,18 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.instrument.src.main.java}" />
-            <present targetdir="${hy.instrument.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -62,11 +63,11 @@
     <!-- Build native code -->
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" >
-        <make dir="${hy.instrument.src.main.native}/instrument/${hy.os.family}" />
+        <make dir="src/main/native/instrument/${hy.os.family}" />
 
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.instrument.src.main.native}/instrument">
+            <fileset dir="src/main/native/instrument">
                 <include name="*${shlib.suffix}*" />
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}*" />
@@ -74,7 +75,7 @@
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.instrument.src.main.native}/instrument/${hy.os.family}">
+            <fileset dir="src/main/native/instrument/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
@@ -82,7 +83,7 @@
     
     <!-- Clean natives -->
     <target name="clean-native">
-        <make dir="${hy.instrument.src.main.native}/instrument/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/instrument/${hy.os.family}" target="clean" />
     </target>
 
     <target name="clean">
@@ -97,11 +98,11 @@
     <target name="compile-java">
         <echo message="Compiling INSTRUMENT classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-            srcdir="${hy.instrument.src.main.java}"
-            destdir="${hy.build}"
+            srcdir="src/main/java"
+            destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -119,9 +120,9 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.instrument.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
@@ -129,7 +130,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/instrument.jar"
-             manifest="${hy.instrument}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -140,7 +141,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/instrument-src.jar">
-            <fileset dir="${hy.instrument.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -152,10 +153,10 @@
     <target name="compile-tests" depends="copy-test-resources">
         <echo message="Compiling INSTRUMENT tests" />
 
-        <mkdir dir="${hy.instrument.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.instrument.src.test.java}"
-            destdir="${hy.instrument.bin.test}"
+        <javac srcdir="src/test/java"
+            destdir="bin/test"
             sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -204,7 +205,7 @@
             <jvmarg value="-Dhy.test.vmargs=${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.instrument.bin.test}"/>
+                <pathelement path="bin/test"/>
             </classpath>
             <classpath location="${hy.hdk}/build/test/support.jar" />
 
@@ -212,7 +213,7 @@
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.instrument.src.test.java}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->
@@ -236,9 +237,9 @@
     </target>
 
     <target name="copy-test-resources">
-        <mkdir dir="${hy.instrument.bin.test}" />
-        <copy todir="${hy.instrument.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.instrument.src.test.resources}">
+        <mkdir dir="bin/test" />
+        <copy todir="bin/test" includeemptydirs="false">
+            <fileset dir="src/test/resources">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>

Modified: harmony/enhanced/classlib/trunk/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/build.xml Sat Jul 11 14:54:39 2009
@@ -21,17 +21,18 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.jndi.src.main.java}" />
-            <present targetdir="${hy.jndi.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -71,11 +72,11 @@
     <target name="compile-java">
         <echo message="Compiling JNDI classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.jndi.src.main.java}"
-               destdir="${hy.build}"
+               srcdir="src/main/java"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -93,9 +94,9 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.jndi.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
@@ -103,7 +104,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/jndi.jar"
-             manifest="${hy.jndi}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -114,7 +115,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/jndi-src.jar">
-            <fileset dir="${hy.jndi.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -126,10 +127,10 @@
     <target name="compile-tests" depends="copy-test-resources" >
         <echo message="Compiling JNDI tests" />
 
-        <mkdir dir="${hy.jndi.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.jndi.src.test.java}"
-            destdir="${hy.jndi.bin.test}"
+        <javac srcdir="src/test/java"
+            destdir="bin/test"
             sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -176,7 +177,7 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.jndi.bin.test}"/>
+                <pathelement path="bin/test"/>
                 <fileset dir="${hy.hdk}/build/test/">
                     <include name="*.jar" />
                 </fileset>
@@ -187,7 +188,7 @@
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.jndi.src.test.java}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->
@@ -205,7 +206,7 @@
             <batchtest todir="${tests.output}" haltonfailure="no"
                    unless="test.case">
             
-                <fileset dir="${hy.jndi.src.test.java}">
+                <fileset dir="src/test/java">
                     <include name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerTest.java" />
                 </fileset>
             </batchtest>
@@ -213,7 +214,7 @@
             <batchtest todir="${tests.output}" haltonfailure="no"
                    unless="test.case">
             
-                <fileset dir="${hy.jndi.src.test.java}">
+                <fileset dir="src/test/java">
                     <include name="org/apache/harmony/jndi/tests/javax/naming/spi/NamingManagerBuilderTest.java" />
                 </fileset>
             </batchtest>            
@@ -221,7 +222,7 @@
             <batchtest todir="${tests.output}" haltonfailure="no"
                    unless="test.case">
             
-                <fileset dir="${hy.jndi.src.test.java}">
+                <fileset dir="src/test/java">
                     <include name="org/apache/harmony/jndi/tests/javax/naming/spi/DirectoryManagerTest.java" />
                 </fileset>
             </batchtest>            
@@ -242,9 +243,9 @@
     </target>
 
     <target name="copy-test-resources">
-        <mkdir dir="${hy.jndi.bin.test}" />
-        <copy todir="${hy.jndi.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.jndi.src.test.resources}">
+        <mkdir dir="bin/test" />
+        <copy todir="bin/test" includeemptydirs="false">
+            <fileset dir="src/test/resources">
                 <exclude name="**/*.java" />
                 <exclude name="**/*.zip" />
             </fileset>

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/build.xml Sat Jul 11 14:54:39 2009
@@ -21,17 +21,18 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.lang-management.src.main.java}" />
-            <present targetdir="${hy.lang-management.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp" from="^(.*?)(\$$[^/\\\.]*)?\.class$$" to="\1.java" />
             </present>
         </or>
@@ -58,8 +59,8 @@
     <target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests" />
 
     <target name="clean">
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.lang-management.packaging.jarname}.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.lang-management.packaging.jarname}-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/lang-management.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/lang-management-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -69,11 +70,11 @@
     <target name="compile-java">
         <echo message="Compiling LANG-MANAGEMENT classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.lang-management.src.main.java}"
-               destdir="${hy.build}"
+               srcdir="src/main/java"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}"
@@ -91,8 +92,8 @@
     </target>
 
     <target name="build-jar" depends="svn-info">
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.lang-management.packaging.jarname}.jar"
-             manifest="${hy.lang-management}/META-INF/MANIFEST.MF"
+        <jar destfile="${hy.jdk}/jre/lib/boot/lang-management.jar"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -101,8 +102,8 @@
             <metainf refid="hy.required.metainf-files" />
         </jar>
 
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.lang-management.packaging.jarname}-src.jar">
-            <fileset dir="${hy.lang-management.src.main.java}" />
+        <jar destfile="${hy.jdk}/jre/lib/boot/lang-management-src.jar">
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}" />
             </manifest>
@@ -116,10 +117,10 @@
     <target name="compile-tests-api">
         <echo message="Compiling LANG-MANAGEMENT API tests" />
 
-        <mkdir dir="${hy.lang-management.bin.test.api}" />
+        <mkdir dir="bin/api" />
 
-        <javac srcdir="${hy.lang-management.src.test.api.java}"
-               destdir="${hy.lang-management.bin.test.api}"
+        <javac srcdir="src/test/api/java"
+               destdir="bin/api"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -142,10 +143,10 @@
     <target name="compile-tests-impl">
         <echo message="Compiling LANG-MANAGEMENT Implementation tests" />
 
-        <mkdir dir="${hy.lang-management.bin.test.impl}" />
+        <mkdir dir="bin/impl" />
 
-        <javac srcdir="${hy.lang-management.src.test.impl.java}"
-               destdir="${hy.lang-management.bin.test.impl}"
+        <javac srcdir="src/test/impl/java"
+               destdir="bin/impl"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -194,14 +195,14 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.lang-management.bin.test.api}" />
+                <pathelement path="bin/api" />
             </classpath>
             <classpath location="${hy.hdk}/build/test/support.jar" />
 
             <formatter type="xml" />
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
-                <fileset dir="${hy.lang-management.src.test.api.java}" >
+                <fileset dir="src/test/api/java" >
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->
@@ -236,14 +237,14 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.lang-management.bin.test.impl}" />
+                <pathelement path="bin/impl" />
             </classpath>
             <classpath location="${hy.hdk}/build/test/support.jar" />
 
             <formatter type="xml" />
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
-                <fileset dir="${hy.lang-management.src.test.impl.java}">
+                <fileset dir="src/test/impl/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->

Modified: harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/logging/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/logging/build.xml Sat Jul 11 14:54:39 2009
@@ -21,17 +21,18 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.logging.src.main.java}" />
-            <present targetdir="${hy.logging.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -71,11 +72,11 @@
     <target name="compile-java">
         <echo message="Compiling LOGGING classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.logging.src.main.java}"
-               destdir="${hy.build}"
+               srcdir="src/main/java"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -94,7 +95,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/logging.jar"
-             manifest="${hy.logging}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -105,7 +106,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/logging-src.jar">
-            <fileset dir="${hy.logging.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -117,11 +118,11 @@
     <target name="compile-tests" depends="copy-test-resources" >
         <echo message="Compiling LOGGING tests" />
 
-        <mkdir dir="${hy.logging.bin.internal}" />
-        <mkdir dir="${hy.logging.bin.test}" />
+        <mkdir dir="bin/test-internal" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.logging.src.test.internal}"
-               destdir="${hy.logging.bin.internal}"
+        <javac srcdir="src/test/java-internal"
+               destdir="bin/test-internal"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -139,8 +140,8 @@
             <classpath location="${hy.hdk}/build/test/support.jar" />
             <classpath location="../../build/tests" />
         </javac>
-        <javac srcdir="${hy.logging.src.test.java}"
-               destdir="${hy.logging.bin.test}"
+        <javac srcdir="src/test/java"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -154,7 +155,7 @@
                 <fileset dir="${hy.jdk}/jre/lib/boot">
                     <include name="**/*.jar" />
                 </fileset>
-                <pathelement path="${hy.logging.bin.internal}"/>
+                <pathelement path="bin/test-internal"/>
             </bootclasspath>
             <classpath location="${hy.hdk}/build/test/support.jar" />
             <classpath location="../../build/tests" />
@@ -196,10 +197,10 @@
         	<!-- Required by various tests that set security manager etc -->
             <jvmarg value="-Djava.security.policy=${hy.hdk}/build/test/testing.policy" />
 
-            <jvmarg value="-Xbootclasspath/a:${hy.logging.bin.internal}"/>
+            <jvmarg value="-Xbootclasspath/a:bin/test-internal"/>
 
             <classpath>
-                <pathelement path="${hy.logging.bin.test}"/>
+                <pathelement path="bin/test"/>
             </classpath>
             <classpath location="${hy.hdk}/build/test/support.jar" />
             <classpath location="../../build/tests" />
@@ -210,7 +211,7 @@
             <batchtest todir="${tests.output}" haltonfailure="no"
                 unless="test.case">
 
-                <fileset dir="${hy.logging.src.test.java}">
+                <fileset dir="src/test/java">
                     <include name="org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java"/>
                     <excludesfile name="${logging.exclude.file}" />
                 </fileset>
@@ -218,7 +219,7 @@
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.logging.src.test.java}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->
@@ -244,9 +245,9 @@
     </target>
 
     <target name="copy-jar-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.logging.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
                 <exclude name="**/logging.properties" />
             </fileset>
@@ -255,16 +256,16 @@
 
     <target name="copy-resources">
         <copy todir="${hy.jdk}/jre/lib" flatten="yes">
-            <fileset dir="${hy.logging.src.main.java}">
+            <fileset dir="src/main/java">
                 <include name="**/logging.properties" />
             </fileset>
         </copy>
     </target>
 
     <target name="copy-test-resources">
-        <mkdir dir="${hy.logging.bin.test}" />
-        <copy todir="${hy.logging.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.logging.src.test.resources}">
+        <mkdir dir="bin/test" />
+        <copy todir="bin/test" includeemptydirs="false">
+            <fileset dir="src/test/resources">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Sat Jul 11 14:54:39 2009
@@ -21,21 +21,22 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
     <property name="hy.luni.src.test.api.java.platform"
-        value="${hy.luni.src.test.api}/${hy.os.family}" />
+        value="src/test/api/${hy.os.family}" />
     <property name="hy.luni.src.test.impl.java.platform"
-        value="${hy.luni.src.test.impl}/${hy.os.family}" />
-    <fileset id="classes" dir="${hy.build}">
+        value="src/test/impl/${hy.os.family}" />
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.luni.src.main.java}" />
-            <present targetdir="${hy.luni.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -43,8 +44,8 @@
         </or>
     </fileset>
 
-    <fileset id="tests.api" dir="${hy.luni.bin.test}/api"/>
-    <fileset id="tests.impl" dir="${hy.luni.bin.test}/impl"/>
+    <fileset id="tests.api" dir="bin/test/api"/>
+    <fileset id="tests.impl" dir="bin/test/impl"/>
 
     <property name="tests.hdk.dir" value="${hy.hdk}/build/test/luni" />
     <property name="tests.resources.hdk.dir" value="${tests.hdk.dir}/resources" />
@@ -60,7 +61,7 @@
 
     <target name="copy-native-includes">
         <copy todir="${hy.hdk}/include" overwrite="yes">
-            <fileset dir="${hy.luni.src.main.native}/include/shared">
+            <fileset dir="src/main/native/include/shared">
                 <include name="vmi.h" />
                 <include name="hyvmls.h" />
                 <include name="hysocket.h" />
@@ -71,7 +72,7 @@
             </fileset>
         </copy>
         <copy todir="${hy.jdk}/include" overwrite="yes">
-            <fileset dir="${hy.luni.src.main.native}/include/shared">
+            <fileset dir="src/main/native/include/shared">
                 <include name="jni.h" />
                 <include name="jni_types.h" />
                 <include name="jvmti.h" />
@@ -80,7 +81,7 @@
         </copy>
 
         <copy todir="${hy.hdk}/include" overwrite="yes">
-            <fileset dir="${hy.luni.src.main.native}/include/${hy.os.family}">
+            <fileset dir="src/main/native/include/${hy.os.family}">
                 <include name="jclprots.h" />
             </fileset>
         </copy>
@@ -95,7 +96,7 @@
     <target name="build-native-core" >
 
         <!-- Build vmi dll -->
-        <make dir="${hy.luni.src.main.native}/vmi/${hy.os.family}" />
+        <make dir="src/main/native/vmi/${hy.os.family}" />
 
         <!-- On Linux we want to copy the libvmi.so into the
              deploy/lib directory so that the natives can link
@@ -104,11 +105,11 @@
              implementation is loaded
           -->
         <copy todir="${hy.hdk}/lib" overwrite="yes" failonerror="false">
-            <fileset dir="${hy.luni.src.main.native}/vmi">
+            <fileset dir="src/main/native/vmi">
                 <include name="libvmi${shlib.suffix}"/>
             </fileset>
             <!-- Copy link exports file on z/OS -->
-            <fileset dir="${hy.luni.src.main.native}/vmi/${hy.os.family}">
+            <fileset dir="src/main/native/vmi/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
@@ -122,12 +123,12 @@
     <target name="-build-native-secondary" >
 
         <!-- Build fdlibm lib -->
-        <make dir="${hy.luni.src.main.native}/fdlibm/${hy.os.family}" />
+        <make dir="src/main/native/fdlibm/${hy.os.family}" />
 
         <!-- Build luni dll -->
-        <make dir="${hy.luni.src.main.native}/luni/${hy.os.family}" />
+        <make dir="src/main/native/luni/${hy.os.family}" />
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.luni.src.main.native}/luni">
+            <fileset dir="src/main/native/luni">
                 <include name="*${shlib.suffix}*" />
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
@@ -135,28 +136,28 @@
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.luni.src.main.native}/luni/${hy.os.family}">
+            <fileset dir="src/main/native/luni/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
 
         <!-- Build vmls lib -->
-        <make dir="${hy.luni.src.main.native}/vmls/${hy.os.family}" />
+        <make dir="src/main/native/vmls/${hy.os.family}" />
     </target>
 
     <target name="-build-hyzip" unless="hy.skip.zip.api">
         <!-- Build hyzip lib -->
-        <make dir="${hy.luni.src.main.native}/hyzip/${hy.os.family}" />
+        <make dir="src/main/native/hyzip/${hy.os.family}" />
     </target>
 
     <target name="-build-native-secondary2" >
 
         <!-- Build launcher executables -->
-        <make dir="${hy.luni.src.main.native}/launcher/${hy.os.family}" />
+        <make dir="src/main/native/launcher/${hy.os.family}" />
 
         <!-- Copy across the built executables -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.luni.src.main.native}/launcher">
+            <fileset dir="src/main/native/launcher">
                 <patternset includes="java${exe.suffix}" />
                 <patternset includes="javaw${exe.suffix}" />
                 <include name="*${progdb.suffix}*" if="is.windows" />
@@ -171,41 +172,41 @@
     <target name="overlay-oss" depends="-unzip-oss,-ascii2ebcdic-conversion" />
 
     <target name="-unzip-oss">
-        <unzip src="${fdlibm.zip}" dest="${hy.luni.src.main.native}/fdlibm_dist" />
-        <chmod dir="${hy.luni.src.main.native}/fdlibm_dist" perm="ugo+r" />
+        <unzip src="${fdlibm.zip}" dest="src/main/native/fdlibm_dist" />
+        <chmod dir="src/main/native/fdlibm_dist" perm="ugo+r" />
     </target>
 
     <target name="-ascii2ebcdic-conversion" if="is.zos">
-        <move todir="${hy.luni.src.main.native}/fdlibm_dist_ascii">
-            <fileset dir="${hy.luni.src.main.native}/fdlibm_dist">
+        <move todir="src/main/native/fdlibm_dist_ascii">
+            <fileset dir="src/main/native/fdlibm_dist">
                 <include name="**/*" />
                 <exclude name="**/*.o" />
             </fileset>
         </move>
-        <copy todir="${hy.luni.src.main.native}/fdlibm_dist" outputencoding="IBM-1047" >
-            <fileset dir="${hy.luni.src.main.native}/fdlibm_dist_ascii">
+        <copy todir="src/main/native/fdlibm_dist" outputencoding="IBM-1047" >
+            <fileset dir="src/main/native/fdlibm_dist_ascii">
                 <include name="**/*" />
                 <exclude name="**/*.o" />
             </fileset>               
         </copy>
-        <fixcrlf srcdir="${hy.luni.src.main.native}/fdlibm_dist" includes="**/*" excludes="**/*.o" eol="unix" />
-        <delete dir="${hy.luni.src.main.native}/fdlibm_dist_ascii" />
+        <fixcrlf srcdir="src/main/native/fdlibm_dist" includes="**/*" excludes="**/*.o" eol="unix" />
+        <delete dir="src/main/native/fdlibm_dist_ascii" />
     </target>
 
     <!-- Clean overlaid OSS packages -->
     <target name="clean-overlay-oss" >
-        <delete dir="${hy.luni.src.main.native}/fdlibm_dist" quiet="true" />
+        <delete dir="src/main/native/fdlibm_dist" quiet="true" />
     </target>
 
     <!-- Clean natives -->
     <target name="clean-native">
-        <make dir="${hy.luni.src.main.native}/fdlibm/${hy.os.family}" target="clean" />
-        <make dir="${hy.luni.src.main.native}/vmi/${hy.os.family}" target="clean" />
-        <make dir="${hy.luni.src.main.native}/luni/${hy.os.family}" target="clean" />
-        <make dir="${hy.luni.src.main.native}/vmls/${hy.os.family}" target="clean" />
-        <make dir="${hy.luni.src.main.native}/hyzip/${hy.os.family}"
+        <make dir="src/main/native/fdlibm/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/vmi/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/luni/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/vmls/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/hyzip/${hy.os.family}"
               target="clean" />
-        <make dir="${hy.luni.src.main.native}/launcher/${hy.os.family}"
+        <make dir="src/main/native/launcher/${hy.os.family}"
               target="clean" />
     </target>
 
@@ -259,8 +260,8 @@
         <echo message="Compiling LUNI classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.luni.src.main.java}"
-               destdir="${hy.build}"
+               srcdir="src/main/java"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -279,7 +280,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/luni.jar"
-             manifest="${hy.luni}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -290,7 +291,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/luni-src.jar">
-            <fileset dir="${hy.luni.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/>
             </manifest>
@@ -302,14 +303,14 @@
     <target name="test-jar" depends="compile-tests, prepare-exclude">
         <mkdir dir="${tests.hdk.dir}"/>
 
-        <jar destfile="${tests.hdk.dir}/${hy.luni.packaging.jarname}_tests_api.jar">
+        <jar destfile="${tests.hdk.dir}/luni_tests_api.jar">
             <fileset refid="tests.api" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/>
             </manifest>
         </jar>
 
-        <jar destfile="${tests.hdk.dir}/${hy.luni.packaging.jarname}_tests_impl.jar">
+        <jar destfile="${tests.hdk.dir}/luni_tests_impl.jar">
             <fileset refid="tests.impl" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/>
@@ -317,7 +318,7 @@
         </jar>
 
         <copy todir="${tests.resources.hdk.dir}">
-            <fileset dir="${hy.luni.src.test.resources}" >
+            <fileset dir="src/test/resources" >
                 <include name="org/**/*"/>
                 <include name="net.resources/**/*"/>
             </fileset>
@@ -330,7 +331,7 @@
               todir="${tests.resources.hdk.dir}/config"/>
 
         <copy todir="${tests.resources.hdk.dir}">
-            <fileset dir="${hy.luni.src.test.resources}" >
+            <fileset dir="src/test/resources" >
                 <include name="serialization/**/*"/>
             </fileset>
         </copy>
@@ -353,10 +354,10 @@
     <target name="compile-tests" depends="compile-tests-api, compile-tests-impl" />
 
     <target name="compile-tests-api" depends="copy-test-resources">
-        <compile-tests description="JUnit API Tests" destdir="${hy.luni.bin.test}/api">
+        <compile-tests description="JUnit API Tests" destdir="bin/test/api">
             <javac-elements>
                 <src>
-                    <pathelement location="${hy.luni.src.test.api}/common" />
+                    <pathelement location="src/test/api/common" />
                     <pathelement location="${hy.luni.src.test.api.java.platform}" />
                 </src>
                 <include name="**/*.java" />
@@ -365,10 +366,10 @@
     </target>
 
     <target name="compile-tests-impl" depends="copy-test-resources">
-         <compile-tests description="JUnit Impl tests" destdir="${hy.luni.bin.test}/impl">
+         <compile-tests description="JUnit Impl tests" destdir="bin/test/impl">
             <javac-elements>
                 <src>
-                   <pathelement location="${hy.luni.src.test.impl}/common" />
+                   <pathelement location="src/test/impl/common" />
                    <pathelement location="${hy.luni.src.test.impl.java.platform}" />
                 </src>
                 <include name="**/*.java" />
@@ -388,8 +389,8 @@
         <run-tests description="JUnit API Tests">
             <junit-elements>
                 <classpath>
-                    <pathelement path="${hy.luni.bin.test}/api"/>
-                    <pathelement path="${hy.luni.src.test.resources}"/>
+                    <pathelement path="bin/test/api"/>
+                    <pathelement path="src/test/resources"/>
                     <pathelement path="../../build/tests"/>
                     <fileset dir="${hy.hdk}/build/test/">
                         <include name="*.jar" />
@@ -397,7 +398,7 @@
                 </classpath>
  
                 <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="${hy.luni.src.test.api}/common">
+                    <fileset dir="src/test/api/common">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
                         <!-- unless ${test.case} -->
@@ -423,15 +424,15 @@
         <run-tests description="JUnit Impl Tests">
             <junit-elements>
                 <classpath>
-                    <pathelement path="${hy.luni.bin.test}/impl"/>
-                    <pathelement path="${hy.luni.src.test.resources}"/>
+                    <pathelement path="bin/test/impl"/>
+                    <pathelement path="src/test/resources"/>
                     <pathelement path="../../build/tests"/>
                     <fileset dir="${hy.hdk}/build/test/">
                         <include name="*.jar" />
                     </fileset>
                 </classpath>
                 <batchtest todir="${tests.output}" haltonfailure="no" >
-                   <fileset dir="${hy.luni.src.test.impl}/common">
+                   <fileset dir="src/test/impl/common">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
                         <!-- unless ${test.case} -->
@@ -465,18 +466,18 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.luni.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
     </target>
 
     <target name="copy-test-resources">
-        <mkdir dir="${hy.luni.bin.test}" />
-        <copy todir="${hy.luni.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.luni.src.test.resources}" />
+        <mkdir dir="bin/test" />
+        <copy todir="bin/test" includeemptydirs="false">
+            <fileset dir="src/test/resources" />
         </copy>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/math/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/math/build.xml Sat Jul 11 14:54:39 2009
@@ -21,17 +21,18 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.math.src.main.java}" />
-            <present targetdir="${hy.math.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -71,11 +72,11 @@
     <target name="compile-java">
         <echo message="Compiling MATH classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.math.src.main.java}"
-               destdir="${hy.build}"
+               srcdir="src/main/java"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -93,9 +94,9 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.math.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
@@ -103,7 +104,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/math.jar"
-             manifest="${hy.math}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -114,7 +115,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/math-src.jar">
-            <fileset dir="${hy.math.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -126,10 +127,10 @@
     <target name="compile-tests">
         <echo message="Compiling MATH tests" />
 
-        <mkdir dir="${hy.math.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.math.src.test.java}"
-               destdir="${hy.math.bin.test}"
+        <javac srcdir="src/test/java"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -176,7 +177,7 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.math.bin.test}"/>
+                <pathelement path="bin/test"/>
             </classpath>
             <classpath location="../../build/tests" />
 
@@ -184,7 +185,7 @@
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.math.src.test.java}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->

Modified: harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/build.xml Sat Jul 11 14:54:39 2009
@@ -21,17 +21,18 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.misc.src.main.java}" />
-            <present targetdir="${hy.misc.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -62,8 +63,8 @@
     <target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests" />
 
     <target name="clean">
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.misc.packaging.jarname}.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.misc.packaging.jarname}-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/misc.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/misc-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -73,11 +74,11 @@
     <target name="compile-java">
         <echo message="Compiling MISC classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.misc.src.main.java}"
-               destdir="${hy.build}"
+               srcdir="src/main/java"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -95,17 +96,17 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.misc.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
     </target>
 
     <target name="build-jar" depends="svn-info">
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.misc.packaging.jarname}.jar"
-             manifest="${hy.misc}/META-INF/MANIFEST.MF"
+        <jar destfile="${hy.jdk}/jre/lib/boot/misc.jar"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -115,8 +116,8 @@
             <metainf refid="hy.required.metainf-files"/>
         </jar>
 
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.misc.packaging.jarname}-src.jar">
-            <fileset dir="${hy.misc.src.main.java}" />
+        <jar destfile="${hy.jdk}/jre/lib/boot/misc-src.jar">
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -127,11 +128,11 @@
 
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" >
-        <make dir="${hy.misc.src.main.native}/accessors/${hy.os.family}" />
+        <make dir="src/main/native/accessors/${hy.os.family}" />
 
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.misc.src.main.native}/accessors">
+            <fileset dir="src/main/native/accessors">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
@@ -139,7 +140,7 @@
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.misc.src.main.native}/accessors/${hy.os.family}">
+            <fileset dir="src/main/native/accessors/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
@@ -147,17 +148,17 @@
     
     <!-- Clean natives -->
     <target name="clean-native">
-        <make dir="${hy.misc.src.main.native}/accessors/${hy.os.family}"
+        <make dir="src/main/native/accessors/${hy.os.family}"
               target="clean" />
     </target>
 
     <target name="compile-tests">
         <echo message="Compiling MISC tests" />
 
-        <mkdir dir="${hy.misc.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.misc.src.test.java}"
-               destdir="${hy.misc.bin.test}"
+        <javac srcdir="src/test/java/common"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -201,17 +202,17 @@
 
             <jvmarg line="${hy.test.vmargs}" />
 
-            <jvmarg value="-Xbootclasspath/a:${hy.misc.bin.test}${path.separator}${basedir}/../../${junit.jar}"/>
+            <jvmarg value="-Xbootclasspath/a:bin/test${path.separator}${basedir}/../../${junit.jar}"/>
 
             <classpath>
-                <pathelement path="${hy.misc.bin.test}"/>
+                <pathelement path="bin/test"/>
             </classpath>
 
             <formatter type="xml" />
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.misc.src.test.java}">
+                <fileset dir="src/test/java/common">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->

Modified: harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/build.xml Sat Jul 11 14:54:39 2009
@@ -21,27 +21,28 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
     <property name="hy.nio.src.main.java.platform"
-              value="${hy.nio.src.main.java}/../${hy.os.family}" />
+              value="src/main/java/common/../${hy.os.family}" />
 
     <property name="hy.nio.src.test.java.platform"
-              value="${hy.nio.src.test.java}/../${hy.os.family}" />
+              value="src/test/java/common/../${hy.os.family}" />
 
     <property name="tests.hdk.dir" value="${hy.hdk}/build/test/nio" />
     <property name="nio.exclude.file"
               location="${tests.hdk.dir}/test.exclude" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.nio.src.main.java}" />
-            <present targetdir="${hy.nio.src.main.java}">
+            <present targetdir="src/main/java/common" />
+            <present targetdir="src/main/java/common">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java" />
@@ -75,11 +76,11 @@
     <!-- Build natives.-->
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" >
-        <make dir="${hy.nio.src.main.native}/nio/${hy.os.family}" />
+        <make dir="src/main/native/nio/${hy.os.family}" />
 
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.nio.src.main.native}/nio">
+            <fileset dir="src/main/native/nio">
                 <include name="*${shlib.suffix}*" />
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}" />
@@ -87,7 +88,7 @@
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.nio.src.main.native}/nio/${hy.os.family}">
+            <fileset dir="src/main/native/nio/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
@@ -104,17 +105,17 @@
 
     <!-- Clean natives. -->
     <target name="clean-native">
-        <make dir="${hy.nio.src.main.native}/nio/${hy.os.family}"
+        <make dir="src/main/native/nio/${hy.os.family}"
               target="clean" />
     </target>
 
     <target name="compile-java">
         <echo message="Compiling NIO classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               destdir="${hy.build}"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}"
@@ -124,7 +125,7 @@
             <compilerarg line="${build.compilerarg}" />
 
             <src>
-                <pathelement location="${hy.nio.src.main.java}" />
+                <pathelement location="src/main/java/common" />
                 <pathelement location="${hy.nio.src.main.java.platform}" />
             </src>
 
@@ -137,9 +138,9 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.nio.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java/common">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
@@ -147,7 +148,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/nio.jar"
-             manifest="${hy.nio}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -158,7 +159,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/nio-src.jar">
-            <fileset dir="${hy.nio.src.main.java}" />
+            <fileset dir="src/main/java/common" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}" />
             </manifest>
@@ -170,9 +171,9 @@
     <target name="compile-tests" depends="copy-test-resources">
         <echo message="Compiling NIO tests" />
 
-        <mkdir dir="${hy.nio.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac destdir="${hy.nio.bin.test}"
+        <javac destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -183,7 +184,7 @@
             <compilerarg line="${build.compilerarg}" />
 
             <src>
-                <pathelement location="${hy.nio.src.test.java}" />
+                <pathelement location="src/test/java/common" />
                 <pathelement location="${hy.nio.src.test.java.platform}" />
             </src>
             <bootclasspath>
@@ -223,14 +224,14 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.nio.bin.test}" />
+                <pathelement path="bin/test" />
                 <pathelement path="${hy.hdk}/build/test/support.jar" />
             </classpath>
 
             <formatter type="xml" />
 
             <batchtest todir="${tests.output}" haltonfailure="no">
-                <fileset dir="${hy.nio.src.test.java}">
+                <fileset dir="src/test/java/common">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->
@@ -261,9 +262,9 @@
     </target>
 
     <target name="copy-test-resources">
-        <mkdir dir="${hy.nio.bin.test}" />
-        <copy todir="${hy.nio.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.nio.src.test.resources}">
+        <mkdir dir="bin/test" />
+        <copy todir="bin/test" includeemptydirs="false">
+            <fileset dir="src/test/resources">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Sat Jul 11 14:54:39 2009
@@ -23,17 +23,18 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.nio_char.src.main.java}" />
-            <present targetdir="${hy.nio_char.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -51,11 +52,11 @@
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" >
 
-        <make dir="${hy.nio_char.src.main.native}/niochar/${hy.os.family}" />
+        <make dir="src/main/native/niochar/${hy.os.family}" />
 
         <!-- Copy the built shared libs over to the jre/bin dir -->
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.nio_char.src.main.native}/niochar">
+            <fileset dir="src/main/native/niochar">
                 <patternset includes="*${shlib.suffix}*" />
             </fileset>
         </copy>
@@ -77,13 +78,13 @@
 
     <!-- Clean natives. -->
     <target name="clean-native">
-        <make dir="${hy.nio_char.src.main.native}/niochar/${hy.os.family}"
+        <make dir="src/main/native/niochar/${hy.os.family}"
                       target="clean" />
     </target>
 
     <target name="clean">
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.nio_char.packaging.jarname}.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.nio_char.packaging.jarname}-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/nio_char.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/nio_char-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -93,11 +94,11 @@
     <target name="compile-java">
         <echo message="Compiling NIO_CHAR classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.nio_char.src.main.java}"
-               destdir="${hy.build}"
+               srcdir="src/main/java"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -118,9 +119,9 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.nio_char.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
                 <exclude name="**/java.nio.charset.spi.CharsetProvider" />
             </fileset>
@@ -128,11 +129,11 @@
     </target>
 
     <target name="build-jar" depends="svn-info">
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.nio_char.packaging.jarname}.jar"
-             manifest="${hy.nio_char}/META-INF/MANIFEST.MF"
+        <jar destfile="${hy.jdk}/jre/lib/boot/nio_char.jar"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <metainf prefix="META-INF/services"
-                dir="${hy.nio_char.src.main.java}/org/apache/harmony/niochar"
+                dir="src/main/java/org/apache/harmony/niochar"
                 includes="java.nio.charset.spi.CharsetProvider"/>
             <fileset refid="classes" />
             <manifest>
@@ -142,11 +143,11 @@
             <metainf refid="hy.required.metainf-files"/>
         </jar>
 
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.nio_char.packaging.jarname}-src.jar">
+        <jar destfile="${hy.jdk}/jre/lib/boot/nio_char-src.jar">
             <metainf prefix="META-INF/services"
-                dir="${hy.nio_char.src.main.java}/org/apache/harmony/niochar"
+                dir="src/main/java/org/apache/harmony/niochar"
                 includes="java.nio.charset.spi.CharsetProvider"/>
-            <fileset dir="${hy.nio_char.src.main.java}">
+            <fileset dir="src/main/java">
                 <excludesfile name="${basedir}/make/excludesfile"/>
             </fileset>
             <manifest>
@@ -160,10 +161,10 @@
     <target name="compile-tests" depends="copy-test-resources">
         <echo message="Compiling NIO_CHAR tests" />
 
-        <mkdir dir="${hy.nio_char.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.nio_char.src.test.java}"
-               destdir="${hy.nio_char.bin.test}"
+        <javac srcdir="src/test/java"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -211,10 +212,10 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.nio_char.bin.test}"/>
+                <pathelement path="bin/test"/>
                 <pathelement path="../../build/tests" />
                 <pathelement path="${hy.hdk}/build/test/support.jar" />
-                <fileset dir="${hy.nio_char.src.test.resources}/jars">
+                <fileset dir="src/test/resources/jars">
                     <include name="**/*.jar" />
                 </fileset>
             </classpath>
@@ -223,7 +224,7 @@
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.nio_char.src.test.java}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->
@@ -247,9 +248,9 @@
     </target>
 
     <target name="copy-test-resources">
-        <mkdir dir="${hy.nio_char.bin.test}" />
-        <copy todir="${hy.nio_char.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.nio_char.src.test.resources}">
+        <mkdir dir="bin/test" />
+        <copy todir="bin/test" includeemptydirs="false">
+            <fileset dir="src/test/resources">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>

Modified: harmony/enhanced/classlib/trunk/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/build.xml Sat Jul 11 14:54:39 2009
@@ -29,18 +29,17 @@
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.pack200.src.main.java}" />
-            <present targetdir="${hy.pack200.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
             </present>
-            <present targetdir="${hy.pack200.src.main.java5}" />
-            <present targetdir="${hy.pack200.src.main.java5}">
+            <present targetdir="src/main/java5" />
+            <present targetdir="src/main/java5">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -100,16 +99,16 @@
     <target name="compile-java">
         <echo message="Compiling PACK200 classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
     	<!-- Ordinary classes -->
         <javac sourcepath=""
-               srcdir="${hy.pack200.src.main.java}"
-               destdir="${hy.build}"
+               srcdir="src/main/java"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.pack200.javac.source}"
-               target="${hy.pack200.javac.target}"
+               source="1.4"
+               target="1.4"
                debug="${hy.javac.debug}">
 
             <compilerarg line="${build.compilerarg}" />
@@ -122,8 +121,8 @@
         </javac>
     	<!-- Java5 classes, with generics -->
         <javac sourcepath=""
-               srcdir="${hy.pack200.src.main.java5}"
-               destdir="${hy.build}"
+               srcdir="src/main/java5"
+               destdir="../../build/classes"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}"
@@ -141,9 +140,9 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.pack200.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
@@ -151,7 +150,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/pack200.jar"
-             manifest="${hy.pack200}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -162,8 +161,8 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/pack200-src.jar">
-            <fileset dir="${hy.pack200.src.main.java}" />
-            <fileset dir="${hy.pack200.src.main.java}/../java5" />
+            <fileset dir="src/main/java" />
+            <fileset dir="src/main/java/../java5" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -173,16 +172,16 @@
     </target>
 
     <target name="compile-tests" depends="copy-test-resources" > 
-        <mkdir dir="${hy.pack200.bin.test}" />
+        <mkdir dir="bin/test" />
 
         <echo message="Compiling PACK200 tests" />
-        <javac srcdir="${hy.pack200.src.test.java}"
-               destdir="${hy.pack200.bin.test}"
+        <javac srcdir="src/test/java"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.pack200.javac.source}" 
-               target="${hy.pack200.javac.target}"
+               source="1.4" 
+               target="1.4"
                debug="${hy.javac.debug}">
 
             <compilerarg line="${build.compilerarg}" />
@@ -225,8 +224,8 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.pack200.bin.test}"/>
-                <pathelement path="${hy.pack200.src.test.resources}"/>
+                <pathelement path="bin/test"/>
+                <pathelement path="src/test/resources"/>
             </classpath>
             <classpath location="../../build/tests" />
             <classpath location="${hy.hdk}/build/test/support.jar" />
@@ -235,7 +234,7 @@
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.pack200.src.test.java}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->
@@ -259,9 +258,9 @@
     </target>
 
     <target name="copy-test-resources">
-        <mkdir dir="${hy.pack200.bin.test}" />
-        <copy todir="${hy.pack200.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.pack200.src.test.resources}">
+        <mkdir dir="bin/test" />
+        <copy todir="bin/test" includeemptydirs="false">
+            <fileset dir="src/test/resources">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>

Modified: harmony/enhanced/classlib/trunk/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/build.xml Sat Jul 11 14:54:39 2009
@@ -21,12 +21,13 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="hy.jre" location="${hy.jdk}/jre" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property name="tests.output" location="../../build/test_report" />
 
     <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
     <property file="../../make/depends.properties" />
     <property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
@@ -57,7 +58,7 @@
     <target name="copy-native-includes"
             depends="-copy-thread-include,-copy-thread-stub-include" >
         <copy todir="${hy.hdk}/include" overwrite="yes">
-            <fileset dir="${hy.portlib.src.main.native}/include/shared">
+            <fileset dir="src/main/native/include/shared">
                 <include name="hyport.h" />
                 <include name="hycomp.h" />
                 <include name="hyporterror.h" />
@@ -71,7 +72,7 @@
             </fileset>
         </copy>
         <copy todir="${hy.hdk}/include" overwrite="yes">
-            <fileset dir="${hy.portlib.src.main.native}/include/${hy.os.family}">
+            <fileset dir="src/main/native/include/${hy.os.family}">
                 <include name="hymutex.h" />
                 <include name="hysock.h" />
                 <include name="hyportpg.h" />
@@ -81,7 +82,7 @@
 
     <target name="-copy-thread-include" unless="hy.skip.thr" >
         <copy todir="${hy.hdk}/include" overwrite="yes">
-            <fileset dir="${hy.portlib.src.main.native}/include/shared">
+            <fileset dir="src/main/native/include/shared">
                 <include name="hythread.h" />
             </fileset>
         </copy>
@@ -89,7 +90,7 @@
 
     <target name="-copy-thread-stub-include" if="hy.skip.thr" >
         <copy todir="${hy.hdk}/include" overwrite="yes">
-            <fileset dir="${hy.portlib.src.main.native}/thrstub/shared">
+            <fileset dir="src/main/native/thrstub/shared">
                 <include name="hythread.h" />
             </fileset>
         </copy>
@@ -100,21 +101,21 @@
         depends="-build-native,-build-native-thread,-build-native-thrstub,-build-native-port" />
     <target name="-build-native">
        <!-- Build common lib -->
-        <make dir="${hy.portlib.src.main.native}/common/${hy.os.family}" />
+        <make dir="src/main/native/common/${hy.os.family}" />
 
         <!-- Build pool lib -->
-        <make dir="${hy.portlib.src.main.native}/pool/${hy.os.family}" />
+        <make dir="src/main/native/pool/${hy.os.family}" />
     </target>
 
     <target name="-build-native-thread" unless="hy.skip.thr">
         <!-- Build thread dll -->
-        <make dir="${hy.portlib.src.main.native}/thread/${hy.os.family}" />
+        <make dir="src/main/native/thread/${hy.os.family}" />
 
         <antcall target="-build-copy-thread" />
 
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.portlib.src.main.native}/thread/${hy.os.family}">
+            <fileset dir="src/main/native/thread/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
@@ -122,7 +123,7 @@
 
     <target name="-build-copy-thread" unless="hy.thr.nodeploy">
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.portlib.src.main.native}/thread">
+            <fileset dir="src/main/native/thread">
                 <include name="*${shlib.suffix}*" />
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
@@ -132,16 +133,16 @@
 
     <target name="-build-native-thrstub" if="hy.skip.thr">
         <!-- Build thread dll -->
-        <make dir="${hy.portlib.src.main.native}/thrstub/${hy.os.family}" />
+        <make dir="src/main/native/thrstub/${hy.os.family}" />
 
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.portlib.src.main.native}/thrstub">
+            <fileset dir="src/main/native/thrstub">
                 <include name="*${shlib.suffix}*" />
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
             </fileset>
             <!-- Copy link exports file on z/OS -->
-            <fileset dir="${hy.portlib.src.main.native}/thrstub/${hy.os.family}">
+            <fileset dir="src/main/native/thrstub/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
@@ -149,10 +150,10 @@
 
     <target name="-build-native-port">
         <!-- Build port dll -->
-        <make dir="${hy.portlib.src.main.native}/port/${hy.os.family}" />
+        <make dir="src/main/native/port/${hy.os.family}" />
 
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.portlib.src.main.native}/port">
+            <fileset dir="src/main/native/port">
                 <include name="*${shlib.suffix}*" />
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
@@ -160,7 +161,7 @@
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.portlib.src.main.native}/port/${hy.os.family}">
+            <fileset dir="src/main/native/port/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
@@ -168,11 +169,11 @@
 
     <!-- Clean natives -->
     <target name="clean-native" depends="-clean-native-tests">
-        <make dir="${hy.portlib.src.main.native}/thread/${hy.os.family}" target="clean" />
-        <make dir="${hy.portlib.src.main.native}/thrstub/${hy.os.family}" target="clean" />
-        <make dir="${hy.portlib.src.main.native}/port/${hy.os.family}" target="clean" />
-        <make dir="${hy.portlib.src.main.native}/common/${hy.os.family}" target="clean" />
-        <make dir="${hy.portlib.src.main.native}/pool/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/thread/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/thrstub/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/port/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/common/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/pool/${hy.os.family}" target="clean" />
     </target>
 
     <target name="clean" depends="clean-native-includes" />
@@ -203,20 +204,20 @@
     </target>
 
     <target name="-compile-native-tests" if="test.portlib">
-        <make dir="${hy.portlib.src.test.native}/init/${hy.os.family}" />
-        <make dir="${hy.portlib.src.test.native}/hycpu/${hy.os.family}" />
-        <make dir="${hy.portlib.src.test.native}/hyerror/${hy.os.family}" />
-        <make dir="${hy.portlib.src.test.native}/hyfile/${hy.os.family}" />
-        <make dir="${hy.portlib.src.test.native}/hyfiletext/${hy.os.family}" />
-        <make dir="${hy.portlib.src.test.native}/hygp/${hy.os.family}" />
-        <make dir="${hy.portlib.src.test.native}/hymem/${hy.os.family}" />
-        <make dir="${hy.portlib.src.test.native}/hynls/${hy.os.family}" />
-        <make dir="${hy.portlib.src.test.native}/hyport/${hy.os.family}" />
-        <make dir="${hy.portlib.src.test.native}/hystr/${hy.os.family}" />
-        <make dir="${hy.portlib.src.test.native}/hytime/${hy.os.family}" />
-        <make dir="${hy.portlib.src.test.native}/hysysinfo/${hy.os.family}" />
-        <make dir="${hy.portlib.src.test.native}/hyipcmutex/${hy.os.family}" />
-        <make dir="${hy.portlib.src.test.native}/hymmap/${hy.os.family}" />
+        <make dir="src/test/native/init/${hy.os.family}" />
+        <make dir="src/test/native/hycpu/${hy.os.family}" />
+        <make dir="src/test/native/hyerror/${hy.os.family}" />
+        <make dir="src/test/native/hyfile/${hy.os.family}" />
+        <make dir="src/test/native/hyfiletext/${hy.os.family}" />
+        <make dir="src/test/native/hygp/${hy.os.family}" />
+        <make dir="src/test/native/hymem/${hy.os.family}" />
+        <make dir="src/test/native/hynls/${hy.os.family}" />
+        <make dir="src/test/native/hyport/${hy.os.family}" />
+        <make dir="src/test/native/hystr/${hy.os.family}" />
+        <make dir="src/test/native/hytime/${hy.os.family}" />
+        <make dir="src/test/native/hysysinfo/${hy.os.family}" />
+        <make dir="src/test/native/hyipcmutex/${hy.os.family}" />
+        <make dir="src/test/native/hymmap/${hy.os.family}" />
     </target>
 
     <target name="-run-native-tests" if="test.portlib">
@@ -241,7 +242,7 @@
         <exec-native test="hymmap" />
 	
         <move todir="${tests.output}">
-            <fileset dir="${hy.portlib}">
+            <fileset dir=".">
                 <include name="TEST-*.xml"/>
             </fileset>
         </move>
@@ -250,33 +251,33 @@
     </target>
 
     <target name="-clean-native-tests" >
-        <make dir="${hy.portlib.src.test.native}/init/${hy.os.family}" 
+        <make dir="src/test/native/init/${hy.os.family}" 
               target="clean" />
-        <make dir="${hy.portlib.src.test.native}/hycpu/${hy.os.family}" 
+        <make dir="src/test/native/hycpu/${hy.os.family}" 
               target="clean" />
-        <make dir="${hy.portlib.src.test.native}/hyerror/${hy.os.family}" 
+        <make dir="src/test/native/hyerror/${hy.os.family}" 
               target="clean" />
-        <make dir="${hy.portlib.src.test.native}/hyfile/${hy.os.family}" 
+        <make dir="src/test/native/hyfile/${hy.os.family}" 
               target="clean" />
-        <make dir="${hy.portlib.src.test.native}/hyfiletext/${hy.os.family}" 
+        <make dir="src/test/native/hyfiletext/${hy.os.family}" 
               target="clean" />
-        <make dir="${hy.portlib.src.test.native}/hygp/${hy.os.family}" 
+        <make dir="src/test/native/hygp/${hy.os.family}" 
               target="clean" />
-        <make dir="${hy.portlib.src.test.native}/hymem/${hy.os.family}" 
+        <make dir="src/test/native/hymem/${hy.os.family}" 
               target="clean" />
-        <make dir="${hy.portlib.src.test.native}/hynls/${hy.os.family}" 
+        <make dir="src/test/native/hynls/${hy.os.family}" 
               target="clean" />
-        <make dir="${hy.portlib.src.test.native}/hyport/${hy.os.family}" 
+        <make dir="src/test/native/hyport/${hy.os.family}" 
               target="clean" />
-        <make dir="${hy.portlib.src.test.native}/hystr/${hy.os.family}" 
+        <make dir="src/test/native/hystr/${hy.os.family}" 
               target="clean" />
-        <make dir="${hy.portlib.src.test.native}/hytime/${hy.os.family}" 
+        <make dir="src/test/native/hytime/${hy.os.family}" 
               target="clean" />
-        <make dir="${hy.portlib.src.test.native}/hysysinfo/${hy.os.family}" 
+        <make dir="src/test/native/hysysinfo/${hy.os.family}" 
               target="clean" />
-        <make dir="${hy.portlib.src.test.native}/hyipcmutex/${hy.os.family}" 
+        <make dir="src/test/native/hyipcmutex/${hy.os.family}" 
               target="clean" />
-        <make dir="${hy.portlib.src.test.native}/hymmap/${hy.os.family}" 
+        <make dir="src/test/native/hymmap/${hy.os.family}" 
               target="clean" />
     </target>
 
@@ -290,7 +291,7 @@
         <sequential>
             <property name="@{test}.name"
                       value="native.portlib.@{test}" />
-            <exec executable="${hy.portlib.src.test.native}/@{test}/@{test}${exe.suffix}"
+            <exec executable="src/test/native/@{test}/@{test}${exe.suffix}"
                   failonerror="false"
                   outputproperty="@{test}.output"
                   resultproperty="@{test}.resultcode" >