From: Francis Dupont Date: Sat, 23 May 2015 09:30:52 +0000 (+0200) Subject: [3634a] merged #3513, #3859 and #3882 (new files) X-Git-Tag: sedhcpv6_base~2 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=b5f4b05f29cf74a0eb79cd1b4f6acfa7b59ab78f;p=thirdparty%2Fkea.git [3634a] merged #3513, #3859 and #3882 (new files) --- diff --git a/src/bin/cfgrpt/.gitignore b/src/bin/cfgrpt/.gitignore new file mode 100644 index 0000000000..9a5683acd1 --- /dev/null +++ b/src/bin/cfgrpt/.gitignore @@ -0,0 +1 @@ +/config_report.cc diff --git a/src/bin/cfgrpt/Makefile.am b/src/bin/cfgrpt/Makefile.am new file mode 100644 index 0000000000..b075c9f07f --- /dev/null +++ b/src/bin/cfgrpt/Makefile.am @@ -0,0 +1,10 @@ +# Get rid of generated message files on a clean +CLEANFILES = *.gcno *.gcda + +# config_report.cc was generated by configure +DISTCLEANFILES = config_report.cc + +# convenience archive +noinst_LTLIBRARIES = libcfgrpt.la + +libcfgrpt_la_SOURCES = config_report.h config_report.cc diff --git a/src/bin/cfgrpt/config_report.h b/src/bin/cfgrpt/config_report.h new file mode 100644 index 0000000000..17ce0163e6 --- /dev/null +++ b/src/bin/cfgrpt/config_report.h @@ -0,0 +1,26 @@ +// Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC") +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +// PERFORMANCE OF THIS SOFTWARE. + +#ifndef CONFIG_REPORT_H +#define CONFIG_REPORT_H + +namespace isc { +namespace detail { + +extern const char* const config_report[]; + +} +} + +#endif // CONFIG_REPORT_H diff --git a/tools/mk_cfgrpt.sh b/tools/mk_cfgrpt.sh new file mode 100644 index 0000000000..62df74f8bb --- /dev/null +++ b/tools/mk_cfgrpt.sh @@ -0,0 +1,46 @@ +#!/bin/sh +# Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC") +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH +# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# +# This script embeds config.report into src/bin/cfgrpt/config_report.cc +# Called by configure +# + +dest=$1 + +# Initializes +cat > $dest + +# Header +cat >> $dest << END +// config_report.cc. Generated from config.report by tools/mk_cfgrpt_header.sh + +namespace isc { +namespace detail { + +extern const char* const config_report[] = { +END + +# Body: escape '\'s and '"'s, preprend ' ";;;; ' and append '",' +sed -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/^/ ";;;; /' -e 's/$/",/' \ + < config.report >> $dest + +# Trailer +cat >> $dest <