[svn] commit: r615 - in /branches/parkinglot: ./ src/bin/cmdctl/ src/bin/msgq/

[BIND 10 source code commits]

Author: jreed
Date: Fri Jan 29 01:02:47 2010
New Revision: 615

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

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

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

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

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