diff -r f8d77e53f7c2 -r b7aef101c7d1 virtualenv/web/res/res_create_env.py --- a/virtualenv/web/res/res_create_env.py Tue May 03 00:01:49 2011 +0200 +++ b/virtualenv/web/res/res_create_env.py Tue May 03 17:17:17 2011 +0200 @@ -4,14 +4,22 @@ system_str = platform.system() +if system_str == 'Windows': + INSTALLS = [ + ('JCC','easy_install',None,None), + ('PSYCOPG2',install_psycopg2,None,None), + ('PYLUCENE','easy_install',None,None), + ] +else: + INSTALLS = [ + ('PYLUCENE',install_pylucene,None,None), + ('PSYCOPG2', 'pip', None, None), + ] if system_str == 'Linux': - INSTALLS = [ + INSTALLS.extend([ ('DISTRIBUTE', 'pip', None, None), - ] -else: - INSTALLS = [] - + ]) INSTALLS.extend([ #(key,method, option_str, dict_extra_env) ('SETUPTOOLS-HG', 'pip', None, None), @@ -30,30 +38,14 @@ ('SOCIAL_AUTH', 'easy_install', None, None), ]) -if system_str == 'Windows': - INSTALLS.extend([ - ('JCC','easy_install',None,None), - ('PSYCOPG2',install_psycopg2,None,None), - ('PYLUCENE','easy_install',None,None), - ]) -else: - INSTALLS.extend([ - ('PYLUCENE',install_pylucene,None,None), - ('PSYCOPG2', 'pip', None, None), - ]) - if system_str == "Darwin": INSTALLS.extend([ ('LXML', 'easy_install', None, {'STATIC_DEPS': 'true', 'LIBXML2_VERSION': '2.7.8', 'LIBXSLT_VERSION': '1.1.26', 'LIBICONV_VERSION': '1.13.1'}), ]) -elif system_str == "Windows": +else: INSTALLS.extend([ ('LXML', 'easy_install', None, None), ]) -else: - INSTALLS.extend([ - ('LXML', 'pip', None, None), - ]) def generate_install_methods(path_locations, src_base, Logger, call_subprocess):