# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1330705475 -3600
# Node ID f8a54d88b49a60d8cd9afb1a359ce4357f000d48
# Parent  e41f2e80806fd63c166efd0f44e4f3d56f4ffa9e
correct virtualenv script creation script

diff -r e41f2e80806f -r f8a54d88b49a virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Thu Mar 01 13:44:07 2012 +0100
+++ b/virtualenv/res/lib/lib_create_env.py	Fri Mar 02 17:24:35 2012 +0100
@@ -245,64 +245,6 @@
 install_libjpeg = gen_install_comp_lib("libjpeg", "LIBJPEG", ['--enable-shared'])
 install_zlib = gen_install_comp_lib("zlib", "ZLIB", [])
 
-#def install_libjpeg(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop):
-#    libjpeg_src = os.path.join(src_dir,"jpegsrc.tar.gz")
-#    shutil.copy(res_env.URLS['LIBJPEG'][res_source_key], libjpeg_src)
-#    tf = tarfile.open(pylucene_src,'r:gz')
-#    libjpeg_base_path = os.path.join(src_dir,"libjpeg") 
-#    logger.notify("Extract libjpeg to %s " % libjpeg_base_path)
-#    tf.extractall(libjpeg_base_path)
-#    tf.close()
-#    
-#    libjpeg_src_path = os.path.join(libjpeg_base_path, os.listdir(libjpeg_base_path)[0])
-#
-#    logger.notify("libjpeg configure")
-#    call_subprocess(['configure', '--enable-shared', '--prefix='+os.path.abspath(home_dir)],
-#                    cwd=os.path.abspath(libjpeg_src_path),
-#                    filter_stdout=filter_python_develop,
-#                    show_stdout=True)
-#    
-#    logger.notify("libjpeg make")
-#    call_subprocess(['make'],
-#                    cwd=os.path.abspath(libjpeg_src_path),
-#                    filter_stdout=filter_python_develop,
-#                    show_stdout=True)
-#
-#    logger.notify("zlib make install")
-#    call_subprocess(['make', 'install'],
-#                    cwd=os.path.abspath(libjpeg_src_path),
-#                    filter_stdout=filter_python_develop,
-#                    show_stdout=True)
-#
-#
-#def install_zlib(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop):
-#    zlib_src = os.path.join(src_dir,"zlib.tar.gz")
-#    shutil.copy(res_env.URLS['ZLIB'][res_source_key], libjpeg_src)
-#    tf = tarfile.open(pylucene_src,'r:gz')
-#    zlib_base_path = os.path.join(src_dir,"zlib") 
-#    logger.notify("Extract libjpeg to %s " % zlib_base_path)
-#    tf.extractall(zlib_base_path)
-#    tf.close()
-#    
-#    zlib_src_path = os.path.join(zlib_base_path, os.listdir(zlib_base_path)[0])
-#
-#    logger.notify("zlib configure")
-#    call_subprocess(['configure', '--enable-shared', '--prefix='+os.path.abspath(home_dir)],
-#                    cwd=os.path.abspath(zlib_src_path),
-#                    filter_stdout=filter_python_develop,
-#                    show_stdout=True)
-#    
-#    logger.notify("zlib make")
-#    call_subprocess(['make'],
-#                    cwd=os.path.abspath(zlib_src_path),
-#                    filter_stdout=filter_python_develop,
-#                    show_stdout=True)
-#
-#    logger.notify("zlib make install")
-#    call_subprocess(['make', 'install'],
-#                    cwd=os.path.abspath(zlib_src_path),
-#                    filter_stdout=filter_python_develop,
-#                    show_stdout=True)
 
     
     
@@ -330,9 +272,9 @@
         logger.notify("Install %s from %s with %s" % (key,res_env.URLS[key][res_source_key],method))
         if method == 'pip':
             if sys.platform == 'win32':
-                args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'pip')), 'install', '-E', os.path.abspath(home_dir), res_env.URLS[key][res_source_key]]
+                args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'pip')), 'install', res_env.URLS[key][res_source_key]]
             else:
-                args = [os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', '-E', os.path.abspath(home_dir), res_env.URLS[key][res_source_key]]
+                args = [os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', res_env.URLS[key][res_source_key]]
             if option_str :
                 args.insert(4,option_str)
             call_subprocess(args,