You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by va...@apache.org on 2009/03/12 02:02:22 UTC
svn commit: r752738 - in /lucene/pylucene/branches/pylucene_2_4: CHANGES
Makefile collections.py jcc/setup.py python/ python/collections.py
Author: vajda
Date: Thu Mar 12 01:02:21 2009
New Revision: 752738
URL: http://svn.apache.org/viewvc?rev=752738&view=rev
Log:
merged rev 752735 into pylucene_2_4 branch
Added:
lucene/pylucene/branches/pylucene_2_4/python/
- copied from r752735, lucene/pylucene/trunk/python/
lucene/pylucene/branches/pylucene_2_4/python/collections.py
- copied unchanged from r752735, lucene/pylucene/trunk/python/collections.py
Removed:
lucene/pylucene/branches/pylucene_2_4/collections.py
Modified:
lucene/pylucene/branches/pylucene_2_4/CHANGES
lucene/pylucene/branches/pylucene_2_4/Makefile
lucene/pylucene/branches/pylucene_2_4/jcc/setup.py
Modified: lucene/pylucene/branches/pylucene_2_4/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/pylucene_2_4/CHANGES?rev=752738&r1=752737&r2=752738&view=diff
==============================================================================
--- lucene/pylucene/branches/pylucene_2_4/CHANGES (original)
+++ lucene/pylucene/branches/pylucene_2_4/CHANGES Thu Mar 12 01:02:21 2009
@@ -7,6 +7,7 @@
- added collections.py module with JavaSet class, a Python java.util.Set
- fixed bug in PythonQueryParser overriding wrong method (Aaron Lav)
- PyLucene built with JCC 2.2
+ - fixed bug with collections.py shadowing Python 2.6's during build
Version 2.3.2 -> 2.4.0
----------------------
Modified: lucene/pylucene/branches/pylucene_2_4/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/pylucene_2_4/Makefile?rev=752738&r1=752737&r2=752738&view=diff
==============================================================================
--- lucene/pylucene/branches/pylucene_2_4/Makefile (original)
+++ lucene/pylucene/branches/pylucene_2_4/Makefile Thu Mar 12 01:02:21 2009
@@ -14,7 +14,7 @@
# site-packages directory.
#
-VERSION=2.4.1-rc2
+VERSION=2.4.1-rc3
LUCENE_SVN_VER=HEAD
LUCENE_VER=2.4.1
LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/java/tags/lucene_2_4_1
@@ -194,7 +194,7 @@
--mapping java.util.Properties 'getProperty:(Ljava/lang/String;)Ljava/lang/String;' \
--sequence org.apache.lucene.search.Hits 'length:()I' 'doc:(I)Lorg/apache/lucene/document/Document;' \
--version $(LUCENE_VER) \
- --module collections.py \
+ --module python/collections.py \
--files $(NUM_FILES)
generate: jars
Modified: lucene/pylucene/branches/pylucene_2_4/jcc/setup.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/branches/pylucene_2_4/jcc/setup.py?rev=752738&r1=752737&r2=752738&view=diff
==============================================================================
--- lucene/pylucene/branches/pylucene_2_4/jcc/setup.py (original)
+++ lucene/pylucene/branches/pylucene_2_4/jcc/setup.py Thu Mar 12 01:02:21 2009
@@ -166,7 +166,7 @@
enable_shared = False
-def main(debug, build):
+def main(debug):
_jcc_argsep = os.environ.get('JCC_ARGSEP', os.pathsep)
@@ -195,17 +195,16 @@
else:
_javac = JAVAC[platform]
- if build:
- config = file(os.path.join(os.path.dirname(os.path.abspath(__file__)),
- 'jcc', 'config.py'), 'w')
- print >>config
- print >>config, 'INCLUDES=%s' %(_includes)
- print >>config, 'CFLAGS=%s' %(_cflags)
- print >>config, 'DEBUG_CFLAGS=%s' %(_debug_cflags)
- print >>config, 'LFLAGS=%s' %(_lflags)
- print >>config, 'SHARED=%s' %(enable_shared)
- print >>config
- config.close()
+ config = file(os.path.join(os.path.dirname(os.path.abspath(__file__)),
+ 'jcc', 'config.py'), 'w')
+ print >>config
+ print >>config, 'INCLUDES=%s' %(_includes)
+ print >>config, 'CFLAGS=%s' %(_cflags)
+ print >>config, 'DEBUG_CFLAGS=%s' %(_debug_cflags)
+ print >>config, 'LFLAGS=%s' %(_lflags)
+ print >>config, 'SHARED=%s' %(enable_shared)
+ print >>config
+ config.close()
extensions = []
@@ -315,4 +314,4 @@
if __name__ == "__main__":
- main('--debug' in sys.argv, 'build' in sys.argv)
+ main('--debug' in sys.argv)