--- a/virtualenv/res/lib/lib_create_env.py Sat Jan 25 02:36:15 2020 +0100
+++ b/virtualenv/res/lib/lib_create_env.py Sat Jan 25 03:14:01 2020 +0100
@@ -51,7 +51,7 @@
else:
URLS.update({
'PSYCOPG2': {'setup': 'psycopg2','url': 'http://initd.org/psycopg/tarballs/PSYCOPG-2-8/psycopg2-2.8.4.tar.gz', 'local':"psycopg2-2.8.4.tar.gz"},
- 'PYLUCENE': {'setup': 'pylucene', 'url': 'http://mirrors.ircam.fr/pub/apache/lucene/pylucene/pylucene-3.6.0-2-src.tar.gz', 'local':"pylucene-3.6.0-2-src.tar.gz"},
+ 'PYLUCENE': {'setup': 'pylucene', 'url': 'https://www-eu.apache.org/dist/lucene/pylucene/pylucene-8.1.1-src.tar.gz', 'local':"pylucene-8.1.1-src.tar.gz"},
'PIL': {'setup': 'pil', 'url': 'http://effbot.org/downloads/Imaging-1.1.7.tar.gz', 'local':"Imaging-1.1.7.tar.gz"},
'LXML': {'setup': 'lxml', 'url':"lxml-4.4.2.tar.gz", 'local':"lxml-4.4.2.tar.gz"}
})
@@ -142,18 +142,18 @@
zf = zipfile.ZipFile(patch_dest_path + ".zip",'r')
zf.extractall(patch_dest_path)
os.remove(patch_dest_path + ".zip")
- logger.notify("Patch jcc : %s " % (patch_dest_path))
- os.chdir(patch_dest_path)
- p = patch.fromfile(os.path.join(jcc_src_path,"jcc","patches","patch.43.0.6c11"))
- p.apply()
- os.chdir(olddir)
+ # logger.notify("Patch jcc : %s " % (patch_dest_path))
+ # os.chdir(patch_dest_path)
+ # p = patch.fromfile(os.path.join(jcc_src_path,"jcc","patches","patch.43.0.6c11"))
+ # p.apply()
+ # os.chdir(olddir)
logger.notify("Install jcc")
call_subprocess([os.path.abspath(os.path.join(home_dir, 'bin', 'python')), 'setup.py', 'install'],
cwd=jcc_src_path,
filter_stdout=filter_python_develop,
show_stdout=True,
- extra_env={'JCC_JDK' : '/usr/lib/jvm/java-7-oracle/'})
+ extra_env={'JCC_JDK' : '/usr/lib/jvm/java-11-openjdk-i386/'})
#install pylucene
logger.notify("Install pylucene")
@@ -194,14 +194,14 @@
cwd=os.path.abspath(pylucene_src_path),
filter_stdout=filter_python_develop,
show_stdout=True,
- extra_env={'JCC_JDK' : '/usr/lib/jvm/java-7-oracle/'})
+ extra_env={'JCC_JDK' : '/usr/lib/jvm/java-11-openjdk-i386/'})
logger.notify("pylucene make install")
call_subprocess(['make', 'install'],
cwd=os.path.abspath(pylucene_src_path),
filter_stdout=filter_python_develop,
show_stdout=True,
- extra_env={'JCC_JDK' : '/usr/lib/jvm/java-7-oracle/'})
+ extra_env={'JCC_JDK' : '/usr/lib/jvm/java-11-openjdk-i386/'})
def install_psycopg2(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop):