From 32c4c83d98d449d48abc1221994d2f8cf95a6030 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Sat, 30 Aug 2025 23:40:29 +0200 Subject: [PATCH] [#4043] Removed meson-info --- config-report.sh.in | 1 - install-meson-info.sh.in | 13 ------------- meson.build | 16 ---------------- 3 files changed, 30 deletions(-) delete mode 100755 install-meson-info.sh.in diff --git a/config-report.sh.in b/config-report.sh.in index 1af984ebde..12e76c3b98 100755 --- a/config-report.sh.in +++ b/config-report.sh.in @@ -22,7 +22,6 @@ Package: Premium hooks: @PREMIUM@ Meson Version: @MESON_VERSION@ -Meson info: @MESON_INFO@ Build Options: @BUILD_OPTIONS@ HERE_DOCUMENT diff --git a/install-meson-info.sh.in b/install-meson-info.sh.in deleted file mode 100755 index 25932188e7..0000000000 --- a/install-meson-info.sh.in +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -set -eu - -# Destdir is set everytime the installation happens through meson or ninja even when --destdir is not passed. -# Set target path to prefix in case someone wants to run this script directly. -target_path='@PREFIX@' -if test -n "${MESON_INSTALL_DESTDIR_PREFIX+x}"; then - target_path="${MESON_INSTALL_DESTDIR_PREFIX}" -fi - -mkdir -p "${target_path}/@DATADIR@/kea/meson-info" -cp -r '@TOP_BUILD_DIR@/meson-info'/* "${target_path}/@DATADIR@/kea/meson-info" diff --git a/meson.build b/meson.build index 980fdaa67f..1e16a8aca1 100644 --- a/meson.build +++ b/meson.build @@ -745,7 +745,6 @@ report_conf_data.set('PREFIX', PREFIX) report_conf_data.set('HOOKS_DIR', DEFAULT_HOOKS_PATH) report_conf_data.set('PREMIUM', premium ? 'yes' : 'no') report_conf_data.set('MESON_VERSION', meson.version()) -report_conf_data.set('MESON_INFO', DATADIR / 'kea/meson-info') build_options = meson.build_options() report_conf_data.set('BUILD_OPTIONS', build_options.replace('\'', '"')) report_conf_data.set('CXX', ' '.join(cpp.cmd_array())) @@ -1138,18 +1137,3 @@ endif # Print the setup report. message(run_command(['cat', CONFIG_REPORT], check: true).stdout()) - -# Copy the meson.info directory during installation. -install_meson_info = configure_file( - input: 'install-meson-info.sh.in', - output: 'install-meson-info.sh', - configuration: configuration_data( - { - 'INSTALL': INSTALL.full_path(), - 'PREFIX': PREFIX, - 'TOP_BUILD_DIR': TOP_BUILD_DIR, - 'DATADIR': DATADIR, - }, - ), -) -meson.add_install_script(install_meson_info) -- 2.47.3