Mailing-List: contact pylucene-commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
Reply-To: pylucene-dev@lucene.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1467705 - in /lucene/pylucene/trunk: CHANGES Makefile
Date: Sat, 13 Apr 2013 21:10:05 -0000
To: pylucene-commits@lucene.apache.org
From: vajda@apache.org
Message-Id: <20130413211006.0D2452388994@eris.apache.org>

Author: vajda
Date: Sat Apr 13 21:10:05 2013
New Revision: 1467705

URL: http://svn.apache.org/r1467705
Log:
preparing 4.2.1 release

Modified:
    lucene/pylucene/trunk/CHANGES
    lucene/pylucene/trunk/Makefile

Modified: lucene/pylucene/trunk/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/CHANGES?rev=1467705&r1=1467704&r2=1467705&view=diff
==============================================================================
--- lucene/pylucene/trunk/CHANGES (original)
+++ lucene/pylucene/trunk/CHANGES Sat Apr 13 21:10:05 2013
@@ -1,11 +1,12 @@
-Version 3.6.2 ->
---------------------
- - using Lucene sources from Lucene's branch_4x
+Version 3.6.2 -> 4.2.1
+----------------------
+ - using Lucene 4.2.1 sources
  - switched build to --use_full_names, Python wrappers now follow Java packages
  - removed all --rename and most --exclude entries from jcc command line
  - migrated all unit tests to Lucene 4.x API
  - migrated FacetExample.py to latest 4.x facets API (Thomas Koch)
- - 
+ - removed Lucene in Action samples as they're incompatible with the 4.x API
+ - PyLucene built with JCC 2.16
 
 Version 3.6.1 -> 3.6.2
 ----------------------

Modified: lucene/pylucene/trunk/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/Makefile?rev=1467705&r1=1467704&r2=1467705&view=diff
==============================================================================
--- lucene/pylucene/trunk/Makefile (original)
+++ lucene/pylucene/trunk/Makefile Sat Apr 13 21:10:05 2013
@@ -15,10 +15,10 @@
 # site-packages directory.
 #
 
-VERSION=4.1-0
+VERSION=4.2.1-0
 LUCENE_SVN_VER=HEAD
-LUCENE_VER=4.1
-LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x
+LUCENE_VER=4.2.1
+LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_4_2_1
 PYLUCENE:=$(shell pwd)
 LUCENE_SRC=lucene-java-$(LUCENE_VER)
 LUCENE=$(LUCENE_SRC)/lucene
@@ -345,7 +345,7 @@ clean:
 
 realclean:
 	if test ! -d $(LUCENE)/.svn; then rm -rf $(LUCENE) lucene; else rm -rf $(LUCENE)/build; fi
-	rm -rf build samples/LuceneInAction/index samples/LuceneInAction/indexes
+	rm -rf build
 
 OS=$(shell uname)
 BUILD_TEST:=$(PYLUCENE)/build/test
@@ -362,20 +362,8 @@ install-test:
 	mkdir -p $(BUILD_TEST)
 	PYTHONPATH=$(BUILD_TEST) $(GENERATE) --install $(DEBUG_OPT) --install-dir $(BUILD_TEST)
 
-samples/LuceneInAction/index:
-	cd samples/LuceneInAction; PYTHONPATH=$(BUILD_TEST) $(PYTHON) index.py
-
-test: install-test #samples/LuceneInAction/index
+test: install-test
 	find test -name 'test_*.py' | PYTHONPATH=$(BUILD_TEST) xargs -t -n 1 $(PYTHON)
-#	ls samples/LuceneInAction/*Test.py | PYTHONPATH=$(BUILD_TEST) xargs -t -n 1 $(PYTHON)
-#	PYTHONPATH=$(BUILD_TEST) $(PYTHON) samples/LuceneInAction/AnalyzerDemo.py
-#	PYTHONPATH=$(BUILD_TEST) $(PYTHON) samples/LuceneInAction/AnalyzerUtils.py
-#	PYTHONPATH=$(BUILD_TEST) $(PYTHON) samples/LuceneInAction/BooksLikeThis.py
-#	PYTHONPATH=$(BUILD_TEST) $(PYTHON) samples/LuceneInAction/Explainer.py samples/LuceneInAction/index programming
-#	PYTHONPATH=$(BUILD_TEST) $(PYTHON) samples/LuceneInAction/HighlightIt.py
-#	PYTHONPATH=$(BUILD_TEST) $(PYTHON) samples/LuceneInAction/SortingExample.py
-#	PYTHONPATH=$(BUILD_TEST) $(PYTHON) samples/LuceneInAction/SynonymAnalyzerViewer.py
-
 
 ARCHIVE=pylucene-$(VERSION)-src.tar.gz