harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r794907 - /harmony/enhanced/classlib/trunk/modules/beans/build.xml
Date Thu, 16 Jul 2009 23:48:04 GMT
Author: hindessm
Date: Thu Jul 16 23:48:03 2009
New Revision: 794907

URL: http://svn.apache.org/viewvc?rev=794907&view=rev
Log:
Convert beans module to use compile-tests macro.

Modified:
    harmony/enhanced/classlib/trunk/modules/beans/build.xml

Modified: harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/build.xml?rev=794907&r1=794906&r2=794907&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/build.xml Thu Jul 16 23:48:03 2009
@@ -127,73 +127,32 @@
     </target>
 
     <target name="compile-tests" depends="copy-test-resources" > 
-        <mkdir dir="bin/test-internal" />
-        <mkdir dir="bin/test" />
-        <mkdir dir="bin/test_support" />
-        
-        <echo message="Compiling support classes for BEANS tests" />
-        <javac srcdir="src/test/support/java"
-               destdir="bin/test_support"
-               sourcepath=""
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-            <classpath location="../../build/tests" />
-        </javac>
-
-        <echo message="Compiling internal BEANS tests" />
-        <javac srcdir="src/test/java-internal"
-               destdir="bin/test-internal"
-               sourcepath=""
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-            <classpath location="../../build/tests" />
-            <classpath location="bin/test_support" />
-            <classpath location="${hy.hdk}/build/test/support.jar" />
-        </javac>
-
-        <echo message="Compiling BEANS tests" />
-        <javac srcdir="src/test/java"
-               destdir="bin/test"
-               sourcepath=""
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <compilerarg line="${build.compilerarg}" />
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-            <classpath location="../../build/tests" />
-            <classpath location="bin/test_support" />
-            <classpath location="${hy.hdk}/build/test/support.jar" />
-        </javac>
+        <compile-tests description="beans test support"
+                       destdir="bin/test_support">
+            <javac-elements>
+                <src>
+                    <pathelement location="src/test/support/java" />
+                </src>
+            </javac-elements>
+        </compile-tests>
+        <compile-tests description="beans internal tests"
+                       destdir="bin/test-internal">
+            <javac-elements>
+                <src>
+                    <pathelement location="src/test/java-internal" />
+                </src>
+                <classpath location="bin/test_support" />
+            </javac-elements>
+        </compile-tests>
+        <compile-tests description="beans api tests"
+                       destdir="bin/test">
+            <javac-elements>
+                <src>
+                    <pathelement location="src/test/java" />
+                </src>
+                <classpath location="bin/test_support" />
+            </javac-elements>
+        </compile-tests>
     </target>
 
     <target name="prepare-exclude">



Mime
View raw message