Skip to content

fix(linux): Fix failing Linux package builds#2843

Merged
ermshiperete merged 3 commits intomasterfrom
fix/linux/keyman-config-package
Mar 18, 2020
Merged

fix(linux): Fix failing Linux package builds#2843
ermshiperete merged 3 commits intomasterfrom
fix/linux/keyman-config-package

Conversation

@ermshiperete
Copy link
Copy Markdown
Contributor

@ermshiperete ermshiperete commented Mar 17, 2020

This fixes keyman-config and keyboardprocessor package builds.

This change is Reviewable

@ermshiperete ermshiperete marked this pull request as ready for review March 17, 2020 14:09
@ermshiperete ermshiperete added this to the P10S2 milestone Mar 17, 2020
Add com.keyman.gschema.xml to source package. We use the Python
setuptools to create the binary and source package, therefore
we have to tell it to include the schema file.
@ermshiperete ermshiperete force-pushed the fix/linux/keyman-config-package branch from f66f4d5 to 81bd3ca Compare March 17, 2020 15:39
@ermshiperete ermshiperete changed the title fix(linux): Fix keyman-config Linux package fix(linux): Fix failing Linux package builds Mar 17, 2020
@ermshiperete
Copy link
Copy Markdown
Contributor Author

When building the binary Linux package for keyboardprocessor we build from a source package. When we do that we don't have VERSION.md because that's outside of what was not included in the source package. Therefore we copy VERSION.md when building the source package. Unfortunately this means that the build configurations for all other platforms also have to copy this file.
meson added support for fs.exists which would allow to check for the existence of the file at build time, but only since version 0.53 - and we're using version 0.45 or 0.48 😞

Copy link
Copy Markdown
Member

@mcdurdin mcdurdin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just one tweak

for proj in ${extra_projects}; do
if [ "${proj}" == "keyboardprocessor" ]; then
rm -rf keyboardprocessor
cp ../VERSION.md ../common/core/desktop/
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add the VERSION.md in common/core/desktop into .gitignore?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. Done.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants