harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r794142 - in /harmony/enhanced/classlib/trunk: make/properties.xml modules/crypto/build.xml modules/luni/build.xml modules/rmi/build.xml modules/security/build.xml modules/x-net/build.xml
Date Wed, 15 Jul 2009 05:49:01 GMT
Author: hindessm
Date: Wed Jul 15 05:49:00 2009
New Revision: 794142

URL: http://svn.apache.org/viewvc?rev=794142&view=rev
Log:
Factor out compile-tests macrodefs to properties.xml

Modified:
    harmony/enhanced/classlib/trunk/make/properties.xml
    harmony/enhanced/classlib/trunk/modules/crypto/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/rmi/build.xml
    harmony/enhanced/classlib/trunk/modules/security/build.xml
    harmony/enhanced/classlib/trunk/modules/x-net/build.xml

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=794142&r1=794141&r2=794142&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Wed Jul 15 05:49:00 2009
@@ -622,6 +622,40 @@
        </javac>
    </presetdef>
 
+    <macrodef name="compile-tests">
+        <attribute name="description" default="" />
+        <attribute name="destdir"  />
+        <element name="javac-elements" />
+        <sequential>
+            <echo message="Compiling tests for @{description}" />
+            
+            <mkdir dir="@{destdir}" />
+            
+            <javac destdir="@{destdir}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+                <javac-elements />
+
+                <compilerarg line="${build.compilerarg}" />
+
+                <bootclasspath>
+                    <fileset dir="${hy.jdk}/jre/lib/boot">
+                        <include name="**/*.jar" />
+                    </fileset>
+                </bootclasspath>
+
+                <!-- TOFIX: this next line breaks modularity a bit -->
+                <classpath location="../../build/tests" />
+
+                <classpath location="${hy.hdk}/build/test/support.jar" />
+            </javac>
+        </sequential>
+    </macrodef>
+
     <macrodef name="run-hdk-tests">
         <attribute name="module" />
         <attribute name="jar" />

Modified: harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?rev=794142&r1=794141&r2=794142&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/build.xml Wed Jul 15 05:49:00 2009
@@ -128,7 +128,8 @@
 
     <target name="compile-tests">
 
-        <compile-tests description="test support files" destdir="../../build/tests">
+        <compile-tests description="crypto test support files"
+                       destdir="../../build/tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/support/common/java"/>
@@ -142,28 +143,30 @@
         </compile-tests>
 
 
-        <compile-tests description="api tests" destdir="bin/test/api">
+        <compile-tests description="crypto api tests" destdir="bin/test/api">
             <javac-elements>
                 <src path="src/test/api/java"/>
                 <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="api injected tests" destdir="bin/test/api.injected">
+        <compile-tests description="crypto api injected tests"
+                       destdir="bin/test/api.injected">
             <javac-elements>
                 <src path="src/test/api/java.injected"/>
                 <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="impl injected tests" destdir="bin/test/impl.injected">
+        <compile-tests description="crypto impl injected tests"
+                       destdir="bin/test/impl.injected">
             <javac-elements>
                 <src path="src/test/impl/java.injected"/>
                 <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="impl tests" destdir="bin/test/impl">
+        <compile-tests description="crypto impl tests" destdir="bin/test/impl">
             <javac-elements>
                 <src path="src/test/impl/java"/>
                 <include name="**/*Test.java" />
@@ -277,37 +280,6 @@
             append="true">crypto${line.separator}</echo>
     </target>
     
-    <macrodef name="compile-tests">
-        <attribute name="description" default="" />
-        <attribute name="destdir"  />
-        <element name="javac-elements" />
-        <sequential>
-            <echo message="Compiling CRYPTO @{description}" />
-            
-            <mkdir dir="@{destdir}" />
-            
-            <javac destdir="@{destdir}"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-                <javac-elements />
-
-                <compilerarg line="${build.compilerarg}" />
-
-                <bootclasspath>
-                    <fileset dir="${hy.jdk}/jre/lib/boot">
-                        <include name="**/*.jar" />
-                    </fileset>
-                </bootclasspath>
-                <classpath location="../../build/tests" />
-                <classpath location="${hy.hdk}/build/test/support.jar" />
-            </javac>
-        </sequential>
-    </macrodef>
-    
     <macrodef name="run-tests">
         <attribute name="description" default="" />
         <element name="junit-elements" />

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=794142&r1=794141&r2=794142&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Wed Jul 15 05:49:00 2009
@@ -355,7 +355,7 @@
     <target name="compile-tests" depends="compile-tests-api, compile-tests-impl" />
 
     <target name="compile-tests-api" depends="copy-test-resources">
