svn commit: r1531724 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/CHANGES.txt lucene/common-build.xml solr/ solr/common-build.xml

[sa...@apache.org]

Author: sarowe
Date: Sun Oct 13 18:03:38 2013
New Revision: 1531724

URL: http://svn.apache.org/r1531724
Log:
LUCENE-5273: Only unpack Lucene/Solr jars/war from binary distributions - other stuff not needed (merged trunk r1531711)

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_4x/lucene/common-build.xml   (contents, props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/common-build.xml   (contents, props changed)

Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1531724&r1=1531723&r2=1531724&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Sun Oct 13 18:03:38 2013
@@ -135,7 +135,7 @@ Build
   
 * LUCENE-5273: Binary artifacts in Lucene and Solr convenience binary
   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
 

Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1531724&r1=1531723&r2=1531724&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Sun Oct 13 18:03:38 2013
@@ -496,6 +496,11 @@
   <property name="lucene.tgz.file" location="${common.dir}/dist/lucene-${version}.tgz"/>
   <available file="${lucene.tgz.file}" property="lucene.tgz.exists"/>
   <property name="lucene.tgz.unpack.dir" location="${common.build.dir}/lucene.tgz.unpacked"/>
+  <patternset id="patternset.lucene.solr.archives">
+    <include name="**/lucene-*.jar"/>
+    <include name="**/solr-*.jar"/>
+    <include name="**/solr-*.war"/>
+  </patternset>
   <available type="dir" file="${lucene.tgz.unpack.dir}" property="lucene.tgz.unpack.dir.exists"/>
   <target name="-ensure-lucene-tgz-exists" unless="lucene.tgz.exists">
     <ant dir="${common.dir}" target="package-tgz" inheritall="false"/>
@@ -503,7 +508,9 @@
   <target name="-unpack-lucene-tgz" unless="lucene.tgz.unpack.dir.exists">
     <antcall target="-ensure-lucene-tgz-exists" inheritall="false"/>
     <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.archives"/>
+    </untar>
   </target>
   <property name="dist.jar.dir.prefix" value="${lucene.tgz.unpack.dir}/lucene"/>
   <pathconvert property="dist.jar.dir.suffix">

Modified: lucene/dev/branches/branch_4x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/common-build.xml?rev=1531724&r1=1531723&r2=1531724&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/common-build.xml Sun Oct 13 18:03:38 2013
@@ -59,7 +59,9 @@
   <target name="-unpack-solr-tgz" unless="${solr.tgz.unpack.dir.exists}">
     <antcall target="-ensure-solr-tgz-exists"/>
     <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.archives"/>
+    </untar>
   </target>
 
   <!-- backwards compatibility with existing targets/tasks; TODO: remove this! -->