improve create env script creation
authorymh <ymh.work@gmail.com>
Thu, 10 Mar 2011 18:33:37 +0100
changeset 47 4ed054be603f
parent 44 20ab9a7f1849
child 48 ef3a8cfef2bc
improve create env script creation
virtualenv/setup/create_python_env.py
virtualenv/setup/res/res_create_env.py
virtualenv/setup/res/src/setuptools_hg-0.2.tar.gz
virtualenv/web/create_python_env.py
virtualenv/web/res/res_create_env.py
virtualenv/web/res/src/setuptools_hg-0.2.tar.gz
--- a/virtualenv/setup/create_python_env.py	Wed Mar 09 18:42:58 2011 +0100
+++ b/virtualenv/setup/create_python_env.py	Thu Mar 10 18:33:37 2011 +0100
@@ -32,134 +32,13 @@
 src_base = os.path.join(here,"res","src").replace("\\","/")
 lib_path = os.path.abspath(os.path.join(here,"res","lib")).replace("\\","/")
 
-EXTRA_TEXT  = "URLS = { \n"
-
-EXTRA_TEXT += "    'DISTRIBUTE' : { 'setup': 'distribute', 'url': 'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.14.tar.gz', 'local': '"+ os.path.abspath(os.path.join(src_base,"distribute-0.6.14.tar.gz")).replace("\\","/")+"'},\n"
-EXTRA_TEXT += "    'MERCURIAL' : { 'setup': 'distribute', 'url': 'http://pypi.python.org/packages/source/d/mercurial/mercurial-1.7.5.tar.gz', 'local': '"+ os.path.abspath(os.path.join(src_base,"mercurial-1.7.5.tar.gz")).replace("\\","/")+"'},\n"
-EXTRA_TEXT += "}\n"
-
-EXTRA_TEXT += "import sys\n"
-EXTRA_TEXT += "sys.path.append('"+lib_path+"')\n"
-
-EXTRA_TEXT += """
-
-import shutil
-import tarfile
-import zipfile
-import urllib
-import platform
-
-
-INDEX_URL = 'http://pypi.python.org/simple/'
-
-
-def extend_parser(parser):
-    parser.add_option(
-        '--index-url',
-        metavar='INDEX_URL',
-        dest='index_url',
-        default='',
-        help='base URL of Python Package Index')
-    parser.add_option(
-        '--type-install',
-        metavar='type_install',
-        dest='type_install',
-        default='local',
-        help='type install : local, url, setup')
-    parser.add_option(
-        '--ignore-packages',
-        metavar='ignore_packages',
-        dest='ignore_packages',
-        default=None,
-        help='list of comma separated keys for package to ignore')
-
-
-
-def adjust_options(options, args):
-    pass
-
+EXTRA_TEXT  = "import sys\n"
+EXTRA_TEXT += "sys.path.append('%s')\n" % (lib_path)
+f = open(os.path.join(os.path. os.path.join(os.path.dirname(os.path.abspath(__file__)),"res"),'res_create_env.py'), 'r')
+EXTRA_TEXT += f.read()
+EXTRA_TEXT += "\n"
+EXTRA_TEXT += "RES_ENV = ResourcesEnv('%s')\n" % (src_base)
 
-def after_install(options, home_dir):
-    home_dir, lib_dir, inc_dir, bin_dir = path_locations(home_dir)
-    base_dir = os.path.dirname(home_dir)
-    src_dir = join(home_dir, 'src')
-    tmp_dir = join(home_dir, 'tmp')
-    ensure_dir(src_dir)
-    ensure_dir(tmp_dir)
-    system_str = platform.system()
-    
-    res_source_key = options.type_install
-    
-    ignore_packages = []
-    
-    if options.ignore_packages :
-        ignore_packages = options.ignore_packages.split(",")
-    
-    logger.indent += 2
-    try:
-        NORMAL_INSTALL = [ #(key,method, option_str, extra_env)
-            ('DISTRIBUTE', 'pip', None, None),
-            ('MERCURIAL', 'pip', None, None),
-            ]
-
-            
-        for key, method, option_str, extra_env in NORMAL_INSTALL:
-            if key not in ignore_packages:
-                normal_install(key, method, option_str, extra_env, res_source_key, home_dir, tmp_dir)
-                        
-        logger.notify("Clear source dir")
-        shutil.rmtree(src_dir)
-
-    finally:
-        logger.indent -= 2
-    script_dir = join(base_dir, bin_dir)
-    logger.notify('Run "%s Package" to install new packages that provide builds'
-                  % join(script_dir, 'easy_install'))
-
-
-def normal_install(key, method, option_str, extra_env, res_source_key, home_dir, tmp_dir):
-    logger.notify("Install %s from %s with %s" % (key,URLS[key][res_source_key],method))
-    if method == 'pip':
-        if sys.platform == 'win32':
-            args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'pip')), 'install', '-E', os.path.abspath(home_dir), URLS[key][res_source_key]]
-        else:
-            args = [os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', '-E', os.path.abspath(home_dir), URLS[key][res_source_key]]
-        if option_str :
-            args.insert(4,option_str)
-        call_subprocess(args,
-                cwd=os.path.abspath(tmp_dir),
-                filter_stdout=filter_python_develop,
-                show_stdout=True,
-                extra_env=extra_env)
-    else:
-        if sys.platform == 'win32':
-            args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'easy_install')), URLS[key][res_source_key]]
-        else:
-            args = [os.path.abspath(os.path.join(home_dir, 'bin', 'easy_install')), URLS[key][res_source_key]]
-        if option_str :
-            args.insert(1,option_str)
-        call_subprocess(args,
-                cwd=os.path.abspath(tmp_dir),
-                filter_stdout=filter_python_develop,
-                show_stdout=True,
-                extra_env=extra_env)
-    
-
-def ensure_dir(dir):
-    if not os.path.exists(dir):
-        logger.notify('Creating directory %s' % dir)
-        os.makedirs(dir)
-
-def filter_python_develop(line):
-    if not line.strip():
-        return Logger.DEBUG
-    for prefix in ['Searching for', 'Reading ', 'Best match: ', 'Processing ',
-                   'Moving ', 'Adding ', 'running ', 'writing ', 'Creating ',
-                   'creating ', 'Copying ']:
-        if line.startswith(prefix):
-            return Logger.DEBUG
-    return Logger.NOTIFY
-"""
 
 def main():
     python_version = ".".join(map(str,sys.version_info[0:2]))
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/virtualenv/setup/res/res_create_env.py	Thu Mar 10 18:33:37 2011 +0100
@@ -0,0 +1,249 @@
+import sys
+import os
+import os.path
+import shutil
+import tarfile
+import zipfile
+import urllib
+import platform
+import patch
+import logging
+
+class ResourcesEnv(object):
+
+    def __init__(self, src_base):
+        self.src_base = src_base
+        self.URLS = {}
+        self.__init_url()
+        self.NORMAL_INSTALL = []
+        self.__init_normal_install()
+
+    def get_src_base_path(self, fpath):
+        return os.path.abspath(os.path.join(self.src_base, fpath)).replace("\\","/")
+    
+    def __add_package_def(self, key, setup, url, local):
+        self.URLS[key] = {'setup':setup, 'url':url, 'local':self.get_src_base_path(local)}
+
+    def __init_url(self):
+        self.__add_package_def('DISTRIBUTE', setup='distribute', url='http://pypi.python.org/packages/source/d/distribute/distribute-0.6.14.tar.gz', local="distribute-0.6.14.tar.gz")
+        self.__add_package_def('MERCURIAL', setup='mercurial', url='http://pypi.python.org/packages/source/d/mercurial/mercurial-1.7.5.tar.gz', local="mercurial-1.7.5.tar.gz")
+        self.__add_package_def('SETUPTOOLS_HG', setup='mercurial_hg', url='http://pypi.python.org/packages/source/s/setuptools_hg/setuptools_hg-0.2.tar.gz', local="setuptools_hg-0.2.tar.gz")
+
+
+    def __init_normal_install(self):
+        system_str = platform.system()
+        self.NORMAL_INSTALL = [ #(key,method, option_str, extra_env)
+            ('DISTRIBUTE', 'pip', None, None),
+            ('MERCURIAL', 'pip', None, None),
+            ('SETUPTOOLS-HG', 'pip', None, None), 
+        ]
+
+def extend_parser(parser):
+    
+    parser.add_option(
+        '--index-url',
+        metavar='INDEX_URL',
+        dest='index_url',
+        default='http://pypi.python.org/simple/',
+        help='base URL of Python Package Index')
+    parser.add_option(
+        '--type-install',
+        metavar='type_install',
+        dest='type_install',
+        default='local',
+        help='type install : local, url, setup')
+    parser.add_option(
+        '--ignore-packages',
+        metavar='ignore_packages',
+        dest='ignore_packages',
+        default=None,
+        help='list of comma separated keys for package to ignore')
+
+
+def adjust_options(options, args):
+    pass
+
+
+def after_install(options, home_dir):
+    global RES_ENV
+    #global path_locations
+    home_dir, lib_dir, inc_dir, bin_dir = path_locations(home_dir)
+    base_dir = os.path.dirname(home_dir)
+    src_dir = os.path.join(home_dir, 'src')
+    tmp_dir = os.path.join(home_dir, 'tmp')
+    ensure_dir(src_dir)
+    ensure_dir(tmp_dir)
+    system_str = platform.system()
+    
+    res_source_key = options.type_install
+    
+    ignore_packages = []
+    
+    if options.ignore_packages :
+        ignore_packages = options.ignore_packages.split(",")
+    
+    logger.indent += 2
+    try:
+        
+        if 'PYLUCENE' not in ignore_packages and system_str != "Windows":
+            #get pylucene
+            logger.notify("Get Pylucene from %s " % RES_ENV.URLS['PYLUCENE'][res_source_key])
+            pylucene_src = os.path.join(src_dir,"pylucene.tar.gz")
+            if res_source_key == 'local':
+                shutil.copy(RES_ENV.URLS['PYLUCENE'][res_source_key], pylucene_src)
+            else:
+                urllib.urlretrieve(RES_ENV.URLS['PYLUCENE'][res_source_key], pylucene_src)
+            tf = tarfile.open(pylucene_src,'r:gz')
+            pylucene_base_path = os.path.join(src_dir,"pylucene") 
+            logger.notify("Extract Pylucene to %s " % pylucene_base_path)
+            tf.extractall(pylucene_base_path)
+            tf.close()
+            
+            pylucene_src_path = os.path.join(pylucene_base_path, os.listdir(pylucene_base_path)[0])
+            jcc_src_path = os.path.abspath(os.path.join(pylucene_src_path,"jcc"))
+            
+            #install jcc
+    
+            #patch for linux
+            if system_str == 'Linux' :
+                olddir = os.getcwd()
+                patch_dest_path = os.path.join(lib_dir,'site-packages','setuptools-0.6c11-py'+'%s.%s' % (sys.version_info[0], sys.version_info[1])+'.egg')
+                if os.path.isfile(patch_dest_path):
+                    # must unzip egg
+                    # rename file and etract all
+                    shutil.move(patch_dest_path, patch_dest_path + ".zip")
+                    zf = zipfile.ZipFile(patch_dest_path + ".zip",'r')
+                    zf.extractall(patch_dest_path)
+                    os.remove(patch_dest_path + ".zip")
+                logger.notify("Patch jcc : %s " % (patch_dest_path))
+                os.chdir(patch_dest_path)
+                p = patch.fromfile(os.path.join(jcc_src_path,"jcc","patches","patch.43.0.6c11"))
+                p.apply()
+                os.chdir(olddir)
+    
+            logger.notify("Install jcc")
+            call_subprocess([os.path.abspath(os.path.join(home_dir, 'bin', 'python')), 'setup.py', 'install'],
+                            cwd=jcc_src_path,
+                            filter_stdout=filter_python_develop,
+                            show_stdout=True)
+            #install pylucene
+            
+            logger.notify("Install pylucene")
+            #modify makefile
+            makefile_path = os.path.join(pylucene_src_path,"Makefile")
+            logger.notify("Modify makefile %s " % makefile_path)
+            shutil.move( makefile_path, makefile_path+"~" )
+    
+            destination= open( makefile_path, "w" )
+            source= open( makefile_path+"~", "r" )
+            destination.write("PREFIX_PYTHON="+os.path.abspath(home_dir)+"\\n")
+            destination.write("ANT=ant\\n")
+            destination.write("PYTHON=$(PREFIX_PYTHON)/bin/python\\n")
+            
+            if system_str == "Darwin":
+                if sys.version_info >= (2,6):
+                    destination.write("JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64 --arch i386\\n")
+                else:
+                    destination.write("JCC=$(PYTHON) -m jcc --shared --arch x86_64 --arch i386\\n")
+                destination.write("NUM_FILES=2\\n")
+            elif system_str == "Windows":
+                destination.write("JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64 --arch i386\\n")
+                destination.write("NUM_FILES=2\\n")
+            else:
+                if sys.version_info >= (2,6) and sys.version_info <= (2,7):
+                    destination.write("JCC=$(PYTHON) -m jcc.__main__ --shared\\n")
+                else:
+                    destination.write("JCC=$(PYTHON) -m jcc --shared\\n")
+                destination.write("NUM_FILES=2\\n")
+            for line in source:
+                destination.write( line )
+            source.close()
+            destination.close()
+            os.remove(makefile_path+"~" )
+    
+            logger.notify("pylucene make")
+            call_subprocess(['make'],
+                            cwd=os.path.abspath(pylucene_src_path),
+                            filter_stdout=filter_python_develop,
+                            show_stdout=True)
+    
+            logger.notify("pylucene make install")
+            call_subprocess(['make', 'install'],
+                            cwd=os.path.abspath(pylucene_src_path),
+                            filter_stdout=filter_python_develop,
+                            show_stdout=True)
+
+
+        if 'PSYCOPG2' not in ignore_packages and system_str == "Windows":
+            #get psycopg2
+            psycopg2_src = os.path.join(src_dir,"psycopg2.zip")
+            shutil.copy(RES_ENV.URLS['PSYCOPG2'][res_source_key], psycopg2_src)
+            #extract psycopg2
+            zf = zipfile.ZipFile(psycopg2_src)
+            psycopg2_base_path = os.path.join(src_dir,"psycopg2")
+            zf.extractall(psycopg2_base_path)
+            zf.close()
+            
+            psycopg2_src_path = os.path.join(psycopg2_base_path, os.listdir(psycopg2_base_path)[0])
+            shutil.copytree(os.path.join(psycopg2_src_path, 'psycopg2'), os.path.abspath(os.path.join(home_dir, 'Lib', 'psycopg2')))
+            shutil.copy(os.path.join(psycopg2_src_path, 'psycopg2-2.0.10-py2.6.egg-info'), os.path.abspath(os.path.join(home_dir, 'Lib', 'site-packages')))
+
+        for key, method, option_str, extra_env in RES_ENV.NORMAL_INSTALL:
+            if key not in ignore_packages:
+                normal_install(key, method, option_str, extra_env, res_source_key, home_dir, tmp_dir)
+                        
+        logger.notify("Clear source dir")
+        shutil.rmtree(src_dir)
+
+    finally:
+        logger.indent -= 2
+    script_dir = join(base_dir, bin_dir)
+    logger.notify('Run "%s Package" to install new packages that provide builds'
+                  % join(script_dir, 'easy_install'))
+
+
+def normal_install(key, method, option_str, extra_env, res_source_key, home_dir, tmp_dir):
+    global logger
+    logger.notify("Install %s from %s with %s" % (key,RES_ENV.URLS[key][res_source_key],method))
+    if method == 'pip':
+        if sys.platform == 'win32':
+            args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'pip')), 'install', '-E', os.path.abspath(home_dir), RES_ENV.URLS[key][res_source_key]]
+        else:
+            args = [os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', '-E', os.path.abspath(home_dir), RES_ENV.URLS[key][res_source_key]]
+        if option_str :
+            args.insert(4,option_str)
+        call_subprocess(args,
+                cwd=os.path.abspath(tmp_dir),
+                filter_stdout=filter_python_develop,
+                show_stdout=True,
+                extra_env=extra_env)
+    else:
+        if sys.platform == 'win32':
+            args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'easy_install')), RES_ENV.URLS[key][res_source_key]]
+        else:
+            args = [os.path.abspath(os.path.join(home_dir, 'bin', 'easy_install')), RES_ENV.URLS[key][res_source_key]]
+        if option_str :
+            args.insert(1,option_str)
+        call_subprocess(args,
+                cwd=os.path.abspath(tmp_dir),
+                filter_stdout=filter_python_develop,
+                show_stdout=True,
+                extra_env=extra_env)
+    
+
+def ensure_dir(dir):
+    global logger
+    if not os.path.exists(dir):
+        logger.notify('Creating directory %s' % dir)
+        os.makedirs(dir)
+
+def filter_python_develop(line):
+    global logger
+    if not line.strip():
+        return Logger.DEBUG
+    for prefix in ['Searching for', 'Reading ', 'Best match: ', 'Processing ',
+                   'Moving ', 'Adding ', 'running ', 'writing ', 'Creating ',
+                   'creating ', 'Copying ']:
+        if line.startswith(prefix):
+            return Logger.DEBUG
+    return Logger.NOTIFY
Binary file virtualenv/setup/res/src/setuptools_hg-0.2.tar.gz has changed
--- a/virtualenv/web/create_python_env.py	Wed Mar 09 18:42:58 2011 +0100
+++ b/virtualenv/web/create_python_env.py	Thu Mar 10 18:33:37 2011 +0100
@@ -8,7 +8,8 @@
 - distribute
 - psycopg2 requires the PostgreSQL libpq libraries and the pg_config utility
 
