[svn] commit: r1120 - in /trunk: ./ src/bin/auth/ src/bin/bind10/ src/bin/bindctl/ src/bin/cmdctl/ src/bin/host/ src/bin/msgq/ src/lib/ src/lib/auth/ src/lib/auth/cpp/ src/lib/auth/testdata/ 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/rdata/ src/lib/dns/tests/ src/lib/exceptions/ src/lib/exceptions/cpp/ 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/ src/lib/python/isc/config/unittests/ src/lib/rbmsgq/
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Mar 5 04:31:29 UTC 2010
Author: jreed
Date: Fri Mar 5 04:31:28 2010
New Revision: 1120
Log:
Restructure trunk again.
This is based on ideas done in experiments/jreed-layout, but
I manually did this again.
Moved around directory structures.
A single python subdirectory under src/lib for single "isc" module.
No "cpp" directories.
No pyshared or includes symlink trees.
I tested running the c++ tests and python tests.
I tested running run_bind10.sh from source tree (with nothing installed).
I tested running bind10 from installed (after moving source).
Added:
trunk/src/lib/auth/Makefile.am
- copied, changed from r1119, trunk/src/lib/auth/cpp/Makefile.am
trunk/src/lib/auth/TODO
- copied unchanged from r1119, trunk/src/lib/auth/cpp/TODO
trunk/src/lib/auth/data_source.cc
- copied unchanged from r1119, trunk/src/lib/auth/cpp/data_source.cc
trunk/src/lib/auth/data_source.h
- copied unchanged from r1119, trunk/src/lib/auth/cpp/data_source.h
trunk/src/lib/auth/data_source_sqlite3.cc
- copied unchanged from r1119, trunk/src/lib/auth/cpp/data_source_sqlite3.cc
trunk/src/lib/auth/data_source_sqlite3.h
- copied unchanged from r1119, trunk/src/lib/auth/cpp/data_source_sqlite3.h
trunk/src/lib/auth/data_source_static.cc
- copied unchanged from r1119, trunk/src/lib/auth/cpp/data_source_static.cc
trunk/src/lib/auth/data_source_static.h
- copied unchanged from r1119, trunk/src/lib/auth/cpp/data_source_static.h
trunk/src/lib/auth/datasrc_unittest.cc
- copied unchanged from r1119, trunk/src/lib/auth/cpp/datasrc_unittest.cc
trunk/src/lib/auth/query.cc
- copied unchanged from r1119, trunk/src/lib/auth/cpp/query.cc
trunk/src/lib/auth/query.h
- copied unchanged from r1119, trunk/src/lib/auth/cpp/query.h
trunk/src/lib/auth/run_unittests.cc
- copied unchanged from r1119, trunk/src/lib/auth/cpp/run_unittests.cc
trunk/src/lib/auth/testdata/
- copied from r1119, trunk/src/lib/auth/cpp/testdata/
trunk/src/lib/auth/unittest_ds.cc
- copied unchanged from r1119, trunk/src/lib/auth/cpp/unittest_ds.cc
trunk/src/lib/auth/unittest_ds.h
- copied unchanged from r1119, trunk/src/lib/auth/cpp/unittest_ds.h
trunk/src/lib/auth/unittest_util.cc
- copied unchanged from r1119, trunk/src/lib/auth/cpp/unittest_util.cc
trunk/src/lib/auth/unittest_util.h
- copied unchanged from r1119, trunk/src/lib/auth/cpp/unittest_util.h
trunk/src/lib/cc/Makefile.am
- copied, changed from r1119, trunk/src/lib/cc/cpp/Makefile.am
trunk/src/lib/cc/data.cc
- copied unchanged from r1119, trunk/src/lib/cc/cpp/data.cc
trunk/src/lib/cc/data.h
- copied unchanged from r1119, trunk/src/lib/cc/cpp/data.h
trunk/src/lib/cc/data_unittests.cc
- copied unchanged from r1119, trunk/src/lib/cc/cpp/data_unittests.cc
trunk/src/lib/cc/run_unittests.cc
- copied unchanged from r1119, trunk/src/lib/cc/cpp/run_unittests.cc
trunk/src/lib/cc/session.cc
- copied unchanged from r1119, trunk/src/lib/cc/cpp/session.cc
trunk/src/lib/cc/session.h
- copied unchanged from r1119, trunk/src/lib/cc/cpp/session.h
trunk/src/lib/config/Makefile.am
- copied, changed from r1119, trunk/src/lib/config/cpp/Makefile.am
trunk/src/lib/config/ccsession.cc
- copied unchanged from r1119, trunk/src/lib/config/cpp/ccsession.cc
trunk/src/lib/config/ccsession.h
- copied unchanged from r1119, trunk/src/lib/config/cpp/ccsession.h
trunk/src/lib/config/config_data.cc
- copied unchanged from r1119, trunk/src/lib/config/cpp/config_data.cc
trunk/src/lib/config/config_data.h
- copied unchanged from r1119, trunk/src/lib/config/cpp/config_data.h
trunk/src/lib/config/config_data_unittests.cc
- copied unchanged from r1119, trunk/src/lib/config/cpp/config_data_unittests.cc
trunk/src/lib/config/data_def_unittests_config.h.in
- copied, changed from r1119, trunk/src/lib/config/cpp/data_def_unittests_config.h.in
trunk/src/lib/config/module_spec.cc
- copied unchanged from r1119, trunk/src/lib/config/cpp/module_spec.cc
trunk/src/lib/config/module_spec.h
- copied unchanged from r1119, trunk/src/lib/config/cpp/module_spec.h
trunk/src/lib/config/module_spec_unittests.cc
- copied unchanged from r1119, trunk/src/lib/config/cpp/module_spec_unittests.cc
trunk/src/lib/config/run_unittests.cc
- copied unchanged from r1119, trunk/src/lib/config/cpp/run_unittests.cc
trunk/src/lib/dns/Makefile.am
- copied, changed from r1119, trunk/src/lib/dns/cpp/Makefile.am
trunk/src/lib/dns/base64.cc
- copied unchanged from r1119, trunk/src/lib/dns/cpp/base64.cc
trunk/src/lib/dns/base64.h
- copied unchanged from r1119, trunk/src/lib/dns/cpp/base64.h
trunk/src/lib/dns/buffer.h
- copied unchanged from r1119, trunk/src/lib/dns/cpp/buffer.h
trunk/src/lib/dns/dnstime.cc
- copied unchanged from r1119, trunk/src/lib/dns/cpp/dnstime.cc
trunk/src/lib/dns/dnstime.h
- copied unchanged from r1119, trunk/src/lib/dns/cpp/dnstime.h
trunk/src/lib/dns/gen-rdatacode.py.in
- copied unchanged from r1119, trunk/src/lib/dns/cpp/gen-rdatacode.py.in
trunk/src/lib/dns/hex.cc
- copied unchanged from r1119, trunk/src/lib/dns/cpp/hex.cc
trunk/src/lib/dns/hex.h
- copied unchanged from r1119, trunk/src/lib/dns/cpp/hex.h
trunk/src/lib/dns/message.cc
- copied unchanged from r1119, trunk/src/lib/dns/cpp/message.cc
trunk/src/lib/dns/message.h
- copied unchanged from r1119, trunk/src/lib/dns/cpp/message.h
trunk/src/lib/dns/messagerenderer.cc
- copied unchanged from r1119, trunk/src/lib/dns/cpp/messagerenderer.cc
trunk/src/lib/dns/messagerenderer.h
- copied unchanged from r1119, trunk/src/lib/dns/cpp/messagerenderer.h
trunk/src/lib/dns/name.cc
- copied unchanged from r1119, trunk/src/lib/dns/cpp/name.cc
trunk/src/lib/dns/name.h
- copied unchanged from r1119, trunk/src/lib/dns/cpp/name.h
trunk/src/lib/dns/question.cc
- copied unchanged from r1119, trunk/src/lib/dns/cpp/question.cc
trunk/src/lib/dns/question.h
- copied unchanged from r1119, trunk/src/lib/dns/cpp/question.h
trunk/src/lib/dns/rdata/
- copied from r1119, trunk/src/lib/dns/cpp/rdata/
trunk/src/lib/dns/rdata.cc
- copied unchanged from r1119, trunk/src/lib/dns/cpp/rdata.cc
trunk/src/lib/dns/rdata.h
- copied unchanged from r1119, trunk/src/lib/dns/cpp/rdata.h
trunk/src/lib/dns/rrclass-placeholder.h
- copied unchanged from r1119, trunk/src/lib/dns/cpp/rrclass-placeholder.h
trunk/src/lib/dns/rrclass.cc
- copied unchanged from r1119, trunk/src/lib/dns/cpp/rrclass.cc
trunk/src/lib/dns/rrparamregistry-placeholder.cc
- copied unchanged from r1119, trunk/src/lib/dns/cpp/rrparamregistry-placeholder.cc
trunk/src/lib/dns/rrparamregistry.h
- copied unchanged from r1119, trunk/src/lib/dns/cpp/rrparamregistry.h
trunk/src/lib/dns/rrset.cc
- copied unchanged from r1119, trunk/src/lib/dns/cpp/rrset.cc
trunk/src/lib/dns/rrset.h
- copied unchanged from r1119, trunk/src/lib/dns/cpp/rrset.h
trunk/src/lib/dns/rrsetlist.cc
- copied unchanged from r1119, trunk/src/lib/dns/cpp/rrsetlist.cc
trunk/src/lib/dns/rrsetlist.h
- copied unchanged from r1119, trunk/src/lib/dns/cpp/rrsetlist.h
trunk/src/lib/dns/rrttl.cc
- copied unchanged from r1119, trunk/src/lib/dns/cpp/rrttl.cc
trunk/src/lib/dns/rrttl.h
- copied unchanged from r1119, trunk/src/lib/dns/cpp/rrttl.h
trunk/src/lib/dns/rrtype-placeholder.h
- copied unchanged from r1119, trunk/src/lib/dns/cpp/rrtype-placeholder.h
trunk/src/lib/dns/rrtype.cc
- copied unchanged from r1119, trunk/src/lib/dns/cpp/rrtype.cc
trunk/src/lib/dns/tests/
- copied from r1119, trunk/src/lib/dns/cpp/tests/
trunk/src/lib/dns/tsig.cc
- copied unchanged from r1119, trunk/src/lib/dns/cpp/tsig.cc
trunk/src/lib/dns/tsig.h
- copied unchanged from r1119, trunk/src/lib/dns/cpp/tsig.h
trunk/src/lib/exceptions/Makefile.am
- copied unchanged from r1119, trunk/src/lib/exceptions/cpp/Makefile.am
trunk/src/lib/exceptions/exceptions.cc
- copied unchanged from r1119, trunk/src/lib/exceptions/cpp/exceptions.cc
trunk/src/lib/exceptions/exceptions.h
- copied unchanged from r1119, trunk/src/lib/exceptions/cpp/exceptions.h
trunk/src/lib/exceptions/exceptions_unittest.cc
- copied unchanged from r1119, trunk/src/lib/exceptions/cpp/exceptions_unittest.cc
trunk/src/lib/exceptions/run_unittests.cc
- copied unchanged from r1119, trunk/src/lib/exceptions/cpp/run_unittests.cc
trunk/src/lib/python/
- copied from r1119, trunk/src/lib/cc/python/
trunk/src/lib/python/isc/cc/tests/
trunk/src/lib/python/isc/cc/tests/sendcmd.py
- copied unchanged from r1119, trunk/src/lib/cc/python/sendcmd.py
trunk/src/lib/python/isc/cc/tests/test.py
- copied unchanged from r1119, trunk/src/lib/cc/python/test.py
trunk/src/lib/python/isc/cc/tests/test_session.py
- copied unchanged from r1119, trunk/src/lib/cc/python/test_session.py
trunk/src/lib/python/isc/config/
- copied from r1119, trunk/src/lib/config/python/isc/config/
trunk/src/lib/rbmsgq/
- copied from r1119, trunk/src/lib/cc/ruby/
Removed:
trunk/src/lib/auth/cpp/
trunk/src/lib/cc/cpp/
trunk/src/lib/cc/python/
trunk/src/lib/cc/ruby/
trunk/src/lib/config/cpp/
trunk/src/lib/config/python/
trunk/src/lib/dns/cpp/
trunk/src/lib/exceptions/cpp/
trunk/src/lib/python/sendcmd.py
trunk/src/lib/python/test.py
trunk/src/lib/python/test_session.py
Modified:
trunk/Makefile.am
trunk/configure.ac
trunk/src/bin/auth/Makefile.am
trunk/src/bin/bind10/bind10_test.in
trunk/src/bin/bind10/run_bind10.sh.in
trunk/src/bin/bindctl/bindctl.in
trunk/src/bin/cmdctl/run_b10-cmdctl.sh.in
trunk/src/bin/host/Makefile.am
trunk/src/bin/msgq/msgq_test.in
trunk/src/bin/msgq/run_msgq.sh.in
trunk/src/lib/Makefile.am
trunk/src/lib/dns/tests/Makefile.am
trunk/src/lib/python/isc/Makefile.am
trunk/src/lib/python/isc/Util/Makefile.am
trunk/src/lib/python/isc/__init__.py
trunk/src/lib/python/isc/cc/Makefile.am
trunk/src/lib/python/isc/config/Makefile.am
trunk/src/lib/python/isc/config/unittests/config_test.in
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Fri Mar 5 04:31:28 2010
@@ -29,36 +29,3 @@
$(GENHTML) -o coverage report.info
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
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Mar 5 04:31:28 2010
@@ -155,23 +155,16 @@
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/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/config/cpp/Makefile
- src/lib/config/python/Makefile
- src/lib/config/python/isc/Makefile
- src/lib/config/python/isc/config/Makefile
src/lib/dns/Makefile
- src/lib/dns/cpp/Makefile
- src/lib/dns/cpp/tests/Makefile
- src/lib/exceptions/cpp/Makefile
+ src/lib/dns/tests/Makefile
src/lib/exceptions/Makefile
src/lib/auth/Makefile
- src/lib/auth/cpp/Makefile
])
AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
src/bin/cmdctl/cmdctl.py
@@ -186,10 +179,10 @@
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/unittests/config_test
- src/lib/dns/cpp/gen-rdatacode.py
- src/lib/dns/cpp/tests/testdata/gen-wiredata.py
+ src/lib/config/data_def_unittests_config.h
+ src/lib/python/isc/config/unittests/config_test
+ src/lib/dns/gen-rdatacode.py
+ src/lib/dns/tests/testdata/gen-wiredata.py
], [
chmod +x src/bin/cmdctl/run_b10-cmdctl.sh
chmod +x src/bin/bind10/run_bind10.sh
@@ -198,7 +191,7 @@
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/cpp/tests/testdata/gen-wiredata.py
+ chmod +x src/lib/dns/gen-rdatacode.py
+ chmod +x src/lib/dns/tests/testdata/gen-wiredata.py
])
AC_OUTPUT
Modified: trunk/src/bin/auth/Makefile.am
==============================================================================
--- trunk/src/bin/auth/Makefile.am (original)
+++ trunk/src/bin/auth/Makefile.am Fri Mar 5 04:31:28 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 $(SQLITE_CFLAGS)
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/ext $(SQLITE_CFLAGS)
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/auth/cpp/.libs/libauth.a
-b10_auth_LDADD += $(top_builddir)/src/lib/dns/cpp/.libs/libdns.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/auth/.libs/libauth.a
+b10_auth_LDADD += $(top_builddir)/src/lib/dns/.libs/libdns.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
b10_auth_LDADD += $(SQLITE_LIBS)
# TODO: config.h.in is wrong because doesn't honor pkgdatadir
Modified: trunk/src/bin/bind10/bind10_test.in
==============================================================================
--- trunk/src/bin/bind10/bind10_test.in (original)
+++ trunk/src/bin/bind10/bind10_test.in Fri Mar 5 04:31:28 2010
@@ -5,10 +5,10 @@
BIND10_PATH=@abs_top_srcdir@/src/bin/bind10
-PATH=@abs_top_srcdir@/src/bin/msgq:@abs_top_srcdir@/src/bin/auth:$PATH
+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/python
export PYTHONPATH
cd ${BIND10_PATH}
Modified: trunk/src/bin/bind10/run_bind10.sh.in
==============================================================================
--- trunk/src/bin/bind10/run_bind10.sh.in (original)
+++ trunk/src/bin/bind10/run_bind10.sh.in Fri Mar 5 04:31:28 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: trunk/src/bin/bindctl/bindctl.in
==============================================================================
--- trunk/src/bin/bindctl/bindctl.in (original)
+++ trunk/src/bin/bindctl/bindctl.in Fri Mar 5 04:31:28 2010
@@ -5,7 +5,7 @@
BINDCTL_PATH=@abs_top_srcdir@/src/bin/bindctl
-PYTHONPATH=@abs_top_builddir@/pyshared
+PYTHONPATH=@abs_top_builddir@/src/lib/python
export PYTHONPATH
cd ${BINDCTL_PATH}
Modified: trunk/src/bin/cmdctl/run_b10-cmdctl.sh.in
==============================================================================
--- trunk/src/bin/cmdctl/run_b10-cmdctl.sh.in (original)
+++ trunk/src/bin/cmdctl/run_b10-cmdctl.sh.in Fri Mar 5 04:31:28 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/python
export PYTHONPATH
cd ${CMD_CTRLD_PATH}
Modified: trunk/src/bin/host/Makefile.am
==============================================================================
--- trunk/src/bin/host/Makefile.am (original)
+++ trunk/src/bin/host/Makefile.am Fri Mar 5 04:31:28 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: trunk/src/bin/msgq/msgq_test.in
==============================================================================
--- trunk/src/bin/msgq/msgq_test.in (original)
+++ trunk/src/bin/msgq/msgq_test.in Fri Mar 5 04:31:28 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/python
export PYTHONPATH
Modified: trunk/src/bin/msgq/run_msgq.sh.in
==============================================================================
--- trunk/src/bin/msgq/run_msgq.sh.in (original)
+++ trunk/src/bin/msgq/run_msgq.sh.in Fri Mar 5 04:31:28 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/python
export PYTHONPATH
cd ${MYPATH_PATH}
Modified: trunk/src/lib/Makefile.am
==============================================================================
--- trunk/src/lib/Makefile.am (original)
+++ trunk/src/lib/Makefile.am Fri Mar 5 04:31:28 2010
@@ -1,1 +1,1 @@
-SUBDIRS = exceptions dns cc config auth
+SUBDIRS = exceptions dns cc config auth python
Modified: trunk/src/lib/dns/tests/Makefile.am
==============================================================================
--- trunk/src/lib/dns/tests/Makefile.am (original)
+++ trunk/src/lib/dns/tests/Makefile.am Fri Mar 5 04:31:28 2010
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/ext
-AM_CPPFLAGS += -I$(top_builddir)/include/dns/cpp
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/ext
CLEANFILES = *.gcno *.gcda
@@ -34,8 +33,8 @@
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD)
-run_unittests_LDADD += $(top_builddir)/src/lib/dns/cpp/.libs/libdns.a
-run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/cpp/.libs/libexceptions.a
+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: 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 04:31:28 2010
@@ -1,8 +1,8 @@
-SUBDIRS = cc Util
+SUBDIRS = cc Util config
PY_MODULES= __init__.py
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/python/isc/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/ ; done)
Modified: trunk/src/lib/python/isc/Util/Makefile.am
==============================================================================
--- trunk/src/lib/python/isc/Util/Makefile.am (original)
+++ trunk/src/lib/python/isc/Util/Makefile.am Fri Mar 5 04:31:28 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/python/isc/Util/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/Util/ ; done)
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 04:31:28 2010
@@ -1,2 +1,3 @@
import isc.cc
import isc.Util
+import isc.config
Modified: trunk/src/lib/python/isc/cc/Makefile.am
==============================================================================
--- trunk/src/lib/python/isc/cc/Makefile.am (original)
+++ trunk/src/lib/python/isc/cc/Makefile.am Fri Mar 5 04:31:28 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/python/isc/cc/$$_foo_ $(DESTDIR)$(pyexecdir)/isc/cc/ ; done)
Modified: trunk/src/lib/python/isc/config/Makefile.am
==============================================================================
--- trunk/src/lib/python/isc/config/Makefile.am (original)
+++ trunk/src/lib/python/isc/config/Makefile.am Fri Mar 5 04:31:28 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/config/python/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: trunk/src/lib/python/isc/config/unittests/config_test.in
==============================================================================
--- trunk/src/lib/python/isc/config/unittests/config_test.in (original)
+++ trunk/src/lib/python/isc/config/unittests/config_test.in Fri Mar 5 04:31:28 2010
@@ -3,9 +3,9 @@
PYTHON_EXEC=${PYTHON_EXEC:- at PYTHON@}
export PYTHON_EXEC
-CONFIG_PATH=@abs_top_srcdir@/src/lib/config/python/isc/config/unittests
+CONFIG_PATH=@abs_top_srcdir@/src/lib/python/isc/config/unittests
-PYTHONPATH=@abs_top_srcdir@/pyshared
+PYTHONPATH=@abs_top_srcdir@/src/lib/python
export PYTHONPATH
CONFIG_TESTDATA_PATH=@abs_top_srcdir@/src/lib/config/testdata
More information about the bind10-changes
mailing list