--- a/virtualenv/setup/create_python_env.py Fri Mar 25 21:39:53 2011 +0100
+++ b/virtualenv/setup/create_python_env.py Tue Mar 29 13:33:43 2011 +0200
@@ -29,15 +29,16 @@
# - 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").replace("\\","/")
-lib_path = os.path.abspath(os.path.join(here,"res","lib")).replace("\\","/")
+src_base = os.path.abspath(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 = "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)
def main():