harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r925815 - in /harmony/enhanced/classlib/trunk: make/ modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/beans/ modules/concurrent/ modules/crypto/ modules/imageio/ modules/instrume...
Date Sun, 21 Mar 2010 16:29:59 GMT
Author: hindessm
Date: Sun Mar 21 16:29:58 2010
New Revision: 925815

URL: http://svn.apache.org/viewvc?rev=925815&view=rev
Log:
Add includeantruntime="false" to silence ant 1.8.0 warning and make our
builds more consistent by not relying on jars in ant lib.  (Still need
ecj in ant lib but might not need junit now?  At least not for compiling
anyway.)

Modified:
    harmony/enhanced/classlib/trunk/make/properties.xml
    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/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Sun Mar 21 16:29:58 2010
@@ -658,7 +658,8 @@ Alternatively, you can switch to another
                source="${hy.javac.source}"
                target="${hy.javac.target}"
                debug="${hy.javac.debug}"
-               debuglevel="${hy.javac.debuglevel}">
+               debuglevel="${hy.javac.debuglevel}"
+               includeantruntime="false">
             <compilerarg line="${build.compilerarg}" />
         </javac>
     </presetdef>
@@ -707,6 +708,12 @@ Alternatively, you can switch to another
             <echo message="Compiling @{description}" />
             
             <mkdir dir="@{destdir}" />
+
+            <mkdir dir="${hy.hdk}/build/test" />
+            <copy file="${junit.jar}"
+                  tofile="${hy.hdk}/build/test/junit.jar" />
+            <copy file="${hamcrest-library.jar}"
+                  tofile="${hy.hdk}/build/test/hamcrest-library.jar" />
             
             <hy.javac destdir="@{destdir}">
 
@@ -720,8 +727,11 @@ Alternatively, you can switch to another
                     </fileset>
                 </bootclasspath>
 
-                <classpath location="${hy.hdk}/build/test/support.jar" />
                 <classpath location="../../build/classes" />
+                <classpath location="${hy.hdk}/build/test/junit.jar" />
+                <classpath
+                     location="${hy.hdk}/build/test/hamcrest-library.jar" />
+                <classpath location="${hy.hdk}/build/test/support.jar" />
             </hy.javac>
         </sequential>
     </macrodef>

Modified: harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="accessibility" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -116,8 +117,6 @@
             </filterchain>
         </copy>
 
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/annotation/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="annotation" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -113,9 +114,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/applet/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/applet/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/applet/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/applet/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="applet" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -114,9 +115,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
- 
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
      </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="archive" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -214,9 +215,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/auth/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/build.xml Sun Mar 21 16:29:58 2010
@@ -22,6 +22,7 @@
 
     <property name="hy.module" value="auth" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -133,9 +134,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Sun Mar 21 16:29:58 2010
@@ -329,8 +329,6 @@ ${line.separator}For Fedora try: yum ins
         <copy todir="${tests.resources.hdk.dir}" includeemptydirs="false">
             <fileset dir="src/test/api/resources" />
         </copy>
-
-        <copy file="${junit.jar}" todir="${hy.hdk}/build/test" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/beans/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="beans" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -130,9 +131,6 @@
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests"> 

Modified: harmony/enhanced/classlib/trunk/modules/concurrent/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/concurrent/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/concurrent/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/concurrent/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="concurrent" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -112,9 +113,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
- 
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
       </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/crypto/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="crypto" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -131,9 +132,6 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/imageio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/imageio/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/imageio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/imageio/build.xml Sun Mar 21 16:29:58 2010
@@ -198,8 +198,6 @@ ${line.separator}For Fedora try: yum ins
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="${junit.jar}" tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/instrument/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/instrument/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/instrument/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/instrument/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="instrument" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -128,9 +129,6 @@
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
-        
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/jndi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/jndi/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/jndi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/jndi/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="jndi" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -119,9 +120,6 @@
                 <exclude name="**/*.java" />
             </fileset>
         </copy>
-        
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/build.xml Sun Mar 21 16:29:58
2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="lang-management" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -116,9 +117,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/logging/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/logging/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="logging" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -134,9 +135,6 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Sun Mar 21 16:29:58 2010
@@ -307,8 +307,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-        <copy file="${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
         <copy file="${jetty.jar}" todir="${hy.hdk}/build/test" />
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/math/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/math/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/math/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/math/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="math" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -113,9 +114,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-        
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/misc/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/misc/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/misc/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/misc/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="misc" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -121,9 +122,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="nio" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -131,9 +132,6 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="nio_char" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -137,9 +138,6 @@
             <fileset dir="src/test/resources" />
             <fileset dir="META-INF" />
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/build.xml Sun Mar 21 16:29:58 2010
@@ -159,13 +159,17 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="${junit.jar}" todir="${hy.hdk}/build/test" />
     </target>
 
     <target name="compile-tests"> 
         <mkdir dir="bin/test" />
 
+        <mkdir dir="${hy.hdk}/build/test" />
+        <copy file="${junit.jar}"
+              tofile="${hy.hdk}/build/test/junit.jar" />
+        <copy file="${hamcrest-library.jar}"
+              tofile="${hy.hdk}/build/test/hamcrest-library.jar" />
+
         <echo message="Compiling ${hy.module} tests" />
         <hy.javac srcdir="src/test/java"
                   destdir="bin/test"
@@ -180,6 +184,8 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
+            <classpath location="${hy.hdk}/build/test/junit.jar" />
+            <classpath location="${hy.hdk}/build/test/hamcrest-library.jar" />
         </hy.javac>
     </target>
 

Modified: harmony/enhanced/classlib/trunk/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="portlib" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />

Modified: harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/build.xml Sun Mar 21 16:29:58 2010
@@ -23,6 +23,7 @@
 
     <property name="hy.module" value="prefs" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -132,9 +133,6 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/print/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/print/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/print/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/print/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="print" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -139,9 +140,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/regex/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/regex/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/regex/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/regex/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="regex" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -117,9 +118,6 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/rmi/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/rmi/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/rmi/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/rmi/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="rmi" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -118,9 +119,6 @@
             <fileset dir="src/test/resources" />
         </copy>
         <copy file="make/all.policy" todir="${tests.resources.hdk.dir}" />
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="security" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -147,9 +148,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/sound/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sound/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sound/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sound/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="sound" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -113,9 +114,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="copy-test-resources">

Modified: harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/build.xml Sun Mar 21 16:29:58 2010
@@ -131,8 +131,6 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-        
-        <copy file="${junit.jar}" todir="${hy.hdk}/build/test" />
 
         <copy todir="${hy.hdk}/build/test/derby"> 
             <fileset dir="${derby.dir}">

Modified: harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/suncompat/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="suncompat" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -113,9 +114,6 @@
                 </tokenfilter>
             </filterchain>
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/swing/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/swing/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="swing" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <!-- List of private classes that cannot be mapped by above mappers -->
@@ -131,10 +132,6 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
-
     </target>
 
     <target name="compile-tests">

Modified: harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/text/build.xml?rev=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/text/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="text" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -117,9 +118,6 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">

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=925815&r1=925814&r2=925815&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/build.xml Sun Mar 21 16:29:58 2010
@@ -21,6 +21,7 @@
 
     <property name="hy.module" value="x-net" />
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
 
     <property file="../../make/depends.properties" />
@@ -129,9 +130,6 @@
         <copy todir="${tests.resources.hdk.dir}">
             <fileset dir="src/test/resources" />
         </copy>
-
-        <copy file="../../${junit.jar}"
-              tofile="${hy.hdk}/build/test/junit.jar" />
     </target>
 
     <target name="compile-tests">



Mime
View raw message