From afd0eb172cf51ff9ce408a8d50049e730c345c8c Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Wed, 20 Dec 2023 18:25:53 -0600 Subject: [PATCH 1/2] fix(common): give warning if emcc.py is present but not executable - change the common emscripten locator to warn if $EMCC or $EMSCRIPTEN_BASE/emcc.py is present but not executable - emscripten v3.1.50 via homebrew seems to be not executable --- resources/locate_emscripten.inc.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/locate_emscripten.inc.sh b/resources/locate_emscripten.inc.sh index a58b384089..be66adfa32 100644 --- a/resources/locate_emscripten.inc.sh +++ b/resources/locate_emscripten.inc.sh @@ -22,9 +22,10 @@ locate_emscripten() { local EMCC=`which emcc.py` [[ -z $EMCC ]] && builder_die "locate_emscripten: Could not locate emscripten (emcc.py) on the path or with \$EMCC or \$EMSCRIPTEN_BASE" fi + [[ -f $EMCC && ! -x $EMCC ]] && builder_die "locate_emscripten: Variable EMCC ($EMCC) points to emcc.py but it is not executable" [[ -x $EMCC ]] || builder_die "locate_emscripten: Variable EMCC ($EMCC) does not point to a valid executable emcc.py" EMSCRIPTEN_BASE="$(dirname "$EMCC")" fi - + [[ -f ${EMSCRIPTEN_BASE}/emcc.py && ! -x ${EMSCRIPTEN_BASE}/emcc.py ]] && builder_die "locate_emscripten: Variable EMSCRIPTEN_BASE ($EMSCRIPTEN_BASE) contains emcc.py but it is not executable" [[ -x ${EMSCRIPTEN_BASE}/emcc.py ]] || builder_die "locate_emscripten: Variable EMSCRIPTEN_BASE ($EMSCRIPTEN_BASE) does not point to emcc.py's folder" -} \ No newline at end of file +} From b8d4d1208f155c02e61c950a96be0b20ad27aafb Mon Sep 17 00:00:00 2001 From: Keyman Build Agent Date: Fri, 22 Dec 2023 13:02:25 -0500 Subject: [PATCH 2/2] auto: increment master version to 17.0.237 --- HISTORY.md | 5 +++++ VERSION.md | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index c8e9dc24f5..04a57cf719 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,10 @@ # Keyman Version History +## 17.0.236 alpha 2023-12-22 + +* fix(oem/fv): Add fv_kwadacha_tsekene (#10292) +* fix(common): give warning if emcc.py is present but not executable (#10289) + ## 17.0.235 alpha 2023-12-21 * feat(developer): ldml: more improvement for key-not-found (#10236) diff --git a/VERSION.md b/VERSION.md index d88c5a51f0..b83abfc3d3 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -17.0.236 \ No newline at end of file +17.0.237 \ No newline at end of file