You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by us...@apache.org on 2009/11/13 16:53:54 UTC

svn commit: r835889 - in /lucene/java/trunk: BUILD.txt CHANGES.txt build.xml

Author: uschindler
Date: Fri Nov 13 15:53:54 2009
New Revision: 835889

URL: http://svn.apache.org/viewvc?rev=835889&view=rev
Log:
LUCENE-2024: Fix: "ant dist" no longer generates md5's for the top-level artifacts

Modified:
    lucene/java/trunk/BUILD.txt
    lucene/java/trunk/CHANGES.txt
    lucene/java/trunk/build.xml

Modified: lucene/java/trunk/BUILD.txt
URL: http://svn.apache.org/viewvc/lucene/java/trunk/BUILD.txt?rev=835889&r1=835888&r2=835889&view=diff
==============================================================================
--- lucene/java/trunk/BUILD.txt (original)
+++ lucene/java/trunk/BUILD.txt Fri Nov 13 15:53:54 2009
@@ -3,14 +3,14 @@
 $Id$
 
 Basic steps:
-  0) Install JDK 1.5 (or greater), Ant 1.6.3 (or greater)
+  0) Install JDK 1.5 (or greater), Ant 1.7.0 (or greater)
   1) Download Lucene from Apache and unpack it
   2) Connect to the top-level of your Lucene installation
   3) Install JavaCC (optional)
   4) Run ant
 
 Step 0) Set up your development environment (JDK 1.5 or greater,
-Ant 1.6.3 or greater)
+Ant 1.7.0 or greater)
 
 We'll assume that you know how to get and set up the JDK - if you
 don't, then we suggest starting at http://java.sun.com and learning
@@ -18,7 +18,7 @@
 JDK 1.5 and later.
 
 Like many Open Source java projects, Lucene uses Apache Ant for build
-control.  Specifically, you MUST use Ant version 1.6.3 or greater.
+control.  Specifically, you MUST use Ant version 1.7.0 or greater.
 
 Ant is "kind of like make without make's wrinkles".  Ant is
 implemented in java and uses XML-based configuration files.  You can

Modified: lucene/java/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/java/trunk/CHANGES.txt?rev=835889&r1=835888&r2=835889&view=diff
==============================================================================
--- lucene/java/trunk/CHANGES.txt (original)
+++ lucene/java/trunk/CHANGES.txt Fri Nov 13 15:53:54 2009
@@ -153,7 +153,10 @@
 
 * LUCENE-486: Remove test->demo dependencies. (Michael Busch)
 
-Test Cases
+Build
+
+ * LUCENE-2024: Raise build requirements to Java 1.5 and ANT 1.7.0
+   (Uwe Schindler, Mike McCandless)
 
 ======================= Release 2.9.1 2009-11-06 =======================
 

Modified: lucene/java/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/java/trunk/build.xml?rev=835889&r1=835888&r2=835889&view=diff
==============================================================================
--- lucene/java/trunk/build.xml (original)
+++ lucene/java/trunk/build.xml Fri Nov 13 15:53:54 2009
@@ -28,9 +28,6 @@
   <property name="demo.name" value="lucene-demos-${version}"/>
   <property name="demo.war.name" value="luceneweb"/>
 
-  <!-- Type of checksum to compute for distribution files -->
-  <property name="checksum.algorithm" value="md5" />
-	
   <!-- Build classpath -->
   <path id="classpath">
     <pathelement location="${build.dir}/classes/java"/>
@@ -692,25 +689,9 @@
    -->
   <macrodef name="lucene-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>
+      <checksum file="@{file}" algorithm="md5" pattern="{0}  {1}" forceoverwrite="yes" readbuffersize="65536"/>
+      <checksum file="@{file}" algorithm="sha1" pattern="{0}  {1}" forceoverwrite="yes" readbuffersize="65536"/>
     </sequential>
   </macrodef>