harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r793176 [1/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 GMT
Author: hindessm
Date: Sat Jul 11 14:54:39 2009
New Revision: 793176

URL: http://svn.apache.org/viewvc?rev=793176&view=rev
Log:
Remove modules/*/make/hyproperties.xml files.  Work in progress.

Removed:
    harmony/enhanced/classlib/trunk/modules/accessibility/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/annotation/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/applet/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/archive/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/auth/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/beans/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/concurrent/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/crypto/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/imageio/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/instrument/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/jndi/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/lang-management/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/logging/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/luni/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/math/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/misc/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/nio/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/nio_char/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/pack200/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/portlib/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/prefs/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/print/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/regex/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/rmi/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/security/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/sound/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/sql/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/suncompat/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/swing/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/text/make/hyproperties.xml
    harmony/enhanced/classlib/trunk/modules/x-net/make/hyproperties.xml
Modified:
    harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
    harmony/enhanced/classlib/trunk/modules/annotation/build.xml
    harmony/enhanced/classlib/trunk/modules/applet/build.xml
    harmony/enhanced/classlib/trunk/modules/archive/build.xml
    harmony/enhanced/classlib/trunk/modules/auth/build.xml
    harmony/enhanced/classlib/trunk/modules/awt/build.xml
    harmony/enhanced/classlib/trunk/modules/beans/build.xml
    harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
    harmony/enhanced/classlib/trunk/modules/crypto/build.xml
    harmony/enhanced/classlib/trunk/modules/imageio/build.xml
    harmony/enhanced/classlib/trunk/modules/instrument/build.xml
    harmony/enhanced/classlib/trunk/modules/jndi/build.xml
    harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
    harmony/enhanced/classlib/trunk/modules/logging/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/math/build.xml
    harmony/enhanced/classlib/trunk/modules/misc/build.xml
    harmony/enhanced/classlib/trunk/modules/nio/build.xml
    harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
    harmony/enhanced/classlib/trunk/modules/pack200/build.xml
    harmony/enhanced/classlib/trunk/modules/portlib/build.xml
    harmony/enhanced/classlib/trunk/modules/prefs/build.xml
    harmony/enhanced/classlib/trunk/modules/print/build.xml
    harmony/enhanced/classlib/trunk/modules/regex/build.xml
    harmony/enhanced/classlib/trunk/modules/rmi/build.xml
    harmony/enhanced/classlib/trunk/modules/security/build.xml
    harmony/enhanced/classlib/trunk/modules/sound/build.xml
    harmony/enhanced/classlib/trunk/modules/sql/build.xml
    harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
    harmony/enhanced/classlib/trunk/modules/swing/build.xml
    harmony/enhanced/classlib/trunk/modules/text/build.xml
    harmony/enhanced/classlib/trunk/modules/x-net/build.xml

Modified: harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/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.accessibility.src.main.java}" />
-            <present targetdir="${hy.accessibility.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -39,7 +40,7 @@
         </or>
     </fileset>
 
-    <fileset id="tests" dir="${hy.accessibility.bin.test}"/>
+    <fileset id="tests" dir="bin/test"/>
 
     <property file="../../make/depends.properties" />
 
@@ -64,9 +65,9 @@
     <target name="-test-module" depends="build, compile-tests, prepare-exclude, test-jar, run-tests" />
 
     <target name="clean">
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.accessibility.packaging.jarname}.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.accessibility.packaging.jarname}-src.jar" />
-        <delete file="${tests.hdk.dir}/${hy.accessibility.packaging.jarname}_tests.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/accessibility.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/accessibility-src.jar" />
+        <delete file="${tests.hdk.dir}/accessibility_tests.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -76,11 +77,11 @@
     <target name="compile-java">
         <echo message="Compiling ACCESSIBILITY classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.accessibility.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}" 
@@ -98,9 +99,9 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.accessibility.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
@@ -108,8 +109,8 @@
 
     <target name="build-jar" depends="svn-info">
         <mkdir dir="${hy.jdk}/jre/lib/boot"/>
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.accessibility.packaging.jarname}.jar"
-             manifest="${hy.accessibility}/META-INF/MANIFEST.MF"
+        <jar destfile="${hy.jdk}/jre/lib/boot/accessibility.jar"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -119,8 +120,8 @@
             <metainf refid="hy.required.metainf-files"/>    
         </jar>
 
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.accessibility.packaging.jarname}-src.jar">
-            <fileset dir="${hy.accessibility.src.main.java}" />
+        <jar destfile="${hy.jdk}/jre/lib/boot/accessibility-src.jar">
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -132,7 +133,7 @@
 
     <target name="test-jar" depends="svn-info,compile-tests">
 	<mkdir dir="${tests.hdk.dir}" />
-        <jar destfile="${tests.hdk.dir}/${hy.accessibility.packaging.jarname}_tests.jar">
+        <jar destfile="${tests.hdk.dir}/accessibility_tests.jar">
             <fileset refid="tests" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
@@ -144,10 +145,10 @@
     <target name="compile-tests">
         <echo message="Compiling ACCESSIBILITY tests" />
 
-        <mkdir dir="${hy.accessibility.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.accessibility.src.test.api}/java/common"
-               destdir="${hy.accessibility.bin.test}"
+        <javac srcdir="src/test/api/java/common"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -194,13 +195,13 @@
 
             <jvmarg line="${hy.test.vmargs}" />
 
-            <jvmarg value="-Xbootclasspath/a:${tests.hdk.dir}/${hy.accessibility.packaging.jarname}_tests.jar${path.separator}../junit.jar${path.separator}${hy.hdk}/build/test/support.jar"/>
+            <jvmarg value="-Xbootclasspath/a:${tests.hdk.dir}/accessibility_tests.jar${path.separator}../junit.jar${path.separator}${hy.hdk}/build/test/support.jar"/>
 
             <formatter type="xml" />
 
             <batchtest todir="${tests.output}" haltonfailure="no">
 
-                <fileset dir="${hy.accessibility.src.test.api}/java/common">
+                <fileset dir="src/test/api/java/common">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->

Modified: harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/annotation/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.annotation.src.main.java}" />
-            <present targetdir="${hy.annotation.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -60,8 +61,8 @@
     <target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests" />
 
     <target name="clean">
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.annotation.packaging.jarname}.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.annotation.packaging.jarname}-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/annotation.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/annotation-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -71,11 +72,11 @@
     <target name="compile-java">
         <echo message="Compiling ANNOTATION classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.annotation.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,9 +92,9 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.annotation.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
@@ -101,8 +102,8 @@
 
 
     <target name="build-jar" depends="svn-info">
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.annotation.packaging.jarname}.jar"
-             manifest="${hy.annotation}/META-INF/MANIFEST.MF"
+        <jar destfile="${hy.jdk}/jre/lib/boot/annotation.jar"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -112,8 +113,8 @@
             <metainf refid="hy.required.metainf-files"/>
         </jar>
 
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.annotation.packaging.jarname}-src.jar">
-            <fileset dir="${hy.annotation.src.main.java}" />
+        <jar destfile="${hy.jdk}/jre/lib/boot/annotation-src.jar">
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -125,10 +126,10 @@
     <target name="compile-tests">
         <echo message="Compiling ANNOTATION tests" />
 
-        <mkdir dir="${hy.annotation.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.annotation.src.test.java}"
-               destdir="${hy.annotation.bin.test}"
+        <javac srcdir="src/test/java"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -174,7 +175,7 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.annotation.bin.test}"/>
+                <pathelement path="bin/test"/>
             </classpath>
             <classpath location="${hy.hdk}/build/test/support.jar" />
 
@@ -182,7 +183,7 @@
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.annotation.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/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/applet/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/applet/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/applet/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.applet.src.main.java}" />
-            <present targetdir="${hy.applet.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 APPLET classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.applet.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,9 +92,9 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.applet.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
@@ -101,7 +102,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/applet.jar"
-             manifest="${hy.applet}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -112,7 +113,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/applet-src.jar">
-            <fileset dir="${hy.applet.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -125,10 +126,10 @@
     <target name="compile-tests">
         <echo message="Compiling APPLET tests" />
 
-        <mkdir dir="${hy.applet.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.applet.src.test.java}"
-               destdir="${hy.applet.bin.test}"
+        <javac srcdir="src/test/java"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -173,14 +174,14 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.applet.bin.test}"/>
+                <pathelement path="bin/test"/>
             </classpath>
 
             <formatter type="xml" />
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.applet.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/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/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.archive.src.main.java}" />
-            <present targetdir="${hy.archive.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -54,7 +55,7 @@
 
     <target name="copy-zlib-include" unless="hy.skip.zlib">
         <copy todir="${hy.hdk}/include" overwrite="yes">
-            <fileset dir="${hy.archive.src.main.native}/zlib_dist">
+            <fileset dir="src/main/native/zlib_dist">
                 <include name="zlib.h" />
                 <include name="zconf.h" />
             </fileset>
@@ -63,7 +64,7 @@
 	
     <target name="copy-zipsup-include" if="hy.skip.zip.api">
         <copy todir="${hy.hdk}/include" overwrite="yes">
-            <fileset dir="${hy.archive.src.main.native}/include/shared">
+            <fileset dir="src/main/native/include/shared">
                 <include name="zipsup.h" />
             </fileset>
         </copy>
@@ -73,30 +74,30 @@
             unless="hy.skip.zlib" />
         
     <target name="-unzip-oss">
-        <mkdir dir="${hy.archive.src.main.native}/zlib_dist" />
-        <unzip src="${zlib.zip}" dest="${hy.archive.src.main.native}/zlib_dist" />
-        <chmod dir="${hy.archive.src.main.native}/zlib_dist" perm="ugo+r" />
+        <mkdir dir="src/main/native/zlib_dist" />
+        <unzip src="${zlib.zip}" dest="src/main/native/zlib_dist" />
+        <chmod dir="src/main/native/zlib_dist" perm="ugo+r" />
     </target>
 
     <target name="-ascii2ebcdic-conversion" if="is.zos">
-        <move todir="${hy.archive.src.main.native}/zlib_dist_ascii">
-            <fileset dir="${hy.archive.src.main.native}/zlib_dist">
+        <move todir="src/main/native/zlib_dist_ascii">
+            <fileset dir="src/main/native/zlib_dist">
                 <include name="**/*" />
                 <exclude name="**/*.o" />
             </fileset>
         </move>
-        <copy todir="${hy.archive.src.main.native}/zlib_dist" outputencoding="IBM-1047" >
-            <fileset dir="${hy.archive.src.main.native}/zlib_dist_ascii">
+        <copy todir="src/main/native/zlib_dist" outputencoding="IBM-1047" >
+            <fileset dir="src/main/native/zlib_dist_ascii">
                 <include name="**/*" />
                 <exclude name="**/*.o" />
             </fileset>               
         </copy>
-        <fixcrlf srcdir="${hy.archive.src.main.native}/zlib_dist" includes="**/*"  excludes="**/*.o" eol="unix" />
-        <delete dir="${hy.archive.src.main.native}/zlib_dist_ascii" />
+        <fixcrlf srcdir="src/main/native/zlib_dist" includes="**/*"  excludes="**/*.o" eol="unix" />
+        <delete dir="src/main/native/zlib_dist_ascii" />
     </target>
     
     <target name="clean-overlay-oss" unless="hy.skip.zlib" >
-        <delete dir="${hy.archive.src.main.native}/zlib_dist" quiet="true" />
+        <delete dir="src/main/native/zlib_dist" quiet="true" />
     </target>
     
     <!-- Build native code -->
@@ -104,13 +105,13 @@
             depends="-build-native-zip,-build-native-zlib,-build-native-archive" />
 
     <target name="-build-native-zip" if="hy.skip.zip.api">
-        <make dir="${hy.archive.src.main.native}/zip/${hy.os.family}" />
+        <make dir="src/main/native/zip/${hy.os.family}" />
     </target>
         
     <target name="-build-native-zlib" unless="hy.skip.zlib">
-        <make dir="${hy.archive.src.main.native}/zlib/${hy.os.family}" />
+        <make dir="src/main/native/zlib/${hy.os.family}" />
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.archive.src.main.native}/zlib">
+            <fileset dir="src/main/native/zlib">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
@@ -118,16 +119,16 @@
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.archive.src.main.native}/zlib/${hy.os.family}">
+            <fileset dir="src/main/native/zlib/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
     </target>
         
     <target name="-build-native-archive">
