[Checkins] SVN: zc.recipe.wrapper/trunk/ merged branch: alex-fix-relative-paths

[Alex Smith]

Log message for revision 112632:
  merged branch: alex-fix-relative-paths
  
  

Changed:
  _U  zc.recipe.wrapper/trunk/
  U   zc.recipe.wrapper/trunk/CHANGES.txt
  U   zc.recipe.wrapper/trunk/src/zc/recipe/wrapper/README.txt
  U   zc.recipe.wrapper/trunk/src/zc/recipe/wrapper/__init__.py

-=-

Property changes on: zc.recipe.wrapper/trunk
___________________________________________________________________
Added: svn:ignore
   + .installed.cfg
TEST_THIS_REST_BEFORE_REGISTERING.txt
bin
develop-eggs
dist
parts


Modified: zc.recipe.wrapper/trunk/CHANGES.txt
===================================================================
--- zc.recipe.wrapper/trunk/CHANGES.txt	2010-05-21 18:17:04 UTC (rev 112631)
+++ zc.recipe.wrapper/trunk/CHANGES.txt	2010-05-21 18:20:05 UTC (rev 112632)
@@ -1,6 +1,12 @@
 CHANGES
 =======
 
+1.1.0 (unreleased)
+------------------
+
+- The wrapper now uses a path relative to its location to invoke a script
+
+
 1.0.1 (2009-12-15)
 ------------------
 

Modified: zc.recipe.wrapper/trunk/src/zc/recipe/wrapper/README.txt
===================================================================
--- zc.recipe.wrapper/trunk/src/zc/recipe/wrapper/README.txt	2010-05-21 18:17:04 UTC (rev 112631)
+++ zc.recipe.wrapper/trunk/src/zc/recipe/wrapper/README.txt	2010-05-21 18:20:05 UTC (rev 112632)
@@ -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/trunk/src/zc/recipe/wrapper/__init__.py
===================================================================
--- zc.recipe.wrapper/trunk/src/zc/recipe/wrapper/__init__.py	2010-05-21 18:17:04 UTC (rev 112631)
+++ zc.recipe.wrapper/trunk/src/zc/recipe/wrapper/__init__.py	2010-05-21 18:20:05 UTC (rev 112632)
@@ -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'],