erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-14 04:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #8352 from keymanapp/chore/developer/kmcompx-build-sh-cleanup

Browse source 
chore(developer): cleanup kmcompx build scripts per recent builder changes
This commit is contained in:
Marc Durdin 2023-03-02 21:13:21 +11:00 • committed by GitHub
commit 7a7d4c1609
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
developer/src/kmcmplib/build.sh
View file

@ -5,8 +5,8 @@ set -u
## START STANDARD BUILD SCRIPT INCLUDE
# adjust relative paths as necessary
THIS_SCRIPT="$(greadlink -f "${BASH_SOURCE[0]}" 2>/dev/null || readlink -f "${BASH_SOURCE[0]}")"
. "$(dirname "$THIS_SCRIPT")/../../../resources/build/build-utils.sh"
THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
. "${THIS_SCRIPT%/*}/../../../resources/build/build-utils.sh"
## END STANDARD BUILD SCRIPT INCLUDE
. "$KEYMAN_ROOT/resources/shellHelperFunctions.sh"
@ -16,8 +16,6 @@ cd "$THIS_SCRIPT_PATH"
################################ Main script ################################
get_builder_OS
#
# Restrict available targets to those that can be built on the current system
#
@ -25,7 +23,7 @@ get_builder_OS
#archtargets=(":wasm WASM build")
archtargets=()
case $os_id in
case $BUILDER_OS in
win)
archtargets+=(
":x86 32-bit Windows (x86) build"
@ -44,7 +42,7 @@ esac
# ":mac Build for current macOS architecture"
builder_describe \
"Build Keyman KMX Compiler Static Library
"Build Keyman KMX Compiler Static Library
Libraries will be built in 'build/<target>/<configuration>/src'.
* <configuration>: 'debug' or 'release' (see --debug flag)
* All parameters after '--' are passed to meson or ninja
@ -70,10 +68,10 @@ builder_describe_outputs \
configure:x64 build/x64/$CONFIGURATION/build.ninja \
configure:arch build/arch/$CONFIGURATION/build.ninja \
configure:wasm build/wasm/$CONFIGURATION/build.ninja \
build:x86 build/x86/$CONFIGURATION/src/libkmnkbp0.a \
build:x64 build/x64/$CONFIGURATION/src/libkmnkbp0.a \
build:arch build/arch/$CONFIGURATION/src/libkmnkbp0.a \
build:wasm build/wasm/$CONFIGURATION/src/libkmnkbp0.a
build:x86 build/x86/$CONFIGURATION/src/libkmcmplib.a \
build:x64 build/x64/$CONFIGURATION/src/libkmcmplib.a \
build:arch build/arch/$CONFIGURATION/src/libkmcmplib.a \
build:wasm build/wasm/$CONFIGURATION/src/libkmcmplib.a
TARGET_PATH="$THIS_SCRIPT_PATH/build"

6
developer/src/kmcmplib/commands.inc.sh
View file

@ -23,8 +23,6 @@ do_configure() {
local STANDARD_MESON_ARGS=
echo_heading "======= Configuring $target ======="
if [[ $target == wasm ]]; then
# do_configure_wasm
locate_emscripten
@ -51,8 +49,6 @@ do_build() {
local target=$1
builder_start_action build:$target || return 0
echo_heading "======= Building $target ======="
if [[ $target =~ ^(x86|x64)$ ]]; then
# Build the meson targets, both x86 and x64 also
# We need to use a batch file here so we can get
@ -76,8 +72,6 @@ do_test() {
local target=$1
builder_start_action test:$target || return 0
echo_heading "======= Testing $target ======="
if [[ $target =~ ^(x86|x64)$ ]]; then
cmd //C build.bat $target $CONFIGURATION test "${builder_extra_params[@]}"
else