-        <make dir="${hy.archive.src.main.native}/archive/${hy.os.family}" />
+        <make dir="src/main/native/archive/${hy.os.family}" />
         <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${hy.archive.src.main.native}/archive">
+            <fileset dir="src/main/native/archive">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
@@ -135,7 +136,7 @@
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.archive.src.main.native}/archive/${hy.os.family}">
+            <fileset dir="src/main/native/archive/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
@@ -146,17 +147,17 @@
             depends="-clean-native-zip,-clean-native-zlib,-clean-native-archive"/>
 
     <target name="-clean-native-zip" if="hy.skip.zip.api">
-        <make dir="${hy.archive.src.main.native}/zip/${hy.os.family}"
+        <make dir="src/main/native/zip/${hy.os.family}"
               target="clean" />
     </target>
 
     <target name="-clean-native-zlib" unless="hy.skip.zlib">
-        <make dir="${hy.archive.src.main.native}/zlib/${hy.os.family}"
+        <make dir="src/main/native/zlib/${hy.os.family}"
               target="clean" />
     </target>
 
     <target name="-clean-native-archive">
-        <make dir="${hy.archive.src.main.native}/archive/${hy.os.family}"
+        <make dir="src/main/native/archive/${hy.os.family}"
               target="clean" />
     </target>
 
@@ -194,11 +195,11 @@
     <target name="compile-java">
         <echo message="Compiling ARCHIVE classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.archive.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}" 
@@ -216,9 +217,9 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.archive.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
@@ -226,7 +227,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/archive.jar"
-             manifest="${hy.archive}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -237,7 +238,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/archive-src.jar">
-            <fileset dir="${hy.archive.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -247,12 +248,12 @@
     </target>
 
     <target name="compile-tests" depends="copy-test-resources">
-        <mkdir dir="${hy.archive.bin.internal}" />
-        <mkdir dir="${hy.archive.bin.test}" />
+        <mkdir dir="bin/test-internal" />
+        <mkdir dir="bin/test" />
 
         <echo message="Compiling internal ARCHIVE tests" />
-        <javac srcdir="${hy.archive.src.test.internal}"
-               destdir="${hy.archive.bin.internal}"
+        <javac srcdir="src/test/java-internal"
+               destdir="bin/test-internal"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -271,8 +272,8 @@
         </javac>
 
         <echo message="Compiling ARCHIVE tests" />
-        <javac srcdir="${hy.archive.src.test.java}"
-               destdir="${hy.archive.bin.test}"
+        <javac srcdir="src/test/java"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -320,10 +321,10 @@
 
             <jvmarg line="${hy.test.vmargs}" />
 
-            <jvmarg value="-Xbootclasspath/a:${hy.archive.bin.internal}${path.separator}../../${junit.jar}"/>         
+            <jvmarg value="-Xbootclasspath/a:bin/test-internal${path.separator}../../${junit.jar}"/>         
             
             <classpath>
-                <pathelement path="${hy.archive.bin.test}"/>
+                <pathelement path="bin/test"/>
             </classpath>
             <classpath location="../../build/tests" />
 			<classpath location="${hy.hdk}/build/test/support.jar" />
@@ -332,7 +333,7 @@
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.archive.src.test.internal}">
+                <fileset dir="src/test/java-internal">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->
@@ -363,7 +364,7 @@
             <jvmarg value="-Dhy.test.vmargs=${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.archive.bin.test}"/>
+                <pathelement path="bin/test"/>
             </classpath>
             <classpath location="../../build/tests" />
             <classpath location="${hy.hdk}/build/test/support.jar" />
@@ -372,7 +373,7 @@
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.archive.src.test.java}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->
@@ -396,9 +397,9 @@
     </target>
 
     <target name="copy-test-resources">
-        <mkdir dir="${hy.archive.bin.test}" />
-        <copy todir="${hy.archive.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.archive.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/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/build.xml Sat Jul 11 14:54:39 2009
@@ -22,23 +22,24 @@
 
     <!-- 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.auth.src.main.java.platform"
-              value="${hy.auth.src.main.java}/../${hy.os.family}" />
+              value="src/main/java/common/../${hy.os.family}" />
 
     <property name="hy.auth.src.test.java.platform"
-              value="${hy.auth.src.test.java}/../${hy.os.family}" />
+              value="src/test/java/common/../${hy.os.family}" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.auth.src.main.java}" />
-            <present targetdir="${hy.auth.src.main.java}">
+            <present targetdir="src/main/java/common" />
+            <present targetdir="src/main/java/common">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -77,11 +78,11 @@
     <!-- Build native code -->
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" >
-        <make dir="${hy.auth.src.main.native}/auth/${hy.os.family}" />
+        <make dir="src/main/native/auth/${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.auth.src.main.native}/auth">
+            <fileset dir="src/main/native/auth">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
@@ -89,7 +90,7 @@
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.auth.src.main.native}/auth/${hy.os.family}">
+            <fileset dir="src/main/native/auth/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
@@ -97,12 +98,12 @@
     
     <!-- Clean natives -->
     <target name="clean-native">
-    <make dir="${hy.auth.src.main.native}/auth/${hy.os.family}" target="clean" />
+    <make dir="src/main/native/auth/${hy.os.family}" target="clean" />
     </target>
 
     <target name="clean">
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.auth.packaging.jarname}.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.auth.packaging.jarname}-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/auth.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/auth-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -112,10 +113,10 @@
     <target name="compile-java">
         <echo message="Compiling AUTH 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}" 
@@ -123,7 +124,7 @@
                debug="${hy.javac.debug}">
 
             <src>
-                <pathelement location="${hy.auth.src.main.java}"/>
+                <pathelement location="src/main/java/common"/>
                 <pathelement location="${hy.auth.src.main.java.platform}" />
             </src>
 
