Commit 2e119c7e authored by Jeremy C. Reed's avatar Jeremy C. Reed

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).


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1120 e5f2f494-b856-4b98-b285-d166d9295462
parent 3e248e34
......@@ -29,36 +29,3 @@ report-coverage:
$(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
......@@ -155,23 +155,16 @@ AC_CONFIG_FILES([Makefile
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 @@ AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
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 @@ AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
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
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 @@ pkglibexec_PROGRAMS = b10-auth
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
......
......@@ -5,10 +5,10 @@ export PYTHON_EXEC
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}
......
......@@ -8,7 +8,7 @@ BIND10_PATH=@abs_top_builddir@/src/bin/bind10
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@
......
......@@ -5,7 +5,7 @@ export PYTHON_EXEC
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}
......
......@@ -4,7 +4,7 @@ PYTHON_EXEC=${PYTHON_EXEC:-@PYTHON@}
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}
......
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
......@@ -5,7 +5,7 @@ export PYTHON_EXEC
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
......
......@@ -5,7 +5,7 @@ export PYTHON_EXEC
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}
......
SUBDIRS = exceptions dns cc config auth
SUBDIRS = exceptions dns cc config auth python
SUBDIRS = cpp
AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/ext $(SQLITE_CFLAGS)
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_sqlite3.h data_source_sqlite3.cc
libauth_la_SOURCES += query.h query.cc
TESTS =
if HAVE_GTEST
TESTS += run_unittests
run_unittests_SOURCES = run_unittests.cc
run_unittests_SOURCES += unittest_util.h unittest_util.cc
run_unittests_SOURCES += unittest_ds.h unittest_ds.cc
run_unittests_SOURCES += datasrc_unittest.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD)
run_unittests_LDADD += .libs/libauth.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)
AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/ext $(SQLITE_CFLAGS)
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_sqlite3.h data_source_sqlite3.cc
libauth_la_SOURCES += query.h query.cc
TESTS =
if HAVE_GTEST
TESTS += run_unittests
run_unittests_SOURCES = run_unittests.cc
run_unittests_SOURCES += unittest_util.h unittest_util.cc
run_unittests_SOURCES += unittest_ds.h unittest_ds.cc
run_unittests_SOURCES += datasrc_unittest.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
run_unittests_LDADD = $(GTEST_LDADD)
run_unittests_LDADD += .libs/libauth.a
run_unittests_LDADD += $(top_builddir)/src/lib/dns/cpp/.libs/libdns.a
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/cpp/.libs/libexceptions.a
endif
noinst_PROGRAMS = $(TESTS)
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)
AM_CPPFLAGS = -I$(top_builddir)/include -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/cpp/.libs/libdns.a
run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/cpp/.libs/libexceptions.a
endif
noinst_PROGRAMS = $(TESTS)
SUBDIRS = cc Util
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)
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)
AM_CPPFLAGS = -I$(top_builddir)/include -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/cpp/libexceptions.la
run_unittests_LDADD += $(top_builddir)/src/lib/cc/cpp/libcc.a
endif
noinst_PROGRAMS = $(TESTS)
#define TEST_DATA_PATH "@abs_srcdir@/../testdata"
#define TEST_DATA_PATH "@abs_srcdir@/testdata"
SUBDIRS = cpp
SUBDIRS = . tests
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 += rrsetlist.h rrsetlist.cc
libdns_la_SOURCES += question.h question.cc
libdns_la_SOURCES += message.h message.cc
libdns_la_SOURCES += base64.h base64.cc
libdns_la_SOURCES += tsig.h tsig.cc
libdns_la_SOURCES += dnstime.h dnstime.cc
libdns_la_SOURCES += hex.h hex.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
SUBDIRS = . tests
AM_CPPFLAGS = -I$(top_builddir)/include -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 += rrsetlist.h rrsetlist.cc
libdns_la_SOURCES += question.h question.cc
libdns_la_SOURCES += message.h message.cc
libdns_la_SOURCES += base64.h base64.cc
libdns_la_SOURCES += tsig.h tsig.cc
libdns_la_SOURCES += dnstime.h dnstime.cc
libdns_la_SOURCES += hex.h hex.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