harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r949289 - in /harmony/enhanced/java/trunk/jdktools/modules: jdktools/build.xml jpda/build.xml jretools/build.xml
Date Fri, 28 May 2010 20:49:23 GMT
Author: hindessm
Date: Fri May 28 20:49:23 2010
New Revision: 949289

URL: http://svn.apache.org/viewvc?rev=949289&view=rev
Log:
Fix dependency checking so fresh checkout of federated build with
-Dvm.dir=ibm-v4 works.

Modified:
    harmony/enhanced/java/trunk/jdktools/modules/jdktools/build.xml
    harmony/enhanced/java/trunk/jdktools/modules/jpda/build.xml
    harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml

Modified: harmony/enhanced/java/trunk/jdktools/modules/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jdktools/build.xml?rev=949289&r1=949288&r2=949289&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jdktools/build.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jdktools/build.xml Fri May 28 20:49:23 2010
@@ -41,6 +41,9 @@
             <fileset file="${bcel.jar}" />
             <fileset dir="depends/bcel" />
         </copy>
+        <check-one-file dest="${junit.jar}" src="${junit.jar.url}"/>
+        <check-one-file dest="${hamcrest-library.jar}"
+                        src="${hamcrest-library.jar.url}"/>
     </target>
     
     <target name="fetch-depends" unless="skip.java.build">
@@ -51,6 +54,8 @@
         <mkdir dir="${bcel.dir}" />
         <download-one-file dest="${bcel.jar}" 
                            src="${bcel.url}" md5="${bcel.md5}"/>
+        <fetch dep="junit.jar"/>
+        <fetch dep="hamcrest-library.jar"/>
     </target>
 
     <target name="build" unless="skip.java.build"

Modified: harmony/enhanced/java/trunk/jdktools/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jpda/build.xml?rev=949289&r1=949288&r2=949289&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jpda/build.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jpda/build.xml Fri May 28 20:49:23 2010
@@ -34,12 +34,17 @@
         <check-one-file src="${jdt.jdimodel.jar.url}"
                         dest="${jdt.jdimodel.jar}" />
         <check-one-file src="${icu.url}" dest="${icu.jar}" />
+        <check-one-file dest="${junit.jar}" src="${junit.jar.url}"/>
+        <check-one-file dest="${hamcrest-library.jar}"
+                        src="${hamcrest-library.jar.url}"/>
     </target>
 
     <target name="fetch-depends" unless="skip.java.build">
         <fetch dep="jdt.jdi.jar"/>
         <fetch dep="jdt.jdimodel.jar"/>
         <fetch dep="icu"/>
+        <fetch dep="junit.jar"/>
+        <fetch dep="hamcrest-library.jar"/>
     </target>
 
     <target name="build"

Modified: harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml?rev=949289&r1=949288&r2=949289&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml (original)
+++ harmony/enhanced/java/trunk/jdktools/modules/jretools/build.xml Fri May 28 20:49:23 2010
@@ -28,6 +28,17 @@
     <property file="../../make/depends.properties" />
     <property file="${common.resources}/make/depends.properties" />
     
+    <target name="check-depends" unless="skip.test.build">
+        <check-one-file dest="${junit.jar}" src="${junit.jar.url}"/>
+        <check-one-file dest="${hamcrest-library.jar}"
+                        src="${hamcrest-library.jar.url}"/>
+    </target>
+
+    <target name="fetch-depends" unless="skip.test.build">
+        <fetch dep="junit.jar"/>
+        <fetch dep="hamcrest-library.jar"/>
+    </target>
+    
     <target name="build" depends="-build-jar,-test-jar" />
 
     <target name="test" depends="-test-module">



Mime
View raw message