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/05/10 22:36:36 UTC
svn commit: r1101636 - in /lucene/pylucene/trunk: Makefile extensions.xml
java/org/apache/pylucene/analysis/PythonCharTokenizer.java
java/org/apache/pylucene/search/PythonSimilarity.java test/test_PyLucene.py
Author: vajda
Date: Tue May 10 20:36:35 2011
New Revision: 1101636
URL: http://svn.apache.org/viewvc?rev=1101636&view=rev
Log:
trunk builds again
Modified:
lucene/pylucene/trunk/Makefile
lucene/pylucene/trunk/extensions.xml
lucene/pylucene/trunk/java/org/apache/pylucene/analysis/PythonCharTokenizer.java
lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonSimilarity.java
lucene/pylucene/trunk/test/test_PyLucene.py
Modified: lucene/pylucene/trunk/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/Makefile?rev=1101636&r1=1101635&r2=1101636&view=diff
==============================================================================
--- lucene/pylucene/trunk/Makefile (original)
+++ lucene/pylucene/trunk/Makefile Tue May 10 20:36:35 2011
@@ -18,11 +18,11 @@
VERSION=4.0-0
LUCENE_SVN_VER=HEAD
LUCENE_VER=4.0
-LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/dev/trunk/lucene
-MODULES_SVN=http://svn.apache.org/repos/asf/lucene/dev/trunk/modules
+LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/dev/trunk
PYLUCENE:=$(shell pwd)
-LUCENE=lucene-java-$(LUCENE_VER)
-MODULES=lucene-modules-$(LUCENE_VER)
+LUCENE_SRC=lucene-java-$(LUCENE_VER)
+LUCENE=$(LUCENE_SRC)/lucene
+MODULES=$(LUCENE_SRC)/modules
#
# You need to uncomment and edit the variables below in the section
@@ -171,13 +171,12 @@ ICUPKG:=$(shell which icupkg)
default: all
-$(LUCENE):
- svn $(SVNOP) -r $(LUCENE_SVN_VER) $(LUCENE_SVN) $(LUCENE)
- if test ! -h lucene; then ln -s $(LUCENE) lucene; fi
- svn $(SVNOP) -r $(LUCENE_SVN_VER) $(MODULES_SVN) $(MODULES)
- if test ! -h modules; then ln -s $(MODULES) modules; fi
+$(LUCENE_SRC):
+ svn $(SVNOP) --depth files -r $(LUCENE_SVN_VER) $(LUCENE_SVN) $(LUCENE_SRC)
+ svn $(SVNOP) -r $(LUCENE_SVN_VER) $(LUCENE_SVN)/lucene $(LUCENE_SRC)/lucene
+ svn $(SVNOP) -r $(LUCENE_SVN_VER) $(LUCENE_SVN)/modules $(LUCENE_SRC)/modules
-sources: $(LUCENE)
+sources: $(LUCENE_SRC)
to-orig: sources
mkdir -p $(LUCENE)-orig
@@ -207,7 +206,7 @@ $(QUERIES_JAR): $(LUCENE_JAR)
cd $(LUCENE)/contrib/queries; $(ANT) -Dversion=$(LUCENE_VER)
$(EXTENSIONS_JAR): $(LUCENE_JAR)
- $(ANT) -f extensions.xml -Dlucene.dir=$(LUCENE)
+ $(ANT) -f extensions.xml -Dlucene.dir=$(LUCENE_SRC)
$(SMARTCN_JAR): $(LUCENE_JAR)
cd $(MODULES)/analysis/smartcn; $(ANT) -Dversion=$(LUCENE_VER)
@@ -245,9 +244,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 \
@@ -337,7 +336,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)
Modified: lucene/pylucene/trunk/extensions.xml
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/extensions.xml?rev=1101636&r1=1101635&r2=1101636&view=diff
==============================================================================
--- lucene/pylucene/trunk/extensions.xml (original)
+++ lucene/pylucene/trunk/extensions.xml Tue May 10 20:36:35 2011
@@ -2,7 +2,7 @@
<project name="extensions" default="jar">
<path id="classpath">
- <fileset dir="${lucene.dir}/build" includes="**/*.jar" />
+ <fileset dir="${lucene.dir}" includes="**/*.jar" />
</path>
<property name="build.dir" value="build" />
Modified: lucene/pylucene/trunk/java/org/apache/pylucene/analysis/PythonCharTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/analysis/PythonCharTokenizer.java?rev=1101636&r1=1101635&r2=1101636&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/analysis/PythonCharTokenizer.java (original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/analysis/PythonCharTokenizer.java Tue May 10 20:36:35 2011
@@ -18,7 +18,7 @@ package org.apache.pylucene.analysis;
import java.io.IOException;
import java.io.Reader;
-import org.apache.lucene.analysis.CharTokenizer;
+import org.apache.lucene.analysis.util.CharTokenizer;
import org.apache.lucene.util.Version;
Modified: lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonSimilarity.java?rev=1101636&r1=1101635&r2=1101636&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonSimilarity.java (original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonSimilarity.java Tue May 10 20:36:35 2011
@@ -68,7 +68,7 @@ public class PythonSimilarity extends Si
public native float coord(int overlap, int maxOverlap);
public native float idf(int docFreq, int numDocs);
- public native float computeNorm(String fieldName, FieldInvertState state);
+ public native float computeNorm(FieldInvertState state);
public native float queryNorm(float sumOfSquaredWeights);
public native float sloppyFreq(int distance);
public native float tf(float freq);
Modified: lucene/pylucene/trunk/test/test_PyLucene.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test/test_PyLucene.py?rev=1101636&r1=1101635&r2=1101636&view=diff
==============================================================================
--- lucene/pylucene/trunk/test/test_PyLucene.py (original)
+++ lucene/pylucene/trunk/test/test_PyLucene.py Tue May 10 20:36:35 2011
@@ -256,8 +256,7 @@ class Test_PyLuceneBase(object):
docids.append(term.utf8ToString())
self.assertEqual(len(docids), 2)
finally:
- pass
- #self.closeStore(store, reader)
+ self.closeStore(store, reader)
def test_getFieldNames(self):