Also add python #! line to b10-cfgmgr.py.in

(it is renamed from b10-cfgmgr.py.)
And path for the modules is added.

Move b10-cfgmgr.in to run_b10-cfgmgr.sh.in
(this is used to run in source tree).

For these shell scripts, run from abs_top_builddir not abs_top_srcdir.
(I will do a later commit for the execute permissions.)


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

configure.ac

@@ -167,7 +167,8 @@ AC_CONFIG_FILES([Makefile
                  src/lib/dns/Makefile
                  src/lib/dns/cpp/Makefile
                ])
-AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr
+AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
+           src/bin/cfgmgr/run_b10-cfgmgr.sh
            src/bin/cmdctl/b10-cmdctl.py
            src/bin/cmdctl/run_b10-cmdctl.sh
            src/bin/bind10/bind10.py
@@ -180,7 +181,7 @@ AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr
            src/bin/msgq/run_msgq.sh
            src/bin/parkinglot/config.h
           ], [
-           chmod +x src/bin/cfgmgr/b10-cfgmgr
+           chmod +x src/bin/cfgmgr/run_b10-cfgmgr.sh
            chmod +x src/bin/cmdctl/run_b10-cmdctl.sh
            chmod +x src/bin/bind10/run_bind10.sh
            chmod +x src/bin/bindctl/bindctl

src/bin/bind10/run_bind10.sh.in

@@ -3,9 +3,9 @@
 PYTHON_EXEC=${PYTHON_EXEC:-@PYTHON@}
 export PYTHON_EXEC
 
-BIND10_PATH=@abs_top_srcdir@/src/bin/bind10
+BIND10_PATH=@abs_top_builddir@/src/bin/bind10
 
-PATH=@abs_top_srcdir@/src/bin/msgq:@abs_top_srcdir@/src/bin/parkinglot:@abs_top_srcdir@/src/bin/cfgmgr:@abs_top_srcdir@/src/bin/cmdctl:$PATH
+PATH=@abs_top_builddir@/src/bin/msgq:@abs_top_builddir@/src/bin/parkinglot:@abs_top_builddir@/src/bin/cfgmgr:@abs_top_builddir@/src/bin/cmdctl:$PATH
 export PATH
 
 PYTHONPATH=@abs_top_srcdir@/src/lib/cc/python:@abs_top_srcdir@/src/lib/config/python

src/bin/cfgmgr/Makefile.am

@@ -1,3 +1,11 @@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
 pkglibexec_SCRIPTS = b10-cfgmgr
+
+CLEANFILES = b10-cfgmgr.py
+
+# TODO: does this need $$(DESTDIR) also?
+# this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
+b10-cfgmgr: b10-cfgmgr.py
+	$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" b10-cfgmgr.py >$@
+#        chmod a+x $@

src/bin/cfgmgr/b10-cfgmgr.in

@@ -1,9 +0,0 @@
-#!/bin/sh
-# use build time srcdir for now
-BINPATH=@abs_top_srcdir@/src/bin/cfgmgr
-LIBPATH=@abs_top_srcdir@/src/lib/cc/python
-
-PYTHON_EXEC=${PYTHON_EXEC:-@PYTHON@}
-
-PYTHONPATH=${LIBPATH}:${PYTHONPATH} ${PYTHON_EXEC} ${BINPATH}/b10-cfgmgr.py
-

src/bin/cfgmgr/b10-cfgmgr.py

@@ -1,3 +1,7 @@
+#!@PYTHON@
+
+import sys; sys.path.append ('@@PYTHONPATH@@')
+
 import ISC
 import signal
 import ast

src/bin/cmdctl/run_b10-cmdctl.sh.in

@@ -3,7 +3,7 @@
 PYTHON_EXEC=${PYTHON_EXEC:-@PYTHON@}
 export PYTHON_EXEC
 
-CMD_CTRLD_PATH=@abs_top_srcdir@/src/bin/cmdctl
+CMD_CTRLD_PATH=@abs_top_builddir@/src/bin/cmdctl
 PYTHONPATH=@abs_top_srcdir@/src/lib/cc/python:${abs_top_src_dir}/lib/cc/python/ISC
 export PYTHONPATH
 

src/bin/msgq/run_msgq.sh.in

@@ -3,7 +3,7 @@
 PYTHON_EXEC=${PYTHON_EXEC:-@PYTHON@}
 export PYTHON_EXEC
 
-MYPATH_PATH=@abs_top_srcdir@/src/bin/msgq
+MYPATH_PATH=@abs_top_builddir@/src/bin/msgq
 
 PYTHONPATH=@abs_top_srcdir@/src/lib/cc/python:${abs_top_src_dir}/lib/cc/python/ISC
 export PYTHONPATH