chore(linux): Fix build scripts #9781
Conversation
User Test ResultsTest specification and instructions User tests are not required |
Creating the coverage option to ninja previously didn't work reliably. This change re-orders the parameters passed to `meson setup` and seems to work better. Additionally this change refactors the scripts and makes use of `builder_run_action`.
ermshiperete
force-pushed
the
chore/linux/fixbuild
branch
from
a8c2598 to
08a259c
Compare
Since keyman-system-service is a dependency of ibus-keyman it gets build when ibus-keyman gets build. However, in that case the `--coverage` flag doesn't get passed through in which case the `coverage-html` target is missing from ninja. This change fixes this problem by checking if ninja has the `coverage-html` target. If not we remove the output directory which causes the configure action to run again with the `--coverage` option.
| if builder_has_option --coverage && [ -d "$MESON_PATH" ]; then | ||
| # It's possible that we got configured because we're a dependency of ibus-keyman | ||
| # in which case the `--coverage` option wasn't passed along. | ||
| cd "$MESON_PATH" | ||
| if ! ninja -t targets | grep -q coverage-html ; then | ||
| cd "$THIS_SCRIPT_PATH" | ||
| clean_action | ||
| fi | ||
| cd "$THIS_SCRIPT_PATH" | ||
| fi |
There was a problem hiding this comment.
Is there an easier solution? I don't think our build.sh system allows to pass the --coverage option to dependencies, or does it?
There was a problem hiding this comment.
keyman-system-service should be a child build rather than a dependency. A dependency is explicitly something that is required for the project but that you only want to build and use. A child build is a component owned by the parent build.
keyman/resources/build/build-utils.md
Lines 447 to 451 in 1e734a4
There was a problem hiding this comment.
It's both. You can't run ibus-keyman tests without first building keyman-system-service.
Or do you mean keyman-system-service should be a child of ibus-keyman? But that doesn't make completely sense either because it's not really a component of ibus-keyman.
There was a problem hiding this comment.
I'm not really sure what you are trying to solve here. It seems like the top-level linux/build.sh is already building all the modules as child builds, and the --coverage option already has + so it should be passed through.
If things are building in the wrong order, you could try putting the keyman-system-service first in linux/build.sh.
|
Changes in this pull request will be available for download in Keyman version 17.0.194-alpha |
Creating the coverage option to ninja previously didn't work reliably. This change re-orders the parameters passed to
meson setupand seems to work better. Additionally this change refactors the scripts and makes use ofbuilder_run_action.@keymanapp-test-bot skip