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/03/04 22:42:44 UTC
svn commit: r1854800 - in /lucene/pylucene/trunk/jcc: CHANGES jcc3/cpp.py
jcc3/python.py
Author: vajda
Date: Mon Mar 4 22:42:44 2019
New Revision: 1854800
URL: http://svn.apache.org/viewvc?rev=1854800&view=rev
Log:
fixed bug PYLUCENE-46
Modified:
lucene/pylucene/trunk/jcc/CHANGES
lucene/pylucene/trunk/jcc/jcc3/cpp.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=1854800&r1=1854799&r2=1854800&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/CHANGES (original)
+++ lucene/pylucene/trunk/jcc/CHANGES Mon Mar 4 22:42:44 2019
@@ -1,3 +1,8 @@
+Version 3.4
+------------------
+ - fixed bug PYLUCENE-46
+ -
+
Version 3.3 -> 3.4
------------------
- added NAN to the list of reserved words
Modified: lucene/pylucene/trunk/jcc/jcc3/cpp.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc3/cpp.py?rev=1854800&r1=1854799&r2=1854800&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc3/cpp.py (original)
+++ lucene/pylucene/trunk/jcc/jcc3/cpp.py Mon Mar 4 22:42:44 2019
@@ -560,7 +560,7 @@ def jcc(args):
importset.add(findClass(className))
for import_, importset in imports.items():
env._addClassPath(import_.CLASSPATH)
- include = os.path.join(import_.__dir__, 'include')
+ include = os.path.join(import_.__module_dir__, 'include')
os.path.walk(include, walk, (include, importset))
typeset.update(importset)
typeset.add(findClass('java/lang/Object'))
Modified: lucene/pylucene/trunk/jcc/jcc3/python.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc3/python.py?rev=1854800&r1=1854799&r2=1854800&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc3/python.py (original)
+++ lucene/pylucene/trunk/jcc/jcc3/python.py Mon Mar 4 22:42:44 2019
@@ -1626,7 +1626,7 @@ def compile(env, jccPath, output, module
line(out, 0, "import os")
line(out, 0, "from . import %s", extname)
line(out)
- line(out, 0, '__dir__ = os.path.abspath(os.path.dirname(__file__))')
+ line(out, 0, '__module_dir__ = os.path.abspath(os.path.dirname(__file__))')
package_data = []
for jar in jars:
@@ -1705,7 +1705,7 @@ def compile(env, jccPath, output, module
line(out)
line(out, 0, 'VERSION = "%s"', version)
- line(out, 0, 'CLASSPATH = [%s]' %(', '.join(['os.path.join(__dir__, "%s")' %(os.path.basename(jar)) for jar in jars])))
+ line(out, 0, 'CLASSPATH = [%s]' %(', '.join(['os.path.join(__module_dir__, "%s")' %(os.path.basename(jar)) for jar in jars])))
line(out, 0, 'CLASSPATH = os.pathsep.join(CLASSPATH)')
line(out, 0, '%s.CLASSPATH = CLASSPATH', extname)
line(out, 0, '%s._set_function_self(%s.initVM, %s)',
@@ -1722,7 +1722,7 @@ def compile(env, jccPath, output, module
includes = [os.path.join(output, extname),
os.path.join(jccPath, 'sources')]
for import_ in imports:
- includes.append(os.path.join(import_.__dir__, 'include'))
+ includes.append(os.path.join(import_.__module_dir__, 'include'))
sources = ['JObject.cpp', 'JArray.cpp', 'functions.cpp', 'types.cpp']
if not shared:
@@ -1843,7 +1843,7 @@ def compile(env, jccPath, output, module
' '.join(IMPLIB_LFLAGS) %(os.path.join(modulePath, extlib))
]
args['libraries'] = [
- os.path.join(import_.__dir__, 'lib',
+ os.path.join(import_.__module_dir__, 'lib',
'_%s%s' %(import_.__name__, _d))
for import_ in imports
]