erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-31 04:37:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

maint(resources): verify order of builder_describe_internal_dependency

Browse source 
Test-bot: skip
This commit is contained in:
Marc Durdin 2025-12-01 16:44:49 +01:00
parent fd9d7f31f9
commit 94ac669ec1
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/windows/delphi/tools/devtools/build.sh
View file

@ -16,13 +16,13 @@ builder_parse "$@"
source "$KEYMAN_ROOT/resources/build/win/environment.inc.sh"
builder_describe_internal_dependency \
prepublish:project build:project
builder_describe_outputs \
configure:project /resources/build/win/delphi_environment_generated.inc.sh \
build:project /common/windows/delphi/tools/devtools/$WIN32_TARGET_PATH/devtools.exe
builder_describe_internal_dependency \
prepublish:project build:project
#-------------------------------------------------------------------------------------------------------------------
builder_run_action clean:project clean_windows_project_files

7
common/windows/delphi/tools/test-klog/build.sh
View file

@ -7,19 +7,20 @@ THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
builder_describe "Tool for validating klog is disabled for release builds" \
clean configure build test prepublish edit
builder_parse "$@"
#-------------------------------------------------------------------------------------------------------------------
source "$KEYMAN_ROOT/resources/build/win/environment.inc.sh"
builder_describe_internal_dependency \
prepublish:project build:project
builder_describe_outputs \
configure:project /resources/build/win/delphi_environment_generated.inc.sh \
build:project /common/windows/delphi/tools/test-klog/$WIN32_TARGET_PATH/test_klog.exe
builder_describe_internal_dependency \
prepublish:project build:project
#-------------------------------------------------------------------------------------------------------------------
function do_build() {

2
docs/builder.md
View file

@ -559,7 +559,7 @@ builder_describe_internal_dependency \
```
**Note:** actions and targets must be fully specified, and this _must_ be called
before either [`builder_describe_outputs`] or [`builder_parse`] in order for
before both of [`builder_describe_outputs`] and [`builder_parse`] in order for
dependencies to be resolved.
--------------------------------------------------------------------------------

12
resources/builder.inc.sh
View file

@ -1408,10 +1408,16 @@ _builder_define_default_internal_dep() {
# build:mac build:mac-x86_64 \
# build:mac build:mac-arm64
#
# Note: actions and targets must be fully specified, and this _must_
# be called before either builder_describe_outputs or builder_parse in
# order for dependencies to be resolved.
# Note: actions and targets must be fully specified, and this _must_ be called
# before both of builder_describe_outputs and builder_parse in order for
# dependencies to be resolved.
builder_describe_internal_dependency() {
_builder_record_function_call builder_describe_internal_dependency
if _builder_has_function_been_called builder_parse && _builder_has_function_been_called builder_describe_outputs; then
builder_warn "WARNING: builder_describe_internal_dependency needs to be called before builder_parse and builder_describe_outputs have both been called"
fi
while [[ $# -gt 0 ]]; do
local action_target=$1 dep_action_target=$2
[[ -z ${_builder_internal_dep[$action_target]+x} ]] &&