lucene-pylucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From va...@apache.org
Subject svn commit: r1306601 - in /lucene/pylucene/trunk/jcc: CHANGES helpers/linux.py
Date Wed, 28 Mar 2012 21:31:11 GMT
Author: vajda
Date: Wed Mar 28 21:31:11 2012
New Revision: 1306601

URL: http://svn.apache.org/viewvc?rev=1306601&view=rev
Log:
updated setuptools patch logic to accomodatenew 0.6.15 and up fork

Modified:
    lucene/pylucene/trunk/jcc/CHANGES
    lucene/pylucene/trunk/jcc/helpers/linux.py

Modified: lucene/pylucene/trunk/jcc/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/CHANGES?rev=1306601&r1=1306600&r2=1306601&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/CHANGES (original)
+++ lucene/pylucene/trunk/jcc/CHANGES Wed Mar 28 21:31:11 2012
@@ -3,6 +3,7 @@ Version 2.12 ->
  - fixed bug with name collision between method and static field of same name
  - added --maxheap, --egg-info and --extra-setup-arg parameters (Chris Wilson)
  - added check for duplicate class names in generated Python module
+ - updated setuptools patch logic to accomodate new 0.6.15 and up fork
  - 
 
 Version 2.11 -> 2.12

Modified: lucene/pylucene/trunk/jcc/helpers/linux.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/helpers/linux.py?rev=1306601&r1=1306600&r2=1306601&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/helpers/linux.py (original)
+++ lucene/pylucene/trunk/jcc/helpers/linux.py Wed Mar 28 21:31:11 2012
@@ -46,6 +46,7 @@ See %s/INSTALL for more information abou
 def patch_setuptools(with_setuptools):
 
     with_setuptools_c11 = ('00000000', '00000006', '*c', '00000011', '*final')
+    with_setuptools_15 = ('00000000', '00000006', '00000015', '*@', '*final')
 
     try:
         from setuptools.command.build_ext import sh_link_shared_object
@@ -54,10 +55,12 @@ def patch_setuptools(with_setuptools):
         import setuptools
         jccdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
         st_egg = os.path.dirname(setuptools.__path__[0])
-        if with_setuptools < with_setuptools_c11:
+        if with_setuptools < with_setuptools_c11:     # old 0.6c7-10 series
             patch_version = '0.6c7'
+        elif with_setuptools >= with_setuptools_15:   # new 0.6.15 and up fork
+            patch_version = '0.6c7'                   # compatible with 0.6c9
         else:
-            patch_version = '0.6c11'
+            patch_version = '0.6c11'                  # old 0.6c11+ series
 
         if os.path.isdir(st_egg):
             raise NotImplementedError, patch_st_dir(patch_version, st_egg,



Mime
View raw message