-        <compile-tests description="JUnit API Tests" destdir="bin/test/api">
+        <compile-tests description="luni api tests" destdir="bin/test/api">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/common" />
@@ -367,7 +367,7 @@
     </target>
 
     <target name="compile-tests-impl" depends="copy-test-resources">
-         <compile-tests description="JUnit Impl tests" destdir="bin/test/impl">
+         <compile-tests description="luni impl tests" destdir="bin/test/impl">
             <javac-elements>
                 <src>
                    <pathelement location="src/test/impl/common" />
@@ -482,37 +482,6 @@
         </copy>
     </target>
 
-    <macrodef name="compile-tests">
-        <attribute name="description" default="" />
-        <attribute name="destdir"  />
-        <element name="javac-elements" />
-        <sequential>
-            <echo message="Compiling LUNI @{description}" />
-
-            <mkdir dir="@{destdir}" />
-
-            <javac destdir="@{destdir}"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-                <javac-elements />
-
-                <compilerarg line="${build.compilerarg}" />
-
-                <bootclasspath>
-                    <fileset dir="${hy.jdk}/jre/lib/boot">
-                        <include name="**/*.jar" />
-                    </fileset>
-                </bootclasspath>
-                <classpath location="../../build/tests" />
-                <classpath location="${hy.hdk}/build/test/support.jar" />
-            </javac>
-        </sequential>
-    </macrodef>
-
     <macrodef name="run-tests">
         <attribute name="description" default="" />
         <element name="junit-elements" />

Modified: harmony/enhanced/classlib/trunk/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/rmi/build.xml?rev=794142&r1=794141&r2=794142&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/rmi/build.xml Wed Jul 15 05:49:00 2009
@@ -128,7 +128,7 @@
 
     <target name="compile-tests">
 
-        <compile-tests description="api tests" destdir="bin/test/api">
+        <compile-tests description="rmi api tests" destdir="bin/test/api">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/java"/>
@@ -184,38 +184,6 @@
             append="true">rmi${line.separator}</echo>
     </target>
 
-    <macrodef name="compile-tests">
-        <attribute name="description" default="" />
-        <attribute name="destdir"  />
-        <element name="javac-elements" />
-        <sequential>
-            <echo message="Compiling RMI @{description}" />
-
-            <mkdir dir="@{destdir}" />
-
-            <javac destdir="@{destdir}"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-                <javac-elements />
-
-                <compilerarg line="${build.compilerarg}" />
-
-                <bootclasspath>
-                    <fileset dir="${hy.jdk}/jre/lib/boot">
-                        <include name="**/*.jar" />
-                    </fileset>
-                </bootclasspath>
-                <classpath location="../../build/tests" />
-                <classpath location="${hy.hdk}/build/test/support.jar" />
-            </javac>
-        </sequential>
-    </macrodef>
-
-
     <macrodef name="run-tests">
         <attribute name="description" default="" />
         <element name="junit-elements" />

Modified: harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/build.xml?rev=794142&r1=794141&r2=794142&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Wed Jul 15 05:49:00 2009
@@ -240,7 +240,8 @@
 
     <target name="compile-tests">
 
-        <compile-tests description="test support files" destdir="bin/test/support">
+        <compile-tests description="security test support files"
+                       destdir="bin/test/support">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/support/common/java"/>
@@ -250,40 +251,47 @@
         </compile-tests>
 
 
-        <compile-tests description="api tests" destdir="bin/test/api">
+        <compile-tests description="security api tests" destdir="bin/test/api">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/api/java"/>
                 </src>
 
                 <include name="**/*Test.java" />
