[svn] commit: r941 - in /experiments/jreed-layout: ./ src/bin/auth/ src/bin/bind10/ src/bin/cmdctl/ src/bin/host/ src/bin/msgq/ src/lib/ src/lib/auth/ src/lib/auth/cpp/ src/lib/cc/ src/lib/cc/cpp/ src/lib/cc/python/ src/lib/cc/ruby/ src/lib/config/ src/lib/config/cpp/ src/lib/config/python/ src/lib/dns/ src/lib/dns/cpp/ src/lib/dns/cpp/rdata/ src/lib/dns/cpp/testdata/ src/lib/dns/rdata/ src/lib/dns/testdata/ src/lib/exceptions/ src/lib/exceptions/cpp/ src/lib/pyconfig/ src/lib/pyconfig/isc/ src/lib/pyconfig/isc/config/ src/lib/pymsgq/ src/lib/pymsgq/isc/ src/lib/pymsgq/isc/Util/ src/lib/pymsgq/isc/cc/ src/lib/rbmsgq/
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Feb 23 20:00:01 UTC 2010
Author: jreed
Date: Tue Feb 23 20:00:00 2010
New Revision: 941
Log:
Moved around directory structures.
No python subdirectories. No cpp subdirectories.
The two python modules got moved to src/lib/pymsgq (for cc)
and src/lib/pyconfig.
I tested and bind10 works from the source tree and also
from the installed location.
This is my experimental branch for testing.
Added:
experiments/jreed-layout/src/lib/auth/TODO
- copied unchanged from r933, experiments/jreed-layout/src/lib/auth/cpp/TODO
experiments/jreed-layout/src/lib/auth/data_source.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/auth/cpp/data_source.cc
experiments/jreed-layout/src/lib/auth/data_source.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/auth/cpp/data_source.h
experiments/jreed-layout/src/lib/auth/data_source_plot.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/auth/cpp/data_source_plot.cc
experiments/jreed-layout/src/lib/auth/data_source_plot.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/auth/cpp/data_source_plot.h
experiments/jreed-layout/src/lib/auth/data_source_static.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/auth/cpp/data_source_static.cc
experiments/jreed-layout/src/lib/auth/data_source_static.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/auth/cpp/data_source_static.h
experiments/jreed-layout/src/lib/auth/query.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/auth/cpp/query.cc
experiments/jreed-layout/src/lib/auth/query.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/auth/cpp/query.h
experiments/jreed-layout/src/lib/cc/data.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/cc/cpp/data.cc
experiments/jreed-layout/src/lib/cc/data.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/cc/cpp/data.h
experiments/jreed-layout/src/lib/cc/data_unittests.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/cc/cpp/data_unittests.cc
experiments/jreed-layout/src/lib/cc/run_unittests.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/cc/cpp/run_unittests.cc
experiments/jreed-layout/src/lib/cc/session.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/cc/cpp/session.cc
experiments/jreed-layout/src/lib/cc/session.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/cc/cpp/session.h
experiments/jreed-layout/src/lib/config/ccsession.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/config/cpp/ccsession.cc
experiments/jreed-layout/src/lib/config/ccsession.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/config/cpp/ccsession.h
experiments/jreed-layout/src/lib/config/config_data.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/config/cpp/config_data.cc
experiments/jreed-layout/src/lib/config/config_data.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/config/cpp/config_data.h
experiments/jreed-layout/src/lib/config/config_data_unittests.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/config/cpp/config_data_unittests.cc
experiments/jreed-layout/src/lib/config/data_def_unittests_config.h.in
- copied unchanged from r933, experiments/jreed-layout/src/lib/config/cpp/data_def_unittests_config.h.in
experiments/jreed-layout/src/lib/config/module_spec.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/config/cpp/module_spec.cc
experiments/jreed-layout/src/lib/config/module_spec.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/config/cpp/module_spec.h
experiments/jreed-layout/src/lib/config/module_spec_unittests.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/config/cpp/module_spec_unittests.cc
experiments/jreed-layout/src/lib/config/run_unittests.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/config/cpp/run_unittests.cc
experiments/jreed-layout/src/lib/dns/base64.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/base64.cc
experiments/jreed-layout/src/lib/dns/base64.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/base64.h
experiments/jreed-layout/src/lib/dns/base64_unittest.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/base64_unittest.cc
experiments/jreed-layout/src/lib/dns/buffer.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/buffer.h
experiments/jreed-layout/src/lib/dns/buffer_unittest.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/buffer_unittest.cc
experiments/jreed-layout/src/lib/dns/gen-rdatacode.py.in
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/gen-rdatacode.py.in
experiments/jreed-layout/src/lib/dns/message.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/message.cc
experiments/jreed-layout/src/lib/dns/message.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/message.h
experiments/jreed-layout/src/lib/dns/message_unittest.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/message_unittest.cc
experiments/jreed-layout/src/lib/dns/messagerenderer.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/messagerenderer.cc
experiments/jreed-layout/src/lib/dns/messagerenderer.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/messagerenderer.h
experiments/jreed-layout/src/lib/dns/messagerenderer_unittest.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/messagerenderer_unittest.cc
experiments/jreed-layout/src/lib/dns/name.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/name.cc
experiments/jreed-layout/src/lib/dns/name.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/name.h
experiments/jreed-layout/src/lib/dns/name_unittest.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/name_unittest.cc
experiments/jreed-layout/src/lib/dns/question.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/question.cc
experiments/jreed-layout/src/lib/dns/question.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/question.h
experiments/jreed-layout/src/lib/dns/question_unittest.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/question_unittest.cc
experiments/jreed-layout/src/lib/dns/rdata/
- copied from r933, experiments/jreed-layout/src/lib/dns/cpp/rdata/
experiments/jreed-layout/src/lib/dns/rdata.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rdata.cc
experiments/jreed-layout/src/lib/dns/rdata.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rdata.h
experiments/jreed-layout/src/lib/dns/rdata_unittest.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rdata_unittest.cc
experiments/jreed-layout/src/lib/dns/rrclass-placeholder.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rrclass-placeholder.h
experiments/jreed-layout/src/lib/dns/rrclass.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rrclass.cc
experiments/jreed-layout/src/lib/dns/rrclass_unittest.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rrclass_unittest.cc
experiments/jreed-layout/src/lib/dns/rrparamregistry-placeholder.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rrparamregistry-placeholder.cc
experiments/jreed-layout/src/lib/dns/rrparamregistry.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rrparamregistry.h
experiments/jreed-layout/src/lib/dns/rrparamregistry_unittest.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rrparamregistry_unittest.cc
experiments/jreed-layout/src/lib/dns/rrset.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rrset.cc
experiments/jreed-layout/src/lib/dns/rrset.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rrset.h
experiments/jreed-layout/src/lib/dns/rrset_unittest.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rrset_unittest.cc
experiments/jreed-layout/src/lib/dns/rrttl.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rrttl.cc
experiments/jreed-layout/src/lib/dns/rrttl.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rrttl.h
experiments/jreed-layout/src/lib/dns/rrttl_unittest.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rrttl_unittest.cc
experiments/jreed-layout/src/lib/dns/rrtype-placeholder.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rrtype-placeholder.h
experiments/jreed-layout/src/lib/dns/rrtype.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rrtype.cc
experiments/jreed-layout/src/lib/dns/rrtype_unittest.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/rrtype_unittest.cc
experiments/jreed-layout/src/lib/dns/run_unittests.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/run_unittests.cc
experiments/jreed-layout/src/lib/dns/testdata/
- copied from r933, experiments/jreed-layout/src/lib/dns/cpp/testdata/
experiments/jreed-layout/src/lib/dns/unittest_util.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/unittest_util.cc
experiments/jreed-layout/src/lib/dns/unittest_util.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/dns/cpp/unittest_util.h
experiments/jreed-layout/src/lib/exceptions/exceptions.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/exceptions/cpp/exceptions.cc
experiments/jreed-layout/src/lib/exceptions/exceptions.h
- copied unchanged from r933, experiments/jreed-layout/src/lib/exceptions/cpp/exceptions.h
experiments/jreed-layout/src/lib/exceptions/exceptions_unittest.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/exceptions/cpp/exceptions_unittest.cc
experiments/jreed-layout/src/lib/exceptions/run_unittests.cc
- copied unchanged from r933, experiments/jreed-layout/src/lib/exceptions/cpp/run_unittests.cc
experiments/jreed-layout/src/lib/pyconfig/
- copied from r933, experiments/jreed-layout/src/lib/config/python/
experiments/jreed-layout/src/lib/pymsgq/
- copied from r933, experiments/jreed-layout/src/lib/cc/python/
experiments/jreed-layout/src/lib/rbmsgq/
- copied from r933, experiments/jreed-layout/src/lib/cc/ruby/
Removed:
experiments/jreed-layout/src/lib/auth/cpp/
experiments/jreed-layout/src/lib/cc/cpp/data.cc
experiments/jreed-layout/src/lib/cc/cpp/data.h
experiments/jreed-layout/src/lib/cc/cpp/data_unittests.cc
experiments/jreed-layout/src/lib/cc/cpp/run_unittests.cc
experiments/jreed-layout/src/lib/cc/cpp/session.cc
experiments/jreed-layout/src/lib/cc/cpp/session.h
experiments/jreed-layout/src/lib/cc/python/
experiments/jreed-layout/src/lib/cc/ruby/
experiments/jreed-layout/src/lib/config/cpp/ccsession.cc
experiments/jreed-layout/src/lib/config/cpp/ccsession.h
experiments/jreed-layout/src/lib/config/cpp/config_data.cc
experiments/jreed-layout/src/lib/config/cpp/config_data.h
experiments/jreed-layout/src/lib/config/cpp/config_data_unittests.cc
experiments/jreed-layout/src/lib/config/cpp/data_def_unittests_config.h.in
experiments/jreed-layout/src/lib/config/cpp/module_spec.cc
experiments/jreed-layout/src/lib/config/cpp/module_spec.h
experiments/jreed-layout/src/lib/config/cpp/module_spec_unittests.cc
experiments/jreed-layout/src/lib/config/cpp/run_unittests.cc
experiments/jreed-layout/src/lib/config/python/
experiments/jreed-layout/src/lib/dns/cpp/base64.cc
experiments/jreed-layout/src/lib/dns/cpp/base64.h
experiments/jreed-layout/src/lib/dns/cpp/base64_unittest.cc
experiments/jreed-layout/src/lib/dns/cpp/buffer.h
experiments/jreed-layout/src/lib/dns/cpp/buffer_unittest.cc
experiments/jreed-layout/src/lib/dns/cpp/gen-rdatacode.py.in
experiments/jreed-layout/src/lib/dns/cpp/message.cc
experiments/jreed-layout/src/lib/dns/cpp/message.h
experiments/jreed-layout/src/lib/dns/cpp/message_unittest.cc
experiments/jreed-layout/src/lib/dns/cpp/messagerenderer.cc
experiments/jreed-layout/src/lib/dns/cpp/messagerenderer.h
experiments/jreed-layout/src/lib/dns/cpp/messagerenderer_unittest.cc
experiments/jreed-layout/src/lib/dns/cpp/name.cc
experiments/jreed-layout/src/lib/dns/cpp/name.h
experiments/jreed-layout/src/lib/dns/cpp/name_unittest.cc
experiments/jreed-layout/src/lib/dns/cpp/question.cc
experiments/jreed-layout/src/lib/dns/cpp/question.h
experiments/jreed-layout/src/lib/dns/cpp/question_unittest.cc
experiments/jreed-layout/src/lib/dns/cpp/rdata/
experiments/jreed-layout/src/lib/dns/cpp/rdata.cc
experiments/jreed-layout/src/lib/dns/cpp/rdata.h
experiments/jreed-layout/src/lib/dns/cpp/rdata_unittest.cc
experiments/jreed-layout/src/lib/dns/cpp/rrclass-placeholder.h
experiments/jreed-layout/src/lib/dns/cpp/rrclass.cc
experiments/jreed-layout/src/lib/dns/cpp/rrclass_unittest.cc
experiments/jreed-layout/src/lib/dns/cpp/rrparamregistry-placeholder.cc
experiments/jreed-layout/src/lib/dns/cpp/rrparamregistry.h
experiments/jreed-layout/src/lib/dns/cpp/rrparamregistry_unittest.cc
experiments/jreed-layout/src/lib/dns/cpp/rrset.cc
experiments/jreed-layout/src/lib/dns/cpp/rrset.h
experiments/jreed-layout/src/lib/dns/cpp/rrset_unittest.cc
experiments/jreed-layout/src/lib/dns/cpp/rrttl.cc
experiments/jreed-layout/src/lib/dns/cpp/rrttl.h
experiments/jreed-layout/src/lib/dns/cpp/rrttl_unittest.cc
experiments/jreed-layout/src/lib/dns/cpp/rrtype-placeholder.h
experiments/jreed-layout/src/lib/dns/cpp/rrtype.cc
experiments/jreed-layout/src/lib/dns/cpp/rrtype_unittest.cc
experiments/jreed-layout/src/lib/dns/cpp/run_unittests.cc
experiments/jreed-layout/src/lib/dns/cpp/testdata/
experiments/jreed-layout/src/lib/dns/cpp/unittest_util.cc
experiments/jreed-layout/src/lib/dns/cpp/unittest_util.h
experiments/jreed-layout/src/lib/exceptions/cpp/exceptions.cc
experiments/jreed-layout/src/lib/exceptions/cpp/exceptions.h
experiments/jreed-layout/src/lib/exceptions/cpp/exceptions_unittest.cc
experiments/jreed-layout/src/lib/exceptions/cpp/run_unittests.cc
Modified:
experiments/jreed-layout/Makefile.am
experiments/jreed-layout/configure.ac
experiments/jreed-layout/src/bin/auth/Makefile.am
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/host/Makefile.am
experiments/jreed-layout/src/bin/msgq/msgq_test.in
experiments/jreed-layout/src/bin/msgq/run_msgq.sh.in
experiments/jreed-layout/src/lib/Makefile.am
experiments/jreed-layout/src/lib/auth/Makefile.am
experiments/jreed-layout/src/lib/cc/Makefile.am
experiments/jreed-layout/src/lib/config/Makefile.am
experiments/jreed-layout/src/lib/dns/Makefile.am
experiments/jreed-layout/src/lib/exceptions/Makefile.am
experiments/jreed-layout/src/lib/pyconfig/isc/Makefile.am
experiments/jreed-layout/src/lib/pyconfig/isc/config/Makefile.am
experiments/jreed-layout/src/lib/pyconfig/isc/config/config_test.in
experiments/jreed-layout/src/lib/pymsgq/isc/Makefile.am
experiments/jreed-layout/src/lib/pymsgq/isc/Util/Makefile.am
experiments/jreed-layout/src/lib/pymsgq/isc/cc/Makefile.am
Modified: experiments/jreed-layout/Makefile.am
==============================================================================
--- experiments/jreed-layout/Makefile.am (original)
+++ experiments/jreed-layout/Makefile.am Tue Feb 23 20:00:00 2010
@@ -30,35 +30,35 @@
coverage: clean-coverage perform-coverage report-coverage
-pyshared:
- mkdir pyshared
- mkdir pyshared/isc
- cat ${srcdir}/src/lib/config/python/isc/__init__.py ${srcdir}/src/lib/cc/python/isc/__init__.py > pyshared/isc/__init__.py
- ln -s ${abs_top_srcdir}/src/lib/config/python/isc/config pyshared/isc/config
- ln -s ${abs_top_srcdir}/src/lib/cc/python/isc/cc pyshared/isc/cc
- ln -s ${abs_top_srcdir}/src/lib/cc/python/isc/Util pyshared/isc/Util
-
-include:
- mkdir include
- ln -s ${abs_top_srcdir}/src/lib/auth/cpp include/auth
- ln -s ${abs_top_srcdir}/src/lib/cc/cpp include/cc
- ln -s ${abs_top_srcdir}/src/lib/config/cpp include/config
- ln -s ${abs_top_srcdir}/src/lib/dns/cpp include/dns
- ln -s ${abs_top_srcdir}/src/lib/exceptions/cpp include/exceptions
-
-stree_symlinks: pyshared include
-.PHONY: stree_symlinks
-
-all: stree_symlinks
-clean-local:
- @if [ -d pyshared/isc ] ; then \
- rm -f pyshared/isc/*; \
- rmdir pyshared/isc; \
- fi
- @if [ -d pyshared ]; then \
- rmdir pyshared; \
- fi
- @if [ -d include ]; then \
- rm -f include/*; \
- rmdir include; \
- fi
+#pyshared:
+# mkdir pyshared
+# mkdir pyshared/isc
+# cat ${srcdir}/src/lib/config/python/isc/__init__.py ${srcdir}/src/lib/cc/python/isc/__init__.py > pyshared/isc/__init__.py
+# ln -s ${abs_top_srcdir}/src/lib/config/python/isc/config pyshared/isc/config
+# ln -s ${abs_top_srcdir}/src/lib/cc/python/isc/cc pyshared/isc/cc
+# ln -s ${abs_top_srcdir}/src/lib/cc/python/isc/Util pyshared/isc/Util
+#
+#include:
+# mkdir include
+# ln -s ${abs_top_srcdir}/src/lib/auth/cpp include/auth
+# ln -s ${abs_top_srcdir}/src/lib/cc/cpp include/cc
+# ln -s ${abs_top_srcdir}/src/lib/config/cpp include/config
+# ln -s ${abs_top_srcdir}/src/lib/dns/cpp include/dns
+# ln -s ${abs_top_srcdir}/src/lib/exceptions/cpp include/exceptions
+#
+#stree_symlinks: pyshared include
+#.PHONY: stree_symlinks
+#
+#all: stree_symlinks
+#clean-local:
+# @if [ -d pyshared/isc ] ; then \
+# rm -f pyshared/isc/*; \
+# rmdir pyshared/isc; \
+# fi
+# @if [ -d pyshared ]; then \
+# rmdir pyshared; \
+# fi
+# @if [ -d include ]; then \
+# rm -f include/*; \
+# rmdir include; \
+# fi
Modified: experiments/jreed-layout/configure.ac
==============================================================================
--- experiments/jreed-layout/configure.ac (original)
+++ experiments/jreed-layout/configure.ac Tue Feb 23 20:00:00 2010
@@ -153,22 +153,17 @@
src/bin/auth/Makefile
src/lib/Makefile
src/lib/cc/Makefile
- src/lib/cc/cpp/Makefile
- src/lib/cc/python/Makefile
- src/lib/cc/python/isc/Makefile
- src/lib/cc/python/isc/cc/Makefile
- src/lib/cc/python/isc/Util/Makefile
+ src/lib/pymsgq/Makefile
+ src/lib/pymsgq/isc/Makefile
+ src/lib/pymsgq/isc/cc/Makefile
+ src/lib/pymsgq/isc/Util/Makefile
src/lib/config/Makefile
- src/lib/config/cpp/Makefile
- src/lib/config/python/Makefile
- src/lib/config/python/isc/Makefile
- src/lib/config/python/isc/config/Makefile
+ src/lib/pyconfig/Makefile
+ src/lib/pyconfig/isc/Makefile
+ src/lib/pyconfig/isc/config/Makefile
src/lib/dns/Makefile
- src/lib/dns/cpp/Makefile
- src/lib/exceptions/cpp/Makefile
src/lib/exceptions/Makefile
src/lib/auth/Makefile
- src/lib/auth/cpp/Makefile
])
AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
src/bin/cfgmgr/run_b10-cfgmgr.sh
@@ -183,9 +178,9 @@
src/bin/msgq/msgq_test
src/bin/msgq/run_msgq.sh
src/bin/auth/config.h
- src/lib/config/cpp/data_def_unittests_config.h
- src/lib/config/python/isc/config/config_test
- src/lib/dns/cpp/gen-rdatacode.py
+ src/lib/config/data_def_unittests_config.h
+ src/lib/pyconfig/isc/config/config_test
+ src/lib/dns/gen-rdatacode.py
], [
chmod +x src/bin/cfgmgr/run_b10-cfgmgr.sh
chmod +x src/bin/cmdctl/run_b10-cmdctl.sh
@@ -193,6 +188,6 @@
chmod +x src/bin/bindctl/bindctl
chmod +x src/bin/msgq/run_msgq.sh
chmod +x src/bin/msgq/msgq_test
- chmod +x src/lib/dns/cpp/gen-rdatacode.py
+ chmod +x src/lib/dns/gen-rdatacode.py
])
AC_OUTPUT
Modified: experiments/jreed-layout/src/bin/auth/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/bin/auth/Makefile.am (original)
+++ experiments/jreed-layout/src/bin/auth/Makefile.am Tue Feb 23 20:00:00 2010
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/src/lib -I$(top_builddir)/src/lib/dns/cpp -I$(top_builddir)/include/dns/cpp -I$(top_builddir)/include -I$(top_srcdir)/ext
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/ext
pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -8,11 +8,11 @@
b10_auth_SOURCES = auth_srv.cc auth_srv.h
b10_auth_SOURCES += common.cc common.h
b10_auth_SOURCES += main.cc
-b10_auth_LDADD = $(top_builddir)/src/lib/dns/cpp/.libs/libdns.a
-b10_auth_LDADD += $(top_builddir)/src/lib/auth/cpp/.libs/libauth.a
-b10_auth_LDADD += $(top_builddir)/src/lib/config/cpp/libcfgclient.a
-b10_auth_LDADD += $(top_builddir)/src/lib/cc/cpp/libcc.a
-b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/cpp/.libs/libexceptions.a
+b10_auth_LDADD = $(top_builddir)/src/lib/dns/.libs/libdns.a
+b10_auth_LDADD += $(top_builddir)/src/lib/auth/.libs/libauth.a
+b10_auth_LDADD += $(top_builddir)/src/lib/config/libcfgclient.a
+b10_auth_LDADD += $(top_builddir)/src/lib/cc/libcc.a
+b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/.libs/libexceptions.a
# TODO: config.h.in is wrong because doesn't honor pkgdatadir
# and can't use @datadir@ because doesn't expand default ${prefix}
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 Tue Feb 23 20:00:00 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/cc/python:${abs_top_src_dir}/lib/cc/python/ISC
+PYTHONPATH=@abs_top_srcdir@/src/lib/pymsgq:${abs_top_src_dir}/lib/pymsgq/ISC
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 Tue Feb 23 20:00:00 2010
@@ -4,7 +4,7 @@
export PYTHON_EXEC
CMD_CTRLD_PATH=@abs_top_builddir@/src/bin/cmdctl
-PYTHONPATH=@abs_top_srcdir@/src/lib/cc/python:${abs_top_src_dir}/lib/cc/python/ISC
+PYTHONPATH=@abs_top_srcdir@/src/lib/pymsgq:${abs_top_src_dir}/lib/pymsgq/ISC
export PYTHONPATH
cd ${CMD_CTRLD_PATH}
Modified: experiments/jreed-layout/src/bin/host/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/bin/host/Makefile.am (original)
+++ experiments/jreed-layout/src/bin/host/Makefile.am Tue Feb 23 20:00:00 2010
@@ -1,8 +1,8 @@
-AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_builddir)/src/lib/dns/cpp -I$(top_builddir)/include/dns/cpp -I$(top_builddir)/include -I$(top_srcdir)/ext
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/ext
CLEANFILES = *.gcno *.gcda
bin_PROGRAMS = host
host_SOURCES = host.cc
-host_LDADD = $(top_builddir)/src/lib/dns/cpp/.libs/libdns.a
-host_LDADD += $(top_builddir)/src/lib/exceptions/cpp/.libs/libexceptions.a
+host_LDADD = $(top_builddir)/src/lib/dns/.libs/libdns.a
+host_LDADD += $(top_builddir)/src/lib/exceptions/.libs/libexceptions.a
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 Tue Feb 23 20:00:00 2010
@@ -5,7 +5,7 @@
MYPATH_PATH=@abs_top_srcdir@/src/bin/msgq
-PYTHONPATH=@abs_top_srcdir@/src/lib/cc/python:${abs_top_src_dir}/lib/cc/python/ISC
+PYTHONPATH=@abs_top_srcdir@/src/lib/pymsgq:${abs_top_src_dir}/lib/pymsgq/ISC
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 Tue Feb 23 20:00:00 2010
@@ -5,7 +5,7 @@
MYPATH_PATH=@abs_top_builddir@/src/bin/msgq
-PYTHONPATH=@abs_top_srcdir@/src/lib/cc/python:${abs_top_src_dir}/lib/cc/python/ISC
+PYTHONPATH=@abs_top_srcdir@/src/lib/pymsgq:${abs_top_src_dir}/lib/pymsgq/ISC
export PYTHONPATH
cd ${MYPATH_PATH}
Modified: experiments/jreed-layout/src/lib/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/lib/Makefile.am (original)
+++ experiments/jreed-layout/src/lib/Makefile.am Tue Feb 23 20:00:00 2010
@@ -1,1 +1,1 @@
-SUBDIRS = exceptions dns cc config auth
+SUBDIRS = exceptions dns cc config auth pymsgq pyconfig
Modified: experiments/jreed-layout/src/lib/auth/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/lib/auth/Makefile.am (original)
+++ experiments/jreed-layout/src/lib/auth/Makefile.am Tue Feb 23 20:00:00 2010
@@ -1,1 +1,9 @@
-SUBDIRS = cpp
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/ext
+
+CLEANFILES = *.gcno *.gcda
+
+lib_LTLIBRARIES = libauth.la
+libauth_la_SOURCES = data_source.h data_source.cc
+libauth_la_SOURCES += data_source_static.h data_source_static.cc
+#libauth_la_SOURCES += data_source_plot.h data_source_plot.cc
+libauth_la_SOURCES += query.h query.cc
Modified: experiments/jreed-layout/src/lib/cc/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/lib/cc/Makefile.am (original)
+++ experiments/jreed-layout/src/lib/cc/Makefile.am Tue Feb 23 20:00:00 2010
@@ -1,1 +1,19 @@
-SUBDIRS = cpp python
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/ext -Wall -Werror
+
+lib_LIBRARIES = libcc.a
+libcc_a_SOURCES = data.cc data.h session.cc session.h
+
+CLEANFILES = *.gcno *.gcda
+
+TESTS =
+if HAVE_GTEST
+TESTS += run_unittests
+run_unittests_SOURCES = data_unittests.cc run_unittests.cc
+run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
+run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
+run_unittests_LDADD = libcc.a $(GTEST_LDADD)
+run_unittests_LDADD += $(top_builddir)/src/lib/dns/.libs/libdns.a
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/.libs/libexceptions.a
+endif
+
+noinst_PROGRAMS = $(TESTS)
Modified: experiments/jreed-layout/src/lib/config/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/lib/config/Makefile.am (original)
+++ experiments/jreed-layout/src/lib/config/Makefile.am Tue Feb 23 20:00:00 2010
@@ -1,1 +1,21 @@
-SUBDIRS = cpp python
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/ext -Wall -Werror
+
+lib_LIBRARIES = libcfgclient.a
+libcfgclient_a_SOURCES = config_data.h config_data.cc module_spec.h module_spec.cc ccsession.cc ccsession.h
+
+CLEANFILES = *.gcno *.gcda
+
+TESTS =
+if HAVE_GTEST
+TESTS += run_unittests
+run_unittests_SOURCES = module_spec_unittests.cc config_data_unittests.cc run_unittests.cc
+run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
+run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
+run_unittests_LDADD = libcfgclient.a $(GTEST_LDADD)
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.a
+endif
+
+noinst_PROGRAMS = $(TESTS)
+
+
Modified: experiments/jreed-layout/src/lib/dns/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/lib/dns/Makefile.am (original)
+++ experiments/jreed-layout/src/lib/dns/Makefile.am Tue Feb 23 20:00:00 2010
@@ -1,1 +1,47 @@
-SUBDIRS = cpp
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/ext
+
+CLEANFILES = *.gcno *.gcda
+CLEANFILES += rrclass.h rrtype.h rrparamregistry.cc rdataclass.h rdataclass.cc
+
+# auto-generate by gen-rdatacode.py:
+BUILT_SOURCES = rrclass.h rrtype.h rrparamregistry.cc
+
+lib_LTLIBRARIES = libdns.la
+libdns_la_SOURCES = buffer.h name.cc name.h messagerenderer.h messagerenderer.cc
+libdns_la_SOURCES += rrparamregistry.h rrparamregistry.cc
+libdns_la_SOURCES += rrclass.h rrclass.cc rrtype.h rrtype.cc rrttl.h rrttl.cc
+libdns_la_SOURCES += rdata.h rdata.cc
+libdns_la_SOURCES += rdataclass.h rdataclass.cc
+libdns_la_SOURCES += rrset.h rrset.cc
+libdns_la_SOURCES += question.h question.cc
+libdns_la_SOURCES += message.h message.cc
+libdns_la_SOURCES += base64.h base64.cc
+
+rrclass.h: rrclass-placeholder.h
+rrtype.h: rrtype-placeholder.h
+rrparamregistry.cc: rrparamregistry-placeholder.cc
+rrclass.h rrtype.h rrparamregistry.cc rdataclass.h rdataclass.cc: Makefile
+ ./gen-rdatacode.py
+
+TESTS =
+if HAVE_GTEST
+TESTS += run_unittests
+run_unittests_SOURCES = unittest_util.h unittest_util.cc
+run_unittests_SOURCES += buffer_unittest.cc name_unittest.cc
+run_unittests_SOURCES += messagerenderer_unittest.cc
+run_unittests_SOURCES += rrclass_unittest.cc rrtype_unittest.cc
+run_unittests_SOURCES += rrttl_unittest.cc
+run_unittests_SOURCES += rdata_unittest.cc
+run_unittests_SOURCES += rrset_unittest.cc
+run_unittests_SOURCES += question_unittest.cc
+run_unittests_SOURCES += rrparamregistry_unittest.cc
+run_unittests_SOURCES += message_unittest.cc
+run_unittests_SOURCES += base64_unittest.cc
+run_unittests_SOURCES += run_unittests.cc
+run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
+run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
+run_unittests_LDADD = .libs/libdns.a $(GTEST_LDADD)
+run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/.libs/libexceptions.a
+endif
+
+noinst_PROGRAMS = $(TESTS)
Modified: experiments/jreed-layout/src/lib/exceptions/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/lib/exceptions/Makefile.am (original)
+++ experiments/jreed-layout/src/lib/exceptions/Makefile.am Tue Feb 23 20:00:00 2010
@@ -1,1 +1,17 @@
-SUBDIRS = cpp
+
+lib_LTLIBRARIES = libexceptions.la
+libexceptions_la_SOURCES = exceptions.h exceptions.cc
+
+CLEANFILES = *.gcno *.gcda
+
+TESTS =
+if HAVE_GTEST
+TESTS += run_unittests
+run_unittests_SOURCES = run_unittests.cc
+run_unittests_SOURCES += exceptions_unittest.cc
+run_unittests_CPPFLAGS = $(GTEST_INCLUDES)
+run_unittests_LDFLAGS = $(GTEST_LDFLAGS)
+run_unittests_LDADD = .libs/libexceptions.a $(GTEST_LDADD)
+endif
+
+noinst_PROGRAMS = $(TESTS)
Modified: experiments/jreed-layout/src/lib/pyconfig/isc/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/lib/pyconfig/isc/Makefile.am (original)
+++ experiments/jreed-layout/src/lib/pyconfig/isc/Makefile.am Tue Feb 23 20:00:00 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/config/python/isc/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/ ; done)
+ do $(INSTALL) -m 0644 $(top_srcdir)/src/lib/pyconfig/isc/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/ ; done)
Modified: experiments/jreed-layout/src/lib/pyconfig/isc/config/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/lib/pyconfig/isc/config/Makefile.am (original)
+++ experiments/jreed-layout/src/lib/pyconfig/isc/config/Makefile.am Tue Feb 23 20:00:00 2010
@@ -1,6 +1,6 @@
-PY_MODULES= __init__.py ccsession.py datadefinition.py cfgmgr.py
+PY_MODULES= junk __init__.py ccsession.py cfgmgr.py config_data.py module_spec.py
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(pyexecdir)/isc/config
- @(for _foo_ in $(PY_MODULES) ; \
- do $(INSTALL) -m 0644 $(top_srcdir)/src/lib/config/python/isc/config/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/config/; done)
+ for _foo_ in $(PY_MODULES) ; \
+ do $(INSTALL) -m 0644 $(top_srcdir)/src/lib/pyconfig/isc/config/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/config/; done
Modified: experiments/jreed-layout/src/lib/pyconfig/isc/config/config_test.in
==============================================================================
--- experiments/jreed-layout/src/lib/pyconfig/isc/config/config_test.in (original)
+++ experiments/jreed-layout/src/lib/pyconfig/isc/config/config_test.in Tue Feb 23 20:00:00 2010
@@ -3,7 +3,7 @@
PYTHON_EXEC=${PYTHON_EXEC:- at PYTHON@}
export PYTHON_EXEC
-CONFIG_PATH=@abs_top_srcdir@/src/lib/config/python/isc/config/
+CONFIG_PATH=@abs_top_srcdir@/src/lib/pyconfig/isc/config/
PYTHONPATH=@abs_top_srcdir@/pyshared
export PYTHONPATH
Modified: experiments/jreed-layout/src/lib/pymsgq/isc/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/lib/pymsgq/isc/Makefile.am (original)
+++ experiments/jreed-layout/src/lib/pymsgq/isc/Makefile.am Tue Feb 23 20:00:00 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/cc/python/isc/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/ ; done)
+ do $(INSTALL) -m 0644 $(top_srcdir)/src/lib/pymsgq/isc/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/ ; done)
Modified: experiments/jreed-layout/src/lib/pymsgq/isc/Util/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/lib/pymsgq/isc/Util/Makefile.am (original)
+++ experiments/jreed-layout/src/lib/pymsgq/isc/Util/Makefile.am Tue Feb 23 20:00:00 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/cc/python/isc/Util/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/Util/ ; done)
+ do $(INSTALL) -m 0644 $(top_srcdir)/src/lib/pymsgq/isc/Util/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/Util/ ; done)
Modified: experiments/jreed-layout/src/lib/pymsgq/isc/cc/Makefile.am
==============================================================================
--- experiments/jreed-layout/src/lib/pymsgq/isc/cc/Makefile.am (original)
+++ experiments/jreed-layout/src/lib/pymsgq/isc/cc/Makefile.am Tue Feb 23 20:00:00 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/cc/python/isc/cc/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/cc/ ; done)
+ do $(INSTALL) -m 0644 $(top_srcdir)/src/lib/pymsgq/isc/cc/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/cc/ ; done)
More information about the bind10-changes
mailing list