Open
Conversation
Having the implicit directories present causes some rebuilds to fail due to name collisions.
* Use the find_program function to find python rather than load the whole python module. * Adjust python scripts to write directly to an output file rather than requiring the meson wrapper for capture. * Move the python scripts to the custom_target command array rather than input files. Changes thanks to review by Eli Schwartz.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
To assist in packaging and make the installation process a bit more predictable (I can read Makefiles, but I don't like to read Makefiles…) I've created a build system for bees using meson.
As best I can tell, it correctly builds the applications, documentation, and runs tests. If you use
meson configure --sysconfdir=/etc --prefix=/usrthen it will match the install locations of the currentmake install.Some options are provided (see
meson_options.txt) to allow enabling/disabling some optional features - generating html documentation, installing systemd unit files, and installing the extrafiemapandfiewalktools.Some of the file generation that was previously done with sed and shell in the makefiles is done with python scripts in the meson build. Since meson is present, we're guaranteed to have a python, and it is a bit easier to work with external scripts in the meson build system then attempt to do inline shell.