harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r614145 - in /harmony/enhanced/classlib/trunk/make: depends.properties depends.xml
Date Tue, 22 Jan 2008 08:32:00 GMT
Author: hindessm
Date: Tue Jan 22 00:31:57 2008
New Revision: 614145

URL: http://svn.apache.org/viewvc?rev=614145&view=rev
Log:
Updating bcprov downloads to use apache server.

Modified:
    harmony/enhanced/classlib/trunk/make/depends.properties
    harmony/enhanced/classlib/trunk/make/depends.xml

Modified: harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?rev=614145&r1=614144&r2=614145&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Tue Jan 22 00:31:57 2008
@@ -33,12 +33,6 @@
 junit.url=${maven2.base}/junit/junit/3.8.2/junit-3.8.2.jar
 junit.md5=28e7eb9eeefe31a657c68755bfccc541
 
-bcprov.dir=${depends.jars}/bcprov-jdk15-138
-bcprov.orig.jar=${bcprov.dir}/bcprov.jar
-bcprov.jar=${bcprov.dir}/bcprov.noidea.jar
-bcprov.url=http://www.bouncycastle.org/download/bcprov-jdk15-138.jar
-bcprov.md5=9c32fec75f2de26cfc18213b20461933
-
 msvcr.dir.x86=${depends.dir}/libs/windows.x86
 msvcr.dll.x86=${msvcr.dir.x86}/msvcr71.dll
 msvcr.url.x86=file:///${hyenv.SystemRoot}/system32/msvcr71.dll
@@ -145,3 +139,9 @@
 icudll.zip=${depends.dir}/libs/${hy.platform.variant}/icu-3.4/icu-3.4.zip
 icudll.url=${depends.url}/libs/${hy.platform.variant}/icu-3.4.zip
 icuhdr.zip=${depends.dir}/oss/icu4c-3.4-harmony-includes.zip
+
+bcprov.ver=bcprov-jdk15-138
+bcprov.dir=${depends.jars}/${bcprov.ver}
+bcprov.jar=${bcprov.dir}/bcprov.noidea.jar
+bcprov.url=${depends.url}/jars/bcprov/${bcprov.ver}/bcprov.noidea.jar
+bcprov.md5=7e2cf5f39012b303b4246e33a66bf078

Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=614145&r1=614144&r2=614145&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Tue Jan 22 00:31:57 2008
@@ -41,7 +41,7 @@
         <check-one-file src="${xalan.url}" dest="${xalan.jar}" />
         <check-one-file src="${xerces.url}" dest="${xerces.zip}" />
         <check-one-file src="${junit.url}" dest="${junit.jar}" />
-        <check-one-file src="${bcprov.url}" dest="${bcprov.orig.jar}" />
+        <check-one-file src="${bcprov.url}" dest="${bcprov.jar}" />
         <check-one-file src="${mx4j.url}" dest="${mx4j.zip}" />
         <check-one-file src="${jetty.url}" dest="${jetty.jar}" />
         <check-one-file src="${jetty-util.url}" dest="${jetty-util.jar}" />
@@ -129,7 +129,7 @@
     </target>
 
     <target name="-extract"
-            depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces,-extract-idea-from-bcprov,-extract-icudlls,-temporary-warning"
/>
+         depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces,-extract-icudlls,-temporary-warning"
/>
 
     <target name="-extract-props">
         <uptodate property="dejavu-fonts.uptodate"
@@ -141,12 +141,6 @@
         <uptodate property="xerces.uptodate"
                   srcfile="${xerces.zip}"
                   targetfile="${xerces.dir}/xercesImpl.jar" />
-        <uptodate property="bcprov.uptodate"
-                  targetfile="${bcprov.jar}">
-            <srcfiles file="${bcprov.orig.jar}" />
-            <srcfiles dir="depends/files/bcprov"
-                      includes="**/IDEAEngine.class" />
-        </uptodate>
         <uptodate property="icudlls.uptodate"
                   srcfile="${icudll.zip}"
                   targetfile="${icudll.dir}/uptodate" />
@@ -197,18 +191,6 @@
 	<touch file="${xerces.dir}/xercesImpl.jar" />
     </target>
 
-    <target name="-extract-idea-from-bcprov" unless="bcprov.uptodate">
-        <zip destfile="${bcprov.jar}">
-            <zipfileset src="${bcprov.orig.jar}">
-                <exclude name="**/BCKEY.*" />
-                <exclude name="**/IDEAEngine.class" />
-            </zipfileset>
-            <fileset dir="depends/files/bcprov">
-                <include name="**/IDEAEngine.class" />
-            </fileset>
-        </zip>
-    </target>
-
     <target name="-extract-icudlls" unless="icudlls.uptodate">
         <unzip src="${icudll.zip}" dest="${icudll.dir}" />
         <touch file="${icudll.dir}/uptodate" />
@@ -417,7 +399,7 @@
                            md5="${junit.md5}" />
 
     <mkdir dir="${bcprov.dir}" />
-    <download-one-file src="${bcprov.url}" dest="${bcprov.orig.jar}"
+    <download-one-file src="${bcprov.url}" dest="${bcprov.jar}"
                            md5="${bcprov.md5}" />
 
     <mkdir dir="${mx4j.dir}" />



Mime
View raw message