@@ -136,17 +137,17 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.auth.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java/common">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
     </target>
 
     <target name="build-jar" depends="svn-info">
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.auth.packaging.jarname}.jar"
-             manifest="${hy.auth}/META-INF/MANIFEST.MF"
+        <jar destfile="${hy.jdk}/jre/lib/boot/auth.jar"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -156,8 +157,8 @@
             <metainf refid="hy.required.metainf-files"/>
         </jar>
 
-        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.auth.packaging.jarname}-src.jar">
-            <fileset dir="${hy.auth.src.main.java}" />
+        <jar destfile="${hy.jdk}/jre/lib/boot/auth-src.jar">
+            <fileset dir="src/main/java/common" />
             <fileset dir="${hy.auth.src.main.java.platform}" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
@@ -170,9 +171,9 @@
     <target name="compile-tests">
         <echo message="Compiling AUTH tests" />
 
-        <mkdir dir="${hy.auth.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac  destdir="${hy.auth.bin.test}"
+        <javac  destdir="bin/test"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -180,7 +181,7 @@
                debug="${hy.javac.debug}">
 
             <src>
-                <pathelement location="${hy.auth.src.test.java}"/>
+                <pathelement location="src/test/java/common"/>
                 <pathelement location="${hy.auth.src.test.java.platform}"/>
             </src>
 
@@ -230,11 +231,11 @@
 
 
             <!-- to pick up junit.jar -->
-            <jvmarg value="-Xbootclasspath/a:${hy.auth.bin.test}${path.separator}../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar"/>
+            <jvmarg value="-Xbootclasspath/a:bin/test${path.separator}../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar"/>
 
             <classpath>
-                <pathelement path="${hy.auth.src.test.resources}"/>
-                <pathelement path="${hy.auth.bin.test}"/>
+                <pathelement path="src/test/resources"/>
+                <pathelement path="bin/test"/>
             </classpath>
 
             <formatter type="xml" />
@@ -248,7 +249,7 @@
                     <include name="**/*Test.java" unless="test.case" />
                     <excludesfile name="${auth.exclude.file}" unless="test.case" />
                 </fileset>
-                <fileset dir="${hy.auth.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/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Sat Jul 11 14:54:39 2009
@@ -21,23 +21,24 @@
 
     <!-- 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.awt.src.main.java.platform"
-              value="${hy.awt.src.main.java}/../${hy.os.family}" />
+              value="src/main/java/common/../${hy.os.family}" />
 
     <property name="hy.awt.src.test.impl.platform"
-              value="${hy.awt.src.test.impl}/${hy.os.family}" />
+              value="src/test/impl/${hy.os.family}" />
 
-    <fileset id="classes" dir="${hy.build}">
+    <fileset id="classes" dir="../../build/classes">
         <or>
-            <present targetdir="${hy.awt.src.main.java}" />
-            <present targetdir="${hy.awt.src.main.java}">
+            <present targetdir="src/main/java/common" />
+            <present targetdir="src/main/java/common">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -86,10 +87,10 @@
     <target name="compile-java">
         <echo message="Compiling AWT 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}" 
@@ -99,7 +100,7 @@
             <compilerarg line="${build.compilerarg}" />
 
             <src>
-                <pathelement location="${hy.awt.src.main.java}"/>
+                <pathelement location="src/main/java/common"/>
                 <pathelement location="${hy.awt.src.main.java.platform}" />
             </src>
 
@@ -112,29 +113,29 @@
     </target>
 
     <target name="copy-resources" depends="-copy-win-resources">
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.awt.src.main.java}">
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java/common">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
 
         <mkdir dir="${hy.jdk}/jre/lib/cmm" />
         <copy todir="${hy.jdk}/jre/lib/cmm">
-            <fileset dir="${hy.awt.src.main.resources}/cmm"/>
+            <fileset dir="src/main/resources/cmm"/>
         </copy>	
     </target>
     
     <target name="-copy-win-resources" if="is.windows">
         <mkdir dir="${hy.jdk}/jre/lib" />
-        <copy file="${hy.awt.src.main.resources}/font.properties.xp"
+        <copy file="src/main/resources/font.properties.xp"
               tofile="${hy.jdk}/jre/lib/font.properties"/>
     </target>
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/awt.jar"
-             manifest="${hy.awt}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -145,7 +146,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/awt-src.jar">
-            <fileset dir="${hy.awt.src.main.java}" />
+            <fileset dir="src/main/java/common" />
             <fileset dir="${hy.awt.src.main.java.platform}" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
@@ -160,10 +161,10 @@
         depends="-build-native-common,-build-native-unix,-build-native-windows" />
         
     <target name="-build-native-common">
-        <make dir="${hy.awt.src.main.native}/lcmm/${hy.os.family}" />
+        <make dir="src/main/native/lcmm/${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.awt.src.main.native}/lcmm">
+            <fileset dir="src/main/native/lcmm">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
@@ -171,15 +172,15 @@
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.awt.src.main.native}/lcmm/${hy.os.family}">
+            <fileset dir="src/main/native/lcmm/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
 
-        <make dir="${hy.awt.src.main.native}/jpegdecoder/${hy.os.family}" />
+        <make dir="src/main/native/jpegdecoder/${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.awt.src.main.native}/jpegdecoder">
+            <fileset dir="src/main/native/jpegdecoder">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
@@ -187,15 +188,15 @@
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.awt.src.main.native}/jpegdecoder/${hy.os.family}">
+            <fileset dir="src/main/native/jpegdecoder/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
 
-        <make dir="${hy.awt.src.main.native}/gl/${hy.os.family}" />
+        <make dir="src/main/native/gl/${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.awt.src.main.native}/gl">
+            <fileset dir="src/main/native/gl">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
@@ -203,15 +204,15 @@
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.awt.src.main.native}/gl/${hy.os.family}">
+            <fileset dir="src/main/native/gl/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
         
-        <make dir="${hy.awt.src.main.native}/oglwrapper/${hy.os.family}" />
+        <make dir="src/main/native/oglwrapper/${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.awt.src.main.native}/oglwrapper">
+            <fileset dir="src/main/native/oglwrapper">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
@@ -219,15 +220,15 @@
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.awt.src.main.native}/oglwrapper/${hy.os.family}">
+            <fileset dir="src/main/native/oglwrapper/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
 
