Mercurial Mercurial > tralalere / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
virtualenv/res/lib/lib_create_env.py
changeset 91 86694f53cf8c
parent 87 81a5cb5aa263
child 93 7b6bcc33783f 
--- a/virtualenv/res/lib/lib_create_env.py	Fri Aug 01 01:09:19 2014 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Fri Aug 01 01:29:47 2014 +0200
@@ -133,8 +133,7 @@
         if os.path.exists(setuptools_path) and os.path.isdir(setuptools_path):
             patch_dest_path = os.path.join(lib_dir, 'site-packages')
         else:
-            #patch_dest_path = os.path.join(lib_dir,'site-packages','setuptools-0.6c11-py%s.%s.egg' % (sys.version_info[0], sys.version_info[1]))
-            patch_dest_path = os.path.join(lib_dir,'site-packages','setuptools')
+            patch_dest_path = os.path.join(lib_dir,'site-packages','setuptools-0.6c11-py%s.%s.egg' % (sys.version_info[0], sys.version_info[1]))
             if os.path.isfile(patch_dest_path):
                 # must unzip egg
                 # rename file and etract all
@@ -144,7 +143,7 @@
                 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.3.6"))
+        p = patch.fromfile(os.path.join(jcc_src_path,"jcc","patches","patch.43.0.6c11"))
         p.apply()
         os.chdir(olddir)
 
@@ -152,7 +151,8 @@
     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)
+                    show_stdout=True,
+                    extra_env={'JCC_JDK' : '/usr/lib/jvm/java-7-openjdk-i386/'})
     #install pylucene
     
     logger.notify("Install pylucene")
@@ -192,13 +192,15 @@
     call_subprocess(['make'],
                     cwd=os.path.abspath(pylucene_src_path),
                     filter_stdout=filter_python_develop,
-                    show_stdout=True)
+                    show_stdout=True,
+                    extra_env={'JCC_JDK' : '/usr/lib/jvm/java-7-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)
+                    show_stdout=True,
+                    extra_env={'JCC_JDK' : '/usr/lib/jvm/java-7-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):
tralalere