[svn] commit: r620 - in /branches/parkinglot: ./ src/bin/bind10/ src/bin/cfgmgr/ src/bin/cmdctl/ src/bin/msgq/

[BIND 10 source code commits]

Author: jreed
Date: Fri Jan 29 01:41:02 2010
New Revision: 620

Log:
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.)

Added:
    branches/parkinglot/src/bin/cfgmgr/b10-cfgmgr.py.in
      - copied, changed from r613, branches/parkinglot/src/bin/cfgmgr/b10-cfgmgr.py
Removed:
    branches/parkinglot/src/bin/cfgmgr/b10-cfgmgr.in
    branches/parkinglot/src/bin/cfgmgr/b10-cfgmgr.py
Modified:
    branches/parkinglot/configure.ac
    branches/parkinglot/src/bin/bind10/run_bind10.sh.in
    branches/parkinglot/src/bin/cfgmgr/Makefile.am
    branches/parkinglot/src/bin/cmdctl/run_b10-cmdctl.sh.in
    branches/parkinglot/src/bin/msgq/run_msgq.sh.in

Modified: branches/parkinglot/configure.ac
==============================================================================
--- branches/parkinglot/configure.ac (original)
+++ branches/parkinglot/configure.ac Fri Jan 29 01:41:02 2010
@@ -167,7 +167,8 @@
                  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 @@
            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

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 Fri Jan 29 01:41:02 2010
@@ -3,9 +3,9 @@
 PYTHON_EXEC=${PYTHON_EXEC:- at 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

Modified: branches/parkinglot/src/bin/cfgmgr/Makefile.am
==============================================================================
--- branches/parkinglot/src/bin/cfgmgr/Makefile.am (original)
+++ branches/parkinglot/src/bin/cfgmgr/Makefile.am Fri Jan 29 01:41:02 2010
@@ -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 $@

Modified: branches/parkinglot/src/bin/cmdctl/run_b10-cmdctl.sh.in
==============================================================================
--- branches/parkinglot/src/bin/cmdctl/run_b10-cmdctl.sh.in (original)
+++ branches/parkinglot/src/bin/cmdctl/run_b10-cmdctl.sh.in Fri Jan 29 01:41:02 2010
@@ -3,7 +3,7 @@
 PYTHON_EXEC=${PYTHON_EXEC:- at 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
 

Modified: branches/parkinglot/src/bin/msgq/run_msgq.sh.in
==============================================================================
--- branches/parkinglot/src/bin/msgq/run_msgq.sh.in (original)
+++ branches/parkinglot/src/bin/msgq/run_msgq.sh.in Fri Jan 29 01:41:02 2010
@@ -3,7 +3,7 @@
 PYTHON_EXEC=${PYTHON_EXEC:- at 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