-        <make dir="${hy.awt.src.main.native}/fontlib/${hy.os.family}" />
+        <make dir="src/main/native/fontlib/${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.awt.src.main.native}/fontlib">
+            <fileset dir="src/main/native/fontlib">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
@@ -235,57 +236,57 @@
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.awt.src.main.native}/fontlib/${hy.os.family}">
+            <fileset dir="src/main/native/fontlib/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
     </target>
 
     <target name="-build-native-unix" if="is.unix">
-        <make dir="${hy.awt.src.main.native}/x11wrapper/${hy.os.family}" />
+        <make dir="src/main/native/x11wrapper/${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.awt.src.main.native}/x11wrapper">
+            <fileset dir="src/main/native/x11wrapper">
                 <include name="*${shlib.suffix}*"/>
             </fileset>
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.awt.src.main.native}/x11wrapper/${hy.os.family}">
+            <fileset dir="src/main/native/x11wrapper/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
 
-        <make dir="${hy.awt.src.main.native}/linuxfont/${hy.os.family}" />
+        <make dir="src/main/native/linuxfont/${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.awt.src.main.native}/linuxfont">
+            <fileset dir="src/main/native/linuxfont">
                 <include name="*${shlib.suffix}*"/>
             </fileset>
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.awt.src.main.native}/linuxfont/${hy.os.family}">
+            <fileset dir="src/main/native/linuxfont/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
     </target>
 
     <target name="-build-native-windows" if="is.windows">
-        <make dir="${hy.awt.src.main.native}/win32wrapper/${hy.os.family}" />
+        <make dir="src/main/native/win32wrapper/${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.awt.src.main.native}/win32wrapper">
+            <fileset dir="src/main/native/win32wrapper">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" />
                 <exclude name="*${manifest.suffix}"/>
             </fileset>
         </copy>
 
-        <make dir="${hy.awt.src.main.native}/winfont/${hy.os.family}" />
+        <make dir="src/main/native/winfont/${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.awt.src.main.native}/winfont">
+            <fileset dir="src/main/native/winfont">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" />
                 <exclude name="*${manifest.suffix}"/>
@@ -295,37 +296,37 @@
 
     <target name="clean-native"
             depends="-clean-native-unix,-clean-native-windows">
-        <make dir="${hy.awt.src.main.native}/lcmm/${hy.os.family}"
+        <make dir="src/main/native/lcmm/${hy.os.family}"
               target="clean"/>
-        <make dir="${hy.awt.src.main.native}/jpegdecoder/${hy.os.family}"
+        <make dir="src/main/native/jpegdecoder/${hy.os.family}"
               target="clean"/>
-        <make dir="${hy.awt.src.main.native}/gl/${hy.os.family}"
+        <make dir="src/main/native/gl/${hy.os.family}"
               target="clean"/>
-        <make dir="${hy.awt.src.main.native}/oglwrapper/${hy.os.family}"
+        <make dir="src/main/native/oglwrapper/${hy.os.family}"
               target="clean"/>
-        <make dir="${hy.awt.src.main.native}/fontlib/${hy.os.family}"
+        <make dir="src/main/native/fontlib/${hy.os.family}"
               target="clean"/>
     </target>
 
     <target name="-clean-native-unix" if="is.unix">
-        <make dir="${hy.awt.src.main.native}/x11wrapper/${hy.os.family}"
+        <make dir="src/main/native/x11wrapper/${hy.os.family}"
               target="clean"/>
-        <make dir="${hy.awt.src.main.native}/linuxfont/${hy.os.family}"
+        <make dir="src/main/native/linuxfont/${hy.os.family}"
               target="clean"/>
     </target>
 
     <target name="-clean-native-windows" if="is.windows">
-        <make dir="${hy.awt.src.main.native}/win32wrapper/${hy.os.family}"
+        <make dir="src/main/native/win32wrapper/${hy.os.family}"
               target="clean"/>
-        <make dir="${hy.awt.src.main.native}/winfont/${hy.os.family}"
+        <make dir="src/main/native/winfont/${hy.os.family}"
               target="clean"/>
     </target>
 
     <target name="compile-tests" depends="copy-test-resources">
         <echo message="Compiling AWT tests" />
 
-        <mkdir dir="${hy.awt.bin.test.boot}" />
-        <javac destdir="${hy.awt.bin.test.boot}"
+        <mkdir dir="bin/test/boot" />
+        <javac destdir="bin/test/boot"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -336,7 +337,7 @@
             <compilerarg line="${build.compilerarg}" />
 
             <src>
-                <pathelement location="${hy.awt.src.test.impl.boot}" />
+                <pathelement location="src/test/impl/boot" />
             </src>
                
             <bootclasspath>
@@ -348,8 +349,8 @@
             <classpath location="${hy.hdk}/build/test/support.jar" />
         </javac>
 
-        <mkdir dir="${hy.awt.bin.test.classes}" />
-        <javac destdir="${hy.awt.bin.test.classes}"
+        <mkdir dir="bin/test/classes" />
+        <javac destdir="bin/test/classes"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -360,7 +361,7 @@
             <compilerarg line="${build.compilerarg}" />
 
             <src>
-                <pathelement location="${hy.awt.src.test.api.java}" />
+                <pathelement location="src/test/api/java" />
                 <pathelement location="${hy.awt.src.test.impl.platform}" />
             </src>
                
@@ -376,9 +377,9 @@
     </target>
 
     <target name="copy-test-resources">
-        <mkdir dir="${hy.awt.bin.test.resources}" />
-        <copy todir="${hy.awt.bin.test.resources}" includeemptydirs="false">
-            <fileset dir="${hy.awt.src.test.api.resources}" />
+        <mkdir dir="bin/test/resources" />
+        <copy todir="bin/test/resources" includeemptydirs="false">
+            <fileset dir="src/test/api/resources" />
         </copy>
     </target>
 
@@ -407,12 +408,12 @@
             </assertions>
 
             <jvmarg line="${hy.test.vmargs}" />
-            <jvmarg value="-Xbootclasspath/a:${hy.awt.bin.test.boot}${path.separator}${basedir}/../../${junit.jar}"/>
+            <jvmarg value="-Xbootclasspath/a:bin/test/boot${path.separator}${basedir}/../../${junit.jar}"/>
 
             <formatter type="xml" />
 
             <batchtest todir="${tests.output}" haltonfailure="no">
-                <fileset dir="${hy.awt.src.test.impl.boot}">
+                <fileset dir="src/test/impl/boot">
                     <include name="${converted.tc}" if="test.case" />
                     <include name="**/*Test.java" unless="test.case" />
                     <excludesfile name="${awt.exclude.file}" unless="test.case" />
@@ -438,7 +439,7 @@
 
             <jvmarg line="${hy.test.vmargs}" />
             <classpath>
-                <pathelement path="${hy.awt.bin.test.classes}" />
+                <pathelement path="bin/test/classes" />
                 <fileset dir="${hy.hdk}/build/test/">
                     <include name="*.jar" />
                 </fileset>
@@ -447,7 +448,7 @@
             <formatter type="xml" />
 
             <batchtest todir="${tests.output}">
-                <fileset dir="${hy.awt.src.test.api.java}">
+                <fileset dir="src/test/api/java">
                     <include name="${converted.tc}" if="test.case" />
                     <include name="**/*Test.java" unless="test.case" />
                     <exclude name="**/*Headless*Test.java" unless="test.case" />
@@ -479,12 +480,12 @@
 
             <jvmarg line="${hy.test.vmargs}" />
             <jvmarg value="-Djava.awt.headless=true"/>
-            <jvmarg value="-Xbootclasspath/a:${hy.awt.bin.test.boot}${path.separator}${basedir}/../../${junit.jar}"/>
+            <jvmarg value="-Xbootclasspath/a:bin/test/boot${path.separator}${basedir}/../../${junit.jar}"/>
 
             <formatter type="xml" />
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
-                <fileset dir="${hy.awt.src.test.impl.boot}">
+                <fileset dir="src/test/impl/boot">
                     <include name="${converted.tc}" if="test.case" />
                     <include name="**/*Headless*Test.java" unless="test.case" />
                     <excludesfile name="${awt.exclude.file}" unless="test.case"/>

Modified: harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/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.beans.src.main.java}" />
-            <present targetdir="${hy.beans.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -73,11 +74,11 @@
     <target name="compile-java">
         <echo message="Compiling BEANS classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.beans.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,9 +96,9 @@
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.beans.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
@@ -105,7 +106,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/beans.jar"
-             manifest="${hy.beans}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -116,7 +117,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/beans-src.jar">
-            <fileset dir="${hy.beans.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -126,13 +127,13 @@
     </target>
 
     <target name="compile-tests" depends="copy-test-resources" > 
-        <mkdir dir="${hy.beans.bin.internal}" />
-        <mkdir dir="${hy.beans.bin.test}" />
-        <mkdir dir="${hy.beans.bin.test.support}" />
+        <mkdir dir="bin/test-internal" />
+        <mkdir dir="bin/test" />
+        <mkdir dir="bin/test_support" />
         
         <echo message="Compiling support classes for BEANS tests" />
-        <javac srcdir="${hy.beans.src.test.support}"
-               destdir="${hy.beans.bin.test.support}"
+        <javac srcdir="src/test/support/java"
+               destdir="bin/test_support"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -151,8 +152,8 @@
         </javac>
 
         <echo message="Compiling internal BEANS tests" />
-        <javac srcdir="${hy.beans.src.test.internal}"
-               destdir="${hy.beans.bin.internal}"
+        <javac srcdir="src/test/java-internal"
+               destdir="bin/test-internal"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -168,13 +169,13 @@
                 </fileset>
             </bootclasspath>
             <classpath location="../../build/tests" />
-            <classpath location="${hy.beans.bin.test.support}" />
+            <classpath location="bin/test_support" />
             <classpath location="${hy.hdk}/build/test/support.jar" />
         </javac>
 
         <echo message="Compiling BEANS tests" />
-        <javac srcdir="${hy.beans.src.test.java}"
-               destdir="${hy.beans.bin.test}"
+        <javac srcdir="src/test/java"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -190,7 +191,7 @@
                 </fileset>
             </bootclasspath>
             <classpath location="../../build/tests" />
-            <classpath location="${hy.beans.bin.test.support}" />
+            <classpath location="bin/test_support" />
             <classpath location="${hy.hdk}/build/test/support.jar" />
         </javac>
     </target>
@@ -224,12 +225,12 @@
 
             <jvmarg line="${hy.test.vmargs}" />
 
-            <jvmarg value="-Xbootclasspath/a:${hy.beans.bin.internal}${path.separator}../../${junit.jar}"/>         
+            <jvmarg value="-Xbootclasspath/a:bin/test-internal${path.separator}../../${junit.jar}"/>         
             
             <classpath>
-                <pathelement path="${hy.beans.bin.test}"/>
-                <pathelement path="${hy.beans.bin.test.support}"/>
-                <pathelement path="${hy.beans.src.test.resources}"/>
+                <pathelement path="bin/test"/>
+                <pathelement path="bin/test_support"/>
+                <pathelement path="src/test/resources"/>
             </classpath>
             <classpath location="../../build/tests" />
 
@@ -237,7 +238,7 @@
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.beans.src.test.internal}">
+                <fileset dir="src/test/java-internal">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->
@@ -266,10 +267,10 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.beans.bin.test}"/>
-                <pathelement path="${hy.beans.bin.test.support}"/>
-                <pathelement path="${hy.beans.src.test.resources}"/>
-                <pathelement path="${hy.beans}"/>
+                <pathelement path="bin/test"/>
+                <pathelement path="bin/test_support"/>
+                <pathelement path="src/test/resources"/>
+                <pathelement path="."/>
             </classpath>
             <classpath location="../../build/tests" />
             <classpath location="${hy.hdk}/build/test/support.jar" />
@@ -278,7 +279,7 @@
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.beans.src.test.java}">
+                <fileset dir="src/test/java">
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->
@@ -302,12 +303,12 @@
     </target>
 
     <target name="copy-test-resources">
-        <mkdir dir="${hy.beans.bin.test}" />
-        <copy todir="${hy.beans.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.beans.src.test.resources}">
+        <mkdir dir="bin/test" />
+        <copy todir="bin/test" includeemptydirs="false">
+            <fileset dir="src/test/resources">
                 <exclude name="**/*.java" />
             </fileset>
-        	<fileset dir="${hy.beans.src.test.support}">
+        	<fileset dir="src/test/support/java">
                 <exclude name="**/*.java" />
         	</fileset>
         </copy>  	

Modified: harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/concurrent/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/concurrent/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.concurrent.src.main.java}" />
-            <present targetdir="${hy.concurrent.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -73,11 +74,11 @@
     <target name="compile-java">
         <echo message="Compiling CONCURRENT classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.concurrent.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}" 
@@ -96,7 +97,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/concurrent.jar"
-             manifest="${hy.concurrent}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -107,7 +108,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/concurrent-src.jar">
-            <fileset dir="${hy.concurrent.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -119,11 +120,11 @@
     <target name="compile-tests">
         <echo message="Compiling CONCURRENT tests" />
 
-        <mkdir dir="${hy.concurrent.bin.test}" />
+        <mkdir dir="bin/test" />
 
         <javac sourcepath=""
-               srcdir="${hy.concurrent.src.test.java}"
-               destdir="${hy.concurrent.bin.test}"
+               srcdir="src/test/java"
+               destdir="bin/test"
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
                source="${hy.javac.source}" 
@@ -167,14 +168,14 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.concurrent.bin.test}"/>
+                <pathelement path="bin/test"/>
             </classpath>
             <classpath location="${hy.hdk}/build/test/support.jar" />
 
             <formatter type="xml" />
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
-                <fileset dir="${hy.concurrent.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/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/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.crypto.src.main.java}" />
-            <present targetdir="${hy.crypto.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.crypto.packaging.jarname}.jar" />
-        <delete file="${hy.jdk}/jre/lib/boot/${hy.crypto.packaging.jarname}-src.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/crypto.jar" />
+        <delete file="${hy.jdk}/jre/lib/boot/crypto-src.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -73,11 +74,11 @@
     <target name="compile-java">
         <echo message="Compiling CRYPTO classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.crypto.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.crypto.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.crypto.packaging.jarname}.jar"
-             manifest="${hy.crypto}/META-INF/MANIFEST.MF"
+        <jar destfile="${hy.jdk}/jre/lib/boot/crypto.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.crypto.packaging.jarname}-src.jar">
-            <fileset dir="${hy.crypto.src.main.java}" />
+        <jar destfile="${hy.jdk}/jre/lib/boot/crypto-src.jar">
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -130,10 +131,10 @@
         <compile-tests description="test support files" destdir="../../build/tests">
             <javac-elements>
                 <src>
-                    <pathelement location="${hy.crypto.src.test}/support/common/java"/>
+                    <pathelement location="src/test/support/common/java"/>
 
                     <!-- FIXME: CRYPTO tests should not reach into security module code -->
-                    <pathelement location="${hy.crypto}/../security/src/test/support/common/java"/>
+                    <pathelement location="./../security/src/test/support/common/java"/>
                 </src>
 
                 <include name="**/*.java" />
@@ -141,30 +142,30 @@
         </compile-tests>
 
 
-        <compile-tests description="api tests" destdir="${hy.crypto.bin.test}/api">
+        <compile-tests description="api tests" destdir="bin/test/api">
             <javac-elements>
-                <src path="${hy.crypto.src.test}/api/java"/>
+                <src path="src/test/api/java"/>
                 <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="api injected tests" destdir="${hy.crypto.bin.test}/api.injected">
+        <compile-tests description="api injected tests" destdir="bin/test/api.injected">
             <javac-elements>
-                <src path="${hy.crypto.src.test}/api/java.injected"/>
+                <src path="src/test/api/java.injected"/>
                 <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="impl injected tests" destdir="${hy.crypto.bin.test}/impl.injected">
+        <compile-tests description="impl injected tests" destdir="bin/test/impl.injected">
             <javac-elements>
-                <src path="${hy.crypto.src.test}/impl/java.injected"/>
+                <src path="src/test/impl/java.injected"/>
                 <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="impl tests" destdir="${hy.crypto.bin.test}/impl">
+        <compile-tests description="impl tests" destdir="bin/test/impl">
             <javac-elements>
-                <src path="${hy.crypto.src.test}/impl/java"/>
+                <src path="src/test/impl/java"/>
                 <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
@@ -183,13 +184,13 @@
             <junit-elements>
 
                 <classpath>
-                    <pathelement path="${hy.crypto.bin.test}/api"/>
+                    <pathelement path="bin/test/api"/>
                     <pathelement path="${hy.hdk}/build/test/support.jar" />
                     <pathelement path="../../build/tests" />
                 </classpath>
 
                 <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="${hy.crypto.src.test}/api/java">
+                    <fileset dir="src/test/api/java">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
                         <!-- unless ${test.case} -->
@@ -204,10 +205,10 @@
         <run-tests description="api.injected tests">
             <junit-elements>
                 <!-- to pick up junit.jar               -->
-                <jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}/api.injected${path.separator}../../${junit.jar}${path.separator}../../build/tests${path.separator}${hy.hdk}/build/test/support.jar"/>
+                <jvmarg value="-Xbootclasspath/a:bin/test/api.injected${path.separator}../../${junit.jar}${path.separator}../../build/tests${path.separator}${hy.hdk}/build/test/support.jar"/>
 
                 <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="${hy.crypto.src.test}/api/java.injected">
+                    <fileset dir="src/test/api/java.injected">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
                         <!-- unless ${test.case} -->
@@ -227,12 +228,12 @@
         <run-tests description="impl tests">
             <junit-elements>
                 <classpath>
-                    <pathelement path="${hy.crypto.bin.test}/impl"/>
+                    <pathelement path="bin/test/impl"/>
                     <pathelement path="${hy.hdk}/build/test/support.jar" />
                 </classpath>
                 
                 <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="${hy.crypto.src.test}/impl/java">
+                    <fileset dir="src/test/impl/java">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
                         <!-- unless ${test.case} -->
@@ -247,10 +248,10 @@
         <run-tests description="impl injected tests">
             <junit-elements>
                 <!-- to pick up junit.jar               -->
-                <jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}/impl.injected${path.separator}../../${junit.jar}${path.separator}../../build/tests"/>
+                <jvmarg value="-Xbootclasspath/a:bin/test/impl.injected${path.separator}../../${junit.jar}${path.separator}../../build/tests"/>
 
                 <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="${hy.crypto.src.test}/impl/java.injected">
+                    <fileset dir="src/test/impl/java.injected">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
                         <!-- unless ${test.case} -->
@@ -336,7 +337,7 @@
                 <junit-elements />
 
                 <classpath>
-                    <pathelement path="${hy.crypto.src.test.resources}"/>
+                    <pathelement path="src/test/resources"/>
                     <pathelement path="../../build/tests" />
                 </classpath>
 

Modified: harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?rev=793176&r1=793175&r2=793176&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/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.imageio.src.main.java}" />
-            <present targetdir="${hy.imageio.src.main.java}">
+            <present targetdir="src/main/java" />
+            <present targetdir="src/main/java">
                 <mapper type="regexp"
                         from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
                         to="\1.java"/>
@@ -74,20 +75,20 @@
     </target>
 
     <target name="clean-native">
-        <make dir="${hy.imageio.src.main.native}/jpegencoder/${hy.os.family}"
+        <make dir="src/main/native/jpegencoder/${hy.os.family}"
               target="clean" />
-        <make dir="${hy.imageio.src.main.native}/pngencoder/${hy.os.family}"
+        <make dir="src/main/native/pngencoder/${hy.os.family}"
               target="clean" />
     </target>
 
     <target name="compile-java">
         <echo message="Compiling ImageIO classes" />
 
-        <mkdir dir="${hy.build}" />
+        <mkdir dir="../../build/classes" />
 
         <javac sourcepath=""
-               srcdir="${hy.imageio.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}" 
@@ -106,10 +107,10 @@
     
     <target name="build-native" depends="build-native-all" />
     <target name="build-native-all" >
-        <make dir="${hy.imageio.src.main.native}/jpegencoder/${hy.os.family}" />
+        <make dir="src/main/native/jpegencoder/${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.imageio.src.main.native}/jpegencoder/">
+            <fileset dir="src/main/native/jpegencoder/">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
@@ -117,15 +118,15 @@
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.imageio.src.main.native}/jpegencoder/${hy.os.family}">
+            <fileset dir="src/main/native/jpegencoder/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
 
-        <make dir="${hy.imageio.src.main.native}/pngencoder/${hy.os.family}" />
+        <make dir="src/main/native/pngencoder/${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.imageio.src.main.native}/pngencoder/">
+            <fileset dir="src/main/native/pngencoder/">
                 <include name="*${shlib.suffix}*"/>
                 <include name="*${progdb.suffix}*" if="is.windows" />
                 <exclude name="*${manifest.suffix}"/>
@@ -133,16 +134,16 @@
         </copy>
         <!-- Copy link exports file on z/OS -->
         <copy todir="${hy.hdk}/lib" overwrite="yes">
-            <fileset dir="${hy.imageio.src.main.native}/pngencoder/${hy.os.family}">
+            <fileset dir="src/main/native/pngencoder/${hy.os.family}">
                 <include name="*${linklib.suffix}" if="is.zos" />
             </fileset>
         </copy>
     </target>
 
     <target name="copy-resources">
-        <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.imageio.src.main.java}">
+        <mkdir dir="../../build/classes" />
+        <copy todir="../../build/classes" includeemptydirs="false">
+            <fileset dir="src/main/java">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
@@ -150,7 +151,7 @@
 
     <target name="build-jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/imageio.jar"
-             manifest="${hy.imageio}/META-INF/MANIFEST.MF"
+             manifest="./META-INF/MANIFEST.MF"
              compress="${hy.jar.compress}">
             <fileset refid="classes" />
             <manifest>
@@ -161,7 +162,7 @@
         </jar>
 
         <jar destfile="${hy.jdk}/jre/lib/boot/imageio-src.jar">
-            <fileset dir="${hy.imageio.src.main.java}" />
+            <fileset dir="src/main/java" />
             <manifest>
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
@@ -173,10 +174,10 @@
     <target name="compile-tests" depends="copy-test-resources">
         <echo message="Compiling ImageIO tests" />
 
-        <mkdir dir="${hy.imageio.bin.test}" />
+        <mkdir dir="bin/test" />
 
-        <javac srcdir="${hy.imageio.src.test.java}"
-               destdir="${hy.imageio.bin.test}"
+        <javac srcdir="src/test/java"
+               destdir="bin/test"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -218,14 +219,14 @@
             <jvmarg line="${hy.test.vmargs}" />
 
             <classpath>
-                <pathelement path="${hy.imageio.bin.test}"/>
+                <pathelement path="bin/test"/>
             </classpath>
 
             <formatter type="xml" />
 
             <batchtest todir="${tests.output}" haltonfailure="no" >
 
-                <fileset dir="${hy.imageio.src.test.java}" >
+                <fileset dir="src/test/java" >
                     <!-- if ${test.case}     -->
                     <include name="${converted.tc}" if="test.case" />
                     <!-- unless ${test.case} -->
@@ -249,9 +250,9 @@
     </target>
 
     <target name="copy-test-resources">
-        <mkdir dir="${hy.imageio.bin.test}/resources" />
-        <copy todir="${hy.imageio.bin.test}/resources" includeemptydirs="false">
-            <fileset dir="${hy.imageio.src.test.resources}">
+        <mkdir dir="bin/test/resources" />
+        <copy todir="bin/test/resources" includeemptydirs="false">
+            <fileset dir="src/test/resources">
                 <exclude name="**/*.java" />
             </fileset>
         </copy>



Mime
View raw message