lucene-pylucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From va...@apache.org
Subject svn commit: r1585161 - in /lucene/pylucene/trunk: ./ CHANGES Makefile java/org/apache/pylucene/store/PythonLock.java test/test_PythonDirectory.py
Date Sat, 05 Apr 2014 18:52:16 GMT
Author: vajda
Date: Sat Apr  5 18:52:15 2014
New Revision: 1585161

URL: http://svn.apache.org/r1585161
Log:
refreshed to latest in branch_4x

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/store/PythonLock.java
    lucene/pylucene/trunk/test/test_PythonDirectory.py

Propchange: lucene/pylucene/trunk/
------------------------------------------------------------------------------
  Merged /lucene/pylucene/branches/pylucene_4_6:r1563225-1565815

Modified: lucene/pylucene/trunk/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/CHANGES?rev=1585161&r1=1585160&r2=1585161&view=diff
==============================================================================
--- lucene/pylucene/trunk/CHANGES (original)
+++ lucene/pylucene/trunk/CHANGES Sat Apr  5 18:52:15 2014
@@ -1,3 +1,8 @@
+Version 4.5.1 -> 4.6.1
+----------------------
+ - using Lucene 4.6.1 sources
+ - PyLucene built with JCC 2.19
+
 Version 4.4.0 -> 4.5.1
 ----------------------
  - using Lucene 4.5.1 sources

Propchange: lucene/pylucene/trunk/CHANGES
------------------------------------------------------------------------------
  Merged /lucene/pylucene/branches/pylucene_4_6/CHANGES:r1563225-1565815

Modified: lucene/pylucene/trunk/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/Makefile?rev=1585161&r1=1585160&r2=1585161&view=diff
==============================================================================
--- lucene/pylucene/trunk/Makefile (original)
+++ lucene/pylucene/trunk/Makefile Sat Apr  5 18:52:15 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=/Users/vajda/tmp/apache-ant-1.9.3/bin/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
@@ -406,7 +413,7 @@ distrib:
 	mkdir -p distrib
 	svn export --force . distrib/pylucene-$(VERSION)
 	tar -cf - --exclude build $(LUCENE_SRC) | tar -C distrib/pylucene-$(VERSION) -xvf -
-	cd distrib; tar -cvzf $(ARCHIVE) pylucene-$(VERSION)
+	cd distrib; tar --disable-copyfile -cvzf $(ARCHIVE) pylucene-$(VERSION)
 	cd distrib; gpg2 --armor --output $(ARCHIVE).asc --detach-sig $(ARCHIVE)
 	cd distrib; md5sum $(ARCHIVE) > $(ARCHIVE).md5
 

Propchange: lucene/pylucene/trunk/Makefile
------------------------------------------------------------------------------
  Merged /lucene/pylucene/branches/pylucene_4_6/Makefile:r1563225-1565815

Modified: lucene/pylucene/trunk/java/org/apache/pylucene/store/PythonLock.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/store/PythonLock.java?rev=1585161&r1=1585160&r2=1585161&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/store/PythonLock.java (original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/store/PythonLock.java Sat Apr  5 18:52:15
2014
@@ -45,4 +45,5 @@ public class PythonLock extends Lock {
     public native boolean isLocked();
     public native boolean obtain();
     public native void release();
+    public native void close();
 }

Modified: lucene/pylucene/trunk/test/test_PythonDirectory.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test/test_PythonDirectory.py?rev=1585161&r1=1585160&r2=1585161&view=diff
==============================================================================
--- lucene/pylucene/trunk/test/test_PythonDirectory.py (original)
+++ lucene/pylucene/trunk/test/test_PythonDirectory.py Sat Apr  5 18:52:15 2014
@@ -72,6 +72,9 @@ class PythonDirLock(PythonLock):
     def release(self):
         return self.lock.release()
 
+    def close(self):
+        return self.lock.close()
+
 
 class PythonDirLockFactory(PythonLockFactory):
 
@@ -257,7 +260,7 @@ class PythonDirectoryTests(unittest.Test
                 try:
                     arg.close()
                 except Exception, e:
-                    import pdb; pdb.set_trace()
+                    pass
         store.close()
 
     def test_IncrementalLoop(self):



Mime
View raw message