svn commit: r1368966 - in /lucene/dev/trunk: build.xml lucene/build.xml lucene/common-build.xml solr/build.xml solr/licenses/xercesImpl-2.9.1.jar.sha1

[rm...@apache.org]

Author: rmuir
Date: Fri Aug  3 14:05:26 2012
New Revision: 1368966

URL: http://svn.apache.org/viewvc?rev=1368966&view=rev
Log:
fix jar-checksums task

Modified:
    lucene/dev/trunk/build.xml
    lucene/dev/trunk/lucene/build.xml
    lucene/dev/trunk/lucene/common-build.xml
    lucene/dev/trunk/solr/build.xml
    lucene/dev/trunk/solr/licenses/xercesImpl-2.9.1.jar.sha1

Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1368966&r1=1368965&r2=1368966&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Fri Aug  3 14:05:26 2012
@@ -176,22 +176,12 @@
     </subant>
   </target>
 
-  <target name="jar-checksums" depends="resolve" description="Recompute SHA1 checksums for all JAR files.">
-    <delete>
-      <fileset dir="${basedir}">
-        <include name="**/*.jar.sha1"/>
-      </fileset>
-    </delete>
-
-    <checksum algorithm="SHA1" fileext=".sha1">
-      <fileset dir="${basedir}">
-        <include name="**/*.jar"/>
-      </fileset>
-    </checksum>
-
-    <fixcrlf 
-      srcdir="${basedir}"
-      includes="**/*.jar.sha1"
-      eol="lf" fixlast="true" encoding="US-ASCII" />
+  <target name="jar-checksums" description="Recompute SHA1 checksums for all JAR files.">
+    <sequential>
+      <subant target="jar-checksums" inheritall="false" failonerror="true">
+        <fileset dir="lucene" includes="build.xml" />
+        <fileset dir="solr" includes="build.xml" />
+      </subant>
+    </sequential>
   </target>
 </project>

Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1368966&r1=1368965&r2=1368966&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Fri Aug  3 14:05:26 2012
@@ -572,4 +572,8 @@
     </sequential>
   </target>
 
+  <target name="jar-checksums" depends="resolve">
+    <jar-checksum-macro srcdir="${common.dir}" dstdir="${common.dir}/licenses"/>
+  </target>
+
 </project>

Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1368966&r1=1368965&r2=1368966&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Fri Aug  3 14:05:26 2012
@@ -1567,6 +1567,38 @@ ${tests-output}/junit4-*.suites     - pe
     </sequential>
   </macrodef>
 
+  <macrodef name="jar-checksum-macro">
+      <attribute name="srcdir"/>
+      <attribute name="dstdir"/>
+    <sequential>
+      <delete>
+        <fileset dir="@{dstdir}">
+          <include name="**/*.jar.sha1"/>
+        </fileset>
+      </delete>
+
+      <!-- checksum task does not have a flatten=true -->
+      <tempfile property="jar-checksum.temp.dir"/>
+      <mkdir dir="${jar-checksum.temp.dir}"/>
+      <copy todir="${jar-checksum.temp.dir}" flatten="true">
+        <fileset dir="@{srcdir}">
+          <include name="**/*.jar"/>
+        </fileset>
+      </copy>
+
+      <checksum algorithm="SHA1" fileext=".sha1" todir="@{dstdir}">
+        <fileset dir="${jar-checksum.temp.dir}"/>
+      </checksum>
+
+      <delete dir="${jar-checksum.temp.dir}"/>
+
+      <fixcrlf 
+        srcdir="@{dstdir}"
+        includes="**/*.jar.sha1"
+        eol="lf" fixlast="true" encoding="US-ASCII" />
+    </sequential>
+  </macrodef>
+
   <macrodef name="sign-artifacts-macro">
     <attribute name="artifacts.dir"/>
     <sequential>

Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1368966&r1=1368965&r2=1368966&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Fri Aug  3 14:05:26 2012
@@ -763,4 +763,8 @@
      </delete>
   </target>
 
+  <target name="jar-checksums" depends="resolve">
+    <jar-checksum-macro srcdir="${common-solr.dir}" dstdir="${common-solr.dir}/licenses"/>
+  </target>
+
 </project>

Modified: lucene/dev/trunk/solr/licenses/xercesImpl-2.9.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/xercesImpl-2.9.1.jar.sha1?rev=1368966&r1=1368965&r2=1368966&view=diff
==============================================================================
--- lucene/dev/trunk/solr/licenses/xercesImpl-2.9.1.jar.sha1 (original)
+++ lucene/dev/trunk/solr/licenses/xercesImpl-2.9.1.jar.sha1 Fri Aug  3 14:05:26 2012
@@ -1 +1 @@
-7bc7e49ddfe4fb5f193ed37ecc96c12292c8ceb6
\ No newline at end of file
+7bc7e49ddfe4fb5f193ed37ecc96c12292c8ceb6