Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-5273: Only unpack Lucene/Solr jars from binary distributions - other stuff not needed 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1531711 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2013-10-13 16:36:05 +00:00
parent eb01f4c2bf
commit a1d0068a93
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/CHANGES.txt
View File

@ -188,7 +188,7 @@ Build
* LUCENE-5273: Binary artifacts in Lucene and Solr convenience binary * LUCENE-5273: Binary artifacts in Lucene and Solr convenience binary
distributions accompanying a release, including on Maven Central, distributions accompanying a release, including on Maven Central,
should be identical across all distributions. (Steve Rowe) should be identical across all distributions. (Steve Rowe, Uwe Schindler)
Tests Tests

8
lucene/common-build.xml
View File

@ -493,6 +493,10 @@
<property name="lucene.tgz.file" location="${common.dir}/dist/lucene-${version}.tgz"/> <property name="lucene.tgz.file" location="${common.dir}/dist/lucene-${version}.tgz"/>
<available file="${lucene.tgz.file}" property="lucene.tgz.exists"/> <available file="${lucene.tgz.file}" property="lucene.tgz.exists"/>
<property name="lucene.tgz.unpack.dir" location="${common.build.dir}/lucene.tgz.unpacked"/> <property name="lucene.tgz.unpack.dir" location="${common.build.dir}/lucene.tgz.unpacked"/>
<patternset id="patternset.lucene.solr.jars">
<include name="**/lucene-*.jar"/>
<include name="**/solr-*.jar"/>
</patternset>
<available type="dir" file="${lucene.tgz.unpack.dir}" property="lucene.tgz.unpack.dir.exists"/> <available type="dir" file="${lucene.tgz.unpack.dir}" property="lucene.tgz.unpack.dir.exists"/>
<target name="-ensure-lucene-tgz-exists" unless="lucene.tgz.exists"> <target name="-ensure-lucene-tgz-exists" unless="lucene.tgz.exists">
<ant dir="${common.dir}" target="package-tgz" inheritall="false"/> <ant dir="${common.dir}" target="package-tgz" inheritall="false"/>
@ -500,7 +504,9 @@
<target name="-unpack-lucene-tgz" unless="lucene.tgz.unpack.dir.exists"> <target name="-unpack-lucene-tgz" unless="lucene.tgz.unpack.dir.exists">
<antcall target="-ensure-lucene-tgz-exists" inheritall="false"/> <antcall target="-ensure-lucene-tgz-exists" inheritall="false"/>
<mkdir dir="${lucene.tgz.unpack.dir}"/> <mkdir dir="${lucene.tgz.unpack.dir}"/>
<untar compression="gzip" src="${lucene.tgz.file}" dest="${lucene.tgz.unpack.dir}"/> <untar compression="gzip" src="${lucene.tgz.file}" dest="${lucene.tgz.unpack.dir}">
<patternset refid="patternset.lucene.solr.jars"/>
</untar>
</target> </target>
<property name="dist.jar.dir.prefix" value="${lucene.tgz.unpack.dir}/lucene"/> <property name="dist.jar.dir.prefix" value="${lucene.tgz.unpack.dir}/lucene"/>
<pathconvert property="dist.jar.dir.suffix"> <pathconvert property="dist.jar.dir.suffix">

4
solr/common-build.xml
View File

@ -59,7 +59,9 @@
<target name="-unpack-solr-tgz" unless="${solr.tgz.unpack.dir.exists}"> <target name="-unpack-solr-tgz" unless="${solr.tgz.unpack.dir.exists}">
<antcall target="-ensure-solr-tgz-exists"/> <antcall target="-ensure-solr-tgz-exists"/>
<mkdir dir="${solr.tgz.unpack.dir}"/> <mkdir dir="${solr.tgz.unpack.dir}"/>
<untar compression="gzip" src="${solr.tgz.file}" dest="${solr.tgz.unpack.dir}"/> <untar compression="gzip" src="${solr.tgz.file}" dest="${solr.tgz.unpack.dir}">
<patternset refid="patternset.lucene.solr.jars"/>
</untar>
</target> </target>
<!-- backwards compatibility with existing targets/tasks; TODO: remove this! --> <!-- backwards compatibility with existing targets/tasks; TODO: remove this! -->