[svn] commit: r2063 - in /trunk: ./ src/bin/auth/ src/bin/bind10/ src/bin/bind10/tests/ src/bin/bindctl/tests/ src/bin/cmdctl/tests/ src/bin/msgq/ src/bin/msgq/tests/ src/bin/xfrin/ src/bin/xfrin/tests/ src/bin/xfrout/ src/bin/xfrout/tests/ src/lib/cc/ src/lib/dns/ src/lib/dns/rdata/generic/ src/lib/dns/tests/ src/lib/python/ src/lib/python/isc/cc/ src/lib/python/isc/cc/tests/ src/lib/python/isc/config/tests/
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Jun 2 17:03:56 UTC 2010
Author: jreed
Date: Wed Jun 2 17:03:55 2010
New Revision: 2063
Log:
merge from trac223 for Trac #223:
lib/python: Add bind10_config.py module for paths and
possibly other configure-time variables. Allow some components
to find spec files in build tree when ran from source.
Added:
trunk/src/lib/python/bind10_config.py.in
- copied unchanged from r2062, branches/trac223/src/lib/python/bind10_config.py.in
trunk/src/lib/python/isc/cc/session.py
- copied unchanged from r2062, branches/trac223/src/lib/python/isc/cc/session.py
Removed:
trunk/src/lib/python/isc/cc/session.py.in
Modified:
trunk/ (props changed)
trunk/ChangeLog
trunk/configure.ac
trunk/src/bin/auth/main.cc
trunk/src/bin/bind10/run_bind10.sh.in
trunk/src/bin/bind10/tests/Makefile.am
trunk/src/bin/bindctl/tests/Makefile.am
trunk/src/bin/cmdctl/tests/Makefile.am
trunk/src/bin/msgq/msgq.py.in
trunk/src/bin/msgq/tests/Makefile.am
trunk/src/bin/xfrin/ (props changed)
trunk/src/bin/xfrin/tests/Makefile.am
trunk/src/bin/xfrin/xfrin.py.in
trunk/src/bin/xfrout/tests/Makefile.am
trunk/src/bin/xfrout/xfrout.py.in
trunk/src/lib/cc/ (props changed)
trunk/src/lib/dns/ (props changed)
trunk/src/lib/dns/rdata/generic/rrsig_46.cc (props changed)
trunk/src/lib/dns/tests/ (props changed)
trunk/src/lib/python/Makefile.am
trunk/src/lib/python/isc/cc/tests/Makefile.am
trunk/src/lib/python/isc/config/tests/Makefile.am
Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Wed Jun 2 17:03:55 2010
@@ -1,4 +1,10 @@
bind10-devel-20100602 released on June 2, 2010
+
+ 51. [build] jelte
+ lib/python: Add bind10_config.py module for paths and
+ possibly other configure-time variables. Allow some components
+ to find spec files in build tree when ran from source.
+ (Trac #223)
50. [bug] zhanglikun
bin/xfrin: a regression in xfrin: it can't communicate with
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Jun 2 17:03:55 2010
@@ -448,7 +448,7 @@
src/lib/python/isc/config/tests/config_test
src/lib/python/isc/cc/tests/cc_test
src/lib/dns/gen-rdatacode.py
- src/lib/python/isc/cc/session.py
+ src/lib/python/bind10_config.py
src/lib/dns/tests/testdata/gen-wiredata.py
src/lib/cc/session_config.h.pre
], [
Modified: trunk/src/bin/auth/main.cc
==============================================================================
--- trunk/src/bin/auth/main.cc (original)
+++ trunk/src/bin/auth/main.cc Wed Jun 2 17:03:55 2010
@@ -135,8 +135,8 @@
int ret = 0;
try {
string specfile;
- if (getenv("B10_FROM_SOURCE")) {
- specfile = string(getenv("B10_FROM_SOURCE")) +
+ if (getenv("B10_FROM_BUILD")) {
+ specfile = string(getenv("B10_FROM_BUILD")) +
"/src/bin/auth/auth.spec";
} else {
specfile = string(AUTH_SPECFILE_LOCATION);
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 Wed Jun 2 17:03:55 2010
@@ -28,6 +28,11 @@
B10_FROM_SOURCE=@abs_top_srcdir@
export B10_FROM_SOURCE
+# TODO: We need to do this feature based (ie. no general from_source)
+# But right now we need a second one because some spec files are
+# generated and hence end up under builddir
+B10_FROM_BUILD=@abs_top_builddir@
+export B10_FROM_BUILD
BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
export BIND10_MSGQ_SOCKET_FILE
Modified: trunk/src/bin/bind10/tests/Makefile.am
==============================================================================
--- trunk/src/bin/bind10/tests/Makefile.am (original)
+++ trunk/src/bin/bind10/tests/Makefile.am Wed Jun 2 17:03:55 2010
@@ -7,6 +7,6 @@
check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/bin/bind10 \
+ env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/bind10 \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done
Modified: trunk/src/bin/bindctl/tests/Makefile.am
==============================================================================
--- trunk/src/bin/bindctl/tests/Makefile.am (original)
+++ trunk/src/bin/bindctl/tests/Makefile.am Wed Jun 2 17:03:55 2010
@@ -7,6 +7,6 @@
check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_srcdir)/src/bin \
+ env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_srcdir)/src/bin \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done
Modified: trunk/src/bin/cmdctl/tests/Makefile.am
==============================================================================
--- trunk/src/bin/cmdctl/tests/Makefile.am (original)
+++ trunk/src/bin/cmdctl/tests/Makefile.am Wed Jun 2 17:03:55 2010
@@ -7,6 +7,6 @@
check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/bin/cmdctl \
+ env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/cmdctl \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done
Modified: trunk/src/bin/msgq/msgq.py.in
==============================================================================
--- trunk/src/bin/msgq/msgq.py.in (original)
+++ trunk/src/bin/msgq/msgq.py.in Wed Jun 2 17:03:55 2010
@@ -144,9 +144,7 @@
if os.path.exists(self.socket_file):
os.remove(self.socket_file)
try:
- print("[XX] SOCKET FILE: " + self.socket_file)
self.listen_socket.bind(self.socket_file)
- print("[XX] LISTENING ON SOCKET FILE: " + self.socket_file)
self.listen_socket.listen(1024)
except Exception as e:
# remove the file again if something goes wrong
Modified: trunk/src/bin/msgq/tests/Makefile.am
==============================================================================
--- trunk/src/bin/msgq/tests/Makefile.am (original)
+++ trunk/src/bin/msgq/tests/Makefile.am Wed Jun 2 17:03:55 2010
@@ -7,7 +7,7 @@
check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_builddir)/src/bin/msgq:$(abs_top_srcdir)/src/lib/python \
+ env PYTHONPATH=$(abs_top_builddir)/src/bin/msgq:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done
Modified: trunk/src/bin/xfrin/tests/Makefile.am
==============================================================================
--- trunk/src/bin/xfrin/tests/Makefile.am (original)
+++ trunk/src/bin/xfrin/tests/Makefile.am Wed Jun 2 17:03:55 2010
@@ -9,7 +9,7 @@
check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/bin/xfrin:$(abs_top_srcdir)/src/lib/python \
+ env PYTHONPATH=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/bin/xfrin:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done
Modified: trunk/src/bin/xfrin/xfrin.py.in
==============================================================================
--- trunk/src/bin/xfrin/xfrin.py.in (original)
+++ trunk/src/bin/xfrin/xfrin.py.in Wed Jun 2 17:03:55 2010
@@ -35,11 +35,11 @@
# must keep running, so we warn about it and move forward.
sys.stderr.write('[b10-xfrin] failed to import DNS module: %s\n' % str(e))
-# If B10_FROM_SOURCE is set in the environment, we use data files
+# If B10_FROM_BUILD is set in the environment, we use data files
# from a directory relative to that, otherwise we use the ones
# installed on the system
-if "B10_FROM_SOURCE" in os.environ:
- SPECFILE_PATH = os.environ["B10_FROM_SOURCE"] + "/src/bin/xfrin"
+if "B10_FROM_BUILD" in os.environ:
+ SPECFILE_PATH = os.environ["B10_FROM_BUILD"] + "/src/bin/xfrin"
else:
PREFIX = "@prefix@"
DATAROOTDIR = "@datarootdir@"
Modified: trunk/src/bin/xfrout/tests/Makefile.am
==============================================================================
--- trunk/src/bin/xfrout/tests/Makefile.am (original)
+++ trunk/src/bin/xfrout/tests/Makefile.am Wed Jun 2 17:03:55 2010
@@ -9,7 +9,7 @@
check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_builddir)/src/bin/xfrout:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/xfr/.libs \
+ env PYTHONPATH=$(abs_top_builddir)/src/bin/xfrout:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/xfr/.libs \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done
Modified: trunk/src/bin/xfrout/xfrout.py.in
==============================================================================
--- trunk/src/bin/xfrout/xfrout.py.in (original)
+++ trunk/src/bin/xfrout/xfrout.py.in Wed Jun 2 17:03:55 2010
@@ -37,8 +37,8 @@
# must keep running, so we warn about it and move forward.
sys.stderr.write('[b10-xfrout] failed to import DNS or XFR module: %s\n' % str(e))
-if "B10_FROM_SOURCE" in os.environ:
- SPECFILE_PATH = os.environ["B10_FROM_SOURCE"] + "/src/bin/xfrout"
+if "B10_FROM_BUILD" in os.environ:
+ SPECFILE_PATH = os.environ["B10_FROM_BUILD"] + "/src/bin/xfrout"
else:
PREFIX = "@prefix@"
DATAROOTDIR = "@datarootdir@"
Modified: trunk/src/lib/python/Makefile.am
==============================================================================
--- trunk/src/lib/python/Makefile.am (original)
+++ trunk/src/lib/python/Makefile.am Wed Jun 2 17:03:55 2010
@@ -1,1 +1,12 @@
SUBDIRS = isc
+
+python_PYTHON = bind10_config.py
+
+# Explicitly define DIST_COMMON so ${python_PYTHON} is not included
+# as we don't want the generated file included in distributed tarfile.
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in bind10_config.py.in
+
+# When setting DIST_COMMON, then need to add the .in file too.
+EXTRA_DIST = bind10_config.py.in
+
+CLEANFILES = bind10_config.pyc
Modified: trunk/src/lib/python/isc/cc/tests/Makefile.am
==============================================================================
--- trunk/src/lib/python/isc/cc/tests/Makefile.am (original)
+++ trunk/src/lib/python/isc/cc/tests/Makefile.am Wed Jun 2 17:03:55 2010
@@ -10,6 +10,6 @@
check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_builddir)/src/lib/python:$(abs_top_srcdir)/src/lib/python \
+ env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done
Modified: trunk/src/lib/python/isc/config/tests/Makefile.am
==============================================================================
--- trunk/src/lib/python/isc/config/tests/Makefile.am (original)
+++ trunk/src/lib/python/isc/config/tests/Makefile.am Wed Jun 2 17:03:55 2010
@@ -9,7 +9,7 @@
check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_srcdir)/src/lib/python \
+ env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
CONFIG_TESTDATA_PATH=$(abs_top_srcdir)/src/lib/config/testdata \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done
More information about the bind10-changes
mailing list