lucene-java-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r887618 - /lucene/java/branches/lucene_3_0/build.xml
Date Sun, 06 Dec 2009 00:29:45 GMT
Author: uschindler
Date: Sun Dec  6 00:29:45 2009
New Revision: 887618

URL: http://svn.apache.org/viewvc?rev=887618&view=rev
Log:
merge to 3.0 branch

Modified:
    lucene/java/branches/lucene_3_0/build.xml   (contents, props changed)

Modified: lucene/java/branches/lucene_3_0/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/branches/lucene_3_0/build.xml?rev=887618&r1=887617&r2=887618&view=diff
==============================================================================
--- lucene/java/branches/lucene_3_0/build.xml (original)
+++ lucene/java/branches/lucene_3_0/build.xml Sun Dec  6 00:29:45 2009
@@ -683,15 +683,12 @@
     <fail if="contribs.failed">Contrib tests failed!</fail>
   </target>
 
-  <!-- Macro for building checksum files
-       This is only needed until the "format" option is supported
-       by ant's built in checksum task
-   -->
+  <!-- Macro for building checksum files -->
   <macrodef name="lucene-checksum">
     <attribute name="file"/>
     <sequential>
-      <checksum file="@{file}" algorithm="md5" pattern="{0}  {1}" forceoverwrite="yes"
readbuffersize="65536"/>
-      <checksum file="@{file}" algorithm="sha1" pattern="{0}  {1}" forceoverwrite="yes"
readbuffersize="65536"/>
+      <checksum file="@{file}" algorithm="md5" format="MD5SUM" forceoverwrite="yes" readbuffersize="65536"/>
+      <checksum file="@{file}" algorithm="sha1" format="MD5SUM" forceoverwrite="yes" readbuffersize="65536"/>
     </sequential>
   </macrodef>
 

Propchange: lucene/java/branches/lucene_3_0/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Dec  6 00:29:45 2009
@@ -0,0 +1,4 @@
+/lucene/java/branches/lucene_2_4/build.xml:748824
+/lucene/java/branches/lucene_2_9/build.xml:817269-818600,825998,829134,829881,831036
+/lucene/java/branches/lucene_2_9_back_compat_tests/build.xml:818601-821336
+/lucene/java/trunk/build.xml:881213,881315,881466,881819,882374,882672,882807,882888,882977,883074-883075,883554,884870,886257,886911,887617



Mime
View raw message