-
-
Notifications
You must be signed in to change notification settings - Fork 112
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
chore(windows): ensure dependencies for keyman32 exclude core:wasm #13379
chore(windows): ensure dependencies for keyman32 exclude core:wasm #13379
Conversation
User Test ResultsTest specification and instructions User tests are not required Test Artifacts
|
@@ -92,16 +93,20 @@ fi | |||
# generates a 'fat' library from them. | |||
builder_describe_internal_dependency \ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
builder_run_action configure:mac mkdir -p "$KEYMAN_ROOT/core/build/mac/$BUILDER_CONFIGURATION" | ||
builder_run_action configure:win mkdir -p "$KEYMAN_ROOT/core/build/win/$BUILDER_CONFIGURATION" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also shortened to use builder_run_action
instead of builder_start_action
+ builder_finish_action
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
makes sense. and agree about :arch in this case. :arch may make sense for building just the current, see #10302 for that
"$KEYMAN_ROOT/core/build/mac-arm64/$BUILDER_CONFIGURATION/src/libkeymancore.a" \ | ||
-output "$KEYMAN_ROOT/core/build/mac/$BUILDER_CONFIGURATION/libkeymancore.a" | ||
|
||
builder_run_action build:win touch "$KEYMAN_ROOT/core/build/win/$BUILDER_CONFIGURATION/BUILT" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does /BUILT ever get cleaned?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good question -- not at this point. Might be worth a future PR to do clean for both :mac and :win.
Add a
:win
meta-target to the /core/build.sh project. This:win
target triggers both:x86
and:x64
targets, and allows us to specify@/core:win
in the windows/keyman32/build.sh project, in order to build only those two targets, and not:wasm
target as well (as we don't need WASM Core for Keyman for Windows).This closely mirrors the pattern we used for
:mac
in /core/build.sh. We could consider using:arch
instead of:win
and:mac
but that needs more careful consideration, as:arch
implies only the current architecture of the building machine.This change also sets us up well for when we start doing arm32 and arm64 builds for Windows on ARM in the near future.
Fixes: #13374
@keymanapp-test-bot skip