[svn] commit: r1372 - in /trunk: README configure.ac src/bin/bindctl/Makefile.am src/bin/bindctl/bindctl.py.in src/bin/bindctl/run_bindctl.sh.in src/bin/loadzone/run_loadzone.sh.in

[BIND 10 source code commits]

Author: jreed
Date: Fri Mar 12 21:16:15 2010
New Revision: 1372

Log:
Install bindctl itself and not the shell script which was
running it from the source tree.
TODO: get the bindctl modules installed.
(As it is now the installed bindctl does not run.)

Renamed the bindctl shell script to run_bindctl.sh which can be ran
from the source.

Rename the run_loadzone to include "sh" to be like the rest in bind10.
(That is not installed.)

Update README to mention the run_*.sh scripts.

Added:
    trunk/src/bin/bindctl/bindctl.py.in
      - copied, changed from r1366, trunk/src/bin/bindctl/bindctl.py
    trunk/src/bin/bindctl/run_bindctl.sh.in
      - copied unchanged from r1366, trunk/src/bin/bindctl/bindctl.in
    trunk/src/bin/loadzone/run_loadzone.sh.in
      - copied unchanged from r1366, trunk/src/bin/loadzone/run_loadzone.in
Modified:
    trunk/README
    trunk/configure.ac
    trunk/src/bin/bindctl/Makefile.am

Modified: trunk/README
==============================================================================
--- trunk/README (original)
+++ trunk/README Fri Mar 12 21:16:15 2010
@@ -36,6 +36,11 @@
   make report-coverage
 	Generates the coverage HTML, excluding some unrelated headers.
 	The HTML reports are placed in a directory called coverage/.
+
+DEVELOPERS
+
+The generated run_*.sh scripts available in the src/bin directories
+are for running the code using the source tree.
 
 RUNNING
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Mar 12 21:16:15 2010
@@ -250,9 +250,10 @@
            src/bin/bind10/bind10.py
            src/bin/bind10/tests/bind10_test
            src/bin/bind10/run_bind10.sh
-           src/bin/bindctl/bindctl
+           src/bin/bindctl/run_bindctl.sh
+           src/bin/bindctl/bindctl.py
            src/bin/bindctl/unittest/bindctl_test
-           src/bin/loadzone/run_loadzone
+           src/bin/loadzone/run_loadzone.sh
            src/bin/loadzone/b10-loadzone.py
            src/bin/usermgr/run_b10-cmdctl-usermgr.sh
            src/bin/usermgr/b10-cmdctl-usermgr.py
@@ -271,8 +272,8 @@
            chmod +x src/bin/cmdctl/unittest/cmdctl_test
            chmod +x src/bin/xfrin/unittest/xfrin_test
            chmod +x src/bin/bindctl/unittest/bindctl_test
-           chmod +x src/bin/bindctl/bindctl
-           chmod +x src/bin/loadzone/run_loadzone
+           chmod +x src/bin/bindctl/run_bindctl.sh
+           chmod +x src/bin/loadzone/run_loadzone.sh
            chmod +x src/bin/usermgr/run_b10-cmdctl-usermgr.sh
            chmod +x src/bin/msgq/run_msgq.sh
            chmod +x src/bin/msgq/msgq_test

Modified: trunk/src/bin/bindctl/Makefile.am
==============================================================================
--- trunk/src/bin/bindctl/Makefile.am (original)
+++ trunk/src/bin/bindctl/Makefile.am Fri Mar 12 21:16:15 2010
@@ -1,2 +1,7 @@
-bin_SCRIPTS = bindctl bindctl.py
+bin_SCRIPTS = bindctl
 man_MANS = bindctl.1
+
+bindctl: bindctl.py
+	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
+	       -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" bindctl.py >$@
+	chmod a+x $@