Skip to content

[build-script] Split execute_one_impl_action. #23917

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 10, 2019
Merged

[build-script] Split execute_one_impl_action. #23917

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 41 additions & 26 deletions utils/build-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,35 +904,18 @@ class BuildScriptInvocation(object):
"""Execute the invocation with the configured arguments."""

# Convert to a build-script-impl invocation.
(impl_env, impl_args) = self.convert_to_impl_arguments()
(self.impl_env, self.impl_args) = self.convert_to_impl_arguments()

# If using the legacy implementation, delegate all behavior to
# `build-script-impl`.
if self.args.legacy_impl:
# Execute the underlying build script implementation.
shell.call_without_sleeping([build_script_impl] + impl_args,
env=impl_env, echo=True)
shell.call_without_sleeping([build_script_impl] + self.impl_args,
env=self.impl_env, echo=True)
return

# Otherwise, we compute and execute the individual actions ourselves.

def execute_one_impl_action(host=None, product_class=None, name=None):
if host is None:
assert (product_class is None and
name == "merged-hosts-lipo"), "invalid action"
action_name = name
elif product_class is None:
assert name in ("package", "extractsymbols"), "invalid action"
action_name = "{}-{}".format(host.name, name)
else:
assert name is not None, "invalid action"
action_name = "{}-{}-{}".format(
host.name, product_class.product_name(), name)
shell.call_without_sleeping(
[build_script_impl] + impl_args + [
"--only-execute", action_name],
env=impl_env, echo=self.args.verbose_build)

# Compute the list of hosts to operate on.
all_host_names = [
self.args.host_target] + self.args.cross_compile_hosts
Expand Down Expand Up @@ -965,17 +948,17 @@ class BuildScriptInvocation(object):
" ".join(config.swift_benchmark_run_targets)))

for product_class in impl_product_classes:
execute_one_impl_action(host_target, product_class, "build")
self._execute_build_action(host_target, product_class)

# Test...
for host_target in all_hosts:
for product_class in impl_product_classes:
execute_one_impl_action(host_target, product_class, "test")
self._execute_test_action(host_target, product_class)

# Install...
for host_target in all_hosts:
for product_class in impl_product_classes:
execute_one_impl_action(host_target, product_class, "install")
self._execute_install_action(host_target, product_class)

# Non-build-script-impl products...
# Note: currently only supports building for the host.
Expand All @@ -996,14 +979,46 @@ class BuildScriptInvocation(object):

# Extract symbols...
for host_target in all_hosts:
execute_one_impl_action(host_target, name="extractsymbols")
self._execute_extract_symbols_action(host_target)

# Package...
for host_target in all_hosts:
execute_one_impl_action(host_target, name="package")
self._execute_package_action(host_target)

# Lipo...
execute_one_impl_action(name="merged-hosts-lipo")
self._execute_merged_host_lipo_action()

def _execute_build_action(self, host_target, product_class):
action_name = "{}-{}-build".format(host_target.name,
product_class.product_name())
self._execute_action(action_name)

def _execute_test_action(self, host_target, product_class):
action_name = "{}-{}-test".format(host_target.name,
product_class.product_name())
self._execute_action(action_name)

def _execute_install_action(self, host_target, product_class):
action_name = "{}-{}-install".format(host_target.name,
product_class.product_name())
self._execute_action(action_name)

def _execute_extract_symbols_action(self, host_target):
action_name = "{}-extractsymbols".format(host_target.name)
self._execute_action(action_name)

def _execute_package_action(self, host_target):
action_name = "{}-package".format(host_target.name)
self._execute_action(action_name)

def _execute_merged_host_lipo_action(self):
self._execute_action("merged-hosts-lipo")

def _execute_action(self, action_name):
shell.call_without_sleeping(
[build_script_impl] + self.impl_args +
["--only-execute", action_name],
env=self.impl_env, echo=self.args.verbose_build)


# Provide a short delay so accidentally invoked clean builds can be canceled.
Expand Down