You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pylucene-commits@lucene.apache.org by va...@apache.org on 2012/07/07 15:20:48 UTC

svn commit: r1358562 - in /lucene/pylucene/branches/branch_3x: ./ Makefile samples/LuceneInAction/lia/meetlucene/

Author: vajda
Date: Sat Jul  7 13:20:48 2012
New Revision: 1358562

URL: http://svn.apache.org/viewvc?rev=1358562&view=rev
Log:
merged pylucene_3_6 into branch_3x

Modified:
    lucene/pylucene/branches/branch_3x/   (props changed)
    lucene/pylucene/branches/branch_3x/Makefile
    lucene/pylucene/branches/branch_3x/samples/LuceneInAction/lia/meetlucene/   (props changed)

Propchange: lucene/pylucene/branches/branch_3x/
------------------------------------------------------------------------------
    svn:mergeinfo = /lucene/pylucene/branches/pylucene_3_6:1334275-1358561

Modified: lucene/pylucene/branches/branch_3x/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/branch_3x/Makefile?rev=1358562&r1=1358561&r2=1358562&view=diff
==============================================================================
--- lucene/pylucene/branches/branch_3x/Makefile (original)
+++ lucene/pylucene/branches/branch_3x/Makefile Sat Jul  7 13:20:48 2012
@@ -386,14 +386,11 @@ test: install-test samples/LuceneInActio
 
 
 ARCHIVE=pylucene-$(VERSION)-src.tar.gz
-SITE=../site/build/site/en
 
 distrib:
 	mkdir -p distrib
 	svn export . distrib/pylucene-$(VERSION)
 	tar -cf - --exclude build $(LUCENE_SRC) | tar -C distrib/pylucene-$(VERSION) -xvf -
-	mkdir distrib/pylucene-$(VERSION)/doc
-	tar -C $(SITE) -cf - . | tar -C distrib/pylucene-$(VERSION)/doc -xvf -
 	cd distrib; tar -cvzf $(ARCHIVE) pylucene-$(VERSION)
 	cd distrib; gpg2 --armor --output $(ARCHIVE).asc --detach-sig $(ARCHIVE)
 	cd distrib; openssl md5 < $(ARCHIVE) > $(ARCHIVE).md5

Propchange: lucene/pylucene/branches/branch_3x/samples/LuceneInAction/lia/meetlucene/
------------------------------------------------------------------------------
  Merged /lucene/pylucene/branches/pylucene_3_6/samples/LuceneInAction/lia/meetlucene:r1334275-1358561