diff -r 1473ba25af1f -r 7bc38c7d6cf9 virtualenv/web/res/res_create_env.py --- a/virtualenv/web/res/res_create_env.py Tue Sep 30 12:31:48 2014 +0200 +++ b/virtualenv/web/res/res_create_env.py Sat Nov 01 17:42:33 2014 +0100 @@ -4,36 +4,34 @@ system_str = platform.system() -INSTALLS = [ #(key,method, option_str, dict_extra_env) - 'LXML', - 'PSYCOPG2', - 'PIL', - 'DJANGO', - 'DJANGO-EXTENSIONS', - 'REGISTRATION', - 'SOUTH', - 'HTTPLIB2', - 'HAYSTACK', - 'WHOOSH', - 'WIKITOOLS', - 'ISODATE', - 'RDFLIB', - 'SPARQLWRAPPER', - 'PYYAML', - 'REQUESTS', - 'PYELASTICSEARCH', - 'EASYTHUMBNAIL', +INSTALLS = [ # (key,method, option_str, dict_extra_env) + {'requirement':'requirements.txt', + 'install': {'option_str': None, + 'dict_extra_env': {'STATIC_DEPS':'true', 'LIBXML2_VERSION': '2.9.2', 'LIBXSLT_VERSION': '1.1.28', 'LIBICONV_VERSION': '1.14'} if system_str == 'Darwin' else None}}, +# 'LXML', +# 'PSYCOPG2', +# 'PIL', +# 'DJANGO', +# 'DJANGO-EXTENSIONS', +# 'REGISTRATION', +# 'SOUTH', +# 'HTTPLIB2', +# 'HAYSTACK', +# 'WHOOSH', +# 'WIKITOOLS', +# 'ISODATE', +# 'RDFLIB', +# 'SPARQLWRAPPER', +# 'PYYAML', +# 'REQUESTS', +# 'PYELASTICSEARCH', +# 'EASYTHUMBNAIL', ] if system_str == 'Windows': INSTALLS.append('PYSTEMMER') -if system_str == "Linux": - INSTALLS.insert(2, 'DISTRIBUTE') +OPTIONS_TO_ADD = ['clear', 'type_install=local', 'unzip_setuptools'] -OPTIONS_TO_ADD = ['clear', 'type_install=local', 'unzip_setuptools'] -if system_str != 'Linux': - OPTIONS_TO_ADD.append('use_distribute') - -def generate_install_methods(path_locations, src_base, Logger, call_subprocess): - return lib_generate_install_methods(path_locations, src_base, Logger, call_subprocess, INSTALLS, OPTIONS_TO_ADD) +def generate_install_methods(path_locations, src_base, run_base, Logger, call_subprocess): + return lib_generate_install_methods(path_locations, src_base, run_base, Logger, call_subprocess, INSTALLS, OPTIONS_TO_ADD)