harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r538414 - in /harmony/enhanced/classlib/trunk/make: depends.properties depends.xml
Date Wed, 16 May 2007 03:01:19 GMT
Author: ndbeyer
Date: Tue May 15 20:01:18 2007
New Revision: 538414

URL: http://svn.apache.org/viewvc?view=rev&rev=538414
Log:
Add msvcr71.dll md5 hash for VS2005 SP1; enable multiple hash value checks

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?view=diff&rev=538414&r1=538413&r2=538414
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Tue May 15 20:01:18 2007
@@ -42,7 +42,10 @@
 msvcr.dll.x86=${msvcr.dir.x86}/msvcr71.dll
 msvcr.dll.file.x86=msvcr71.dll
 msvcr.url.x86=file:///${hyenv.SystemRoot}/system32/msvcr71.dll
-msvcr.md5.x86=86f1895ae8c5e8b17d99ece768a70732
+# This is the md5 hash for the VS2003 version, 7.10.3052.4
+msvcr_VS2003.md5.x86=86f1895ae8c5e8b17d99ece768a70732
+# This is the md5 hash for the VS2003 SP1 version, 7.10.6030.0
+msvcr_VS2003SP1.md5.x86=ca2f560921b7b8be1cf555a5a18d54c3
 
 msvcr.dir.x86_64=${depends.dir}/libs/windows.x86_64
 msvcr.dll.x86_64=${msvcr.dir.x86_64}/msvcr80.dll

Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?view=diff&rev=538414&r1=538413&r2=538414
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Tue May 15 20:01:18 2007
@@ -63,7 +63,8 @@
         <property name="msvcr.dll" value="${msvcr.dll.x86}"/>
         <property name="msvcr.url" value="${msvcr.url.x86}"/>
         <property name="msvcr.dll.file" value="${msvcr.dll.file.x86}"/>
-        <property name="msvcr.md5" value="${msvcr.md5.x86}"/>
+        <property name="msvcr.md5" value="${msvcr_VS2003SP1.md5.x86}"/>
+        <property name="msvcr.md5.deprecated" value="${msvcr_VS2003.md5.x86}"/>
     </target>
 
     <target name="-select-win-deps-x86_64" if="is.x86_64">
@@ -344,13 +345,15 @@
     <property environment="hyenv" />
 
     <mkdir dir="${msvcr.dir}" />
-
-    <download-one-file src="${msvcr.url}" dest="${msvcr.dll}"
-                           md5="${msvcr.md5}" />
+    <download-one-file src="${msvcr.url}"
+                       dest="${msvcr.dll}"
+                       md5="${msvcr.md5}"
+                       md5-deprecated="${msvcr.md5.deprecated}" />
 
     <mkdir dir="${awtdeps.dir}" />
-    <download-one-file src="${awtdeps.url}" dest="${awtdeps.tar}"
-                           md5="${awtdeps.md5}" />
+    <download-one-file src="${awtdeps.url}"
+                       dest="${awtdeps.tar}"
+                       md5="${awtdeps.md5}" />
 
     </target>
 
@@ -358,9 +361,10 @@
         <attribute name="src" />
         <attribute name="dest" />
         <attribute name="md5" />
+        <attribute name="md5-deprecated" default="" />
         <sequential>
             <echo>Checking @{dest}</echo>
-        <available file="@{dest}" type="file"
+            <available file="@{dest}" type="file"
                        property="@{dest}.exists" />
             <antcall target="-really-download">
                 <param name="src" value="@{src}" />
@@ -368,7 +372,10 @@
             </antcall>
             <checksum file="@{dest}" property="@{dest}.md5" />
             <condition property="@{dest}.md5.verified" value="true">
-                <equals arg1="${@{dest}.md5}" arg2="@{md5}" />
+                <or>
+                    <equals arg1="${@{dest}.md5}" arg2="@{md5}" />
+                    <equals arg1="${@{dest}.md5}" arg2="@{md5-deprecated}" />
+                </or>
             </condition>
             <antcall target="-remove-file-if-bad">
                 <param name="jar" value="@{dest}" />
@@ -376,10 +383,9 @@
         <fail unless="@{dest}.md5.verified">
 ...
 
-File @{dest} has incorrect md5 checksum.  Expected:
-  @{md5}
-found:
-  ${@{dest}.md5}
+File @{dest} has incorrect md5 checksum.
+    Expected: @{md5} (or @{md5-deprecated})
+    Found:    ${@{dest}.md5}
 
             </fail>
             <echo>Checksum verified (${@{dest}.md5.verified})</echo>



Mime
View raw message