[Checkins] SVN: zc.recipe.wrapper/branches/alex-fix-relative-paths/src/zc/recipe/wrapper/ make wrapper script compute a path relative to __file__

[Alex Smith]

Log message for revision 112630:
  make wrapper script compute a path relative to __file__
  
  

Changed:
  U   zc.recipe.wrapper/branches/alex-fix-relative-paths/src/zc/recipe/wrapper/README.txt
  U   zc.recipe.wrapper/branches/alex-fix-relative-paths/src/zc/recipe/wrapper/__init__.py

-=-
Modified: zc.recipe.wrapper/branches/alex-fix-relative-paths/src/zc/recipe/wrapper/README.txt
===================================================================
--- zc.recipe.wrapper/branches/alex-fix-relative-paths/src/zc/recipe/wrapper/README.txt	2010-05-21 18:00:16 UTC (rev 112629)
+++ zc.recipe.wrapper/branches/alex-fix-relative-paths/src/zc/recipe/wrapper/README.txt	2010-05-21 18:10:19 UTC (rev 112630)
@@ -132,8 +132,10 @@
     newenv = {'LD_LIBRARY': 'some_library_I_like'}
     env.update(newenv)
     target = 'bin/basepy'
+    base = os.path.dirname(os.path.abspath(os.path.realpath(__file__)))
+    base = os.path.dirname(base)
     path = os.path.join(
-        *([os.sep,] + 'PREFIX'.split(os.sep) + target.split(os.sep)))
+        *([os.sep,] + base.split(os.sep) + target.split(os.sep)))
     args = [sys.executable] + [path] + sys.argv[1:]
     os.execve(sys.executable, args, env)
     >>> os.chdir(wrapper)

Modified: zc.recipe.wrapper/branches/alex-fix-relative-paths/src/zc/recipe/wrapper/__init__.py
===================================================================
--- zc.recipe.wrapper/branches/alex-fix-relative-paths/src/zc/recipe/wrapper/__init__.py	2010-05-21 18:00:16 UTC (rev 112629)
+++ zc.recipe.wrapper/branches/alex-fix-relative-paths/src/zc/recipe/wrapper/__init__.py	2010-05-21 18:10:19 UTC (rev 112630)
@@ -12,8 +12,10 @@
 newenv = %(env)s
 env.update(newenv)
 target = '%(target)s'
+base = os.path.dirname(os.path.abspath(os.path.realpath(__file__)))
+base = os.path.dirname(base)
 path = os.path.join(
-    *([os.sep,] + '%(base)s'.split(os.sep) + target.split(os.sep)))
+    *([os.sep,] + base.split(os.sep) + target.split(os.sep)))
 args = [sys.executable] + [path] + sys.argv[1:]
 os.execve(sys.executable, args, env)"""
 
@@ -48,7 +50,6 @@
             self.options.update(options)
 
             parameters = dict(
-                base = path,
                 env = pprint.pformat(
                     self.buildout[self.options['environment']]),
                 interpreter = self.buildout['buildout']['executable'],