# HG changeset patch
# User wakimd
# Date 1296727973 -3600
# Node ID ab47434f9ffcedff617c3c1c0d91f900706d351d
# Parent  ad8856219008f8355cd1a97bb2262d01fc65bd56
update boot-script for env on windows

diff -r ad8856219008 -r ab47434f9ffc virtualenv/web/create_python_env.py
--- a/virtualenv/web/create_python_env.py	Sat Jan 29 06:48:05 2011 +0100
+++ b/virtualenv/web/create_python_env.py	Thu Feb 03 11:12:53 2011 +0100
@@ -33,24 +33,37 @@
 # - 4Suite-xml - easy_install ftp://ftp.4suite.org/pub/4Suite/4Suite-XML-1.0.2.tar.bz2
 # - pylucene  - script
 
-src_base = os.path.join(here,"res","src")
-lib_path = os.path.abspath(os.path.join(here,"res","lib"))
-patch_path = os.path.abspath(os.path.join(here,"res","patch"))
+src_base = os.path.join(here,"res","src").replace("\\","/")
+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"))+"'},\n"
-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"))+"'},\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"))+"'},\n"
-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"))+"'},\n"
-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"))+"'},\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"))+"'},\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"))+"'},\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"))+"' },\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"))+"' },\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"))+"' },\n"
-EXTRA_TEXT += "    'DJANGO-PISTON' : { 'setup': 'django-piston', 'url':'http://bitbucket.org/jespern/django-piston/downloads/django-piston-0.2.2.tar.gz', 'local':'"+ os.path.abspath(os.path.join(src_base,"django-piston-0.2.2.tar.gz"))+"' },\n"
-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"))+"'},\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':'http://bitbucket.org/jespern/django-piston/downloads/django-piston-0.2.2.tar.gz', 'local':'"+ os.path.abspath(os.path.join(src_base,"django-piston-0.2.2.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 += "}\n"
 
 EXTRA_TEXT += "import sys\n"
@@ -60,6 +73,7 @@
 
 import shutil
 import tarfile
+import zipfile
 import urllib
 import platform
 import patch
@@ -113,11 +127,14 @@
     logger.indent += 2
     try:
         
-        if 'PYLUCENE' not in ignore_packages:
+        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")
-            urllib.urlretrieve(URLS['PYLUCENE'][res_source_key], pylucene_src)
+            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)
@@ -202,10 +219,8 @@
             normal_install('DISTRIBUTE', 'pip', None, None, res_source_key, home_dir, tmp_dir)
 
         NORMAL_INSTALL = [ #(key,method, option_str, extra_env)
-            #('LXML', 'easy_install', None, {'STATIC_DEPS': 'true'}),
-            ('PSYCOPG2', 'pip', None, None),
             ('MYSQL', 'pip', None, None),
-            ('PIL', 'pip', None, None), 
+            ('PIL', 'easy_install', None, None), 
             ('DJANGO','pip', None, None),
             ('JOGGING','pip', None, None),
             ('DJANGO-EXTENSIONS', 'pip', None, None),
@@ -213,12 +228,32 @@
             ('DJANGO-TAGGING', 'pip', None, None),
             ('DJANGO-PISTON', '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:
@@ -229,7 +264,7 @@
 
     finally:
         logger.indent -= 2
-    script_dir = join(base_dir, 'bin')
+    script_dir = join(base_dir, bin_dir)
     logger.notify('Run "%s Package" to install new packages that provide builds'
                   % join(script_dir, 'easy_install'))
 
@@ -237,7 +272,10 @@
 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':
-        args = [os.path.abspath(os.path.join(home_dir, 'bin', 'pip')), 'install', '-E', os.path.abspath(home_dir), URLS[key][res_source_key]]
+        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,
@@ -246,7 +284,10 @@
                 show_stdout=True,
                 extra_env=extra_env)
     else:
-        args = [os.path.abspath(os.path.join(home_dir, 'bin', 'easy_install')), URLS[key][res_source_key]]
+        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,
diff -r ad8856219008 -r ab47434f9ffc virtualenv/web/res/src/JCC-2.6-py2.6-win32.egg
Binary file virtualenv/web/res/src/JCC-2.6-py2.6-win32.egg has changed
diff -r ad8856219008 -r ab47434f9ffc virtualenv/web/res/src/PIL-1.1.7.win32-py2.6.exe
Binary file virtualenv/web/res/src/PIL-1.1.7.win32-py2.6.exe has changed
diff -r ad8856219008 -r ab47434f9ffc virtualenv/web/res/src/lucene-3.0.2-py2.6-win32.egg
Binary file virtualenv/web/res/src/lucene-3.0.2-py2.6-win32.egg has changed
diff -r ad8856219008 -r ab47434f9ffc virtualenv/web/res/src/lxml-2.2.8-py2.6-win32.egg
Binary file virtualenv/web/res/src/lxml-2.2.8-py2.6-win32.egg has changed
diff -r ad8856219008 -r ab47434f9ffc virtualenv/web/res/src/psycopg2-2.0.10.win32-py2.6-pg8.3.7-release.zip
Binary file virtualenv/web/res/src/psycopg2-2.0.10.win32-py2.6-pg8.3.7-release.zip has changed