iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(bazel): revert location of xi18n outputs to bazel-genfiles (#31410) 

This is needed in g3 where the translation system is sensitive to the full path of the output.
For Bazel users, we don't want this because it would force them to
disable a Bazel option that prevents using the deprecated ctx.new_file
API

PR Close #31410
This commit is contained in:
Alex Eagle 2019-07-03 12:52:07 -07:00 committed by Alex Rickabaugh
parent c0955975f4
commit 1d3e22766a
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/bazel/src/ng_module.bzl
View File

@ -267,8 +267,11 @@ def _expected_outs(ctx):
# TODO(alxhub): i18n is only produced by the legacy compiler currently. This should be re-enabled # TODO(alxhub): i18n is only produced by the legacy compiler currently. This should be re-enabled
# when ngtsc can extract messages # when ngtsc can extract messages
if is_legacy_ngc: if is_legacy_ngc and _is_bazel():
i18n_messages_files = [ctx.actions.declare_file(ctx.label.name + "_ngc_messages.xmb")] i18n_messages_files = [ctx.actions.declare_file(ctx.label.name + "_ngc_messages.xmb")]
elif is_legacy_ngc:
# write the xmb file to blaze-genfiles since that path appears in the translation console keys
i18n_messages_files = [ctx.new_file(ctx.genfiles_dir, ctx.label.name + "_ngc_messages.xmb")]
else: else:
i18n_messages_files = [] i18n_messages_files = []
@ -425,13 +428,19 @@ def ngc_compile_action(
) )
if is_legacy_ngc and messages_out != None: if is_legacy_ngc and messages_out != None:
# The base path is bin_dir because of the way the ngc
# compiler host is configured. Under Blaze, we need to explicitly
# point to genfiles/ to redirect the output.
# See _expected_outs above, where the output path for the message file
# is conditional on whether we are in Bazel.
message_file_path = messages_out[0].short_path if _is_bazel() else "../genfiles/" + messages_out[0].short_path
ctx.actions.run( ctx.actions.run(
inputs = inputs, inputs = inputs,
outputs = messages_out, outputs = messages_out,
executable = ctx.executable.ng_xi18n, executable = ctx.executable.ng_xi18n,
arguments = (_EXTRA_NODE_OPTIONS_FLAGS + arguments = (_EXTRA_NODE_OPTIONS_FLAGS +
[tsconfig_file.path] + [tsconfig_file.path] +
[messages_out[0].short_path]), [message_file_path]),
progress_message = "Extracting Angular 2 messages (ng_xi18n)", progress_message = "Extracting Angular 2 messages (ng_xi18n)",
mnemonic = "Angular2MessageExtractor", mnemonic = "Angular2MessageExtractor",
) )