[svn] commit: r1139 - in /trunk: ./ src/bin/ src/bin/loadzone/ src/bin/loadzone/testdata/ src/lib/python/isc/ src/lib/python/isc/auth/

[BIND 10 source code commits]

Author: each
Date: Fri Mar  5 19:45:24 2010
New Revision: 1139

Log:
Merged b10-loadzone command

Added:
    trunk/src/bin/loadzone/
      - copied from r1137, branches/each-loadzone/src/bin/loadzone/
    trunk/src/bin/loadzone/b10-loadzone.py.in
      - copied, changed from r1137, branches/each-loadzone/src/bin/loadzone/b10-loadzone.py
    trunk/src/bin/loadzone/run_loadzone.in
      - copied, changed from r1137, branches/each-loadzone/src/bin/loadzone/b10-loadzone.in
    trunk/src/bin/loadzone/testdata/
    trunk/src/bin/loadzone/testdata/Kexample.com.+005+04456.key
    trunk/src/bin/loadzone/testdata/Kexample.com.+005+04456.private
    trunk/src/bin/loadzone/testdata/Kexample.com.+005+33495.key
    trunk/src/bin/loadzone/testdata/Kexample.com.+005+33495.private
    trunk/src/bin/loadzone/testdata/Ksql1.example.com.+005+12447.key
    trunk/src/bin/loadzone/testdata/Ksql1.example.com.+005+12447.private
    trunk/src/bin/loadzone/testdata/Ksql1.example.com.+005+33313.key
    trunk/src/bin/loadzone/testdata/Ksql1.example.com.+005+33313.private
    trunk/src/bin/loadzone/testdata/README
    trunk/src/bin/loadzone/testdata/dsset-subzone.example.com.
    trunk/src/bin/loadzone/testdata/example.com
    trunk/src/bin/loadzone/testdata/example.com.signed
    trunk/src/bin/loadzone/testdata/sql1.example.com
    trunk/src/bin/loadzone/testdata/sql1.example.com.signed
    trunk/src/lib/python/isc/auth/
      - copied from r1137, branches/each-loadzone/src/lib/auth/python/isc/auth/
Removed:
    trunk/src/bin/loadzone/b10-loadzone.in
    trunk/src/bin/loadzone/b10-loadzone.py
Modified:
    trunk/configure.ac
    trunk/src/bin/Makefile.am
    trunk/src/bin/loadzone/Makefile.am
    trunk/src/lib/python/isc/Makefile.am
    trunk/src/lib/python/isc/__init__.py

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Mar  5 19:45:24 2010
@@ -149,12 +149,14 @@
                  src/bin/bindctl/Makefile
                  src/bin/cfgmgr/Makefile
                  src/bin/host/Makefile
+                 src/bin/loadzone/Makefile
                  src/bin/msgq/Makefile
                  src/bin/auth/Makefile
                  src/lib/Makefile
                  src/lib/cc/Makefile
                  src/lib/python/Makefile
                  src/lib/python/isc/Makefile
+                 src/lib/python/isc/auth/Makefile
                  src/lib/python/isc/cc/Makefile
                  src/lib/python/isc/config/Makefile
                  src/lib/python/isc/Util/Makefile
@@ -173,6 +175,8 @@
            src/bin/bind10/run_bind10.sh
            src/bin/bindctl/bindctl
            src/bin/bindctl/unittest/bindctl_test
+           src/bin/loadzone/run_loadzone
+           src/bin/loadzone/b10-loadzone.py
            src/bin/msgq/msgq.py
            src/bin/msgq/msgq_test
            src/bin/msgq/run_msgq.sh
@@ -187,6 +191,8 @@
            chmod +x src/bin/cmdctl/unittest/cmdctl_test
            chmod +x src/bin/bindctl/unittest/bindctl_test
            chmod +x src/bin/bindctl/bindctl
+           chmod +x src/bin/loadzone/b10-loadzone
+           chmod +x src/bin/loadzone/run_loadzone
            chmod +x src/bin/msgq/run_msgq.sh
            chmod +x src/bin/msgq/msgq_test
 	   chmod +x src/lib/dns/gen-rdatacode.py

Modified: trunk/src/bin/Makefile.am
==============================================================================
--- trunk/src/bin/Makefile.am (original)
+++ trunk/src/bin/Makefile.am Fri Mar  5 19:45:24 2010
@@ -1,1 +1,1 @@
-SUBDIRS = bind10 bindctl cfgmgr msgq host cmdctl auth
+SUBDIRS = bind10 bindctl cfgmgr loadzone msgq host cmdctl auth

Modified: trunk/src/bin/loadzone/Makefile.am
==============================================================================
--- trunk/src/bin/loadzone/Makefile.am (original)
+++ trunk/src/bin/loadzone/Makefile.am Fri Mar  5 19:45:24 2010
@@ -1,1 +1,6 @@
-bin_SCRIPTS = b10-loadzone b10-loadzone.py
+bin_SCRIPTS = b10-loadzone
+
+b10-loadzone: b10-loadzone.py
+	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
+	       -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" b10-loadzone.py >$@
+	chmod a+x $@

Modified: trunk/src/lib/python/isc/Makefile.am
==============================================================================
--- trunk/src/lib/python/isc/Makefile.am (original)
+++ trunk/src/lib/python/isc/Makefile.am Fri Mar  5 19:45:24 2010
@@ -1,4 +1,4 @@
-SUBDIRS = cc Util config
+SUBDIRS = auth cc Util config
 
 PY_MODULES=	__init__.py
 

Modified: trunk/src/lib/python/isc/__init__.py
==============================================================================
--- trunk/src/lib/python/isc/__init__.py (original)
+++ trunk/src/lib/python/isc/__init__.py Fri Mar  5 19:45:24 2010
@@ -1,3 +1,4 @@
+import isc.auth
 import isc.cc
 import isc.Util
 import isc.config