-- python project-boot.py --distribute --no-site-packages --index-url=http://pypi.websushi.org/ --clear --type-install=local <path_to_venv>
+- python project-boot.py --distribute --no-site-packages --index-url=http://pypi.websushi.org/ --clear --type-install=local --ignore-packages=MYSQL <path_to_venv>
+- 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>
 
@@ -37,289 +38,13 @@
 lib_path = os.path.abspath(os.path.join(here,"res","lib")).replace("\\","/")
 patch_path = os.path.abspath(os.path.join(here,"res","patch")).replace("\\","/")
 
-EXTRA_TEXT  = "URLS = { \n"
 
-EXTRA_TEXT += "    'DISTRIBUTE' : { 'setup': 'distribute', 'url': 'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.14.tar.gz', 'local': '"+ os.path.abspath(os.path.join(src_base,"distribute-0.6.14.tar.gz")).replace("\\","/")+"'},\n"
-if sys.platform == 'win32':
-    EXTRA_TEXT += "    'PSYCOPG2' : { 'setup': 'psycopg2','url': 'D:/wakimd/dev/hg/platform/virtualenv/web/res/src/psycopg2-2.0.10.win32-py2.6-pg8.3.7-release.zip', 'local': '"+ os.path.abspath(os.path.join(src_base,"psycopg2-2.0.10.win32-py2.6-pg8.3.7-release.zip")).replace("\\","/")+"'},\n"
-else:
-    EXTRA_TEXT += "    'PSYCOPG2' : { 'setup': 'psycopg2','url': 'http://initd.org/psycopg/tarballs/PSYCOPG-2-3/psycopg2-2.3.2.tar.gz', 'local': '"+ os.path.abspath(os.path.join(src_base,"psycopg2-2.3.2.tar.gz")).replace("\\","/")+"'},\n"
-EXTRA_TEXT += "    'MYSQL' : { 'setup': 'mysql-python', 'url': 'http://sourceforge.net/projects/mysql-python/files/mysql-python/1.2.3/MySQL-python-1.2.3.tar.gz/download', 'local' : '"+ os.path.abspath(os.path.join(src_base,"MySQL-python-1.2.3.tar.gz")).replace("\\","/")+"'},\n"
-if sys.platform == 'win32':
-    EXTRA_TEXT += "    'PYLUCENE' : { 'setup': 'http://pylucene-win32-binary.googlecode.com/files/lucene-3.0.2-py2.6-win32.egg', 'local': '"+ os.path.abspath(os.path.join(src_base,"lucene-3.0.2-py2.6-win32.egg")).replace("\\","/")+"'},\n"
-    EXTRA_TEXT += "    'JCC' : { 'setup': 'http://pylucene-win32-binary.googlecode.com/files/JCC-2.6-py2.6-win32.egg', 'local': '"+ os.path.abspath(os.path.join(src_base,"JCC-2.6-py2.6-win32.egg")).replace("\\","/")+"'},\n"
-else:
-    EXTRA_TEXT += "    'PYLUCENE' : { 'setup': 'http://apache.crihan.fr/dist/lucene/pylucene/pylucene-3.0.3-1-src.tar.gz', 'url': 'http://apache.crihan.fr/dist/lucene/pylucene/pylucene-3.0.3-1-src.tar.gz', 'local': '"+ os.path.abspath(os.path.join(src_base,"pylucene-3.0.3-1-src.tar.gz")).replace("\\","/")+"'},\n"
-if sys.platform == 'win32':
-    EXTRA_TEXT += "    'PIL' : { 'setup': 'pil', 'url': 'http://effbot.org/media/downloads/PIL-1.1.7.win32-py2.6.exe', 'local': '"+ os.path.abspath(os.path.join(src_base,"PIL-1.1.7.win32-py2.6.exe")).replace("\\","/")+"'},\n"
-else:
-    EXTRA_TEXT += "    'PIL' : { 'setup': 'pil', 'url': 'http://effbot.org/downloads/Imaging-1.1.7.tar.gz', 'local': '"+ os.path.abspath(os.path.join(src_base,"Imaging-1.1.7.tar.gz")).replace("\\","/")+"'},\n"
-EXTRA_TEXT += "    'DJANGO' : { 'setup': 'django', 'url': 'http://www.djangoproject.com/download/1.2.4/tarball/', 'local': '"+ os.path.abspath(os.path.join(src_base,"Django-1.2.4.tar.gz")).replace("\\","/")+"'},\n"
-EXTRA_TEXT += "    'JOGGING' : { 'setup': 'jogging', 'url': 'http://github.com/zain/jogging/tarball/v0.2.2', 'local': '"+ os.path.abspath(os.path.join(src_base,"jogging-0.2.2.tar.gz")).replace("\\","/")+"'},\n"
-EXTRA_TEXT += "    'DJANGO-EXTENSIONS' : { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/tarball/0.6', 'local':'"+ os.path.abspath(os.path.join(src_base,"django-extensions-0.6.tar.gz")).replace("\\","/")+"' },\n"
-EXTRA_TEXT += "    'DJANGO-REGISTRATION' : { 'setup': 'django-registration', 'url':'http://bitbucket.org/ubernostrum/django-registration/get/tip.tar.gz', 'local':'"+ os.path.abspath(os.path.join(src_base,"django-registration.tar.gz")).replace("\\","/")+"' },\n"
-EXTRA_TEXT += "    'DJANGO-TAGGING' : { 'setup': 'django-tagging', 'url':'http://django-tagging.googlecode.com/files/django-tagging-0.3.1.tar.gz', 'local':'"+ os.path.abspath(os.path.join(src_base,"django-tagging-0.3.1.tar.gz")).replace("\\","/")+"' },\n"
-EXTRA_TEXT += "    'DJANGO-PISTON' : { 'setup': 'django-piston', 'url':'"+ os.path.abspath(os.path.join(src_base,"django-piston-0.2.2-modified.tar.gz")).replace("\\","/")+"', 'local':'"+ os.path.abspath(os.path.join(src_base,"django-piston-0.2.2-modified.tar.gz")).replace("\\","/")+"' },\n"
-if sys.platform == 'win32':
-    EXTRA_TEXT += "    'LXML' : { 'setup': 'lxml', 'url': 'http://pypi.python.org/packages/2.6/l/lxml/lxml-2.2.8-py2.6-win32.egg', 'local': '"+ os.path.abspath(os.path.join(src_base,"lxml-2.2.8-py2.6-win32.egg")).replace("\\","/")+"'},\n"
-else:
-    EXTRA_TEXT += "    'LXML' : { 'setup': 'lxml', 'url': '"+ os.path.abspath(os.path.join(src_base,"lxml_2.2.8.tar.gz"))+"', 'local': '"+ os.path.abspath(os.path.join(src_base,"lxml-2.2.8.tar.gz")).replace("\\","/")+"'},\n"
-EXTRA_TEXT += "    'SETUPTOOLS-HG' : { 'setup': 'setuptools-hg', 'url':'http://bitbucket.org/jezdez/setuptools_hg/downloads/setuptools_hg-0.2.tar.gz', 'local':'"+ os.path.abspath(os.path.join(src_base,"setuptools_hg-0.2.tar.gz")).replace("\\","/")+"' },\n"
-EXTRA_TEXT += "    'OAUTH2' : { 'setup': 'python-oauth2', 'url':'"+ os.path.abspath(os.path.join(src_base,"python-oauth2-1.2.1-modified.tar.gz")).replace("\\","/")+"', 'local':'"+ os.path.abspath(os.path.join(src_base,"python-oauth2-1.2.1-modified.tar.gz")).replace("\\","/")+"' },\n"
-EXTRA_TEXT += "    'HTTPLIB2' : { 'setup': 'python-oauth2', 'url':'http://httplib2.googlecode.com/files/httplib2-0.6.0.tar.gz', 'local':'"+ os.path.abspath(os.path.join(src_base,"httplib2-0.6.0.tar.gz")).replace("\\","/")+"' },\n"
-EXTRA_TEXT += "    'DJANGO-OAUTH-PLUS' : { 'setup': 'django-oauth-plus', 'url':'http://bitbucket.org/david/django-oauth-plus/get/f314f018e473.gz', 'local':'"+ os.path.abspath(os.path.join(src_base,"django-oauth-plus.tar.gz")).replace("\\","/")+"' },\n"
-EXTRA_TEXT += "}\n"
-
-EXTRA_TEXT += "import sys\n"
-EXTRA_TEXT += "sys.path.append('"+lib_path+"')\n"
-
-EXTRA_TEXT += """
-
-import shutil
-import tarfile
-import zipfile
-import urllib
-import platform
-import patch
-
-
-INDEX_URL = 'http://pypi.python.org/simple/'
-
-
-def extend_parser(parser):
-    parser.add_option(
-        '--index-url',
-        metavar='INDEX_URL',
-        dest='index_url',
-        default='',
-        help='base URL of Python Package Index')
-    parser.add_option(
-        '--type-install',
-        metavar='type_install',
-        dest='type_install',
-        default='local',
-        help='type install : local, url, setup')
-    parser.add_option(
-        '--ignore-packages',
-        metavar='ignore_packages',
-        dest='ignore_packages',
-        default=None,
-        help='list of comma separated keys for package to ignore')
-
-
-
-def adjust_options(options, args):
-    pass
-
-
-def after_install(options, home_dir):
-    home_dir, lib_dir, inc_dir, bin_dir = path_locations(home_dir)
-    base_dir = os.path.dirname(home_dir)
-    src_dir = join(home_dir, 'src')
-    tmp_dir = join(home_dir, 'tmp')
-    ensure_dir(src_dir)
-    ensure_dir(tmp_dir)
-    system_str = platform.system()
-    
-    res_source_key = options.type_install
-    
-    ignore_packages = []
-    
-    if options.ignore_packages :
-        ignore_packages = options.ignore_packages.split(",")
-    
-    logger.indent += 2
-    try:
-        
-        if 'PYLUCENE' not in ignore_packages and system_str != "Windows":
-            #get pylucene
-            logger.notify("Get Pylucene from %s " % URLS['PYLUCENE'][res_source_key])
-            pylucene_src = os.path.join(src_dir,"pylucene.tar.gz")
-            if res_source_key == 'local':
-                shutil.copy(URLS['PYLUCENE'][res_source_key], pylucene_src)
-            else:
-                urllib.urlretrieve(URLS['PYLUCENE'][res_source_key], pylucene_src)
-            tf = tarfile.open(pylucene_src,'r:gz')
-            pylucene_base_path = os.path.join(src_dir,"pylucene") 
-            logger.notify("Extract Pylucene to %s " % pylucene_base_path)
-            tf.extractall(pylucene_base_path)
-            tf.close()
-            
-            pylucene_src_path = os.path.join(pylucene_base_path, os.listdir(pylucene_base_path)[0])
-            jcc_src_path = os.path.abspath(os.path.join(pylucene_src_path,"jcc"))
-            
-            #install jcc
-    
-            #patch for linux
-            if system_str == 'Linux' :
-                olddir = os.getcwd()
-                patch_dest_path = os.path.join(lib_dir,'site-packages','setuptools-0.6c11-py'+'%s.%s' % (sys.version_info[0], sys.version_info[1])+'.egg')
-                if os.path.isfile(patch_dest_path):
-                    # must unzip egg
-                    # rename file and etract all
-                    shutil.move(patch_dest_path, patch_dest_path + ".zip")
-                    zf = zipfile.ZipFile(patch_dest_path + ".zip",'r')
-                    zf.extractall(patch_dest_path)
-                    os.remove(patch_dest_path + ".zip")
-                logger.notify("Patch jcc : %s " % (patch_dest_path))
-                os.chdir(patch_dest_path)
-                p = patch.fromfile(os.path.join(jcc_src_path,"jcc","patches","patch.43.0.6c11"))
-                p.apply()
-                os.chdir(olddir)
-    
-            logger.notify("Install jcc")
-            call_subprocess([os.path.abspath(os.path.join(home_dir, 'bin', 'python')), 'setup.py', 'install'],
-                            cwd=jcc_src_path,
-                            filter_stdout=filter_python_develop,
-                            show_stdout=True)
-            #install pylucene
-            
-            logger.notify("Install pylucene")
-            #modify makefile
-            makefile_path = os.path.join(pylucene_src_path,"Makefile")
-            logger.notify("Modify makefile %s " % makefile_path)
-            shutil.move( makefile_path, makefile_path+"~" )
-    
-            destination= open( makefile_path, "w" )
-            source= open( makefile_path+"~", "r" )
-            destination.write("PREFIX_PYTHON="+os.path.abspath(home_dir)+"\\n")
-            destination.write("ANT=ant\\n")
-            destination.write("PYTHON=$(PREFIX_PYTHON)/bin/python\\n")
-            
-            if system_str == "Darwin":
-                if sys.version_info >= (2,6):
-                    destination.write("JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64 --arch i386\\n")
-                else:
-                    destination.write("JCC=$(PYTHON) -m jcc --shared --arch x86_64 --arch i386\\n")
-                destination.write("NUM_FILES=2\\n")
-            elif system_str == "Windows":
-                destination.write("JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64 --arch i386\\n")
-                destination.write("NUM_FILES=2\\n")
-            else:
-                if sys.version_info >= (2,6) and sys.version_info < (2,7):
-                    destination.write("JCC=$(PYTHON) -m jcc.__main__ --shared\\n")
-                else:
-                    destination.write("JCC=$(PYTHON) -m jcc --shared\\n")
-                destination.write("NUM_FILES=2\\n")
-            for line in source:
-                destination.write( line )
-            source.close()
-            destination.close()
-            os.remove(makefile_path+"~" )
-    
-            logger.notify("pylucene make")
-            call_subprocess(['make'],
-                            cwd=os.path.abspath(pylucene_src_path),
-                            filter_stdout=filter_python_develop,
-                            show_stdout=True)
-    
-            logger.notify("pylucene make install")
-            call_subprocess(['make', 'install'],
-                            cwd=os.path.abspath(pylucene_src_path),
-                            filter_stdout=filter_python_develop,
-                            show_stdout=True)
-
-        if system_str == 'Linux'  and 'DISTRIBUTE' not in ignore_packages:
-            normal_install('DISTRIBUTE', 'pip', None, None, res_source_key, home_dir, tmp_dir)
-
-        NORMAL_INSTALL = [ #(key,method, option_str, extra_env)
-            ('MYSQL', 'pip', None, None),
-            ('PIL', 'easy_install', None, None), 
-            ('DJANGO','pip', None, None),
-            ('JOGGING','pip', None, None),
-            ('DJANGO-EXTENSIONS', 'pip', None, None),
-            ('DJANGO-REGISTRATION', 'easy_install', '-Z', None),
-            ('DJANGO-TAGGING', 'pip', None, None),
-            ('DJANGO-PISTON', 'pip', None, None),
-            ('SETUPTOOLS-HG', 'pip', None, None), 
-            ('HTTPLIB2', 'pip', None, None),
-            ('OAUTH2', 'pip', None, None),
-            ('DJANGO-OAUTH-PLUS', 'pip', None, None),
-            ]
-
-        if 'PYLUCENE' not in ignore_packages and system_str == "Windows":
-            NORMAL_INSTALL.append(('JCC','easy_install',None,None))
-            NORMAL_INSTALL.append(('PYLUCENE','easy_install',None,None))
-             
-        if system_str == "Darwin":
-            NORMAL_INSTALL.append(('LXML', 'easy_install', None, {'STATIC_DEPS': 'true'}))
-        else:
-            NORMAL_INSTALL.append(('LXML', 'easy_install', None, None))
-        
-        if system_str == "Windows":
-            #get psycopg2
-            psycopg2_src = os.path.join(src_dir,"psycopg2.zip")
-            shutil.copy(URLS['PSYCOPG2'][res_source_key], psycopg2_src)
-            #extract psycopg2
-            zf = zipfile.ZipFile(psycopg2_src)
-            psycopg2_base_path = os.path.join(src_dir,"psycopg2")
-            zf.extractall(psycopg2_base_path)
-            zf.close()
-            
-            psycopg2_src_path = os.path.join(psycopg2_base_path, os.listdir(psycopg2_base_path)[0])
-            shutil.copytree(os.path.join(psycopg2_src_path, 'psycopg2'), os.path.abspath(os.path.join(home_dir, 'Lib', 'psycopg2')))
-            shutil.copy(os.path.join(psycopg2_src_path, 'psycopg2-2.0.10-py2.6.egg-info'), os.path.abspath(os.path.join(home_dir, 'Lib', 'site-packages')))
-        else:
-            NORMAL_INSTALL.append(('PSYCOPG2', 'pip', None, None))
-
-            
-        for key, method, option_str, extra_env in NORMAL_INSTALL:
-            if key not in ignore_packages:
-                normal_install(key, method, option_str, extra_env, res_source_key, home_dir, tmp_dir)
-                        
-        logger.notify("Clear source dir")
-        shutil.rmtree(src_dir)
-
-    finally:
-        logger.indent -= 2
-    script_dir = join(base_dir, bin_dir)
-    logger.notify('Run "%s Package" to install new packages that provide builds'
-                  % join(script_dir, 'easy_install'))
-
-
-def normal_install(key, method, option_str, extra_env, res_source_key, home_dir, tmp_dir):
-    logger.notify("Install %s from %s with %s" % (key,URLS[key][res_source_key],method))
-    if method == 'pip':
-        if sys.platform == 'win32':
-            args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'pip')), 'install', '-E', os.path.abspath(home_dir), URLS[key][res_source_key]]
-        else:
-            args = [os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', '-E', os.path.abspath(home_dir), URLS[key][res_source_key]]
-        if option_str :
-            args.insert(4,option_str)
-        call_subprocess(args,
-                cwd=os.path.abspath(tmp_dir),
-                filter_stdout=filter_python_develop,
-                show_stdout=True,
-                extra_env=extra_env)
-    else:
-        if sys.platform == 'win32':
-            args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'easy_install')), URLS[key][res_source_key]]
-        else:
-            args = [os.path.abspath(os.path.join(home_dir, 'bin', 'easy_install')), URLS[key][res_source_key]]
-        if option_str :
-            args.insert(1,option_str)
-        call_subprocess(args,
-                cwd=os.path.abspath(tmp_dir),
-                filter_stdout=filter_python_develop,
-                show_stdout=True,
-                extra_env=extra_env)
-    
-
-def ensure_dir(dir):
-    if not os.path.exists(dir):
-        logger.notify('Creating directory %s' % dir)
-        os.makedirs(dir)
-
-def filter_python_develop(line):
-    if not line.strip():
-        return Logger.DEBUG
-    for prefix in ['Searching for', 'Reading ', 'Best match: ', 'Processing ',
-                   'Moving ', 'Adding ', 'running ', 'writing ', 'Creating ',
-                   'creating ', 'Copying ']:
-        if line.startswith(prefix):
-            return Logger.DEBUG
-    return Logger.NOTIFY
-"""
+EXTRA_TEXT  = "import sys\n"
+EXTRA_TEXT += "sys.path.append('%s')\n" % (lib_path)
+f = open(os.path.join(os.path. os.path.join(os.path.dirname(os.path.abspath(__file__)),"res"),'res_create_env.py'), 'r')
+EXTRA_TEXT += f.read()
+EXTRA_TEXT += "\n"
+EXTRA_TEXT += "RES_ENV = ResourcesEnv('%s')\n" % (src_base)
 
 def main():
     python_version = ".".join(map(str,sys.version_info[0:2]))
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/virtualenv/web/res/res_create_env.py	Thu Mar 10 18:33:37 2011 +0100
@@ -0,0 +1,292 @@
+import sys
+import os
+import os.path
+import shutil
+import tarfile
+import zipfile
+import urllib
+import platform
+import patch
+import logging
+
+class ResourcesEnv(object):
+
+    def __init__(self, src_base):
+        self.src_base = src_base
+        self.URLS = {}
+        self.__init_url()
+        self.NORMAL_INSTALL = []
+        self.__init_normal_install()
+
+    def get_src_base_path(self, fpath):
+        return os.path.abspath(os.path.join(self.src_base, fpath)).replace("\\","/")
+    
+    def __add_package_def(self, key, setup, url, local):
+        self.URLS[key] = {'setup':setup, 'url':url, 'local':self.get_src_base_path(local)}
+
+    def __init_url(self):
+        self.__add_package_def('DISTRIBUTE', setup='distribute', url='http://pypi.python.org/packages/source/d/distribute/distribute-0.6.14.tar.gz', local="distribute-0.6.14.tar.gz")
+        self.__add_package_def('DJANGO', setup= 'django', url= 'http://www.djangoproject.com/download/1.2.4/tarball/', local="Django-1.2.4.tar.gz")
+        self.__add_package_def('JOGGING', setup= 'jogging', url= 'http://github.com/zain/jogging/tarball/v0.2.2', local="jogging-0.2.2.tar.gz")
+        self.__add_package_def('DJANGO-EXTENSIONS', setup= 'django-extensions', url='https://github.com/django-extensions/django-extensions/tarball/0.6', local="django-extensions-0.6.tar.gz")
+        self.__add_package_def('DJANGO-REGISTRATION', setup= 'django-registration', url='http://bitbucket.org/ubernostrum/django-registration/get/tip.tar.gz', local="django-registration.tar.gz")
+        self.__add_package_def('DJANGO-TAGGING', setup= 'django-tagging', url='http://django-tagging.googlecode.com/files/django-tagging-0.3.1.tar.gz', local="django-tagging-0.3.1.tar.gz")
+        self.__add_package_def('DJANGO-PISTON', setup= 'django-piston', url=self.get_src_base_path("django-piston-0.2.2-modified.tar.gz"), local="django-piston-0.2.2-modified.tar.gz")
+        self.__add_package_def('OAUTH2', setup= 'python-oauth2', url=self.get_src_base_path("python-oauth2-1.2.1-modified.tar.gz"), local="python-oauth2-1.2.1-modified.tar.gz")
+        self.__add_package_def('HTTPLIB2', setup= 'python-oauth2', url='http://httplib2.googlecode.com/files/httplib2-0.6.0.tar.gz', local="httplib2-0.6.0.tar.gz")
+        self.__add_package_def('DJANGO-OAUTH-PLUS', setup= 'django-oauth-plus', url='http://bitbucket.org/david/django-oauth-plus/get/f314f018e473.gz', local="django-oauth-plus.tar.gz")
+        self.__add_package_def('MYSQL', setup= 'mysql-python', url= 'http://sourceforge.net/projects/mysql-python/files/mysql-python/1.2.3/MySQL-python-1.2.3.tar.gz/download', local="MySQL-python-1.2.3.tar.gz")
+
+        if sys.platform == 'win32':
+            self.__add_package_def('PSYCOPG2', setup= 'psycopg2',url= self.get_src_base_path('psycopg2-2.0.10.win32-py2.6-pg8.3.7-release.zip'), local="psycopg2-2.0.10.win32-py2.6-pg8.3.7-release.zip")
+            self.__add_package_def('JCC', setup= 'http://pylucene-win32-binary.googlecode.com/files/JCC-2.6-py2.6-win32.egg', local="JCC-2.6-py2.6-win32.egg")
+            self.__add_package_def('PYLUCENE', setup= 'http://pylucene-win32-binary.googlecode.com/files/lucene-3.0.2-py2.6-win32.egg', local="lucene-3.0.2-py2.6-win32.egg")
+            self.__add_package_def('PIL', setup= 'pil', url= 'http://effbot.org/media/downloads/PIL-1.1.7.win32-py2.6.exe', local="PIL-1.1.7.win32-py2.6.exe")
+            self.__add_package_def('LXML', setup= 'lxml', url= 'http://pypi.python.org/packages/2.6/l/lxml/lxml-2.2.8-py2.6-win32.egg', local="lxml-2.2.8-py2.6-win32.egg")        
+        else:
+            self.__add_package_def('PSYCOPG2', setup= 'psycopg2',url= 'http://initd.org/psycopg/tarballs/PSYCOPG-2-3/psycopg2-2.3.2.tar.gz', local="psycopg2-2.3.2.tar.gz")
+            self.__add_package_def('PYLUCENE', setup= 'http://apache.crihan.fr/dist/lucene/pylucene/pylucene-3.0.3-1-src.tar.gz', url= 'http://apache.crihan.fr/dist/lucene/pylucene/pylucene-3.0.3-1-src.tar.gz', local="pylucene-3.0.3-1-src.tar.gz")
+            self.__add_package_def('PIL', setup= 'pil', url= 'http://effbot.org/downloads/Imaging-1.1.7.tar.gz', local="Imaging-1.1.7.tar.gz")
+            self.__add_package_def('LXML', setup= 'lxml', url=self.get_src_base_path("lxml_2.2.8.tar.gz"), local="lxml-2.2.8.tar.gz")
+
+    def __init_normal_install(self):
+        system_str = platform.system()
+        self.NORMAL_INSTALL = [ #(key,method, option_str, extra_env)
+            ('MYSQL', 'pip', None, None),
+            ('PIL', 'easy_install', None, None), 
+            ('DJANGO','pip', None, None),
+            ('JOGGING','pip', None, None),
+            ('DJANGO-EXTENSIONS', 'pip', None, None),
+            ('DJANGO-REGISTRATION', 'easy_install', '-Z', None),
+            ('DJANGO-TAGGING', 'pip', None, None),
+            ('DJANGO-PISTON', 'pip', None, None),
+            ('SETUPTOOLS-HG', 'pip', None, None), 
+            ('HTTPLIB2', 'pip', None, None),
+            ('OAUTH2', 'easy_install', None, None),
+            ('DJANGO-OAUTH-PLUS', 'pip', None, None),
+        ]
+        if system_str == "Windows":
+            self.NORMAL_INSTALL.append(('JCC','easy_install',None,None))
+            self.NORMAL_INSTALL.append(('PYLUCENE','easy_install',None,None))
+             
+        if system_str == "Darwin":
+            self.NORMAL_INSTALL.append(('LXML', 'pip', None, {'STATIC_DEPS': 'true', 'LIBXML2_VERSION': '2.7.8', 'LIBXSLT_VERSION': '1.1.26'}))
+        else:
+            self.NORMAL_INSTALL.append(('LXML', 'pip', None, None))
+        
+        if system_str != "Windows":
+            self.NORMAL_INSTALL.append(('PSYCOPG2', 'pip', None, None))
+
+        if system_str == 'Linux':
+            self.NORMAL_INSTALL.insert(0, ('DISTRIBUTE', 'pip', None, None))
+
+
+def extend_parser(parser):
+    
+    parser.add_option(
+        '--index-url',
+        metavar='INDEX_URL',
+        dest='index_url',
+        default='http://pypi.python.org/simple/',
+        help='base URL of Python Package Index')
+    parser.add_option(
+        '--type-install',
+        metavar='type_install',
+        dest='type_install',
+        default='local',
+        help='type install : local, url, setup')
+    parser.add_option(
+        '--ignore-packages',
+        metavar='ignore_packages',
+        dest='ignore_packages',
+        default=None,
+        help='list of comma separated keys for package to ignore')
+
+
+def adjust_options(options, args):
+    pass
+
+
+def after_install(options, home_dir):
+    global RES_ENV
+    #global path_locations
+    home_dir, lib_dir, inc_dir, bin_dir = path_locations(home_dir)
+    base_dir = os.path.dirname(home_dir)
+    src_dir = os.path.join(home_dir, 'src')
+    tmp_dir = os.path.join(home_dir, 'tmp')
+    ensure_dir(src_dir)
+    ensure_dir(tmp_dir)
+    system_str = platform.system()
+    
+    res_source_key = options.type_install
+    
+    ignore_packages = []
+    
+    if options.ignore_packages :
+        ignore_packages = options.ignore_packages.split(",")
+    
+    logger.indent += 2
+    try:
+        
+        if 'PYLUCENE' not in ignore_packages and system_str != "Windows":
+            #get pylucene
+            logger.notify("Get Pylucene from %s " % RES_ENV.URLS['PYLUCENE'][res_source_key])
+            pylucene_src = os.path.join(src_dir,"pylucene.tar.gz")
+            if res_source_key == 'local':
+                shutil.copy(RES_ENV.URLS['PYLUCENE'][res_source_key], pylucene_src)
+            else:
+                urllib.urlretrieve(RES_ENV.URLS['PYLUCENE'][res_source_key], pylucene_src)
+            tf = tarfile.open(pylucene_src,'r:gz')
+            pylucene_base_path = os.path.join(src_dir,"pylucene") 
+            logger.notify("Extract Pylucene to %s " % pylucene_base_path)
+            tf.extractall(pylucene_base_path)
+            tf.close()
+            
+            pylucene_src_path = os.path.join(pylucene_base_path, os.listdir(pylucene_base_path)[0])
+            jcc_src_path = os.path.abspath(os.path.join(pylucene_src_path,"jcc"))
+            
+            #install jcc
+    
+            #patch for linux
+            if system_str == 'Linux' :
+                olddir = os.getcwd()
+                patch_dest_path = os.path.join(lib_dir,'site-packages','setuptools-0.6c11-py'+'%s.%s' % (sys.version_info[0], sys.version_info[1])+'.egg')
+                if os.path.isfile(patch_dest_path):
+                    # must unzip egg
+                    # rename file and etract all
+                    shutil.move(patch_dest_path, patch_dest_path + ".zip")
+                    zf = zipfile.ZipFile(patch_dest_path + ".zip",'r')
+                    zf.extractall(patch_dest_path)
+                    os.remove(patch_dest_path + ".zip")
+                logger.notify("Patch jcc : %s " % (patch_dest_path))
+                os.chdir(patch_dest_path)
+                p = patch.fromfile(os.path.join(jcc_src_path,"jcc","patches","patch.43.0.6c11"))
+                p.apply()
+                os.chdir(olddir)
+    
+            logger.notify("Install jcc")
+            call_subprocess([os.path.abspath(os.path.join(home_dir, 'bin', 'python')), 'setup.py', 'install'],
+                            cwd=jcc_src_path,
+                            filter_stdout=filter_python_develop,
+                            show_stdout=True)
+            #install pylucene
+            
+            logger.notify("Install pylucene")
+            #modify makefile
+            makefile_path = os.path.join(pylucene_src_path,"Makefile")
+            logger.notify("Modify makefile %s " % makefile_path)
+            shutil.move( makefile_path, makefile_path+"~" )
+    
+            destination= open( makefile_path, "w" )
+            source= open( makefile_path+"~", "r" )
+            destination.write("PREFIX_PYTHON="+os.path.abspath(home_dir)+"\\n")
+            destination.write("ANT=ant\\n")
+            destination.write("PYTHON=$(PREFIX_PYTHON)/bin/python\\n")
+            
+            if system_str == "Darwin":
+                if sys.version_info >= (2,6):
+                    destination.write("JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64 --arch i386\\n")
+                else:
+                    destination.write("JCC=$(PYTHON) -m jcc --shared --arch x86_64 --arch i386\\n")
+                destination.write("NUM_FILES=2\\n")
+            elif system_str == "Windows":
+                destination.write("JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64 --arch i386\\n")
+                destination.write("NUM_FILES=2\\n")
+            else:
+                if sys.version_info >= (2,6) and sys.version_info <= (2,7):
+                    destination.write("JCC=$(PYTHON) -m jcc.__main__ --shared\\n")
+                else:
+                    destination.write("JCC=$(PYTHON) -m jcc --shared\\n")
+                destination.write("NUM_FILES=2\\n")
+            for line in source:
+                destination.write( line )
+            source.close()
+            destination.close()
+            os.remove(makefile_path+"~" )
+    
+            logger.notify("pylucene make")
+            call_subprocess(['make'],
+                            cwd=os.path.abspath(pylucene_src_path),
+                            filter_stdout=filter_python_develop,
+                            show_stdout=True)
+    
+            logger.notify("pylucene make install")
+            call_subprocess(['make', 'install'],
+                            cwd=os.path.abspath(pylucene_src_path),
+                            filter_stdout=filter_python_develop,
+                            show_stdout=True)
+
+
+        if 'PSYCOPG2' not in ignore_packages and system_str == "Windows":
+            #get psycopg2
+            psycopg2_src = os.path.join(src_dir,"psycopg2.zip")
+            shutil.copy(RES_ENV.URLS['PSYCOPG2'][res_source_key], psycopg2_src)
+            #extract psycopg2
+            zf = zipfile.ZipFile(psycopg2_src)
+            psycopg2_base_path = os.path.join(src_dir,"psycopg2")
+            zf.extractall(psycopg2_base_path)
+            zf.close()
+            
+            psycopg2_src_path = os.path.join(psycopg2_base_path, os.listdir(psycopg2_base_path)[0])
+            shutil.copytree(os.path.join(psycopg2_src_path, 'psycopg2'), os.path.abspath(os.path.join(home_dir, 'Lib', 'psycopg2')))
+            shutil.copy(os.path.join(psycopg2_src_path, 'psycopg2-2.0.10-py2.6.egg-info'), os.path.abspath(os.path.join(home_dir, 'Lib', 'site-packages')))
+
+        for key, method, option_str, extra_env in RES_ENV.NORMAL_INSTALL:
+            if key not in ignore_packages:
+                normal_install(key, method, option_str, extra_env, res_source_key, home_dir, tmp_dir)
+                        
+        logger.notify("Clear source dir")
+        shutil.rmtree(src_dir)
+
+    finally:
+        logger.indent -= 2
+    script_dir = join(base_dir, bin_dir)
+    logger.notify('Run "%s Package" to install new packages that provide builds'
+                  % join(script_dir, 'easy_install'))
+
+
+def normal_install(key, method, option_str, extra_env, res_source_key, home_dir, tmp_dir):
+    global logger
+    logger.notify("Install %s from %s with %s" % (key,RES_ENV.URLS[key][res_source_key],method))
+    if method == 'pip':
+        if sys.platform == 'win32':
+            args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'pip')), 'install', '-E', os.path.abspath(home_dir), RES_ENV.URLS[key][res_source_key]]
+        else:
+            args = [os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', '-E', os.path.abspath(home_dir), RES_ENV.URLS[key][res_source_key]]
+        if option_str :
+            args.insert(4,option_str)
+        call_subprocess(args,
+                cwd=os.path.abspath(tmp_dir),
+                filter_stdout=filter_python_develop,
+                show_stdout=True,
+                extra_env=extra_env)
+    else:
+        if sys.platform == 'win32':
+            args = [os.path.abspath(os.path.join(home_dir, 'Scripts', 'easy_install')), RES_ENV.URLS[key][res_source_key]]
+        else:
+            args = [os.path.abspath(os.path.join(home_dir, 'bin', 'easy_install')), RES_ENV.URLS[key][res_source_key]]
+        if option_str :
+            args.insert(1,option_str)
+        call_subprocess(args,
+                cwd=os.path.abspath(tmp_dir),
+                filter_stdout=filter_python_develop,
+                show_stdout=True,
+                extra_env=extra_env)
+    
+
+def ensure_dir(dir):
+    global logger
+    if not os.path.exists(dir):
+        logger.notify('Creating directory %s' % dir)
+        os.makedirs(dir)
+
+def filter_python_develop(line):
+    global logger
+    if not line.strip():
+        return Logger.DEBUG
+    for prefix in ['Searching for', 'Reading ', 'Best match: ', 'Processing ',
+                   'Moving ', 'Adding ', 'running ', 'writing ', 'Creating ',
+                   'creating ', 'Copying ']:
+        if line.startswith(prefix):
+            return Logger.DEBUG
+    return Logger.NOTIFY
Binary file virtualenv/web/res/src/setuptools_hg-0.2.tar.gz has changed