diff --git a/linux/keyman-system-service/meson.build b/linux/keyman-system-service/meson.build index 596ba48bcd4..66da8f98914 100644 --- a/linux/keyman-system-service/meson.build +++ b/linux/keyman-system-service/meson.build @@ -1,7 +1,7 @@ project('keyman-system-service', 'c', 'cpp', version: run_command('cat', '../../VERSION.md', check: true).stdout().strip(), license: 'GPL-2+', - meson_version: '>=1.0') + meson_version: '>=0.61') evdev = dependency('libevdev', version: '>= 1.9') systemd = dependency('libsystemd') diff --git a/linux/scripts/reconf.sh b/linux/scripts/reconf.sh index 4e4f5c1b115..49dfe21b1d0 100755 --- a/linux/scripts/reconf.sh +++ b/linux/scripts/reconf.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -eu ## START STANDARD BUILD SCRIPT INCLUDE # adjust relative paths as necessary @@ -17,13 +17,14 @@ echo "Found tier ${TIER}, version ${VERSION}" cd ../core ./build.sh --no-tests clean:arch configure:arch build:arch +# Building ibus-keyman will also build dependency keyman-system-service cd "$BASEDIR/ibus-keyman" ./build.sh clean configure cd "$BASEDIR/keyman-config" ./build.sh clean -cd keyman_config +cd "$BASEDIR/keyman-config/keyman_config" sed \ -e "s/_VERSION_/${VERSION}/g" \ -e "s/_VERSIONWITHTAG_/${VERSION_WITH_TAG}/g" \