[svn] commit: r951 - in /experiments/jreed-layout: ./ src/bin/bind10/ src/lib/ src/lib/pyconfig/ src/lib/pymsgq/ src/lib/python/ src/lib/python/isc/ src/lib/python/isc/Util/ src/lib/python/isc/cc/ src/lib/python/isc/cc/tests/ src/lib/python/isc/config/

[BIND 10 source code commits]

Author: jreed
Date: Wed Feb 24 19:51:42 2010
New Revision: 951

Log:
Moved the pymsgq and pyconfig module code to src/lib/python/isc/.
Merged the isc/__init_.py.
This makes it so I can run the bind10 from the source tree.

Moved the mymsgq tests to src/lib/python/isc/cc/tests/.

Added:
    experiments/jreed-layout/src/lib/python/
    experiments/jreed-layout/src/lib/python/Makefile.am
    experiments/jreed-layout/src/lib/python/isc/
    experiments/jreed-layout/src/lib/python/isc/Makefile.am
      - copied, changed from r941, experiments/jreed-layout/src/lib/pymsgq/isc/Makefile.am
    experiments/jreed-layout/src/lib/python/isc/Util/
      - copied from r941, experiments/jreed-layout/src/lib/pymsgq/isc/Util/
    experiments/jreed-layout/src/lib/python/isc/__init__.py
      - copied, changed from r941, experiments/jreed-layout/src/lib/pymsgq/isc/__init__.py
    experiments/jreed-layout/src/lib/python/isc/cc/
      - copied from r941, experiments/jreed-layout/src/lib/pymsgq/isc/cc/
    experiments/jreed-layout/src/lib/python/isc/cc/tests/
    experiments/jreed-layout/src/lib/python/isc/cc/tests/sendcmd.py
      - copied unchanged from r941, experiments/jreed-layout/src/lib/pymsgq/sendcmd.py
    experiments/jreed-layout/src/lib/python/isc/cc/tests/test.py
      - copied unchanged from r941, experiments/jreed-layout/src/lib/pymsgq/test.py
    experiments/jreed-layout/src/lib/python/isc/cc/tests/test_session.py
      - copied unchanged from r941, experiments/jreed-layout/src/lib/pymsgq/test_session.py
    experiments/jreed-layout/src/lib/python/isc/config/
      - copied from r941, experiments/jreed-layout/src/lib/pyconfig/isc/config/
Removed:
    experiments/jreed-layout/src/lib/pyconfig/
    experiments/jreed-layout/src/lib/pymsgq/
Modified:
    experiments/jreed-layout/configure.ac
    experiments/jreed-layout/src/bin/bind10/run_bind10.sh.in
    experiments/jreed-layout/src/lib/Makefile.am

Modified: experiments/jreed-layout/configure.ac
==============================================================================
--- experiments/jreed-layout/configure.ac (original)
+++ experiments/jreed-layout/configure.ac Wed Feb 24 19:51:42 2010
@@ -153,14 +153,12 @@
                  src/bin/auth/Makefile
                  src/lib/Makefile
                  src/lib/cc/Makefile
-                 src/lib/pymsgq/Makefile
-                 src/lib/pymsgq/isc/Makefile
-                 src/lib/pymsgq/isc/cc/Makefile
-                 src/lib/pymsgq/isc/Util/Makefile
+                 src/lib/python/Makefile
+                 src/lib/python/isc/Makefile
+                 src/lib/python/isc/cc/Makefile
+                 src/lib/python/isc/config/Makefile
+                 src/lib/python/isc/Util/Makefile
                  src/lib/config/Makefile
-                 src/lib/pyconfig/Makefile
-                 src/lib/pyconfig/isc/Makefile
-                 src/lib/pyconfig/isc/config/Makefile
                  src/lib/dns/Makefile
                  src/lib/exceptions/Makefile
                  src/lib/auth/Makefile
@@ -179,7 +177,7 @@
            src/bin/msgq/run_msgq.sh
            src/bin/auth/config.h
            src/lib/config/data_def_unittests_config.h
-           src/lib/pyconfig/isc/config/config_test
+           src/lib/python/isc/config/config_test
            src/lib/dns/gen-rdatacode.py
           ], [
            chmod +x src/bin/cfgmgr/run_b10-cfgmgr.sh

Modified: experiments/jreed-layout/src/bin/bind10/run_bind10.sh.in
==============================================================================
--- experiments/jreed-layout/src/bin/bind10/run_bind10.sh.in (original)
+++ experiments/jreed-layout/src/bin/bind10/run_bind10.sh.in Wed Feb 24 19:51:42 2010
@@ -8,7 +8,7 @@
 PATH=@abs_top_builddir@/src/bin/msgq:@abs_top_builddir@/src/bin/auth:@abs_top_builddir@/src/bin/cfgmgr:@abs_top_builddir@/src/bin/cmdctl:$PATH
 export PATH
 
-PYTHONPATH=@abs_top_builddir@/pyshared/
+PYTHONPATH=@abs_top_builddir@/src/lib/python
 export PYTHONPATH
 
 B10_FROM_SOURCE=@abs_top_srcdir@

Modified: experiments/jreed-layout/src/lib/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/lib/Makefile.am (original)
+++ experiments/jreed-layout/src/lib/Makefile.am Wed Feb 24 19:51:42 2010
@@ -1,1 +1,1 @@
-SUBDIRS = exceptions dns cc config auth pymsgq pyconfig
+SUBDIRS = exceptions dns cc config auth python