[svn] commit: r674 - in /branches/parkinglot/src/bin/bind10: bind10.py.in run_bind10.sh.in

[BIND 10 source code commits]

Author: jelte
Date: Sat Jan 30 00:26:45 2010
New Revision: 674

Log:
renamved B10_SPECFILE_PATH to B10_FROM_SOURCE
to tell bind10 and all its subprocesses that we are running from source and where that source lives

Modified:
    branches/parkinglot/src/bin/bind10/bind10.py.in
    branches/parkinglot/src/bin/bind10/run_bind10.sh.in

Modified: branches/parkinglot/src/bin/bind10/bind10.py.in
==============================================================================
--- branches/parkinglot/src/bin/bind10/bind10.py.in (original)
+++ branches/parkinglot/src/bin/bind10/bind10.py.in Sat Jan 30 00:26:45 2010
@@ -27,8 +27,8 @@
 # If B10_SPECFILE_PATH is set in the environment, we use the specification
 # file there, instead of the installed one (for instance when we run
 # from the source tree)
-if "B10_SPECFILE_PATH" in os.environ:
-    SPECFILE_LOCATION = os.environ["B10_SPECFILE_PATH"] + "/bob.spec"
+if "B10_FROM_SOURCE" in os.environ:
+    SPECFILE_LOCATION = os.environ["B10_FROM_SOURCE"] + "/src/bin/bind10/bob.spec"
 else:
     PREFIX = "@prefix@"
     DATAROOTDIR = "@datarootdir@"
@@ -69,6 +69,8 @@
             spawn_stdout = None
         spawn_env = self.env
         spawn_env['PATH'] = os.environ['PATH']
+        if 'B10_FROM_SOURCE' in os.environ:
+            spawn_env['B10_FROM_SOURCE'] = os.environ['B10_FROM_SOURCE']
         if 'PYTHON_EXEC' in os.environ:
             spawn_env['PYTHON_EXEC'] = os.environ['PYTHON_EXEC']
         self.process = subprocess.Popen(self.args,

Modified: branches/parkinglot/src/bin/bind10/run_bind10.sh.in
==============================================================================
--- branches/parkinglot/src/bin/bind10/run_bind10.sh.in (original)
+++ branches/parkinglot/src/bin/bind10/run_bind10.sh.in Sat Jan 30 00:26:45 2010
@@ -11,8 +11,8 @@
 PYTHONPATH=@abs_top_srcdir@/src/lib/cc/python:@abs_top_srcdir@/src/lib/config/python
 export PYTHONPATH
 
-B10_SPECFILE_PATH=@abs_srcdir@
-export B10_SPECFILE_PATH
+B10_FROM_SOURCE=@abs_top_srcdir@
+export B10_FROM_SOURCE
 
 cd ${BIND10_PATH}
 exec ${PYTHON_EXEC} -O bind10 $*