Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: harmony-dev@incubator.apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r464166 - in
 /incubator/harmony/enhanced/classlib/trunk/make:
 depends.properties depends.xml
Date: Sun, 15 Oct 2006 13:04:20 -0000
To: harmony-commits@incubator.apache.org
From: hindessm@apache.org
Message-Id: <20061015130421.2E5371A981A@eris.apache.org>

Author: hindessm
Date: Sun Oct 15 06:04:20 2006
New Revision: 464166

URL: http://svn.apache.org/viewvc?view=rev&rev=464166
Log:
Remove the unsigning process for bcprov jar.

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

Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/depends.properties?view=diff&rev=464166&r1=464165&r2=464166
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.properties Sun Oct 15 06:04:20 2006
@@ -40,10 +40,11 @@
 junit.url=${ibiblio.base}/maven2/junit/junit/3.8.2/junit-3.8.2.jar
 junit.md5=28e7eb9eeefe31a657c68755bfccc541
 
+# will the next person to update bcprov.jar please remove the "signed."
+# prefix from the bcprov.jar property
 bcprov.dir=${depends.jars}/bcprov-jdk14-134
-bcprov.jar=${bcprov.dir}/bcprov.jar
-signed.bcprov.jar=${bcprov.dir}/signed.bcprov.jar
-signed.bcprov.md5=dac389845d499bfa901f30bbe63250d1
+bcprov.jar=${bcprov.dir}/signed.bcprov.jar
+bcprov.md5=dac389845d499bfa901f30bbe63250d1
 bcprov.url=http://www.bouncycastle.org/download/bcprov-jdk14-134.jar
 
 msvcr71.dir=${depends.dir}/libs/windows.x86

Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/depends.xml?view=diff&rev=464166&r1=464165&r2=464166
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.xml Sun Oct 15 06:04:20 2006
@@ -29,8 +29,7 @@
     <import file="${basedir}/make/properties.xml" />
 
     <target name="check" description="Check whether dependencies are available"
-            depends="-check,-create-unsigned-bcprov-jar,
-                     -check-win,-check-unix" />
+            depends="-check,-check-win,-check-unix" />
 
     <target name="-check">
 
@@ -50,7 +49,7 @@
 
 	<check-one-file src="${junit.url}" dest="${junit.jar}" />
 
-	<check-one-file src="${bcprov.url}" dest="${signed.bcprov.jar}" />
+	<check-one-file src="${bcprov.url}" dest="${bcprov.jar}" />
 
 	<check-one-file src="${icu4j.url}" dest="${icu4j.jar}" />
 
@@ -66,10 +65,6 @@
   
         <check-one-file src="${servlet-api.url}" dest="${servlet-api.jar}" /> 
 
-	<uptodate property="bcprov.uptodate"
-                  srcfile="${signed.bcprov.jar}"
-                  targetfile="${bcprov.jar}" />
-
     </target>
 
     <target name="-check-win" if="is.windows" depends="-really-check-win" />
@@ -189,8 +184,8 @@
                            md5="${junit.md5}" />
 
 	<mkdir dir="${bcprov.dir}" />
-	<download-one-file src="${bcprov.url}" dest="${signed.bcprov.jar}"
-                           md5="${signed.bcprov.md5}" />
+	<download-one-file src="${bcprov.url}" dest="${bcprov.jar}"
+                           md5="${bcprov.md5}" />
 
 	<mkdir dir="${icu4j.dir}" />
 	<download-one-file src="${icu4j.url}" dest="${icu4j.jar}"
@@ -301,19 +296,6 @@
             </fail>
         </sequential>
     </macrodef>
-
-    <target name="-create-unsigned-bcprov-jar" unless="bcprov.uptodate">
-        <echo>Removing signature from bcprov.jar</echo>
-	<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>
 
     <target name="-awt-tar-extract" unless="awtdeps.uptodate">
         <echo>Extracting awt dependencies</echo>