You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/08/10 14:38:48 UTC

svn commit: r1371688 - in /lucene/dev/trunk/solr: CHANGES.txt build.xml

Author: rmuir
Date: Fri Aug 10 12:38:48 2012
New Revision: 1371688

URL: http://svn.apache.org/viewvc?rev=1371688&view=rev
Log:
SOLR-3725: fix package-local-src-tgz to not bring in jars/binary content

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/build.xml

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1371688&r1=1371687&r2=1371688&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Aug 10 12:38:48 2012
@@ -48,6 +48,9 @@ Bug Fixes
 * SOLR-3229: Fixed TermVectorComponent to work with distributed search
   (Hang Xie, hossman)
 
+* SOLR-3725: Fixed package-local-src-tgz target to not bring in unnecessary jars
+  and binary contents.  (Michael Dodsworth via rmuir)
+
 ==================  4.0.0-BETA ===================
 
 

Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1371688&r1=1371687&r2=1371688&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Fri Aug 10 12:38:48 2012
@@ -361,12 +361,17 @@
               value="${common-solr.dir}/build/${fullnamever}-src.tgz"/>
     <delete file="${source.package.file}" failonerror="false" />
 
+    <!-- includes/excludes requires a relative path -->
+    <property name="dist.rel" location="${dist}" relative="yes"/>
+    <property name="package.dir.rel" location="${package.dir}" relative="yes"/>
+
     <tar destfile="${source.package.file}" compression="gzip" longfile="gnu">
       <tarfileset dir=".." prefix="${fullnamever}" includes="*.txt *.xml dev-tools/" />
       <tarfileset dir="." prefix="${fullnamever}" includes="LICENSE.txt NOTICE.txt"/>
       <tarfileset dir="." prefix="${fullnamever}/solr"
-                  excludes="build ${package.dir}/** ${dist}/**
-                            example/webapps/*.war example/exampledocs/post.jar
+                  excludes="build/** ${package.dir.rel}/** ${dist.rel}/**
+                            example/webapps/*.war example/lib/**
+                            **/*.jar 
                             lib/README.committers.txt **/data/ **/logs/*
                             **/*.sh **/bin/ scripts/ 
                             .idea/ **/*.iml **/pom.xml" />