Browse Source

Rename bind10.in to run_bind10.sh.in -- this is the script that
can be ran from source tree.

Rename bind10.py to bind10.py.in -- this is the bind10 tool. It
has the python and python module path added to it.

The python script will actually startup from installed directory.

TODO: bind10 will run daemons from @libexecdir@ (I will commit those
daemon install changes shortly).
TODO: don't need special python handling.
TODO: split out all functionality to a bind10 specific module


git-svn-id: svn://bind10.isc.org/svn/bind10/branches/parkinglot@613 e5f2f494-b856-4b98-b285-d166d9295462

Jeremy C. Reed 15 years ago
parent
commit
2240b75fe4
3 changed files with 7 additions and 3 deletions
  1. 2 1
      configure.ac
  2. 4 1
      src/bin/bind10/bind10.py
  3. 1 1
      src/bin/bind10/bind10.in

+ 2 - 1
configure.ac

@@ -169,8 +169,9 @@ AC_CONFIG_FILES([Makefile
                ])
                ])
 AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr
 AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr
            src/bin/cmdctl/b10-cmdctl
            src/bin/cmdctl/b10-cmdctl
-           src/bin/bind10/bind10
+           src/bin/bind10/bind10.py
            src/bin/bind10/bind10_test
            src/bin/bind10/bind10_test
+           src/bin/bind10/run_bind10.sh
            src/bin/bindctl/bindctl
            src/bin/bindctl/bindctl
            src/bin/bindctl/unittest/bindctl_test
            src/bin/bindctl/unittest/bindctl_test
            src/bin/msgq/msgq
            src/bin/msgq/msgq

+ 4 - 1
src/bin/bind10/bind10.py

@@ -1,3 +1,7 @@
+#!@PYTHON@
+
+import sys; sys.path.append ('@@PYTHONPATH@@')
+
 """\
 """\
 This file implements the Boss of Bind (BoB, or bob) program.
 This file implements the Boss of Bind (BoB, or bob) program.
 
 
@@ -24,7 +28,6 @@ __main__.
 import subprocess
 import subprocess
 import signal
 import signal
 import os
 import os
-import sys
 import re
 import re
 import errno
 import errno
 import time
 import time

+ 1 - 1
src/bin/bind10/bind10.in

@@ -12,5 +12,5 @@ PYTHONPATH=@abs_top_srcdir@/src/lib/cc/python:@abs_top_srcdir@/src/lib/config/py
 export PYTHONPATH
 export PYTHONPATH
 
 
 cd ${BIND10_PATH}
 cd ${BIND10_PATH}
-exec ${PYTHON_EXEC} -O bind10.py $*
+exec ${PYTHON_EXEC} -O bind10 $*