[svn] commit: r953 - in /experiments/jreed-layout/src: bin/bind10/ bin/cmdctl/ bin/msgq/ lib/config/ lib/python/isc/ lib/python/isc/Util/ lib/python/isc/cc/ lib/python/isc/config/

[BIND 10 source code commits]

Author: jreed
Date: Wed Feb 24 20:44:56 2010
New Revision: 953

Log:
Catchup on my python module moves. Now the "make install" works
and the make tests can find the testdata.

Modified:
    experiments/jreed-layout/src/bin/bind10/bind10_test.in
    experiments/jreed-layout/src/bin/cmdctl/run_b10-cmdctl.sh.in
    experiments/jreed-layout/src/bin/msgq/msgq_test.in
    experiments/jreed-layout/src/bin/msgq/run_msgq.sh.in
    experiments/jreed-layout/src/lib/config/data_def_unittests_config.h.in
    experiments/jreed-layout/src/lib/python/isc/Makefile.am
    experiments/jreed-layout/src/lib/python/isc/Util/Makefile.am
    experiments/jreed-layout/src/lib/python/isc/cc/Makefile.am
    experiments/jreed-layout/src/lib/python/isc/config/Makefile.am
    experiments/jreed-layout/src/lib/python/isc/config/config_test.in

Modified: experiments/jreed-layout/src/bin/bind10/bind10_test.in
==============================================================================
--- experiments/jreed-layout/src/bin/bind10/bind10_test.in (original)
+++ experiments/jreed-layout/src/bin/bind10/bind10_test.in Wed Feb 24 20:44:56 2010
@@ -8,7 +8,7 @@
 PATH=@abs_top_srcdir@/src/bin/msgq:@abs_top_srcdir@/src/bin/auth:@abs_top_srcdir@/src/bin/bind-cfgd:$PATH
 export PATH
 
-PYTHONPATH=@abs_top_srcdir@/src/lib/pymsgq:${abs_top_src_dir}/lib/pymsgq/ISC
+PYTHONPATH=@abs_top_srcdir@/src/lib/python
 export PYTHONPATH
 
 cd ${BIND10_PATH}

Modified: experiments/jreed-layout/src/bin/cmdctl/run_b10-cmdctl.sh.in
==============================================================================
--- experiments/jreed-layout/src/bin/cmdctl/run_b10-cmdctl.sh.in (original)
+++ experiments/jreed-layout/src/bin/cmdctl/run_b10-cmdctl.sh.in Wed Feb 24 20:44:56 2010
@@ -4,7 +4,7 @@
 export PYTHON_EXEC
 
 CMD_CTRLD_PATH=@abs_top_builddir@/src/bin/cmdctl
-PYTHONPATH=@abs_top_srcdir@/src/lib/pymsgq:${abs_top_src_dir}/lib/pymsgq/ISC
+PYTHONPATH=@abs_top_srcdir@/src/lib/python
 export PYTHONPATH
 
 cd ${CMD_CTRLD_PATH}

Modified: experiments/jreed-layout/src/bin/msgq/msgq_test.in
==============================================================================
--- experiments/jreed-layout/src/bin/msgq/msgq_test.in (original)
+++ experiments/jreed-layout/src/bin/msgq/msgq_test.in Wed Feb 24 20:44:56 2010
@@ -5,7 +5,7 @@
 
 MYPATH_PATH=@abs_top_srcdir@/src/bin/msgq
 
-PYTHONPATH=@abs_top_srcdir@/src/lib/pymsgq:${abs_top_src_dir}/lib/pymsgq/ISC
+PYTHONPATH=@abs_top_srcdir@/src/lib/python
 
 export PYTHONPATH
 

Modified: experiments/jreed-layout/src/bin/msgq/run_msgq.sh.in
==============================================================================
--- experiments/jreed-layout/src/bin/msgq/run_msgq.sh.in (original)
+++ experiments/jreed-layout/src/bin/msgq/run_msgq.sh.in Wed Feb 24 20:44:56 2010
@@ -5,7 +5,7 @@
 
 MYPATH_PATH=@abs_top_builddir@/src/bin/msgq
 
