Commit 5b9ff9b8 authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰

[master] Merge branch 'master' of ssh://git.kea.isc.org/git/kea

parents 73916cbf 3543f2cd
1068. [func] marcin
Renamed log message compiler binary from 'message' to
'kea-msg-compiler'.
(Trac #4228, git bbeb5c776c39b9f4132f7f614720db75590ccef9)
Kea 1.0.0-beta released on December 8, 2015
1067. [doc] sar
......
......@@ -54,7 +54,7 @@ spec_config.h: spec_config.h.pre
d2_messages.h d2_messages.cc: s-messages
s-messages: d2_messages.mes
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/bin/d2/d2_messages.mes
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/d2/d2_messages.mes
touch $@
BUILT_SOURCES = spec_config.h d2_messages.h d2_messages.cc
......
......@@ -48,7 +48,7 @@ spec_config.h: spec_config.h.pre
dhcp4_messages.h dhcp4_messages.cc: s-messages
s-messages: dhcp4_messages.mes
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/bin/dhcp4/dhcp4_messages.mes
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/dhcp4/dhcp4_messages.mes
touch $@
BUILT_SOURCES = spec_config.h dhcp4_messages.h dhcp4_messages.cc
......
......@@ -49,7 +49,7 @@ spec_config.h: spec_config.h.pre
dhcp6_messages.h dhcp6_messages.cc: s-messages
s-messages: dhcp6_messages.mes
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/bin/dhcp6/dhcp6_messages.mes
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/dhcp6/dhcp6_messages.mes
touch $@
BUILT_SOURCES = spec_config.h dhcp6_messages.h dhcp6_messages.cc
......
......@@ -37,7 +37,7 @@ endif
lfc_messages.h lfc_messages.cc: s-messages
s-messages: lfc_messages.mes
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/bin/lfc/lfc_messages.mes
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/bin/lfc/lfc_messages.mes
touch $@
BUILT_SOURCES = lfc_messages.h lfc_messages.cc
......
......@@ -13,7 +13,7 @@ AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
# Define rule to build logging source files from message file
user_chk_messages.h user_chk_messages.cc: s-messages
s-messages: user_chk_messages.mes
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/hooks/dhcp/user_chk/user_chk_messages.mes
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/hooks/dhcp/user_chk/user_chk_messages.mes
touch $@
# Tell automake that the message files are built as part of the build process
......
......@@ -11,7 +11,7 @@ CLEANFILES = *.gcno *.gcda asiodns_messages.h asiodns_messages.cc s-messages
asiodns_messages.h asiodns_messages.cc: s-messages
s-messages: asiodns_messages.mes
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/asiodns/asiodns_messages.mes
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/asiodns/asiodns_messages.mes
touch $@
BUILT_SOURCES = asiodns_messages.h asiodns_messages.cc
......
......@@ -7,7 +7,7 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
config_messages.h config_messages.cc: s-messages
s-messages: config_messages.mes
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/config/config_messages.mes
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/config/config_messages.mes
touch $@
BUILT_SOURCES = config_messages.h config_messages.cc
......
......@@ -15,7 +15,7 @@ AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
dhcp_ddns_messages.h dhcp_ddns_messages.cc: s-messages
s-messages: dhcp_ddns_messages.mes
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/dhcp_ddns/dhcp_ddns_messages.mes
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcp_ddns/dhcp_ddns_messages.mes
touch $@
# Tell automake that the message files are built as part of the build process
......
......@@ -46,11 +46,11 @@ alloc_engine_messages.h alloc_engine_messages.cc dhcpsrv_messages.h \
dhcpsrv_messages.cc hosts_messages.h hosts_messages.cc: s-messages
s-messages: alloc_engine_messages.mes dhcpsrv_messages.mes hosts_messages.mes
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/dhcpsrv/alloc_engine_messages.mes
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcpsrv/alloc_engine_messages.mes
touch $@
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/dhcpsrv/dhcpsrv_messages.mes
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcpsrv/dhcpsrv_messages.mes
touch $@
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/dhcpsrv/hosts_messages.mes
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/dhcpsrv/hosts_messages.mes
touch $@
# Tell Automake that the {alloc_engine,dhcpsrv,hosts}_messages.{cc,h} source files
......
eval_messages.cc
eval_messages.h
/eval_messages.cc
/eval_messages.h
/s-messages
\ No newline at end of file
......@@ -49,7 +49,7 @@ EXTRA_DIST += lexer.ll parser.yy
eval_messages.h eval_messages.cc: s-messages
s-messages: eval_messages.mes
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/eval/eval_messages.mes
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/eval/eval_messages.mes
touch $@
# Tell Automake that the eval_messages.{cc,h} source files are created in the
......
......@@ -15,7 +15,7 @@ AM_CXXFLAGS += $(WARNING_NO_MISSING_FIELD_INITIALIZERS_CFLAG)
hooks_messages.h hooks_messages.cc: s-messages
s-messages: hooks_messages.mes
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/hooks/hooks_messages.mes
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/hooks/hooks_messages.mes
touch $@
# Tell automake that the message files are built as part of the build process
......
......@@ -11,11 +11,11 @@ endif
CLEANFILES = *.gcno *.gcda
bin_PROGRAMS = message
bin_PROGRAMS = kea-msg-compiler
message_SOURCES = message.cc
message_LDADD = $(top_builddir)/src/lib/log/libkea-log.la
message_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
message_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
message_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
message_LDADD += $(LOG4CPLUS_LIBS)
kea_msg_compiler_SOURCES = message.cc
kea_msg_compiler_LDADD = $(top_builddir)/src/lib/log/libkea-log.la
kea_msg_compiler_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la
kea_msg_compiler_LDADD += $(top_builddir)/src/lib/util/libkea-util.la
kea_msg_compiler_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la
kea_msg_compiler_LDADD += $(LOG4CPLUS_LIBS)
......@@ -58,7 +58,7 @@ static const char* VERSION = "1.0-0";
/// \b Invocation<BR>
/// The program is invoked with the command:
///
/// <tt>message [-v | -h | -d &lt;dir&gt; | <message-file>]</tt>
/// <tt>kea-msg-compiler [-v | -h | -d &lt;dir&gt; | <message-file>]</tt>
///
/// It reads the message file and writes out two files of the same
/// name in the current working directory (unless -d is used) but
......@@ -85,7 +85,7 @@ version() {
void
usage() {
cout <<
"Usage: message [-h] [-v] [-d dir] <message-file>\n" <<
"Usage: kea-msg-compiler [-h] [-v] [-d dir] <message-file>\n" <<
"\n" <<
"-h Print this message and exit\n" <<
"-v Print the program version and exit\n" <<
......
......@@ -350,7 +350,7 @@ programs.
The message compiler is a program built in the src/log/compiler directory.
It is invoked by the command:
@code
message [-h] [-v] [-d dir] <message-file>
kea-msg-compiler [-h] [-v] [-d dir] <message-file>
@endcode
"-v" prints the version number and exits; "-h" prints brief help text.
Finally, the "-d" switch directs the compiler to produce the output
......@@ -427,7 +427,7 @@ the entries needed.
hooks_messages.h hooks_messages.cc: s-messages
s-messages: hooks_messages.mes
$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/hooks/hooks_messages.mes
$(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/hooks/hooks_messages.mes
touch $@
# Tell automake that the message files are built as part of the build process
......
......@@ -17,7 +17,7 @@ BUILT_SOURCES = log_test_messages.h log_test_messages.cc
log_test_messages.h log_test_messages.cc: s-messages
s-messages: log_test_messages.mes
$(AM_V_GEN) $(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/log/tests/log_test_messages.mes
$(AM_V_GEN) $(top_builddir)/src/lib/log/compiler/kea-msg-compiler $(top_srcdir)/src/lib/log/tests/log_test_messages.mes
touch $@
CLEANFILES += log_test_messages.h log_test_messages.cc s-messages
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment