[Checkins] SVN: zc.buildout/branches/gary-9/ basic changes to support relative-paths better

[Gary Poster]

Log message for revision 111137:
  basic changes to support relative-paths better

Changed:
  A   zc.buildout/branches/gary-9/
  U   zc.buildout/branches/gary-9/src/zc/buildout/buildout.py
  U   zc.buildout/branches/gary-9/src/zc/buildout/easy_install.py
  U   zc.buildout/branches/gary-9/src/zc/buildout/easy_install.txt

-=-
Modified: zc.buildout/branches/gary-9/src/zc/buildout/buildout.py
===================================================================
--- zc.buildout/branches/gary-8/src/zc/buildout/buildout.py	2010-03-19 19:12:57 UTC (rev 110067)
+++ zc.buildout/branches/gary-9/src/zc/buildout/buildout.py	2010-04-19 19:19:31 UTC (rev 111137)
@@ -397,9 +397,16 @@
         partsdir = os.path.join(options['parts-directory'], 'buildout')
         if not os.path.exists(partsdir):
             os.mkdir(partsdir)
+        # (Honor the relative-paths option.)
+        relative_paths = options.get('relative-paths', 'false')
+        if relative_paths == 'true':
+            relative_paths = options['directory']
+        else:
+            assert relative_paths == 'false'
+            relative_paths = ''
         zc.buildout.easy_install.sitepackage_safe_scripts(
             options['bin-directory'], ws, options['executable'], partsdir,
-            reqs=['zc.buildout'])
+            reqs=['zc.buildout'], relative_paths=relative_paths)
 
     init = bootstrap
 

Modified: zc.buildout/branches/gary-9/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/gary-8/src/zc/buildout/easy_install.py	2010-03-19 19:12:57 UTC (rev 110067)
+++ zc.buildout/branches/gary-9/src/zc/buildout/easy_install.py	2010-04-19 19:19:31 UTC (rev 111137)
@@ -1199,12 +1199,12 @@
     return generated
 
 _script_initialization_template = '''
-import site # imports custom buildout-generated site.py
 import os
-path = %(site_py_dest)r
+path = sys.path[0]
 if os.environ.get('PYTHONPATH'):
     path = os.pathsep.join([path, os.environ['PYTHONPATH']])
 os.environ['PYTHONPATH'] = path
+import site # imports custom buildout-generated site.py
 %(script_initialization)s'''
 
 # Utilities for the script generation functions.

Modified: zc.buildout/branches/gary-9/src/zc/buildout/easy_install.txt
===================================================================
--- zc.buildout/branches/gary-8/src/zc/buildout/easy_install.txt	2010-03-19 19:12:57 UTC (rev 110067)
+++ zc.buildout/branches/gary-9/src/zc/buildout/easy_install.txt	2010-04-19 19:19:31 UTC (rev 111137)
@@ -1498,12 +1498,12 @@
         ]
     <BLANKLINE>
     <BLANKLINE>
-    import site # imports custom buildout-generated site.py
     import os
-    path = '/interpreter/parts/interpreter'
+    path = sys.path[0]
     if os.environ.get('PYTHONPATH'):
         path = os.pathsep.join([path, os.environ['PYTHONPATH']])
     os.environ['PYTHONPATH'] = path
+    import site # imports custom buildout-generated site.py
     <BLANKLINE>
     import eggrecipedemo
     <BLANKLINE>
@@ -1542,12 +1542,12 @@
       '/interpreter/parts/interpreter',
       ]
     <BLANKLINE>
-    import site # imports custom buildout-generated site.py
     import os
-    path = '/interpreter/parts/interpreter'
+    path = sys.path[0]
     if os.environ.get('PYTHONPATH'):
         path = os.pathsep.join([path, os.environ['PYTHONPATH']])
     os.environ['PYTHONPATH'] = path
+    import site # imports custom buildout-generated site.py
     import os
     os.chdir("foo")
     <BLANKLINE>