Author: vajda
Date: Thu Mar 21 16:38:12 2024
New Revision: 1916468
URL: http://svn.apache.org/viewvc?rev=1916468&view=rev
Log:
fixed bug PYLUCENE-70
Modified:
lucene/pylucene/trunk/jcc/CHANGES
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=1916468&r1=1916467&r2=1916468&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/CHANGES (original)
+++ lucene/pylucene/trunk/jcc/CHANGES Thu Mar 21 16:38:12 2024
@@ -1,3 +1,8 @@
+Version 3.14 ->
+---------------------
+ - fixed bug PYLUCENE-70
+ -
+
Version 3.13 -> 3.14
---------------------
- added support for --generate to output setup.py instead of calling setup()
Modified: lucene/pylucene/trunk/jcc/jcc3/python.py
URL:
http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc3/python.py?rev=1916468&r1=1916467&r2=1916468&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc3/python.py (original)
+++ lucene/pylucene/trunk/jcc/jcc3/python.py Thu Mar 21 16:38:12 2024
@@ -1878,11 +1878,20 @@ def compile(env, jccPath, output, module
line(out, 0, 'setup(')
line(out, 1, 'name="%s",', moduleName)
line(out, 1, 'packages=%s,', packages)
- line(out, 1, 'package_dir={"%s": "%s"},', moduleName, modulePath)
- line(out, 1, 'package_data={"%s": %s},', moduleName, package_data)
+ line(out, 1, 'package_dir={"%s": r"%s"},', moduleName, modulePath)
+ line(out, 1, 'package_data={"%s": [', moduleName)
+ for pd in package_data:
+ line(out, 2, 'r"%s",', pd)
+ line(out, 1, ']},')
line(out, 1, 'ext_modules=[Extension("%s.%s",', moduleName, extname)
for arg, value in args.items():
- line(out, 2, '%s=%s,', arg, value)
+ if arg in ('define_macros', 'libraries'):
+ line(out, 2, '%s=%s,', arg, value)
+ else:
+ line(out, 2, '%s=[', arg)
+ for v in value:
+ line(out, 3, 'r"%s",', v)
+ line(out, 2, '],')
line(out, 1, ")],")
if version:
line(out, 1, 'version="%s",', version)
