# HG changeset patch # User ymh # Date 1301085593 -3600 # Node ID 8ccbd2f3820e806856c094bd2d1d6e07c26de9d7 # Parent ef3a8cfef2bc7bd5c2da705691d51b59b9d641fe correct createenv script diff -r ef3a8cfef2bc -r 8ccbd2f3820e virtualenv/setup/res/res_create_env.py --- a/virtualenv/setup/res/res_create_env.py Mon Mar 21 19:26:49 2011 +0100 +++ b/virtualenv/setup/res/res_create_env.py Fri Mar 25 21:39:53 2011 +0100 @@ -27,7 +27,7 @@ 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") + 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): diff -r ef3a8cfef2bc -r 8ccbd2f3820e virtualenv/web/create_python_env.py --- a/virtualenv/web/create_python_env.py Mon Mar 21 19:26:49 2011 +0100 +++ b/virtualenv/web/create_python_env.py Fri Mar 25 21:39:53 2011 +0100 @@ -41,10 +41,16 @@ 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) +EXTRA_TEXT += "sys.path.append('%s')\n" % (os.path.abspath(os.path.join(here,"res")).replace("\\","/")) +EXTRA_TEXT += "from res_create_env import generate_install_methods\n" +EXTRA_TEXT += "adjust_options, extend_parser, after_install = generate_install_methods(path_locations, '%s', Logger, call_subprocess)\n" % (src_base) + + + +#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])) diff -r ef3a8cfef2bc -r 8ccbd2f3820e virtualenv/web/res/res_create_env.py --- a/virtualenv/web/res/res_create_env.py Mon Mar 21 19:26:49 2011 +0100 +++ b/virtualenv/web/res/res_create_env.py Fri Mar 25 21:39:53 2011 +0100 @@ -7,7 +7,8 @@ import urllib import platform import patch -import logging + +join = os.path.join class ResourcesEnv(object): @@ -36,6 +37,7 @@ 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") + 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") 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") @@ -52,6 +54,7 @@ def __init_normal_install(self): system_str = platform.system() self.NORMAL_INSTALL = [ #(key,method, option_str, extra_env) + ('SETUPTOOLS-HG', 'pip', None, None), ('MYSQL', 'pip', None, None), ('PIL', 'easy_install', None, None), ('DJANGO','pip', None, None), @@ -60,7 +63,6 @@ ('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), @@ -81,212 +83,221 @@ self.NORMAL_INSTALL.insert(0, ('DISTRIBUTE', 'pip', None, None)) -def extend_parser(parser): +def generate_install_methods(path_locations, src_base, Logger, call_subprocess): - 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') - + res_env = ResourcesEnv(src_base) -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() + 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') - res_source_key = options.type_install - - ignore_packages = [] - if options.ignore_packages : - ignore_packages = options.ignore_packages.split(",") + def adjust_options(options, args): + pass - logger.indent += 2 - try: + + def after_install(options, home_dir): - 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") + global logger + + verbosity = options.verbose - options.quiet + logger = Logger([(Logger.level_for_integer(2-verbosity), sys.stdout)]) + + + 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 system_str == "Darwin": - if sys.version_info >= (2,6): - destination.write("JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64 --arch i386\\n") + 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: - 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") + 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: - 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+"~" ) + 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) - logger.notify("pylucene make") - call_subprocess(['make'], - 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')) + - 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'))) + 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): + 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 - 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 + return adjust_options, extend_parser, after_install diff -r ef3a8cfef2bc -r 8ccbd2f3820e virtualenv/web/res/src/setuptools_hg-0.2.tar.gz Binary file virtualenv/web/res/src/setuptools_hg-0.2.tar.gz has changed