lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From va...@apache.org
Subject svn commit: r775516 - in /lucene/pylucene/trunk/jcc: CHANGES jcc/python.py jcc/sources/functions.h setup.py
Date Sat, 16 May 2009 19:30:48 GMT
Author: vajda
Date: Sat May 16 19:30:48 2009
New Revision: 775516

URL: http://svn.apache.org/viewvc?rev=775516&view=rev
Log:
 - removed -framework Python from darwin link flags in setup.py
 - version 2.3

Modified:
    lucene/pylucene/trunk/jcc/CHANGES
    lucene/pylucene/trunk/jcc/jcc/python.py
    lucene/pylucene/trunk/jcc/jcc/sources/functions.h
    lucene/pylucene/trunk/jcc/setup.py

Modified: lucene/pylucene/trunk/jcc/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/CHANGES?rev=775516&r1=775515&r2=775516&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/CHANGES (original)
+++ lucene/pylucene/trunk/jcc/CHANGES Sat May 16 19:30:48 2009
@@ -1,5 +1,5 @@
 
-Version 2.2 ->
+Version 2.2 -> 2.3
 ------------------
  - fixed Solaris compilation issue with using va_arg() with function pointers
  - added --reserved command line arg to extend list of words to mangle
@@ -8,7 +8,7 @@
  - added --help to describe command line options (Jonas Maurus)
  - added support for --rename to workaround python flattened namespace clashes
  - fixed bug with Enumeration/Iterator template function instantiation
- - 
+ - removed -framework Python from darwin link flags in setup.py
 
 Version 2.1 -> 2.2
 ------------------

Modified: lucene/pylucene/trunk/jcc/jcc/python.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/python.py?rev=775516&r1=775515&r2=775516&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/python.py (original)
+++ lucene/pylucene/trunk/jcc/jcc/python.py Sat May 16 19:30:48 2009
@@ -728,7 +728,7 @@
         if nextElementExt:
             tp_iternext = 'get_extension_nextElement'
         else:
-            tp_iternext = '((PyObject *(*)(java::util::t_Enumeration *)) get_enumeration_nextElement<java::util::t_Enumeration,%s%st_%s,%s>)'
%(ns, sep, n, returnName)
+            tp_iternext = '((PyObject *(*)(java::util::t_Enumeration *)) get_enumeration_next<java::util::t_Enumeration,%s%st_%s,%s>)'
%(ns, sep, n, returnName)
     elif nextMethod:
         tp_iter = 'PyObject_SelfIter'
         returnName = typename(nextMethod.getReturnType(), cls, False)

Modified: lucene/pylucene/trunk/jcc/jcc/sources/functions.h
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc/sources/functions.h?rev=775516&r1=775515&r2=775516&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc/sources/functions.h (original)
+++ lucene/pylucene/trunk/jcc/jcc/sources/functions.h Sat May 16 19:30:48 2009
@@ -122,7 +122,7 @@
     return U::wrap_Object(next);
 }
 
-template<class T, class U, class V> PyObject *get_enumeration_nextElement(T *self)
+template<class T, class U, class V> PyObject *get_enumeration_next(T *self)
 {
     jboolean hasMoreElements;
 

Modified: lucene/pylucene/trunk/jcc/setup.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/setup.py?rev=775516&r1=775515&r2=775516&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/setup.py (original)
+++ lucene/pylucene/trunk/jcc/setup.py Sat May 16 19:30:48 2009
@@ -12,7 +12,7 @@
 
 import os, sys, platform, subprocess
 
-jcc_ver = '2.2'
+jcc_ver = '2.3'
 python_ver = '%d.%d.%d' %(sys.version_info[0:3])
 machine = platform.machine()
 
@@ -74,7 +74,7 @@
 }
 
 LFLAGS = {
-    'darwin': ['-framework', 'JavaVM', '-framework', 'Python'],
+    'darwin': ['-framework', 'JavaVM'],
     'ipod': ['-ljvm', '-lpython%s.%s' %(sys.version_info[0:2]),
              '-L/usr/lib/gcc/arm-apple-darwin9/4.0.1'],
     'linux2/i386': ['-L%(linux2)s/jre/lib/i386' %(JDK), '-ljava',



Mime
View raw message