diff options
author | Nan Zhou <nanzhoumails@gmail.com> | 2022-10-12 23:29:34 +0300 |
---|---|---|
committer | Nan Zhou <nanzhoumails@gmail.com> | 2022-10-18 01:26:09 +0300 |
commit | 307386e8e5a18ec24955fc32bee556409a831a83 (patch) | |
tree | 4fc1e3675db68684535eacd4bd75d800f402087f /meson.build | |
parent | bf7e67e7210df3db013df5fe4c232737fe1eb10b (diff) | |
download | bmcweb-307386e8e5a18ec24955fc32bee556409a831a83.tar.xz |
move config to a subdir
This pattern is used in other places, e.g.,
https://github.com/openbmc/phosphor-logging
In this way, we can cleanly add the bmcweb_config.h into include
directory. Otherwise, any subdir we have in this project will need to
include the root.
Tested: it builds.
Signed-off-by: Nan Zhou <nanzhoumails@gmail.com>
Change-Id: I882e51f3acb256a881c9474f6e4d4e19fea4a413
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 44 |
1 files changed, 5 insertions, 39 deletions
diff --git a/meson.build b/meson.build index 7e58791aa2..1024761fbc 100644 --- a/meson.build +++ b/meson.build @@ -316,26 +316,6 @@ if get_option('tests').enabled() gmock = gmock.as_system('system') endif -# Gather the Configuration data - -conf_data = configuration_data() -conf_data.set('BMCWEB_HTTP_REQ_BODY_LIMIT_MB', get_option('http-body-limit')) -xss_enabled = get_option('insecure-disable-xss') -conf_data.set10('BMCWEB_INSECURE_DISABLE_XSS_PREVENTION', xss_enabled.enabled()) -enable_redfish_query = get_option('insecure-enable-redfish-query') -conf_data.set10('BMCWEB_INSECURE_ENABLE_QUERY_PARAMS', enable_redfish_query.enabled()) -# enable_redfish_aggregation = get_option('redfish-aggregation') -# conf_data.set10('BMCWEB_ENABLE_REDFISH_AGGREGATION', enable_redfish_aggregation.enabled()) -insecure_push_style_notification = get_option('insecure-push-style-notification') -conf_data.set10('BMCWEB_INSECURE_ENABLE_HTTP_PUSH_STYLE_EVENTING', insecure_push_style_notification.enabled()) -conf_data.set('MESON_INSTALL_PREFIX', get_option('prefix')) -conf_data.set('HTTPS_PORT', get_option('https_port')) -configure_file(input: 'bmcweb_config.h.in', - output: 'bmcweb_config.h', - configuration: conf_data) - -# Configure and install systemd unit files - systemd_system_unit_dir = systemd.get_variable(pkgconfig: 'systemdsystemunitdir') bindir = get_option('prefix') + '/' +get_option('bindir') @@ -346,27 +326,13 @@ summary({ 'systemd unit directory' : systemd_system_unit_dir }, section : 'Directories') -configure_file(input : 'bmcweb.socket.in', - output : 'bmcweb.socket', - install_dir: systemd_system_unit_dir, - configuration: conf_data, - install : true) - -configure_file(input : 'bmcweb.service.in', - output : 'bmcweb.service', - install_dir: systemd_system_unit_dir, - configuration: conf_data, - install : true) - -# Copy pam-webserver to etc/pam.d -configure_file(input : 'pam-webserver', - output : 'webserver', - copy : true, - install_dir: '/etc/pam.d', - install : true) - install_subdir('static', install_dir : 'share/www', strip_directory : true) +# Config subdirectory + +subdir('config') +bmcweb_dependencies += conf_h_dep + # Source files srcfiles_bmcweb = [ |