You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by va...@apache.org on 2009/05/16 21:32:57 UTC
svn commit: r775517 - in /lucene/pylucene/trunk: CHANGES Makefile
Author: vajda
Date: Sat May 16 19:32:57 2009
New Revision: 775517
URL: http://svn.apache.org/viewvc?rev=775517&view=rev
Log:
- fixed bug in Makefile's test target which tested installed build
- PyLucene built with JCC 2.3
- version 2.4.1-2
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=775517&r1=775516&r2=775517&view=diff
==============================================================================
--- lucene/pylucene/trunk/CHANGES (original)
+++ lucene/pylucene/trunk/CHANGES Sat May 16 19:32:57 2009
@@ -2,6 +2,8 @@
Version 2.4.1 ->
----------------------
- renamed the Highlighter's SpanScorer class to HighlighterSpanScorer
+ - fixed bug in Makefile's test target which tested installed build
+ - PyLucene built with JCC 2.3
-
Version 2.4.0 -> 2.4.1
Modified: lucene/pylucene/trunk/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/Makefile?rev=775517&r1=775516&r2=775517&view=diff
==============================================================================
--- lucene/pylucene/trunk/Makefile (original)
+++ lucene/pylucene/trunk/Makefile Sat May 16 19:32:57 2009
@@ -14,7 +14,7 @@
# site-packages directory.
#
-VERSION=2.4.1-1
+VERSION=2.4.1-2
LUCENE_SVN_VER=HEAD
LUCENE_VER=2.4.1
LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/java/tags/lucene_2_4_1
@@ -46,8 +46,8 @@
#JCC=$(PYTHON) -m jcc --shared
#NUM_FILES=2
-# Mac OS X (Python 2.6, Java 1.5)
-#PREFIX_PYTHON=/Users/vajda/tmp/Python-2.6/install
+# Mac OS X (Python 2.6.2, Java 1.5)
+#PREFIX_PYTHON=/Users/vajda/tmp/Python-2.6.2/install
#ANT=ant
#PYTHON=$(PREFIX_PYTHON)/Python.framework/Versions/2.6/bin/python
#JCC=$(PYTHON) -m jcc.__main__ --shared
@@ -57,14 +57,14 @@
#PREFIX_PYTHON=/usr
#ANT=ant
#PYTHON=$(PREFIX_PYTHON)/bin/python
-#JCC=$(PYTHON) /System/Library/Frameworks/Python.framework/Versions/2.3/lib/python2.3/site-packages/JCC-2.2-py2.3-macosx-10.4-i386.egg/jcc/__init__.py
+#JCC=$(PYTHON) /System/Library/Frameworks/Python.framework/Versions/2.3/lib/python2.3/site-packages/JCC-2.3-py2.3-macosx-10.4-i386.egg/jcc/__init__.py
#NUM_FILES=2
# Mac OS X (Python 2.3.5, Java 1.5, setuptools 0.6c7, PPC Mac OS X 10.4)
#PREFIX_PYTHON=/usr
#ANT=ant
#PYTHON=$(PREFIX_PYTHON)/bin/python
-#JCC=$(PYTHON) /System/Library/Frameworks/Python.framework/Versions/2.3/lib/python2.3/site-packages/JCC-2.2-py2.3-macosx-10.4-ppc.egg/jcc/__init__.py
+#JCC=$(PYTHON) /System/Library/Frameworks/Python.framework/Versions/2.3/lib/python2.3/site-packages/JCC-2.3-py2.3-macosx-10.4-ppc.egg/jcc/__init__.py
#NUM_FILES=2
# Linux (Ubuntu 6.06, Python 2.4, Java 1.5, no setuptools)
@@ -221,12 +221,18 @@
rm -rf $(LUCENE)
+BUILD_TEST=$(PYLUCENE)/build/test
+
+install-test:
+ mkdir -p $(BUILD_TEST)
+ export PYTHONPATH=$(BUILD_TEST); $(GENERATE) --install $(DEBUG_OPT) --install-dir $(BUILD_TEST)
+
samples/LuceneInAction/index:
- cd samples/LuceneInAction; $(PYTHON) index.py
+ export PYTHONPATH=$(BUILD_TEST); cd samples/LuceneInAction; $(PYTHON) index.py
-test: samples/LuceneInAction/index
- find test -name 'test_*.py' | xargs -t -n 1 $(PYTHON)
- ls samples/LuceneInAction/*Test.py | xargs -t -n 1 $(PYTHON)
+test: install-test samples/LuceneInAction/index
+ export PYTHONPATH=$(BUILD_TEST); find test -name 'test_*.py' | xargs -t -n 1 $(PYTHON)
+ export PYTHONPATH=$(BUILD_TEST); ls samples/LuceneInAction/*Test.py | xargs -t -n 1 $(PYTHON)
ARCHIVE=pylucene-$(VERSION)-src.tar.gz