You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pylucene-commits@lucene.apache.org by va...@apache.org on 2019/04/23 17:16:07 UTC
svn commit: r1858014 - in /lucene/pylucene/trunk/jcc: CHANGES jcc2/python.py
jcc3/python.py
Author: vajda
Date: Tue Apr 23 17:16:07 2019
New Revision: 1858014
URL: http://svn.apache.org/viewvc?rev=1858014&view=rev
Log:
- fixed bug PYLUCENE-48
Modified:
lucene/pylucene/trunk/jcc/CHANGES
lucene/pylucene/trunk/jcc/jcc2/python.py
lucene/pylucene/trunk/jcc/jcc3/python.py
Modified: lucene/pylucene/trunk/jcc/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/CHANGES?rev=1858014&r1=1858013&r2=1858014&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/CHANGES (original)
+++ lucene/pylucene/trunk/jcc/CHANGES Tue Apr 23 17:16:07 2019
@@ -1,6 +1,7 @@
Version 3.5 ->
------------------
- fixed bug PYLUCENE-47 (with help from Petrus Hyvönen)
+ - fixed bug PYLUCENE-48
-
Version 3.4 -> 3.5
Modified: lucene/pylucene/trunk/jcc/jcc2/python.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc2/python.py?rev=1858014&r1=1858013&r2=1858014&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc2/python.py (original)
+++ lucene/pylucene/trunk/jcc/jcc2/python.py Tue Apr 23 17:16:07 2019
@@ -1438,7 +1438,7 @@ def package(out, allInOne, cppdir, names
line(out, 0, '#include "JCCEnv.h"')
line(out, 0, '#include "functions.h"')
- if not names:
+ if not names or not allInOne:
line(out)
line(out, 0, 'PyObject *initVM(PyObject *module, PyObject *args, PyObject *kwds);')
if use_full_names:
@@ -1884,10 +1884,11 @@ def compile(env, jccPath, output, module
'packages': packages,
'package_dir': {moduleName: modulePath},
'package_data': {moduleName: package_data},
- 'version': version,
'ext_modules': extensions,
'script_args': script_args
}
+ if version:
+ args['version'] = version
if with_setuptools:
args['zip_safe'] = False
Modified: lucene/pylucene/trunk/jcc/jcc3/python.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc3/python.py?rev=1858014&r1=1858013&r2=1858014&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc3/python.py (original)
+++ lucene/pylucene/trunk/jcc/jcc3/python.py Tue Apr 23 17:16:07 2019
@@ -1423,7 +1423,7 @@ def package(out, allInOne, cppdir, names
line(out, 0, '#include "JCCEnv.h"')
line(out, 0, '#include "functions.h"')
- if not names:
+ if not names or not allInOne:
line(out)
line(out, 0, 'PyObject *initVM(PyObject *module, PyObject *args, PyObject *kwds);')
if use_full_names:
@@ -1877,10 +1877,11 @@ def compile(env, jccPath, output, module
'packages': packages,
'package_dir': {moduleName: modulePath},
'package_data': {moduleName: package_data},
- 'version': version,
'ext_modules': extensions,
'script_args': script_args
}
+ if version:
+ args['version'] = version
if with_setuptools:
args['zip_safe'] = False