-PYTHONPATH=@abs_top_srcdir@/src/lib/pymsgq:${abs_top_src_dir}/lib/pymsgq/ISC
+PYTHONPATH=@abs_top_srcdir@/src/lib/python
 export PYTHONPATH
 
 cd ${MYPATH_PATH}

Modified: experiments/jreed-layout/src/lib/config/data_def_unittests_config.h.in
==============================================================================
--- experiments/jreed-layout/src/lib/config/data_def_unittests_config.h.in (original)
+++ experiments/jreed-layout/src/lib/config/data_def_unittests_config.h.in Wed Feb 24 20:44:56 2010
@@ -1,1 +1,1 @@
-#define TEST_DATA_PATH "@abs_srcdir@/../testdata"
+#define TEST_DATA_PATH "@abs_srcdir@/testdata"

Modified: experiments/jreed-layout/src/lib/python/isc/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/lib/python/isc/Makefile.am (original)
+++ experiments/jreed-layout/src/lib/python/isc/Makefile.am Wed Feb 24 20:44:56 2010
@@ -5,4 +5,4 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(pyexecdir)/isc
 	@(for _foo_ in $(PY_MODULES) ; \
-		do $(INSTALL) -m 0644 $(top_srcdir)/src/lib/pymsgq/isc/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/ ; done)
+		do $(INSTALL) -m 0644 $(top_srcdir)/src/lib/python/isc/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/ ; done)

Modified: experiments/jreed-layout/src/lib/python/isc/Util/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/lib/python/isc/Util/Makefile.am (original)
+++ experiments/jreed-layout/src/lib/python/isc/Util/Makefile.am Wed Feb 24 20:44:56 2010
@@ -3,4 +3,4 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(pyexecdir)/isc/Util
 	@(for _foo_ in $(PY_MODULES) ; \
-		do $(INSTALL) -m 0644 $(top_srcdir)/src/lib/pymsgq/isc/Util/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/Util/ ; done)
+		do $(INSTALL) -m 0644 $(top_srcdir)/src/lib/python/isc/Util/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/Util/ ; done)

Modified: experiments/jreed-layout/src/lib/python/isc/cc/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/lib/python/isc/cc/Makefile.am (original)
+++ experiments/jreed-layout/src/lib/python/isc/cc/Makefile.am Wed Feb 24 20:44:56 2010
@@ -3,4 +3,4 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(pyexecdir)/isc/cc
 	@(for _foo_ in $(PY_MODULES) ; \
-		do $(INSTALL) -m 0644 $(top_srcdir)/src/lib/pymsgq/isc/cc/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/cc/ ; done)
+		do $(INSTALL) -m 0644 $(top_srcdir)/src/lib/python/isc/cc/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/cc/ ; done)

Modified: experiments/jreed-layout/src/lib/python/isc/config/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/lib/python/isc/config/Makefile.am (original)
+++ experiments/jreed-layout/src/lib/python/isc/config/Makefile.am Wed Feb 24 20:44:56 2010
@@ -3,4 +3,4 @@
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(pyexecdir)/isc/config
 	for _foo_ in $(PY_MODULES) ; \
-		do $(INSTALL) -m 0644 $(top_srcdir)/src/lib/pyconfig/isc/config/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/config/; done
+		do $(INSTALL) -m 0644 $(top_srcdir)/src/lib/python/isc/config/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/config/; done

Modified: experiments/jreed-layout/src/lib/python/isc/config/config_test.in
==============================================================================
--- experiments/jreed-layout/src/lib/python/isc/config/config_test.in (original)
+++ experiments/jreed-layout/src/lib/python/isc/config/config_test.in Wed Feb 24 20:44:56 2010
@@ -3,9 +3,9 @@
 PYTHON_EXEC=${PYTHON_EXEC:- at PYTHON@}
 export PYTHON_EXEC
 
-CONFIG_PATH=@abs_top_srcdir@/src/lib/pyconfig/isc/config/
+CONFIG_PATH=@abs_top_srcdir@/src/lib/python/isc/config/
 
-PYTHONPATH=@abs_top_srcdir@/pyshared
+PYTHONPATH=@abs_top_srcdir@/src/lib/python/
 export PYTHONPATH
 
 CONFIG_TESTDATA_PATH=@abs_top_srcdir@/src/lib/config/testdata