svn commit: r752735 - in /lucene/pylucene/trunk: CHANGES Makefile collections.py jcc/setup.py python/ python/collections.py

[va...@apache.org]

Author: vajda
Date: Thu Mar 12 01:00:31 2009
New Revision: 752735

URL: http://svn.apache.org/viewvc?rev=752735&view=rev
Log:
  - backed out config.py-only-with-build trick (as it fails with install)
  - fixed bug with collections.py shadowing Python 2.6's during build

Added:
    lucene/pylucene/trunk/python/
    lucene/pylucene/trunk/python/collections.py
      - copied unchanged from r746941, lucene/pylucene/trunk/collections.py
Removed:
    lucene/pylucene/trunk/collections.py
Modified:
    lucene/pylucene/trunk/CHANGES
    lucene/pylucene/trunk/Makefile
    lucene/pylucene/trunk/jcc/setup.py

Modified: lucene/pylucene/trunk/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/CHANGES?rev=752735&r1=752734&r2=752735&view=diff
==============================================================================
--- lucene/pylucene/trunk/CHANGES (original)
+++ lucene/pylucene/trunk/CHANGES Thu Mar 12 01:00:31 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/trunk/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/Makefile?rev=752735&r1=752734&r2=752735&view=diff
==============================================================================
--- lucene/pylucene/trunk/Makefile (original)
+++ lucene/pylucene/trunk/Makefile Thu Mar 12 01:00:31 2009
@@ -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/trunk/jcc/setup.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/setup.py?rev=752735&r1=752734&r2=752735&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/setup.py (original)
+++ lucene/pylucene/trunk/jcc/setup.py Thu Mar 12 01:00:31 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)