harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r785610 - in /harmony/enhanced/classlib/trunk: depends/manifests/asm-3.1/ make/ modules/pack200/ modules/pack200/depends/ modules/pack200/depends/manifests/ modules/pack200/depends/manifests/asm-3.1/ modules/pack200/make/
Date Wed, 17 Jun 2009 14:05:28 GMT
Author: hindessm
Date: Wed Jun 17 14:05:28 2009
New Revision: 785610

URL: http://svn.apache.org/viewvc?rev=785610&view=rev
Log:
Delegate asm dependency to pack200 module.

Added:
    harmony/enhanced/classlib/trunk/modules/pack200/depends/
    harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/
    harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1/   (props changed)
      - copied from r776240, harmony/enhanced/classlib/trunk/depends/manifests/asm-3.1/
    harmony/enhanced/classlib/trunk/modules/pack200/make/depends.properties   (with props)
Removed:
    harmony/enhanced/classlib/trunk/depends/manifests/asm-3.1/
Modified:
    harmony/enhanced/classlib/trunk/make/build-java.xml
    harmony/enhanced/classlib/trunk/make/depends.properties
    harmony/enhanced/classlib/trunk/make/depends.xml
    harmony/enhanced/classlib/trunk/modules/pack200/build.xml

Modified: harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=785610&r1=785609&r2=785610&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-java.xml Wed Jun 17 14:05:28 2009
@@ -201,7 +201,6 @@
         <!-- Copy across the boot dependency jars --><!-- TOFIX clean these? -->
         <copy todir="${hy.jdk}/jre/lib/boot">
             <fileset dir="${depends.jars}">
-                <patternset includes="asm-3.1/*.jar" />
                 <patternset includes="icu4j_4.0/*.jar" />
                 <patternset includes="xalan-j_2.7.0/xalan.jar" />
                 <patternset includes="xerces_2.9.1/*.jar" />

Modified: harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?rev=785610&r1=785609&r2=785610&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Wed Jun 17 14:05:28 2009
@@ -108,12 +108,6 @@
 bcprov.url=${depends.url}/jars/bcprov/${bcprov.ver}/bcprov.jar
 bcprov.md5=f7cd7e1dcfe4b84d820b3a0937dc13f4
 
-asm.ver=asm-3.1
-asm.dir=${depends.jars}/${asm.ver}
-asm.jar=${asm.dir}/asm-3.1.jar
-asm.url=http://download.forge.objectweb.org/asm/asm-3.1.jar
-asm.md5=4fbe0fd975ecc71480846ce272b483b0
-
 icu4j.ver=icu4j_4.0
 icu4j.dir=${depends.jars}/${icu4j.ver}
 icu4j.jar=${icu4j.dir}/icu4j-4_0.jar

Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=785610&r1=785609&r2=785610&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Wed Jun 17 14:05:28 2009
@@ -41,7 +41,6 @@
         <check-one-file src="${servlet-api.url}" dest="${servlet-api.jar}" />
         <check-one-file src="${dejavu-fonts.url}" dest="${dejavu-fonts.zip}" />
         <check-one-file src="${derby.url}" dest="${derby.jar}" />
-        <check-one-file src="${asm.url}" dest="${asm.jar}" />
         <check-one-file src="${icu4j.url}" dest="${icu4j.jar}" />
         <check-one-file src="${icu4j-charsets.url}" dest="${icu4j-charsets.jar}" />
   
     </target>
@@ -171,10 +170,6 @@
                        dest="${derby.jar}"
                        md5="${derby.md5}" />
 
-    <mkdir dir="${asm.dir}" />
-    <download-one-file src="${asm.url}" dest="${asm.jar}"
-                           md5="${asm.md5}" />
-
     <mkdir dir="${icu4j.dir}" />
     <download-one-file src="${icu4j.url}"
                        dest="${icu4j.jar}"

Modified: harmony/enhanced/classlib/trunk/modules/pack200/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/build.xml?rev=785610&r1=785609&r2=785610&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/pack200/build.xml Wed Jun 17 14:05:28 2009
@@ -21,7 +21,10 @@
 
     <!-- import common properties -->
     <property name="hy.hdk" location="${basedir}/../../deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="depends.dir" location="${basedir}/../../depends" />
     <import file="${hy.hdk}/build/ant/properties.xml" />
+    <import file="${hy.hdk}/build/ant/depends.xml" />
 
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
@@ -47,7 +50,25 @@
 
     <property name="pack200.exclude.file" location="${hy.hdk}/build/pack200.exclude" />
 
-    <target name="build" depends="compile-java, copy-resources, build-jar" />
+    <target name="build"
+            depends="check-depends, compile-java, copy-resources, build-jar" />
+
+    <target name="check-depends">
+        <check-one-file src="${asm.url}" dest="${asm.jar}" />
+        <copy todir="${hy.jdk}/jre/lib/boot">
+            <fileset dir="${depends.jars}">
+                <patternset includes="${asm.ver}/*.jar" />
+            </fileset>
+            <fileset dir="depends/manifests"/>
+        </copy>
+
+    </target>
+
+    <target name="fetch-depends">
+        <mkdir dir="${asm.dir}" />
+        <download-one-file src="${asm.url}" dest="${asm.jar}"
+                           md5="${asm.md5}" />
+    </target>
 
     <target name="test" depends="-test-module">
         <fail message="Some tests failed">

Propchange: harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Added: harmony/enhanced/classlib/trunk/modules/pack200/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/pack200/make/depends.properties?rev=785610&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/pack200/make/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/modules/pack200/make/depends.properties Wed Jun 17 14:05:28
2009
@@ -0,0 +1,6 @@
+depends.jars=${depends.dir}/jars
+asm.ver=asm-3.1
+asm.dir=${depends.jars}/${asm.ver}
+asm.jar=${asm.dir}/${asm.ver}.jar
+asm.url=http://download.forge.objectweb.org/asm/${asm.ver}.jar
+asm.md5=4fbe0fd975ecc71480846ce272b483b0

Propchange: harmony/enhanced/classlib/trunk/modules/pack200/make/depends.properties
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message