BIND 10 trac1190, updated. 44f6dc45fffe9a44d8700bbb601dab169568f7ac [1190] Generate the msgq message file

[BIND 10 source code commits]

The branch, trac1190 has been updated
       via  44f6dc45fffe9a44d8700bbb601dab169568f7ac (commit)
      from  b40cd6851ace87bc97a095cf76b2a0ddee3666ed (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 44f6dc45fffe9a44d8700bbb601dab169568f7ac
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Tue Dec 18 12:11:23 2012 +0100

    [1190] Generate the msgq message file
    
    It is empty now, just updating the build system - yes, we really do need
    2 new files and 2 makefiles to generate one message file :-|.

-----------------------------------------------------------------------

Summary of changes:
 src/bin/msgq/Makefile.am                           |   13 ++++++++++++-
 src/bin/msgq/msgq.py.in                            |    1 +
 examples/AUTHORS => src/bin/msgq/msgq_messages.mes |    0
 src/lib/python/isc/log_messages/Makefile.am        |    2 ++
 src/lib/python/isc/log_messages/msgq_messages.py   |    1 +
 5 files changed, 16 insertions(+), 1 deletion(-)
 copy examples/AUTHORS => src/bin/msgq/msgq_messages.mes (100%)
 create mode 100644 src/lib/python/isc/log_messages/msgq_messages.py

-----------------------------------------------------------------------
diff --git a/src/bin/msgq/Makefile.am b/src/bin/msgq/Makefile.am
index 4244d07..5f377b1 100644
--- a/src/bin/msgq/Makefile.am
+++ b/src/bin/msgq/Makefile.am
@@ -5,10 +5,16 @@ pkglibexecdir = $(libexecdir)/@PACKAGE@
 pkglibexec_SCRIPTS = b10-msgq
 
 CLEANFILES = b10-msgq msgq.pyc
+CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/msgq_messages.py
+CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/msgq_messages.pyc
 
 man_MANS = b10-msgq.8
 DISTCLEANFILES = $(man_MANS)
-EXTRA_DIST = $(man_MANS) msgq.xml
+EXTRA_DIST = $(man_MANS) msgq.xml msgq_messages.mes
+
+nodist_pylogmessage_PYTHON = $(PYTHON_LOGMSGPKG_DIR)/work/msgq_messages.py
+pylogmessagedir = $(pyexecdir)/isc/log_messages/
+BUILT_SOURCES = $(PYTHON_LOGMSGPKG_DIR)/work/msgq_messages.py
 
 if GENERATE_DOCS
 
@@ -23,6 +29,11 @@ $(man_MANS):
 
 endif
 
+# Define rule to build logging source files from message file
+$(PYTHON_LOGMSGPKG_DIR)/work/msgq_messages.py : msgq_messages.mes
+	$(top_builddir)/src/lib/log/compiler/message \
+	-d $(PYTHON_LOGMSGPKG_DIR)/work -p $(srcdir)/msgq_messages.mes
+
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 b10-msgq: msgq.py
 	$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" msgq.py >$@
diff --git a/src/bin/msgq/msgq.py.in b/src/bin/msgq/msgq.py.in
index fda1b23..71b8d28 100755
--- a/src/bin/msgq/msgq.py.in
+++ b/src/bin/msgq/msgq.py.in
@@ -32,6 +32,7 @@ import random
 from optparse import OptionParser, OptionValueError
 import isc.util.process
 import isc.log
+from isc.log_messages.msgq_messages import *
 
 import isc.cc
 
diff --git a/src/bin/msgq/msgq_messages.mes b/src/bin/msgq/msgq_messages.mes
new file mode 100644
index 0000000..e69de29
diff --git a/src/lib/python/isc/log_messages/Makefile.am b/src/lib/python/isc/log_messages/Makefile.am
index 6d23df3..e031046 100644
--- a/src/lib/python/isc/log_messages/Makefile.am
+++ b/src/lib/python/isc/log_messages/Makefile.am
@@ -16,6 +16,7 @@ EXTRA_DIST += libddns_messages.py
 EXTRA_DIST += libxfrin_messages.py
 EXTRA_DIST += server_common_messages.py
 EXTRA_DIST += dbutil_messages.py
+EXTRA_DIST += msgq_messages.py
 
 CLEANFILES = __init__.pyc
 CLEANFILES += bind10_messages.pyc
@@ -33,6 +34,7 @@ CLEANFILES += libddns_messages.pyc
 CLEANFILES += libxfrin_messages.pyc
 CLEANFILES += server_common_messages.pyc
 CLEANFILES += dbutil_messages.pyc
+CLEANFILES += msgq_messages.pyc
 
 CLEANDIRS = __pycache__
 
diff --git a/src/lib/python/isc/log_messages/msgq_messages.py b/src/lib/python/isc/log_messages/msgq_messages.py
new file mode 100644
index 0000000..81efa41
--- /dev/null
+++ b/src/lib/python/isc/log_messages/msgq_messages.py
@@ -0,0 +1 @@
+from work.msgq_messages import *