Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fv_all] Migrate from keyboards.csv to regions.json and add to fv_all.kmp #2872

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

darcywong00
Copy link
Contributor

Relates to Keyman 18.0 work for keymanapp/keyman#2036 and follows #2755

  • Replace keyboards.csv with regions.json
  • Add 7z.inc.sh to handle 7z calls
  • Update fv_all build.sh script:
    • Merge regions.json with keyboards[] from kmp.json --> keyboards.json
    • Add keyboards.json to fv_all.kmp
    • Fail build if a new keyboard doesn't have a region declared in regions.json

My lack of JQ-fu makes some of this a dog's breakfast (notably updating fields, and converting to JSONArray).
I also couldn't figure out how to get the in-place jqi to work

# JQ with inplace file replacement
function jqi() {
cat <<< "$($JQ -c "$1" < "$2")" > "$2"
}

Comment on lines +24 to +28
if [ -z "${SEVENZ_HOME+x}" ]; then
builder_die "7zip requires SEVENZ_HOME path"
fi
APP7Z="$SEVENZ_HOME/7z"
;;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From

keyboards/ci.sh

Lines 33 to 37 in e38fac8

if [ ! -z "${SEVENZ_HOME+x}" ]; then
APP7Z="$SEVENZ_HOME/7z"
else
APP7Z="/c/Program Files/7-Zip/7z.exe"
fi

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant