svn commit: r1078673 - in /lucene/dev/branches/lucene_solr_3_1: ./ lucene/ solr/ solr/common-build.xml

[rm...@apache.org]

Author: rmuir
Date: Mon Mar  7 04:11:40 2011
New Revision: 1078673

URL: http://svn.apache.org/viewvc?rev=1078673&view=rev
Log:
fix broken checksum task

Modified:
    lucene/dev/branches/lucene_solr_3_1/   (props changed)
    lucene/dev/branches/lucene_solr_3_1/lucene/   (props changed)
    lucene/dev/branches/lucene_solr_3_1/solr/   (props changed)
    lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml

Modified: lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml?rev=1078673&r1=1078672&r2=1078673&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/common-build.xml Mon Mar  7 04:11:40 2011
@@ -304,25 +304,10 @@
    -->
   <macrodef name="solr-checksum">
     <attribute name="file"/>
-    <!-- NOTE: we use the value of @{file} in the names any properties
-         set because macro's don't have variables, and otherwise we
-         wouldn't be able to checksum more then one file per build
-      -->
     <sequential>
-     <checksum file="@{file}"
-               property="@{file}.sum"
-               algorithm="${checksum.algorithm}" />
-     <basename file="@{file}" property="@{file}.base" />
-     <concat destfile="@{file}.${checksum.algorithm}"
-             force="yes"
-             append="false"
-             fixlastline="yes">
-       <header trimleading="yes">${@{file}.sum}  </header>
-       <!-- empty fileset to trick concat -->
-       <fileset dir="." excludes="**" />
-       <footer trimleading="yes">${@{file}.base}
-       </footer>
-     </concat>
+      <echo>Building checksums for '@{file}'</echo>
+      <checksum file="@{file}" algorithm="md5" format="MD5SUM" forceoverwrite="yes" readbuffersize="65536"/>
+      <checksum file="@{file}" algorithm="sha1" format="MD5SUM" forceoverwrite="yes" readbuffersize="65536"/>
     </sequential>
   </macrodef>