harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r770252 - in /harmony/enhanced/classlib/trunk: make/build-java.xml modules/orb/build.xml modules/orb/make/depends.properties
Date Thu, 30 Apr 2009 14:42:50 GMT
Author: hindessm
Date: Thu Apr 30 14:42:50 2009
New Revision: 770252

URL: http://svn.apache.org/viewvc?rev=770252&view=rev
Log:
More improvements for yoko/bcel dependencies.

Modified:
    harmony/enhanced/classlib/trunk/make/build-java.xml
    harmony/enhanced/classlib/trunk/modules/orb/build.xml
    harmony/enhanced/classlib/trunk/modules/orb/make/depends.properties

Modified: harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=770252&r1=770251&r2=770252&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-java.xml Thu Apr 30 14:42:50 2009
@@ -201,15 +201,10 @@
         <!-- Copy across the boot dependency jars --><!-- TOFIX clean these? -->
         <copy todir="${hy.jdk}/jre/lib/boot">
             <fileset dir="${depends.jars}">
-                <patternset includes="bcel-5.2/*.jar" />
                 <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" />
-                <patternset includes="yoko-1.0/yoko-rmi-spec.jar" />
-                <patternset includes="yoko-1.0/yoko-rmi-impl.jar" />
-                <patternset includes="yoko-1.0/yoko.jar" />
-                <patternset includes="yoko-1.0/yoko-core.jar" />
             </fileset>
             <fileset dir="${depends.manifests}"/>
         </copy>

Modified: harmony/enhanced/classlib/trunk/modules/orb/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/orb/build.xml?rev=770252&r1=770251&r2=770252&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/orb/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/orb/build.xml Thu Apr 30 14:42:50 2009
@@ -68,10 +68,8 @@
     <target name="-copy-jars">
         <copy todir="${hy.jdk}/jre/lib/boot">
             <fileset dir="${depends.jars}">
-                <patternset includes="yoko-1.0/yoko-rmi-spec.jar" />
-                <patternset includes="yoko-1.0/yoko-rmi-impl.jar" />
-                <patternset includes="yoko-1.0/yoko.jar" />
-                <patternset includes="yoko-1.0/yoko-core.jar" />
+                <patternset includes="yoko-${yoko.version}/*.jar" />
+                <patternset includes="bcel-${bcel.version}/*.jar" />
             </fileset>
         </copy>
     </target>
@@ -79,7 +77,8 @@
     <target name="test" />
 
     <target name="clean">
-        <delete dir="${hy.jdk}/jre/lib/boot/yoko-1.0" />
+        <delete dir="${hy.jdk}/jre/lib/boot/yoko-${yoko.version}" />
+        <delete dir="${hy.jdk}/jre/lib/boot/bcel-${bcel.version}" />
     </target>
 
 </project>

Modified: harmony/enhanced/classlib/trunk/modules/orb/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/orb/make/depends.properties?rev=770252&r1=770251&r2=770252&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/orb/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/modules/orb/make/depends.properties Thu Apr 30 14:42:50
2009
@@ -17,29 +17,31 @@
 maven2.base=http://repo1.maven.org/maven2
 yoko.base=${maven2.base}/org/apache/yoko
 
-yoko.dir=${depends.jars}/yoko-1.0
+yoko.version=1.0
+yoko.dir=${depends.jars}/yoko-${yoko.version}
 yoko.jar=${yoko.dir}/yoko.jar
-yoko.url=${yoko.base}/yoko-spec-corba/1.0/yoko-spec-corba-1.0.jar
+yoko.url=${yoko.base}/yoko-spec-corba/${yoko.version}/yoko-spec-corba-${yoko.version}.jar
 yoko.md5=9785a46807b2f9d374296b4af1ff97fb
 
-yoko-core.dir=${depends.jars}/yoko-1.0
+yoko-core.dir=${depends.jars}/yoko-${yoko.version}
 yoko-core.jar=${yoko.dir}/yoko-core.jar
-yoko-core.url=${yoko.base}/yoko-core/1.0/yoko-core-1.0.jar
+yoko-core.url=${yoko.base}/yoko-core/${yoko.version}/yoko-core-${yoko.version}.jar
 yoko-core.md5=14acb2d10e6725ebda5bd02e7afc8218
 
-yoko-rmi-impl.dir=${depends.jars}/yoko-1.0
+yoko-rmi-impl.dir=${depends.jars}/yoko-${yoko.version}
 yoko-rmi-impl.jar=${yoko-rmi-impl.dir}/yoko-rmi-impl.jar
-yoko-rmi-impl.url=${yoko.base}/yoko-rmi-impl/1.0/yoko-rmi-impl-1.0.jar
+yoko-rmi-impl.url=${yoko.base}/yoko-rmi-impl/${yoko.version}/yoko-rmi-impl-${yoko.version}.jar
 yoko-rmi-impl.md5=dee6e519c83796d99a51b1379abf772a
 
-yoko-rmi-spec.dir=${depends.jars}/yoko-1.0
+yoko-rmi-spec.dir=${depends.jars}/yoko-${yoko.version}
 yoko-rmi-spec.jar=${yoko-rmi-spec.dir}/yoko-rmi-spec.jar
-yoko-rmi-spec.url=${yoko.base}/yoko-rmi-spec/1.0/yoko-rmi-spec-1.0.jar
+yoko-rmi-spec.url=${yoko.base}/yoko-rmi-spec/${yoko.version}/yoko-rmi-spec-${yoko.version}.jar
 yoko-rmi-spec.md5=2f8e962b3a5b9dea0a573a5285b669f6
 
 # bcel is needed by yoko-rmi
-bcel.dir=${depends.jars}/bcel-5.2
-bcel.jar=${bcel.dir}/bcel-5.2.jar
-bcel.url=${maven2.base}/org/apache/bcel/bcel/5.2/bcel-5.2.jar
+bcel.version=5.2
+bcel.dir=${depends.jars}/bcel-${bcel.version}
+bcel.jar=${bcel.dir}/bcel-${bcel.version}.jar
+bcel.url=${maven2.base}/org/apache/bcel/bcel/${bcel.version}/bcel-${bcel.version}.jar
 bcel.md5=43d54687362fc2991d61201c453a8286
 



Mime
View raw message