# HG changeset patch # User ymh # Date 1304422606 -7200 # Node ID d7acd4e2c1c8dfc6bb9123caa0a0da54430635a0 # Parent 3b0882c91a7d2a261c508fe5391a8d37a36d3c4f reorder install order for linux diff -r 3b0882c91a7d -r d7acd4e2c1c8 virtualenv/web/create_python_env.py --- a/virtualenv/web/create_python_env.py Tue May 03 12:51:26 2011 +0200 +++ b/virtualenv/web/create_python_env.py Tue May 03 13:36:46 2011 +0200 @@ -10,7 +10,7 @@ - python project-boot.py --no-site-packages --clear --ignore-packages=MYSQL --type-install=local - For Linux : -python project-boot.py --unzip-setuptools --no-site-packages --index-url=http://pypi.websushi.org/ --clear --type-install=local +python project-boot.py --unzip-setuptools --no-site-packages --ignore-packages=MYSQL --clear --type-install=local """ diff -r 3b0882c91a7d -r d7acd4e2c1c8 virtualenv/web/res/res_create_env.py --- a/virtualenv/web/res/res_create_env.py Tue May 03 12:51:26 2011 +0200 +++ b/virtualenv/web/res/res_create_env.py Tue May 03 13:36:46 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), @@ -32,18 +40,6 @@ ('MODELTRANSLATION', 'pip', 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'}),