lucene-pylucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From va...@apache.org
Subject svn commit: r1171209 - in /lucene/pylucene/branches/pylucene_3_4: ./ CHANGES Makefile samples/LuceneInAction/lia/meetlucene/
Date Thu, 15 Sep 2011 18:22:32 GMT
Author: vajda
Date: Thu Sep 15 18:22:31 2011
New Revision: 1171209

URL: http://svn.apache.org/viewvc?rev=1171209&view=rev
Log:
merged changes from branch_3x

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

Propchange: lucene/pylucene/branches/pylucene_3_4/
------------------------------------------------------------------------------
    svn:mergeinfo = /lucene/pylucene/branches/branch_3x:1171208

Modified: lucene/pylucene/branches/pylucene_3_4/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/pylucene_3_4/CHANGES?rev=1171209&r1=1171208&r2=1171209&view=diff
==============================================================================
--- lucene/pylucene/branches/pylucene_3_4/CHANGES (original)
+++ lucene/pylucene/branches/pylucene_3_4/CHANGES Thu Sep 15 18:22:31 2011
@@ -1,7 +1,8 @@
 
-Version 3.3 ->
+Version 3.3 -> 3.4
 ------------------
- - 
+ - added new join contrib module to build
+ - PyLucene built with JCC 2.11
 
 Version 3.2 -> 3.3
 ------------------

Modified: lucene/pylucene/branches/pylucene_3_4/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/pylucene_3_4/Makefile?rev=1171209&r1=1171208&r2=1171209&view=diff
==============================================================================
--- lucene/pylucene/branches/pylucene_3_4/Makefile (original)
+++ lucene/pylucene/branches/pylucene_3_4/Makefile Thu Sep 15 18:22:31 2011
@@ -15,10 +15,10 @@
 # site-packages directory.
 #
 
-VERSION=3.x-0
+VERSION=3.4.0-1
 LUCENE_SVN_VER=HEAD
-LUCENE_VER=3.x
-LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x
+LUCENE_VER=3.4.0
+LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/dev/tags/lucene_solr_3_4_0
 PYLUCENE:=$(shell pwd)
 LUCENE_SRC=lucene-java-$(LUCENE_VER)
 LUCENE=$(LUCENE_SRC)/lucene
@@ -154,6 +154,7 @@ JARS+=$(QUERIES_JAR)            # regex 
 #JARS+=$(SMARTCN_JAR)            # smart chinese analyzer
 #JARS+=$(SPATIAL_JAR)            # spatial lucene
 JARS+=$(GROUPING_JAR)           # grouping module
+JARS+=$(JOIN_JAR)               # join module
 
 
 #
@@ -177,6 +178,7 @@ EXTENSIONS_JAR=build/jar/extensions.jar
 SMARTCN_JAR=$(LUCENE)/build/contrib/analyzers/smartcn/lucene-smartcn-$(LUCENE_VER).jar
 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
 
 ICUPKG:=$(shell which icupkg)
 
@@ -230,6 +232,9 @@ $(SPATIAL_JAR): $(LUCENE_JAR)
 $(GROUPING_JAR): $(LUCENE_JAR)
 	cd $(LUCENE)/contrib/grouping; $(ANT) -Dversion=$(LUCENE_VER)
 
+$(JOIN_JAR): $(LUCENE_JAR)
+	cd $(LUCENE)/contrib/join; $(ANT) -Dversion=$(LUCENE_VER)
+
 JCCFLAGS?=
 
 jars: $(JARS)

Propchange: lucene/pylucene/branches/pylucene_3_4/samples/LuceneInAction/lia/meetlucene/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 15 18:22:31 2011
@@ -1 +1,2 @@
+/lucene/pylucene/branches/branch_3x/samples/LuceneInAction/lia/meetlucene:1171208
 /lucene/pylucene/branches/pylucene_3_0/samples/LuceneInAction/lia/meetlucene:950836,984081



Mime
View raw message