mirror of
https://github.com/keymanapp/keyman.git
synced 2026-08-08 09:55:32 +00:00
Merge branch 'master' into maint/dev-android-on-mac
This commit is contained in:
Joshua Horton
commit
e83ec37231
12 changed files with 70 additions and 16 deletions
20
HISTORY.md
20
HISTORY.md
|
|
@ -1,5 +1,25 @@
|
|||
# Keyman Version History
|
||||
|
||||
## 19.0.43 alpha 2025-05-20
|
||||
|
||||
* chore(ios): FirstVoices certificate update (#13991)
|
||||
* fix(linux): configurable path in `.service` file when using basu (#13980)
|
||||
|
||||
## 19.0.42 alpha 2025-05-20
|
||||
|
||||
* maint(linux): add `--no-werror` option to not report warnings as errors (#13988)
|
||||
|
||||
## 19.0.41 alpha 2025-05-19
|
||||
|
||||
* fix(web): inspectable test-script mode should not be auto-enabled in local-env tests (#13895)
|
||||
* maint(common): evaluate and apply npm audit fix (without forced changes) (#13897)
|
||||
* maint: update mocha (#13899)
|
||||
* maint: update @actions/github + @octokit references (#13900)
|
||||
* maint(common): update fast-json-patch to ^3.1.1 (#13901)
|
||||
* change(web): cancel flicks when both returning to and releasing at original tap location (#13683)
|
||||
* fix(web): empty layout fontSize property should default to 1em (#13959)
|
||||
* maint(linux): fix release build to run all tests except integration tests (#13968)
|
||||
|
||||
## 19.0.40 alpha 2025-05-17
|
||||
|
||||
* maint(common): Add zip.inc.sh for cross-platform zipping (#13812)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
19.0.41
|
||||
19.0.44
|
||||
|
|
@ -69,7 +69,8 @@ Libraries will be built in 'build/<target>/<configuration>/src'.
|
|||
"uninstall uninstall libraries from current system" \
|
||||
"${archtargets[@]}" \
|
||||
"--no-tests do not configure tests (used by other projects)" \
|
||||
"--test,-t=opt_tests test[s] to run (space separated)"
|
||||
"--test,-t=opt_tests test[s] to run (space separated)" \
|
||||
"--no-werror don't report warnings as errors"
|
||||
|
||||
builder_parse "$@"
|
||||
|
||||
|
|
@ -115,6 +116,11 @@ builder_describe_outputs \
|
|||
build:arch /core/build/arch/$BUILDER_CONFIGURATION/src/libkeymancore.a \
|
||||
build:wasm /core/build/wasm/$BUILDER_CONFIGURATION/src/libkeymancore.a
|
||||
|
||||
MESON_ARGS=--werror
|
||||
if builder_has_option --no-werror; then
|
||||
MESON_ARGS=
|
||||
fi
|
||||
|
||||
if builder_has_action configure; then
|
||||
# Import our standard compiler defines
|
||||
source "$KEYMAN_ROOT/resources/build/meson/standard_meson_build.inc.sh"
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ do_configure() {
|
|||
else
|
||||
pushd "$THIS_SCRIPT_PATH" > /dev/null
|
||||
# Additional arguments are used by Linux build, e.g. -Dprefix=${INSTALLDIR}
|
||||
meson setup "$MESON_PATH" $MESON_CROSS_FILE --werror --buildtype $BUILDER_CONFIGURATION $STANDARD_MESON_ARGS "${builder_extra_params[@]}"
|
||||
meson setup "$MESON_PATH" $MESON_CROSS_FILE ${MESON_ARGS} --buildtype $BUILDER_CONFIGURATION $STANDARD_MESON_ARGS "${builder_extra_params[@]}"
|
||||
popd > /dev/null
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,8 @@ builder_describe \
|
|||
"--no-integration+ don't run integration tests" \
|
||||
"--coverage+ capture test coverage" \
|
||||
"--report+ create coverage report" \
|
||||
"--open open the coverage reports in the browser"
|
||||
"--open open the coverage reports in the browser" \
|
||||
"--no-werror+ don't report warnings as errors"
|
||||
|
||||
builder_parse "$@"
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@ builder_describe \
|
|||
"@../keyman-system-service:service" \
|
||||
"--no-integration don't run integration tests" \
|
||||
"--report create coverage report" \
|
||||
"--coverage capture test coverage"
|
||||
"--coverage capture test coverage" \
|
||||
"--no-werror don't report warnings as errors"
|
||||
|
||||
builder_parse "$@"
|
||||
|
||||
|
|
@ -45,6 +46,11 @@ else
|
|||
MESON_COVERAGE=
|
||||
fi
|
||||
|
||||
MESON_ARGS=--werror
|
||||
if builder_has_option --no-werror; then
|
||||
MESON_ARGS=
|
||||
fi
|
||||
|
||||
if builder_has_action configure; then
|
||||
# Import our standard compiler defines
|
||||
source "$KEYMAN_ROOT/resources/build/meson/standard_meson_build.inc.sh"
|
||||
|
|
@ -53,7 +59,7 @@ fi
|
|||
|
||||
configure_action() {
|
||||
# shellcheck disable=SC2086,SC2154
|
||||
meson setup ${MESON_COVERAGE} --werror --buildtype $MESON_TARGET "${builder_extra_params[@]}" "$MESON_PATH"
|
||||
meson setup ${MESON_COVERAGE} ${MESON_ARGS} --buildtype $MESON_TARGET "${builder_extra_params[@]}" "$MESON_PATH"
|
||||
}
|
||||
|
||||
test_action() {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@ builder_describe \
|
|||
"uninstall uninstall artifacts" \
|
||||
"--no-integration don't run integration tests" \
|
||||
"--report create coverage report" \
|
||||
"--coverage capture test coverage"
|
||||
"--coverage capture test coverage" \
|
||||
"--no-werror don't report warnings as errors"
|
||||
|
||||
builder_parse "$@"
|
||||
|
||||
|
|
@ -42,6 +43,11 @@ else
|
|||
fi
|
||||
MESON_PATH="build/$(uname -m)/$MESON_TARGET"
|
||||
|
||||
MESON_ARGS=--werror
|
||||
if builder_has_option --no-werror; then
|
||||
MESON_ARGS=
|
||||
fi
|
||||
|
||||
clean_action() {
|
||||
rm -rf "$THIS_SCRIPT_PATH/build/"
|
||||
}
|
||||
|
|
@ -61,7 +67,7 @@ check_missing_coverage_configuration() {
|
|||
|
||||
configure_action() {
|
||||
# shellcheck disable=SC2086,SC2154,SC2248
|
||||
meson setup ${MESON_COVERAGE} --werror --buildtype ${MESON_TARGET} "${builder_extra_params[@]}" "${MESON_PATH}"
|
||||
meson setup ${MESON_COVERAGE} ${MESON_ARGS} --buildtype ${MESON_TARGET} "${builder_extra_params[@]}" "${MESON_PATH}"
|
||||
}
|
||||
|
||||
test_action() {
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@
|
|||
|
||||
[D-BUS Service]
|
||||
Name=com.keyman.SystemService1
|
||||
Exec=/usr/libexec/systemd-keyman.service
|
||||
Exec=@LIBEXECDIR@/systemd-keyman.service
|
||||
User=root
|
||||
|
|
|
|||
|
|
@ -1,11 +1,26 @@
|
|||
# This file will be appended to meson.build by build.sh
|
||||
cfg = configuration_data()
|
||||
cfg.set('LIBEXECDIR', get_option('prefix') / get_option('libexecdir'))
|
||||
|
||||
install_data('com.keyman.SystemService1.conf', install_dir: get_option('datadir') / 'dbus-1/system.d/')
|
||||
|
||||
if systemd.name() == 'libsystemd'
|
||||
install_data('com.keyman.SystemService1.service.systemd', install_dir: get_option('datadir') / 'dbus-1/system-services/', rename: ['com.keyman.SystemService1.service'])
|
||||
else
|
||||
# libelogind or basu
|
||||
install_data('com.keyman.SystemService1.service.basu', install_dir: get_option('datadir') / 'dbus-1/system-services/')
|
||||
configure_file(
|
||||
configuration: cfg,
|
||||
input: 'com.keyman.SystemService1.service.basu',
|
||||
output: 'com.keyman.SystemService1.service',
|
||||
install: true,
|
||||
install_dir: get_option('datadir') / 'dbus-1/system-services/'
|
||||
)
|
||||
endif
|
||||
|
||||
install_data('systemd-keyman.service', install_dir: get_option('prefix') / 'lib/systemd/system/')
|
||||
configure_file(
|
||||
configuration: cfg,
|
||||
input: 'systemd-keyman.service.in',
|
||||
output: 'systemd-keyman.service',
|
||||
install: true,
|
||||
install_dir: get_option('prefix') / 'lib/systemd/system/'
|
||||
)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ Documentation=https://github.com/keymanapp/keyman/tree/master/linux/keyman-syste
|
|||
[Service]
|
||||
Type=dbus
|
||||
BusName=com.keyman.SystemService1
|
||||
ExecStart=/usr/libexec/keyman-system-service
|
||||
ExecStart=@LIBEXECDIR@/keyman-system-service
|
||||
Restart=on-failure
|
||||
|
||||
# Filesystem lockdown
|
||||
|
|
@ -7,9 +7,9 @@
|
|||
<key>teamID</key>
|
||||
<string>D7TR486TEH</string>
|
||||
<key>signingCertificate</key>
|
||||
<string>227D454DE9320031D7E9C3E02FEB7463B9A33776</string>
|
||||
<string>D7B7973A30C90C1A04666667F24B4D5C7E913923</string>
|
||||
<key>installerSigningCertificate</key>
|
||||
<string>227D454DE9320031D7E9C3E02FEB7463B9A33776</string>
|
||||
<string>D7B7973A30C90C1A04666667F24B4D5C7E913923</string>
|
||||
<key>provisioningProfiles</key>
|
||||
<dict>
|
||||
<key>com.firstvoices.keyboards</key>
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ if builder_has_action all; then
|
|||
set_variables_for_nvm
|
||||
|
||||
linux_build_action
|
||||
linux_unit_tests_action
|
||||
linux_unit_tests_action --no-integration
|
||||
publish_action
|
||||
else
|
||||
builder_run_action configure linux_install_dependencies_action
|
||||
|
|
@ -177,6 +177,6 @@ else
|
|||
set_variables_for_nvm
|
||||
|
||||
builder_run_action build linux_build_action
|
||||
builder_run_action test linux_unit_tests_action
|
||||
builder_run_action test linux_unit_tests_action --no-integration
|
||||
builder_run_action publish publish_action
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue