harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r938692 - in /harmony/enhanced/java/branches/mrh: build.xml drlvm/make/depends.properties jdktools/modules/jdktools/build.xml
Date Tue, 27 Apr 2010 21:53:36 GMT
Author: hindessm
Date: Tue Apr 27 21:53:35 2010
New Revision: 938692

URL: http://svn.apache.org/viewvc?rev=938692&view=rev
Log:
Fix icu fetch/check depends mechanism.
Add federated check-depends target for sanity checking.

Modified:
    harmony/enhanced/java/branches/mrh/build.xml
    harmony/enhanced/java/branches/mrh/drlvm/make/depends.properties
    harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml

Modified: harmony/enhanced/java/branches/mrh/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/build.xml?rev=938692&r1=938691&r2=938692&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/build.xml Tue Apr 27 21:53:35 2010
@@ -168,6 +168,13 @@ Usage:
                  fetch-commonresources,
                  fetch-jdktools-libs"/>
 
+    <target name="check-depends"
+        description="Checks dependencies."
+        depends="check-classlib-libs,
+                 check-vm-libs,
+                 check-commonresources,
+                 check-jdktools-libs"/>
+
     <target name="bundle-hdk-tgz" depends="init" if="is.unix">
 
         <!-- create the tar file and then md5 checksum using harmony-hdk-rev as the root,
@@ -429,7 +436,17 @@ Usage:
     </target>
 
     <target name="fetch-classlib-libs">
-        <ant antfile="classlib/build.xml" target="fetch-depends" inheritall="false" >
+        <ant antfile="classlib/build.xml" target="fetch-depends"
+             inheritall="false" >
+            <propertyset refid="required.props" />
+            <property name="svn.info" value="${harmony.long.version}"/>
+            <property name="svn.revision" value="${harmony.version}"/>
+        </ant>
+    </target>
+
+    <target name="check-classlib-libs">
+        <ant antfile="classlib/build.xml" target="check-depends"
+             inheritall="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
@@ -487,6 +504,15 @@ Usage:
         </ant>
     </target>
 
+    <target name="check-vm-libs">
+        <ant antfile="${vm.dir.loc}/build.xml"
+             target="check-depends" inheritall="false" >
+            <propertyset refid="required.props" />
+            <property name="svn.info" value="${harmony.long.version}"/>
+            <property name="svn.revision" value="${harmony.version}"/>
+        </ant>
+    </target>
+
     <target name="clean-vm">
         <ant antfile="${vm.dir.loc}/build.xml"
              target="clean" inheritall="false" >
@@ -513,7 +539,17 @@ Usage:
     </target>
 
     <target name="fetch-commonresources">
-        <ant antfile="common_resources/build.xml" target="fetch-depends" inheritall="false"
>
+        <ant antfile="common_resources/build.xml" target="fetch-depends"
+             inheritall="false" >
+            <propertyset refid="required.props" />
+            <property name="svn.info" value="${harmony.long.version}"/>
+            <property name="svn.revision" value="${harmony.version}"/>
+        </ant>
+    </target>
+
+    <target name="check-commonresources">
+        <ant antfile="common_resources/build.xml" target="check-depends"
+             inheritall="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
@@ -540,7 +576,16 @@ Usage:
     </target>
 
     <target name="fetch-jdktools-libs">
-        <ant antfile="jdktools/build.xml" target="fetch-depends" inheritall="false" >
+        <ant antfile="jdktools/build.xml" target="fetch-depends"
+             inheritall="false" >
+            <propertyset refid="required.props" />
+            <property name="common.resources" location="common_resources" />
+        </ant>
+    </target>
+
+    <target name="check-jdktools-libs">
+        <ant antfile="jdktools/build.xml" target="check-depends"
+             inheritall="false" >
             <propertyset refid="required.props" />
             <property name="common.resources" location="common_resources" />
         </ant>

Modified: harmony/enhanced/java/branches/mrh/drlvm/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/drlvm/make/depends.properties?rev=938692&r1=938691&r2=938692&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/drlvm/make/depends.properties (original)
+++ harmony/enhanced/java/branches/mrh/drlvm/make/depends.properties Tue Apr 27 21:53:35 2010
@@ -44,7 +44,7 @@ zlib.md5@x86_64@=7397278304667d4e68e9af0
 # Ant-contrib, version 0.6 or above
 # http://sourceforge.net/project/showfiles.php?group_id=36177
 ant-contrib=${depends.jars}/ant-contrib-1.0b3/ant-contrib.zip
-ant-contrib.jar=${depends.jars}/ant-contrib-1.0b3/ant-contrib.jar
+ant-contrib.jar=${depends.jars}/ant-contrib-1.0b3/ant-contrib-1.0b3.jar
 ant-contrib.unzip.path=ant-contrib/ant-contrib-1.0b3.jar
 ant-contrib.url=http://downloads.sourceforge.net/project/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip
 ant-contrib.md5=c5a75fc28cbc52f09bd43b5506978601

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml?rev=938692&r1=938691&r2=938692&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/build.xml Tue Apr 27 21:53:35
2010
@@ -33,7 +33,7 @@
                         dest="${jdt.jdi.jar}" />
         <check-one-file src="${jdt.jdimodel.jar.url}"
                         dest="${jdt.jdimodel.jar}" />
-        <check-one-file src="${icu.url}" dest="${icu.zip}" />
+        <check-one-file src="${icu.url}" dest="${icu.jar}" />
         <check-one-file src="${ecj.jar.url}" dest="${ecj.jar}" />
         <check-one-file src="${bcel.jar}" dest="${bcel.jar}" />
         <copy todir="${hy.hdk}/jdk/jre/lib/boot">
@@ -47,9 +47,7 @@
     <target name="fetch-depends">
         <fetch dep="jdt.jdi.jar"/>
         <fetch dep="jdt.jdimodel.jar"/>
-        <mkdir dir="${icu.dir}" />
-        <download-one-file dest="${icu.zip}" 
-                           src="${icu.url}" md5="${icu.md5}"/>
+        <fetch dep="icu"/>
         <fetch dep="ecj.jar"/>
         <mkdir dir="${bcel.dir}" />
         <download-one-file dest="${bcel.jar}" 



Mime
View raw message