[#3731] Checkpont: netconf to finish

diff --git a/config-report.sh.in b/config-report.sh.in
index 798c86c9bf03232f77137d53cf0ae067b8a5fc8b..622f34793a04b574ac89cc35d32273f9b1a50be5 100755 (executable)
--- a/config-report.sh.in
+++ b/config-report.sh.in
@@ -21,11 +21,9 @@ Package:
   Hooks directory:   @HOOKS_DIR@
   Premium hooks:     @PREMIUM@
 
-Build Options:  @BUILD_OPTIONS@
-
-Meson Version:  @MESON_VERSION@
-
-Meson info:     @MESON_INFO@
+Build Options:     @BUILD_OPTIONS@
+Meson Version:     @MESON_VERSION@
+Meson info:        @MESON_INFO@
 
 C++ Compiler:
   CXX:             @CXX@
@@ -44,11 +42,12 @@ Python:
 
 Boost:             @BOOST_VERSION@
 
-@CRYPTO_NAME@:     @CRYPTO_VERSION@
+@CRYPTO_NAME@:
+  VERSION:         @CRYPTO_VERSION@
 
 Log4cplus:         @LOG4CPLUS_VERSION@
 
-flex:              @FLEX@
+Flex:              @FLEX@
 Bison:             @BISON@
 '
 
@@ -75,7 +74,11 @@ fi
 if test '@HAVE_NETCONF@' != 'no'; then
 add_to_report '
 Netconf:
+  LIBYANG:         @LIBYANG_VERSION@
+  LIBYANGCPP:      @LIBYANGCPP_VERSION@
   LIBYANG_PREFIX:  @LIBYANG_PREFIX@
+  SYSREPO:         @SYSREPO_VERSION@
+  SYSREPOCPP:      @SYSREPOCPP_VERSION@
   SYSREPO_PREFIX:  @SYSREPO_PREFIX@
 '
 else
@@ -96,14 +99,13 @@ fi
 
 if test '@HAVE_KRB5@' != 'no'; then
 add_to_report '
-Kerberos5 GSS-API support:
-  KRB5_GSSAPI_VERSION:  @KRB5_GSSAPI_VERSION@
-  KRB5_GSSAPI_VENDOR:   @KRB5_GSSAPI_VENDOR@
+Kerberos5 GSS-API:
+  VERSION:         @KRB5_GSSAPI_VERSION@
+  VENDOR:          @KRB5_GSSAPI_VENDOR@
 '
 else
 add_to_report '
-Kerberos5 GSS-API support:
-  no
+Kerberos5 GSS-API: no
 '
 fi
 

diff --git a/meson.build b/meson.build
index 3f6ab748b80dae87ee632143dfdf6834cd1aa0b9..68467ca8e271147553ad1c3f12badeb9cee58821 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -542,10 +542,11 @@ endif
 result = cpp.run(
     fs.read('compiler-checks/get-cpp-standard.cc'),
     name: 'Get cpp standard',
-    required: true,
 )
 if result.returncode() == 0
     report_conf_data.set('CXX_STANDARD', result.stdout().strip())
+else
+    error('Cpp standard is unknown')
 endif
 report_conf_data.set('CXX_ARGS', ' '.join(compile_args))
 report_conf_data.set('LD_ID', cpp.get_linker_id())
@@ -652,10 +653,42 @@ if NETCONF_DEP.found()
         'SYSREPO_PREFIX',
         NETCONF_DEP.get_variable('sysrepo_prefix', default_value: 'unknown'),
     )
+    report_conf_data.set(
+        'LIBYANG_VERSION',
+        NETCONF_DEP.get_variable(
+            'libyang_version',
+            default_value: 'unknown version',
+        ),
+    )
+    report_conf_data.set(
+        'LIBYANGCPP_VERSION',
+        NETCONF_DEP.get_variable(
+            'libyangcpp_version',
+            default_value: 'unknown version',
+        ),
+    )
+    report_conf_data.set(
+        'SYSREPO_VERSION',
+        NETCONF_DEP.get_variable(
+            'sysrepo_version',
+            default_value: 'unknown version',
+        ),
+    )
+    report_conf_data.set(
+        'SYSREPOCPP_VERSION',
+        NETCONF_DEP.get_variable(
+            'sysrepocpp_version',
+            default_value: 'unknown version',
+        ),
+    )
 else
     report_conf_data.set('HAVE_NETCONF', 'no')
     report_conf_data.set('LIBYANG_PREFIX', 'no')
     report_conf_data.set('SYSREPO_PREFIX', 'no')
+    report_conf_data.set('LIBYANG_VERSION', 'no')
+    report_conf_data.set('LIBYANGCPP_VERSION', 'no')
+    report_conf_data.set('SYSREPO_VERSION', 'no')
+    report_conf_data.set('SYSREPOCPP_VERSION', 'no')
 endif
 if FUZZ_OPT.enabled() or TESTS_OPT.enabled()
     report_conf_data.set('HAVE_GTEST', 'yes')
@@ -861,11 +894,14 @@ install_emptydir('var/run/kea')
 # Print the setup report.
 message(run_command(['cat', CONFIG_REPORT], check: true).stdout())
 
-# Install meson-info
-if fs.is_dir(TOP_BUILD_DIR / 'meson-info')
-    install_subdir(
-        TOP_BUILD_DIR / 'meson-info',
-        install_dir: DATADIR / 'kea',
-        strip_directory: false,
-    )
-endif
+# Copy the meson.info directory.
+copy_info_conf = configuration_data()
+copy_info_conf.set('SOURCE', TOP_BUILD_DIR / 'meson-info')
+copy_info_conf.set('TARGET', PREFIX / DATADIR / 'kea/meson-info')
+copy_info = configure_file(
+    input: 'tools/copy-dir.sh.in',
+    output: 'copy-meson-info.sh',
+    configuration: copy_info_conf,
+)
+meson.add_install_script(copy_info)
+

diff --git a/tools/copy-dir.sh.in b/tools/copy-dir.sh.in
new file mode 100755 (executable)
index 0000000..9860f72
--- /dev/null
+++ b/tools/copy-dir.sh.in
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -eu
+
+if test -d @SOURCE@; then
+    cp -r @SOURCE@ @TARGET@
+fi