lucene-pylucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From va...@apache.org
Subject svn commit: r1555358 - in /lucene/pylucene/trunk: ./ CHANGES Makefile java/org/apache/pylucene/queryparser/classic/PythonQueryParser.java jcc/ jcc/setup.py samples/
Date Sat, 04 Jan 2014 16:02:05 GMT
Author: vajda
Date: Sat Jan  4 16:02:04 2014
New Revision: 1555358

URL: http://svn.apache.org/r1555358
Log:
  - merged 4.5 branch into trunk
  - fixed bug with wrong getRangeQuery() extension signature
  - added missing --include jars to be able to wrap expressions module
  - refreshed to HEAD of branch_4x lucene branch

Modified:
    lucene/pylucene/trunk/   (props changed)
    lucene/pylucene/trunk/CHANGES   (contents, props changed)
    lucene/pylucene/trunk/Makefile   (contents, props changed)
    lucene/pylucene/trunk/java/org/apache/pylucene/queryparser/classic/PythonQueryParser.java
    lucene/pylucene/trunk/jcc/   (props changed)
    lucene/pylucene/trunk/jcc/setup.py   (props changed)
    lucene/pylucene/trunk/samples/   (props changed)

Propchange: lucene/pylucene/trunk/
------------------------------------------------------------------------------
  Merged /lucene/pylucene/branches/pylucene_4_5:r1531782-1536565

Modified: lucene/pylucene/trunk/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/CHANGES?rev=1555358&r1=1555357&r2=1555358&view=diff
==============================================================================
--- lucene/pylucene/trunk/CHANGES (original)
+++ lucene/pylucene/trunk/CHANGES Sat Jan  4 16:02:04 2014
@@ -1,6 +1,6 @@
-Version 4.4.0 -> 4.5.0
+Version 4.4.0 -> 4.5.1
 ----------------------
- - using Lucene 4.5.0 sources
+ - using Lucene 4.5.1 sources
  - PyLucene built with JCC 2.18
 
 Version 4.3.0 -> 4.4.0

Propchange: lucene/pylucene/trunk/CHANGES
------------------------------------------------------------------------------
  Merged /lucene/pylucene/branches/pylucene_4_5/CHANGES:r1531782-1536565

Modified: lucene/pylucene/trunk/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/Makefile?rev=1555358&r1=1555357&r2=1555358&view=diff
==============================================================================
--- lucene/pylucene/trunk/Makefile (original)
+++ lucene/pylucene/trunk/Makefile Sat Jan  4 16:02:04 2014
@@ -45,6 +45,13 @@ LUCENE=$(LUCENE_SRC)/lucene
 # limit.
 #
 
+# Mac OS X 10.6 (MacPorts 1.8.0 64-bit Python 2.7, Java 1.6)
+PREFIX_PYTHON=/Users/vajda/apache/pylucene/_install
+ANT=ant
+PYTHON=$(PREFIX_PYTHON)/bin/python
+JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64
+NUM_FILES=8
+
 # Mac OS X 10.6 (64-bit Python 2.6, Java 1.6)
 #PREFIX_PYTHON=/usr
 #ANT=ant
@@ -162,6 +169,7 @@ JARS+=$(GROUPING_JAR)           # groupi
 JARS+=$(JOIN_JAR)               # join module
 JARS+=$(FACET_JAR)              # facet module
 JARS+=$(SUGGEST_JAR)            # suggest/spell module
+JARS+=$(EXPRESSIONS_JAR)        # expressions module
 
 
 #
@@ -191,7 +199,12 @@ GROUPING_JAR=$(LUCENE)/build/grouping/lu
 JOIN_JAR=$(LUCENE)/build/join/lucene-join-$(LUCENE_VER).jar
 FACET_JAR=$(LUCENE)/build/facet/lucene-facet-$(LUCENE_VER).jar
 SUGGEST_JAR=$(LUCENE)/build/suggest/lucene-suggest-$(LUCENE_VER).jar
+EXPRESSIONS_JAR=$(LUCENE)/build/expressions/lucene-expressions-$(LUCENE_VER).jar
+
 MISC_JAR=$(LUCENE)/build/misc/lucene-misc-$(LUCENE_VER).jar
+ANTLR_JAR=$(LUCENE)/expressions/lib/antlr-runtime-3.5.jar
+ASM_JAR=$(LUCENE)/expressions/lib/asm-4.1.jar
+ASM_COMMONS_JAR=$(LUCENE)/expressions/lib/asm-commons-4.1.jar
 
 ICUPKG:=$(shell which icupkg)
 
@@ -275,12 +288,15 @@ $(FACET_JAR): $(LUCENE_JAR)
 $(SUGGEST_JAR): $(LUCENE_JAR)
 	cd $(LUCENE)/suggest; $(ANT) -Dversion=$(LUCENE_VER)
 
+$(EXPRESSIONS_JAR): $(LUCENE_JAR)
+	cd $(LUCENE)/expressions; $(ANT) -Dversion=$(LUCENE_VER)
+
 $(MISC_JAR): $(LUCENE_JAR)
 	cd $(LUCENE)/misc; $(ANT) -Dversion=$(LUCENE_VER)
 
 JCCFLAGS?=
 
-jars: $(JARS) $(MISC_JAR)
+jars: $(JARS) $(MISC_JAR) $(ANTLR_JAR) $(ASM_JAR) $(ASM_COMMONS)
 
 
 ifneq ($(ICUPKG),)
@@ -307,8 +323,12 @@ resources:
 
 endif
 
-GENERATE=$(JCC) $(foreach jar,$(JARS),--jar $(jar)) --include $(MISC_JAR) \
+GENERATE=$(JCC) $(foreach jar,$(JARS),--jar $(jar)) \
            $(JCCFLAGS) --use_full_names \
+           --include $(MISC_JAR) \
+           --include $(ANTLR_JAR) \
+           --include $(ASM_JAR) \
+           --include $(ASM_COMMONS_JAR) \
            --package java.lang java.lang.System \
                                java.lang.Runtime \
            --package java.util java.util.Arrays \

Propchange: lucene/pylucene/trunk/Makefile
------------------------------------------------------------------------------
  Merged /lucene/pylucene/branches/pylucene_4_5/Makefile:r1531782-1536565

Modified: lucene/pylucene/trunk/java/org/apache/pylucene/queryparser/classic/PythonQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/queryparser/classic/PythonQueryParser.java?rev=1555358&r1=1555357&r2=1555358&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/queryparser/classic/PythonQueryParser.java
(original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/queryparser/classic/PythonQueryParser.java
Sat Jan  4 16:02:04 2014
@@ -61,7 +61,8 @@ public class PythonQueryParser extends Q
     public native Query getPrefixQuery(String field, String termText);
     public native Query getRangeQuery(String field,
                                       String part1, String part2,
-                                      boolean inclusive);
+                                      boolean startInclusive,
+                                      boolean endInclusive);
     public native Query getWildcardQuery(String field, String termText);
 
     public native Query getFieldQuery_quoted(String field, String queryText,

Propchange: lucene/pylucene/trunk/jcc/
------------------------------------------------------------------------------
  Merged /lucene/pylucene/branches/pylucene_4_5/jcc:r1531782-1536565

Propchange: lucene/pylucene/trunk/jcc/setup.py
------------------------------------------------------------------------------
  Merged /lucene/pylucene/branches/pylucene_4_5/jcc/setup.py:r1531782-1536565

Propchange: lucene/pylucene/trunk/samples/
------------------------------------------------------------------------------
  Merged /lucene/pylucene/branches/pylucene_4_5/samples:r1531782-1536565



Mime
View raw message