harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r963432 - in /harmony/enhanced/java/trunk: classlib/make/depends-common.xml common_resources/make/depends.xml
Date Mon, 12 Jul 2010 18:50:35 GMT
Author: hindessm
Date: Mon Jul 12 18:50:35 2010
New Revision: 963432

URL: http://svn.apache.org/viewvc?rev=963432&view=rev
Log:
Make sure dependency corruption failures always report the full path.
Previously if you had a corrupt icu4j jar then the federated build
fetch-depends would report:

  File depends/jars/icu4j_4.2.1/icu4j-4_2_1.jar has incorrect md5 checksum.

But really the path is classlib/depends/... so it is misleading and the
simplest way to report the correct path in all cases is just to report
the full path rather than the relative path.

Thanks to Roderick McLean for pointing this out.

Modified:
    harmony/enhanced/java/trunk/classlib/make/depends-common.xml
    harmony/enhanced/java/trunk/common_resources/make/depends.xml

Modified: harmony/enhanced/java/trunk/classlib/make/depends-common.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/make/depends-common.xml?rev=963432&r1=963431&r2=963432&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/make/depends-common.xml (original)
+++ harmony/enhanced/java/trunk/classlib/make/depends-common.xml Mon Jul 12 18:50:35 2010
@@ -62,10 +62,11 @@
             <antcall target="-remove-file-if-bad">
                 <param name="jar" value="@{dest}" />
             </antcall>
+            <property name="@{dest}.fullpath" location="@{dest}" />
             <fail unless="@{dest}.md5.verified">
 ...
 
-File @{dest} has incorrect md5 checksum.
+File ${@{dest}.fullpath} has incorrect md5 checksum.
     Expected: @{md5} (or @{md5-deprecated})
     Found:    ${@{dest}.md5}
 

Modified: harmony/enhanced/java/trunk/common_resources/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/make/depends.xml?rev=963432&r1=963431&r2=963432&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/make/depends.xml (original)
+++ harmony/enhanced/java/trunk/common_resources/make/depends.xml Mon Jul 12 18:50:35 2010
@@ -181,10 +181,11 @@
             <antcall target="-remove-file-if-bad">
                 <param name="jar" value="@{dest}" />
             </antcall>
-        <fail unless="@{dest}.md5.verified">
+            <property name="@{dest}.fullpath" location="@{dest}" />
+            <fail unless="@{dest}.md5.verified">
 ...
 
-File @{dest} has incorrect md5 checksum.
+File ${@{dest}.fullpath} has incorrect md5 checksum.
     Expected: @{md5} (or @{md5-deprecated})
     Found:    ${@{dest}.md5}
 



Mime
View raw message