Merge branch 'master' into feat/core/9468-stacked-markers-epic-ldml

This commit is contained in:
Steven R. Loomis 2023-12-22 17:52:01 -06:00 committed by GitHub
commit e864c8c06c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions

View file

@ -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)

View file

@ -1 +1 @@
17.0.236
17.0.237

View file

@ -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"
}
}