fix jar-checksums task

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1368966 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Muir 2012-08-03 14:05:26 +00:00
parent a8ebce8f73
commit 16dbab69b2
5 changed files with 48 additions and 18 deletions

View File

@ -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>

View File

@ -572,4 +572,8 @@
</sequential>
</target>
<target name="jar-checksums" depends="resolve">
<jar-checksum-macro srcdir="${common.dir}" dstdir="${common.dir}/licenses"/>
</target>
</project>

View File

@ -1567,6 +1567,38 @@ ${tests-output}/junit4-*.suites - per-JVM executed suites
</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>

View File

@ -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>

View File

@ -1 +1 @@
7bc7e49ddfe4fb5f193ed37ecc96c12292c8ceb6
7bc7e49ddfe4fb5f193ed37ecc96c12292c8ceb6