X-Git-Url: https://git.mdrn.pl/pylucene.git/blobdiff_plain/1328cd8ddc9f6dcb73f08ef4ab8e85a0f15b00e3..refs/heads/master:/Makefile?ds=sidebyside diff --git a/Makefile b/Makefile index 06179e7..2001975 100644 --- a/Makefile +++ b/Makefile @@ -15,10 +15,10 @@ # site-packages directory. # -VERSION=3.4.0-1 +VERSION=3.5.0-3 LUCENE_SVN_VER=HEAD -LUCENE_VER=3.4.0 -LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_3_4_0 +LUCENE_VER=3.5.0 +LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_3_5_0 PYLUCENE:=$(shell pwd) LUCENE_SRC=lucene-java-$(LUCENE_VER) LUCENE=$(LUCENE_SRC)/lucene @@ -50,68 +50,68 @@ LUCENE=$(LUCENE_SRC)/lucene #ANT=ant #PYTHON=$(PREFIX_PYTHON)/bin/python #JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64 -#NUM_FILES=3 +#NUM_FILES=4 # Mac OS X 10.6 (MacPorts 1.8.0 64-bit Python 2.7, Java 1.6) #PREFIX_PYTHON=/opt/local #ANT=ant #PYTHON=$(PREFIX_PYTHON)/bin/python #JCC=$(PYTHON) -m jcc --shared --arch x86_64 -#NUM_FILES=3 +#NUM_FILES=4 # Mac OS X 10.6 (MacPorts 1.8.0 64-bit Python 2.6, Java 1.6) #PREFIX_PYTHON=/opt/local #ANT=ant #PYTHON=$(PREFIX_PYTHON)/bin/python #JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64 -#NUM_FILES=3 +#NUM_FILES=4 # Mac OS X 10.6 (64-bit and 32-bit Python 2.6 together, Java 1.6) #PREFIX_PYTHON=/usr #ANT=ant #PYTHON=$(PREFIX_PYTHON)/bin/python #JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64 --arch i386 -#NUM_FILES=3 +#NUM_FILES=4 # Mac OS X 10.5 (32-bit Python 2.5, Java 1.5) #PREFIX_PYTHON=/usr #ANT=ant #PYTHON=$(PREFIX_PYTHON)/bin/python #JCC=$(PYTHON) -m jcc --shared -#NUM_FILES=3 +#NUM_FILES=4 # Mac OS X (Python 2.3.5, Java 1.5, setuptools 0.6c7, Intel 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.3-py2.3-macosx-10.4-i386.egg/jcc/__init__.py -#NUM_FILES=3 +#NUM_FILES=4 # 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.3-py2.3-macosx-10.4-ppc.egg/jcc/__init__.py -#NUM_FILES=3 +#NUM_FILES=4 # Linux (Ubuntu 6.06, Python 2.4, Java 1.5, no setuptools) #PREFIX_PYTHON=/usr #ANT=ant #PYTHON=$(PREFIX_PYTHON)/bin/python #JCC=$(PYTHON) $(PREFIX_PYTHON)/lib/python2.4/site-packages/jcc/__init__.py -#NUM_FILES=3 +#NUM_FILES=4 # Linux (Ubuntu 8.10 64-bit, Python 2.5.2, OpenJDK 1.6, setuptools 0.6c9) #PREFIX_PYTHON=/usr #ANT=ant #PYTHON=$(PREFIX_PYTHON)/bin/python #JCC=$(PYTHON) -m jcc --shared -#NUM_FILES=3 +#NUM_FILES=4 PREFIX_PYTHON=$(VIRTUAL_ENV) ANT=ant PYTHON=$(PREFIX_PYTHON)/bin/python -JCC=$(PYTHON) -m jcc #--shared +JCC=$(PYTHON) -m jcc.__main__ --shared NUM_FILES=3 # FreeBSD @@ -119,35 +119,35 @@ NUM_FILES=3 #ANT=ant #PYTHON=$(PREFIX_PYTHON)/bin/python #JCC=$(PYTHON) -m jcc -#NUM_FILES=3 +#NUM_FILES=4 # Solaris (Solaris 11, Python 2.4 32-bit, Sun Studio 12, Java 1.6) #PREFIX_PYTHON=/usr #ANT=/usr/local/apache-ant-1.7.0/bin/ant #PYTHON=$(PREFIX_PYTHON)/bin/python #JCC=$(PYTHON) $(PREFIX_PYTHON)/lib/python2.4/site-packages/jcc/__init__.py -#NUM_FILES=3 +#NUM_FILES=4 # Windows (Win32, Python 2.5.1, Java 1.6, ant 1.7.0) #PREFIX_PYTHON=/cygdrive/o/Python-2.5.2/PCbuild #ANT=JAVA_HOME=o:\\Java\\jdk1.6.0_02 /cygdrive/o/java/apache-ant-1.7.0/bin/ant #PYTHON=$(PREFIX_PYTHON)/python.exe #JCC=$(PYTHON) -m jcc --shared -#NUM_FILES=3 +#NUM_FILES=4 # Windows (Win32, msys/MinGW, Python 2.6.4, Java 1.6, ant 1.7.1 (WinAnt)) #PREFIX_PYTHON=/c/Python26 #ANT=JAVA_HOME="c:\\Program Files\\Java\\jdk1.6.0_18" "/c/Program Files/WinAnt/bin/ant" #PYTHON=$(PREFIX_PYTHON)/python.exe #JCC=$(PYTHON) -m jcc.__main__ --shared --compiler mingw32 -#NUM_FILES=3 +#NUM_FILES=4 # Windows (Win32, Python 2.7, Java 1.6, ant 1.8.1, Java not on PATH) #PREFIX_PYTHON=/cygdrive/c/Python27 #ANT=JAVA_HOME=c:\\jdk1.6.0_22 /cygdrive/c/java/apache-ant-1.8.1/bin/ant #PYTHON=$(PREFIX_PYTHON)/python.exe #JCC=$(PYTHON) -m jcc --shared --find-jvm-dll -#NUM_FILES=3 +#NUM_FILES=4 JARS=$(LUCENE_JAR) @@ -162,6 +162,8 @@ JARS+=$(STEMPEL_JAR) #JARS+=$(SPATIAL_JAR) # spatial lucene JARS+=$(GROUPING_JAR) # grouping module JARS+=$(JOIN_JAR) # join module +JARS+=$(FACET_JAR) # facet module +JARS+=$(SPELLCHECKER_JAR) # spellchecker/suggest module # @@ -187,6 +189,8 @@ STEMPEL_JAR=$(LUCENE)/build/contrib/analyzers/stempel/lucene-stempel-$(LUCENE_VE SPATIAL_JAR=$(LUCENE)/build/contrib/spatial/lucene-spatial-$(LUCENE_VER).jar GROUPING_JAR=$(LUCENE)/build/contrib/grouping/lucene-grouping-$(LUCENE_VER).jar JOIN_JAR=$(LUCENE)/build/contrib/join/lucene-join-$(LUCENE_VER).jar +FACET_JAR=$(LUCENE)/build/contrib/facet/lucene-facet-$(LUCENE_VER).jar +SPELLCHECKER_JAR=$(LUCENE)/build/contrib/spellchecker/lucene-spellchecker-$(LUCENE_VER).jar ICUPKG:=$(shell which icupkg) @@ -246,6 +250,12 @@ $(GROUPING_JAR): $(LUCENE_JAR) $(JOIN_JAR): $(LUCENE_JAR) cd $(LUCENE)/contrib/join; $(ANT) -Dversion=$(LUCENE_VER) +$(FACET_JAR): $(LUCENE_JAR) + cd $(LUCENE)/contrib/facet; $(ANT) -Dversion=$(LUCENE_VER) + +$(SPELLCHECKER_JAR): $(LUCENE_JAR) + cd $(LUCENE)/contrib/spellchecker; $(ANT) -Dversion=$(LUCENE_VER) + JCCFLAGS?= jars: $(JARS) @@ -329,7 +339,7 @@ clean: realclean: if test ! -d $(LUCENE)/.svn; then rm -rf $(LUCENE_SRC); else rm -rf $(LUCENE)/build; fi - rm -rf build samples/LuceneInAction/index + rm -rf build samples/LuceneInAction/index samples/LuceneInAction/indexes OS=$(shell uname) BUILD_TEST:=$(PYLUCENE)/build/test @@ -358,6 +368,7 @@ test: install-test samples/LuceneInAction/index 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