Move b10-cmdctl.in to run_b10-cmdctl.sh.in.

Move b10-cmdctl.py to b10-cmdctl.py.in.

Move msgq.in to run_msgq.sh.in.
Move msgq.py to msgq.py.in.

At same time, the new installed versions are installed to libexec
directory and runnable from there.

TODO: the run*sh.in scripts are still broken (before my commits)
as they use abs_top_srcdir instead of builddir.


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

configure.ac

@@ -168,21 +168,23 @@ AC_CONFIG_FILES([Makefile
                  src/lib/dns/cpp/Makefile
                ])
 AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr
-           src/bin/cmdctl/b10-cmdctl
+           src/bin/cmdctl/b10-cmdctl.py
+           src/bin/cmdctl/run_b10-cmdctl.sh
            src/bin/bind10/bind10.py
            src/bin/bind10/bind10_test
            src/bin/bind10/run_bind10.sh
            src/bin/bindctl/bindctl
            src/bin/bindctl/unittest/bindctl_test
-           src/bin/msgq/msgq
+           src/bin/msgq/msgq.py
            src/bin/msgq/msgq_test
+           src/bin/msgq/run_msgq.sh
            src/bin/parkinglot/config.h
           ], [
            chmod +x src/bin/cfgmgr/b10-cfgmgr
-           chmod +x src/bin/cmdctl/b10-cmdctl
-           chmod +x src/bin/bind10/bind10
+           chmod +x src/bin/cmdctl/run_b10-cmdctl.sh
+           chmod +x src/bin/bind10/run_bind10.sh
            chmod +x src/bin/bindctl/bindctl
-           chmod +x src/bin/msgq/msgq
+           chmod +x src/bin/msgq/run_msgq.sh
            chmod +x src/bin/msgq/msgq_test
           ])
 AC_OUTPUT

src/bin/cmdctl/Makefile.am

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

src/bin/cmdctl/b10-cmdctl.py

@@ -1,3 +1,7 @@
+#!@PYTHON@
+
+import sys; sys.path.append ('@@PYTHONPATH@@')
+
 # Copyright (C) 2010  Internet Systems Consortium.
 #
 # Permission to use, copy, modify, and distribute this software for any

src/bin/cmdctl/b10-cmdctl.in

@@ -8,5 +8,5 @@ PYTHONPATH=@abs_top_srcdir@/src/lib/cc/python:${abs_top_src_dir}/lib/cc/python/I
 export PYTHONPATH
 
 cd ${CMD_CTRLD_PATH}
-${PYTHON_EXEC} b10-cmdctl.py
+${PYTHON_EXEC} b10-cmdctl
 

src/bin/msgq/Makefile.am

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

src/bin/msgq/msgq.py

@@ -1,3 +1,7 @@
+#!@PYTHON@
+
+import sys; sys.path.append ('@@PYTHONPATH@@')
+
 """This code implements the msgq daemon."""
 
 import subprocess

src/bin/msgq/msgq.in

@@ -9,4 +9,4 @@ PYTHONPATH=@abs_top_srcdir@/src/lib/cc/python:${abs_top_src_dir}/lib/cc/python/I
 export PYTHONPATH
 
 cd ${MYPATH_PATH}
-exec ${PYTHON_EXEC} -O msgq.py $*
+exec ${PYTHON_EXEC} -O msgq $*