harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r389161 - in /incubator/harmony/enhanced/classlib/trunk: depends/jars/ make/build-java.xml make/depends.properties make/depends.xml
Date Mon, 27 Mar 2006 15:06:36 GMT
Author: tellison
Date: Mon Mar 27 07:06:33 2006
New Revision: 389161

URL: http://svn.apache.org/viewcvs?rev=389161&view=rev
Log:
Fix for HARMONY-208 (Download and unsign bcprov.jar dependency file)

Modified:
    incubator/harmony/enhanced/classlib/trunk/depends/jars/   (props changed)
    incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
    incubator/harmony/enhanced/classlib/trunk/make/depends.properties
    incubator/harmony/enhanced/classlib/trunk/make/depends.xml

Propchange: incubator/harmony/enhanced/classlib/trunk/depends/jars/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 27 07:06:33 2006
@@ -1,3 +1,4 @@
 junit_3.8.1
 xalan-j_2.6.0
 xerces_2.6.2
+bcprov-jdk14-131

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=389161&r1=389160&r2=389161&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Mon Mar 27 07:06:33 2006
@@ -37,6 +37,7 @@
     <property name="components.patternsets" location="make/patternsets" />
     <property name="components.output" location="build/components" />
     <property name="target.output" location="deploy" />
+    <property file="make/depends.properties" />
 
 
     <!-- ================================= 
@@ -317,6 +318,12 @@
                 <patternset includes="xerces_2.6.2/*.jar" />
                 <patternset includes="xalan-j_2.6.0/*.jar" />
             </fileset>
+        </copy>
+
+        <!-- Copy across the extension dependency jars -->
+        <copy todir="${target.output}/jre/lib/ext" overwrite="yes"
+              verbose="yes" flatten="yes">
+            <fileset file="${bcprov.jar}" />
         </copy>
 
         <!-- Copy across the component jars -->

Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/depends.properties?rev=389161&r1=389160&r2=389161&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.properties Mon Mar 27 07:06:33
2006
@@ -38,3 +38,8 @@
 junit.dir=${depends.jars}/junit_3.8.1
 junit.jar=${junit.dir}/junit.jar
 junit.url=${ibiblio.base}/maven/junit/jars/junit-3.8.1.jar
+
+bcprov.dir=${depends.jars}/bcprov-jdk14-131
+bcprov.jar=${bcprov.dir}/bcprov.jar
+signed.bcprov.jar=${bcprov.dir}/signed.bcprov.jar
+bcprov.url=http://www.bouncycastle.org/download/bcprov-jdk14-131.jar

Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/depends.xml?rev=389161&r1=389160&r2=389161&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.xml Mon Mar 27 07:06:33 2006
@@ -54,6 +54,12 @@
 			<param name="dest" value="${junit.jar}" />
 		</antcall>
 
+		<antcall target="check-one-jar">
+			<param name="src" value="${bcprov.url}" />
+			<param name="dest" value="${signed.bcprov.jar}" />
+		</antcall>
+		<uptodate property="bcprov.uptodate" srcfile="${signed.bcprov.jar}" targetfile="${bcprov.jar}"
/>
+		<antcall target="create-unsigned-bcprov-jar" />
 	</target>
 
 	<target name="download" description="Download required jars">
@@ -86,6 +92,11 @@
 			<param name="dest" value="${junit.jar}" />
 		</antcall>
 
+		<mkdir dir="${bcprov.dir}" />
+		<antcall target="download-one-jar">
+			<param name="src" value="${bcprov.url}" />
+			<param name="dest" value="${signed.bcprov.jar}" />
+		</antcall>
 	</target>
 
 	<target name="download-one-jar">
@@ -110,8 +121,20 @@
 
   ${dest}
 
-(Run "ant -f make/depends.xml download" to automatically fetch dependencies.)
+Run  "ant -f make/depends.xml download"  to automatically fetch dependencies.
+Note: Some of Harmony's dependencies are licensed under terms other than the ASLv2.
 </fail>
 	</target>
 
+	<target name="create-unsigned-bcprov-jar" unless="bcprov.uptodate">
+		<delete dir="${bcprov.dir}/temp" />
+		<unzip src="${signed.bcprov.jar}" dest="${bcprov.dir}/temp">
+			<patternset>
+				<exclude name="META-INF/BCKEY.SF" />
+			</patternset>
+		</unzip>
+		<jar destfile="${bcprov.jar}" basedir="${bcprov.dir}/temp"
+          manifest="${bcprov.dir}/temp/META-INF/MANIFEST.MF" />
+		<delete dir="${bcprov.dir}/temp" />
+	</target>
 </project>



Mime
View raw message