harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r452451 - in /incubator/harmony/enhanced/classlib/trunk/make: depends.properties depends.xml
Date Tue, 03 Oct 2006 12:18:04 GMT
Author: hindessm
Date: Tue Oct  3 05:18:03 2006
New Revision: 452451

URL: http://svn.apache.org/viewvc?view=rev&rev=452451
Log:
Fixing md5 checking of dependencies (and fixing an incorrect md5sum so
things don't break now it works properly!).  Hopefully not too many
people will discover they have bad files after I check this in.

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=452451&r1=452450&r2=452451
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.properties Tue Oct  3 05:18:03
2006
@@ -29,7 +29,7 @@
 
 xerces.impl.jar=${xerces.dir}/xercesImpl.jar
 xerces.impl.url=${ibiblio.base}/maven/xerces/jars/xercesImpl-2.8.0.jar
-xerces.impl.md5=00b9a88a935985d17b7621c74a498bb4
+xerces.impl.md5=7eb2db331a62e74744ab79aab5b454bd
 
 xml.apis.jar=${xerces.dir}/xml-apis.jar
 xml.apis.url=${ibiblio.base}/maven/xml-apis/jars/xml-apis-1.3.03.jar

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=452451&r1=452450&r2=452451
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.xml Tue Oct  3 05:18:03 2006
@@ -228,23 +228,23 @@
                 <param name="src" value="@{src}" />
                 <param name="dest" value="@{dest}" />
             </antcall>
-            <checksum file="@{dest}" property="new.md5" />
-            <condition property="md5.verified" value="true">
-                <equals arg1="${new.md5}" arg2="@{md5}" />
+            <checksum file="@{dest}" property="@{dest}.md5" />
+            <condition property="@{dest}.md5.verified" value="true">
+                <equals arg1="${@{dest}.md5}" arg2="@{md5}" />
             </condition>
             <antcall target="-remove-file-if-bad">
                 <param name="jar" value="@{dest}" />
             </antcall>
-	    <fail unless="md5.verified">
+	    <fail unless="@{dest}.md5.verified">
 ...
 
 File @{dest} has incorrect md5 checksum.  Expected:
   @{md5}
 found:
-  ${new.md5}
+  ${@{dest}.md5}
 
             </fail>
-            <echo>Checksum verified (${md5.verified})</echo>
+            <echo>Checksum verified (${@{dest}.md5.verified})</echo>
         </sequential>
     </macrodef>
 
@@ -253,7 +253,7 @@
 	<get src="${src}" dest="${dest}" usetimestamp="true" verbose="true" />
     </target>
 
-    <target name="-remove-file-if-bad" unless="md5.verified">
+    <target name="-remove-file-if-bad" unless="${dest}.md5.verified">
         <delete file="${dest}" />
     </target>
 



Mime
View raw message