+                <classpath location="bin/test/support" />
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="api injected tests" destdir="bin/test/api.injected">
+        <compile-tests description="security api injected tests"
+                       destdir="bin/test/api.injected">
             <javac-elements>
                 <src path="src/test/api/java.injected"/>
                 <include name="**/*Test.java" />
+                <classpath location="bin/test/support" />
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="impl injected tests" destdir="bin/test/impl.injected">
+        <compile-tests description="security impl injected tests"
+                       destdir="bin/test/impl.injected">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/impl/java.injected"/>
                 </src>
 
                 <include name="**/*Test.java" />
+                <classpath location="bin/test/support" />
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="impl tests" destdir="bin/test/impl">
+        <compile-tests description="security impl tests"
+                       destdir="bin/test/impl">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/impl/java"/>
                 </src>
 
                 <include name="**/*Test.java" />
+                <classpath location="bin/test/support" />
             </javac-elements>
         </compile-tests>
     </target>
@@ -292,35 +300,4 @@
         <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
-    <macrodef name="compile-tests">
-        <attribute name="description" default="" />
-        <attribute name="destdir"  />
-        <element name="javac-elements" />
-        <sequential>
-            <echo message="Compiling SECURITY @{description}" />
-
-            <mkdir dir="@{destdir}" />
-
-            <javac destdir="@{destdir}"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-                <javac-elements />
-
-                <compilerarg line="${build.compilerarg}" />
-
-                <bootclasspath>
-                    <fileset dir="${hy.jdk}/jre/lib/boot">
-                        <include name="**/*.jar" />
-                    </fileset>
-                </bootclasspath>
-                <classpath location="bin/test/support" />
-                <classpath location="${hy.hdk}/build/test/support.jar" />
-            </javac>
-        </sequential>
-    </macrodef>
-
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?rev=794142&r1=794141&r2=794142&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/build.xml Wed Jul 15 05:49:00 2009
@@ -128,7 +128,8 @@
 
     <target name="compile-tests">
 
-        <compile-tests description="test support files" destdir="../../build/tests">
+        <compile-tests description="x-net test support files"
+                       destdir="../../build/tests">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/support/common/java" />
@@ -138,7 +139,7 @@
             </javac-elements>
         </compile-tests>
         
-        <compile-tests description="api tests" destdir="bin/test/api">
+        <compile-tests description="x-net api tests" destdir="bin/test/api">
             <javac-elements>
                 <src path="src/test/api/java"/>
                 <src path="src/test/java"/>
@@ -146,14 +147,15 @@
             </javac-elements>
         </compile-tests>
 
-        <compile-tests description="impl injected tests" destdir="bin/test/impl.injected">
+        <compile-tests description="x-net impl injected tests"
+                       destdir="bin/test/impl.injected">
             <javac-elements>
                 <src path="src/test/impl/java.injected"/>
                 <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
         
-        <compile-tests description="impl tests" destdir="bin/test/impl">
+        <compile-tests description="x-net impl tests" destdir="bin/test/impl">
             <javac-elements>
                 <src path="src/test/impl/java"/>
                 <include name="**/*Test.java" />
@@ -248,37 +250,6 @@
             append="true">x-net${line.separator}</echo>
     </target>
     
-    <macrodef name="compile-tests">
-        <attribute name="description" default="" />
-        <attribute name="destdir"  />
-        <element name="javac-elements" />
-        <sequential>
-            <echo message="Compiling X-NET @{description}" />
-            
-            <mkdir dir="@{destdir}" />
-            
-            <javac destdir="@{destdir}"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-                <javac-elements />
-
-                <compilerarg line="${build.compilerarg}" />
-
-                <bootclasspath>
-                    <fileset dir="${hy.jdk}/jre/lib/boot">
-                        <include name="**/*.jar" />
-                    </fileset>
-                </bootclasspath>
-                <classpath location="../../build/tests" />
-                <classpath location="${hy.hdk}/build/test/support.jar" />
-            </javac>
-        </sequential>
-    </macrodef>
-    
     <macrodef name="run-tests">
         <attribute name="description" default="" />
         <element name="junit-elements" />



Mime
View raw message