[svn] commit: r1410 - in /trunk/src/bin/bindctl: Makefile.am bindcmd.py bindctl.py.in cmdparse.py moduleinfo.py run_bindctl.sh.in

[BIND 10 source code commits]

Author: jelte
Date: Mon Mar 15 14:24:33 2010
New Revision: 1410

Log:
install bindctl .py files, and change imports and scripts to reflect

Modified:
    trunk/src/bin/bindctl/Makefile.am
    trunk/src/bin/bindctl/bindcmd.py
    trunk/src/bin/bindctl/bindctl.py.in
    trunk/src/bin/bindctl/cmdparse.py
    trunk/src/bin/bindctl/moduleinfo.py
    trunk/src/bin/bindctl/run_bindctl.sh.in

Modified: trunk/src/bin/bindctl/Makefile.am
==============================================================================
--- trunk/src/bin/bindctl/Makefile.am (original)
+++ trunk/src/bin/bindctl/Makefile.am Mon Mar 15 14:24:33 2010
@@ -2,6 +2,9 @@
 man_MANS = bindctl.1
 
 EXTRA_DIST = $(man_MANS)
+
+python_PYTHON = __init__.py bindcmd.py cmdparse.py exception.py moduleinfo.py mycollections.py
+pythondir = $(pyexecdir)/bindctl
 
 CLEANFILES = bindctl
 

Modified: trunk/src/bin/bindctl/bindcmd.py
==============================================================================
--- trunk/src/bin/bindctl/bindcmd.py (original)
+++ trunk/src/bin/bindctl/bindcmd.py Mon Mar 15 14:24:33 2010
@@ -16,9 +16,9 @@
 import sys
 import readline
 from cmd import Cmd
-from exception import *
-from moduleinfo import *
-from cmdparse import BindCmdParse
+from bindctl.exception import *
+from bindctl.moduleinfo import *
+from bindctl.cmdparse import BindCmdParse
 from xml.dom import minidom
 import isc
 import isc.cc.data
@@ -36,7 +36,7 @@
 try:
     from collections import OrderedDict
 except ImportError:
-    from mycollections import OrderedDict
+    from bindctl.mycollections import OrderedDict
 
 
 CONST_BINDCTL_HELP = """BindCtl, verstion 0.1

Modified: trunk/src/bin/bindctl/bindctl.py.in
==============================================================================
--- trunk/src/bin/bindctl/bindctl.py.in (original)
+++ trunk/src/bin/bindctl/bindctl.py.in Mon Mar 15 14:24:33 2010
@@ -17,10 +17,10 @@
 
 
 import sys; sys.path.append ('@@PYTHONPATH@@')
-
-from moduleinfo  import *
-from bindcmd import *
-import isc
+
+import bindctl
+from bindctl.moduleinfo import *
+from bindctl.bindcmd import *
 import pprint
 from optparse import OptionParser, OptionValueError
 

Modified: trunk/src/bin/bindctl/cmdparse.py
==============================================================================
--- trunk/src/bin/bindctl/cmdparse.py (original)
+++ trunk/src/bin/bindctl/cmdparse.py Mon Mar 15 14:24:33 2010
@@ -14,11 +14,11 @@
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 import re
-from exception import *
+from bindctl.exception import *
 try:
     from collections import OrderedDict
 except ImportError:
-    from mycollections import OrderedDict
+    from bindctl.mycollections import OrderedDict
 
 param_name_str = "^\s*(?P<param_name>[\w]+)\s*=\s*"
 param_value_str = "(?P<param_value>[\w\./-]+)"

Modified: trunk/src/bin/bindctl/moduleinfo.py
==============================================================================
--- trunk/src/bin/bindctl/moduleinfo.py (original)
+++ trunk/src/bin/bindctl/moduleinfo.py Mon Mar 15 14:24:33 2010
@@ -17,7 +17,7 @@
 try:
     from collections import OrderedDict
 except ImportError:
-    from mycollections import OrderedDict
+    from bindctl.mycollections import OrderedDict
 
 # Define value type
 STRING_TYPE = "string"

Modified: trunk/src/bin/bindctl/run_bindctl.sh.in
==============================================================================
--- trunk/src/bin/bindctl/run_bindctl.sh.in (original)
+++ trunk/src/bin/bindctl/run_bindctl.sh.in Mon Mar 15 14:24:33 2010
@@ -5,7 +5,7 @@
 
 BINDCTL_PATH=@abs_top_srcdir@/src/bin/bindctl
 
-PYTHONPATH=@abs_top_builddir@/src/lib/python
+PYTHONPATH=@abs_top_builddir@/src/lib/python:@abs_top_builddir@/src/bin
 export PYTHONPATH
 
 cd ${BINDCTL_PATH}