diff -r daaafc916dc4 -r 29caac899e1f virtualenv/res/lib/lib_create_env.py --- a/virtualenv/res/lib/lib_create_env.py Wed Feb 06 13:15:27 2013 +0100 +++ b/virtualenv/res/lib/lib_create_env.py Mon Feb 11 14:10:22 2013 +0100 @@ -22,7 +22,7 @@ 'DJANGO-REGISTRATION': { 'setup': 'django-registration', 'url':'https://bitbucket.org/ubernostrum/django-registration/get/v0.8.tar.gz', 'local':"django-registration-0.8.tar.gz", 'install': {'method': 'easy_install', 'option_str': '-Z', 'dict_extra_env': None}}, 'SOUTH': { 'setup': 'South', 'url':'http://www.aeracode.org/releases/south/south-0.7.5.tar.gz', 'local':"south-0.7.5.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'SORL_THUMBNAIL' : { 'setup': 'sorl-thumbnail', 'url':'https://github.com/sorl/sorl-thumbnail/archive/master.tar.gz', 'local':"sorl-thumbnail-v11.12.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, - 'LIBJPEG': {'setup': None, 'url':'jpegsrc.v8d.tar.gz', 'local':'jpegsrc.v8d.tar.gz', 'install': {'method': 'install_libjpeg', 'option_str': None, 'dict_extra_env': None}}, + 'LIBJPEG': {'setup': None, 'url':'jpegsrc.v9.tar.gz', 'local':'jpegsrc.v9.tar.gz', 'install': {'method': 'install_libjpeg', 'option_str': None, 'dict_extra_env': None}}, 'ZLIB': {'setup': None, 'url':'zlib-1.2.7.tar.gz', 'local':'zlib-1.2.7.tar.gz', 'install': {'method': 'install_zlib', 'option_str': None, 'dict_extra_env': None}}, 'PYCRYPTO': {'setup': 'pycrypto', 'url':'https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz', 'local':'pycrypto-2.6.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, 'PARAMIKO': {'setup': 'paramiko', 'url':'https://github.com/paramiko/paramiko/archive/v1.9.0.tar.gz', 'local':'paramiko-1.9.0.tar.gz', 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}}, @@ -172,6 +172,7 @@ def install_lib(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop): lib_src = os.path.join(src_dir,lib_name+".tar.gz") + logger.notify("Copy %s to %s " % (res_env.URLS[lib_key][res_source_key],lib_src)) shutil.copy(res_env.URLS[lib_key][res_source_key], lib_src) tf = tarfile.open(lib_src,'r:gz') lib_base_path = os.path.join(src_dir, lib_name) @@ -181,30 +182,27 @@ lib_src_path = os.path.join(lib_base_path, os.listdir(lib_base_path)[0]) - logger.notify(libname + " configure") - call_subprocess(['configure', '--prefix='+os.path.abspath(home_dir)] + configure_options, + logger.notify(lib_name + " configure in " + lib_src_path) + call_subprocess(['./configure', '--prefix='+os.path.abspath(home_dir)] + configure_options, cwd=os.path.abspath(lib_src_path), filter_stdout=filter_python_develop, show_stdout=True) - logger.notify(libname + " make") + logger.notify(lib_name + " make in " + lib_src_path) call_subprocess(['make'], cwd=os.path.abspath(lib_src_path), filter_stdout=filter_python_develop, show_stdout=True) - logger.notify(libname + "make install") + logger.notify(lib_name + "make install in " + lib_src_path) call_subprocess(['make', 'install'], cwd=os.path.abspath(lib_src_path), filter_stdout=filter_python_develop, show_stdout=True) - return install_lib + return install_lib install_libjpeg = gen_install_comp_lib("libjpeg", "LIBJPEG", ['--enable-shared']) install_zlib = gen_install_comp_lib("zlib", "ZLIB", []) - - - def lib_generate_install_methods(path_locations, src_base, Logger, call_subprocess, normal_installs, options_to_add=None, urls= None): @@ -302,6 +300,7 @@ extra_env['TMPDIR'] = os.path.abspath(tmp_dir) #isinstance(lst, (list, tuple)) if key not in ignore_packages: + logger.notify("install %s with method %s" % (key, repr(method))) if callable(method): method(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop) elif method in globals() and callable(globals()[method]) and method not in ['pip', 'easy_install']: