You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pylucene-commits@lucene.apache.org by va...@apache.org on 2011/03/28 00:01:17 UTC
svn commit: r1086053 - in /lucene/pylucene/branches/branch_3x: CHANGES
Makefile
Author: vajda
Date: Sun Mar 27 22:01:17 2011
New Revision: 1086053
URL: http://svn.apache.org/viewvc?rev=1086053&view=rev
Log:
- rearranged Lucene source checkout tree to reflect new constraints
Modified:
lucene/pylucene/branches/branch_3x/CHANGES
lucene/pylucene/branches/branch_3x/Makefile
Modified: lucene/pylucene/branches/branch_3x/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/branch_3x/CHANGES?rev=1086053&r1=1086052&r2=1086053&view=diff
==============================================================================
--- lucene/pylucene/branches/branch_3x/CHANGES (original)
+++ lucene/pylucene/branches/branch_3x/CHANGES Sun Mar 27 22:01:17 2011
@@ -7,10 +7,11 @@ Version 3.0.0 ->
- added port of ICUFoldingFilter using C++ ICU's Normalizer2 via PyICU
- added port of ICUTransformFilter using C++ ICU's Transliterator via PyICU
- PyLucene built with JCC 2.6
- - fixed "Lucene in Action" samples leftover on old API
+ - fixed "Lucene in Action" samples left over on old API
- improved support for adding optional contrib modules
- added --package java.util.regex to wrap constructors on PatternAnalyzer
- fixed mansearch.py sample to reflect API changes
+ - rearranged Lucene source checkout tree to reflect new constraints
-
Version 2.9.0 -> 3.0.0
Modified: lucene/pylucene/branches/branch_3x/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/branch_3x/Makefile?rev=1086053&r1=1086052&r2=1086053&view=diff
==============================================================================
--- lucene/pylucene/branches/branch_3x/Makefile (original)
+++ lucene/pylucene/branches/branch_3x/Makefile Sun Mar 27 22:01:17 2011
@@ -18,9 +18,10 @@
VERSION=3.x-0
LUCENE_SVN_VER=HEAD
LUCENE_VER=3.x
-LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x/lucene
+LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/dev/branches/branch_3x
PYLUCENE:=$(shell pwd)
-LUCENE=lucene-java-$(LUCENE_VER)
+LUCENE_SRC=lucene-java-$(LUCENE_VER)
+LUCENE=$(LUCENE_SRC)/lucene
#
# You need to uncomment and edit the variables below in the section
@@ -182,10 +183,12 @@ ICUPKG:=$(shell which icupkg)
default: all
-$(LUCENE):
- svn $(SVNOP) -r $(LUCENE_SVN_VER) $(LUCENE_SVN) $(LUCENE)
+$(LUCENE_SRC):
+ mkdir -p $(LUCENE_SRC)
+ svn $(SVNOP) -r $(LUCENE_SVN_VER) $(LUCENE_SVN)/lucene $(LUCENE_SRC)/lucene
+ svn $(SVNOP) -r $(LUCENE_SVN_VER) $(LUCENE_SVN)/common-build.xml $(LUCENE_SRC)/common-build.xml
-sources: $(LUCENE)
+sources: $(LUCENE_SRC)
to-orig: sources
mkdir -p $(LUCENE)-orig
@@ -252,9 +255,9 @@ GENERATE=$(JCC) $(foreach jar,$(JARS),--
$(JCCFLAGS) \
--package java.lang java.lang.System \
java.lang.Runtime \
- --package java.util \
- java.util.Arrays \
- java.util.HashSet \
+ --package java.util java.util.Arrays \
+ java.util.HashMap \
+ java.util.HashSet \
java.text.SimpleDateFormat \
java.text.DecimalFormat \
java.text.Collator \
@@ -343,7 +346,7 @@ SITE=../site/build/site/en
distrib:
mkdir -p distrib
svn export . distrib/pylucene-$(VERSION)
- tar -cf - --exclude build $(LUCENE) | tar -C distrib/pylucene-$(VERSION) -xvf -
+ tar -cf - --exclude build $(LUCENE_SRC) | tar -C distrib/pylucene-$(VERSION) -xvf -
mkdir distrib/pylucene-$(VERSION)/doc
tar -C $(SITE) -cf - . | tar -C distrib/pylucene-$(VERSION)/doc -xvf -
cd distrib; tar -cvzf $(ARCHIVE) pylucene-$(VERSION)