reorder install order for linux
authorymh <ymh.work@gmail.com>
Tue, 03 May 2011 13:36:46 +0200
changeset 84 d7acd4e2c1c8
parent 83 3b0882c91a7d
child 85 98040e87b7e8
reorder install order for linux
virtualenv/web/create_python_env.py
virtualenv/web/res/res_create_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 <path_to_venv>
 - For Linux :
-python project-boot.py --unzip-setuptools --no-site-packages --index-url=http://pypi.websushi.org/ --clear --type-install=local <path_to_venv>
+python project-boot.py --unzip-setuptools --no-site-packages --ignore-packages=MYSQL --clear --type-install=local <path_to_venv>
 
 """
 
--- 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'}),