Skip to content

Move code from rule impls/common to phases #930

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 17 commits into from
Jan 17, 2020
Merged

Move code from rule impls/common to phases #930

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cabe1a6
collect_srcjars to phase
ittaiz Jan 16, 2020
2b3ba42
move compile_or_empty and needed code to phase_compile (from rule_impls)
ittaiz Jan 16, 2020
f183a54
phase_compile to take scalac_provider from phases instead of rule_impls
ittaiz Jan 16, 2020
8a99e54
rule_impls loads are loaded as private and unused are removed
ittaiz Jan 16, 2020
f43b47b
get_scalac_provider in phase_scalac_provider and not rule_impls
ittaiz Jan 16, 2020
b1cea88
move write_java_wrapper from rule_impls to phase_java_wrapper
ittaiz Jan 16, 2020
297b154
move merge_jars from rule_impls to phase_merge_jars
ittaiz Jan 16, 2020
8c91462
move get_unused_dependency_checker_mode from rule_impls to get_unused…
ittaiz Jan 16, 2020
341b417
move write_manifest from common to get_write_manifest
ittaiz Jan 16, 2020
a5bfa1e
move collect_jars_from_common_ctx from rule_impls to phase_collect_jars
ittaiz Jan 16, 2020
6d18788
move write_executable from rule_impls to phase_write_executable
ittaiz Jan 16, 2020
ccd0af7
linting
ittaiz Jan 17, 2020
2270c47
[CR] inline _collect_jars_from_common_ctx
ittaiz Jan 17, 2020
2d81721
[CR] inline _collect_srcjars
ittaiz Jan 17, 2020
c2131fd
[CR] inline write_java_wrapper
ittaiz Jan 17, 2020
a2ba66d
[CR] inline merge_jars
ittaiz Jan 17, 2020
df66116
[CR] inline _write_executable
ittaiz Jan 17, 2020
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
12 changes: 8 additions & 4 deletions scala/private/phases/phase_compile.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ load(
_adjust_resources_path_by_default_prefixes = "adjust_resources_path_by_default_prefixes",
_compile_scala = "compile_scala",
_expand_location = "expand_location",
_get_scalac_provider = "get_scalac_provider",
)

_java_extension = ".java"
Expand Down Expand Up @@ -142,6 +141,7 @@ def _phase_compile(
transitive_compile_jars = p.collect_jars.transitive_compile_jars
jars2labels = p.collect_jars.jars2labels.jars_to_labels
deps_providers = p.collect_jars.deps_providers
default_classpath = p.scalac_provider.default_classpath

out = _compile_or_empty(
ctx,
Expand All @@ -155,6 +155,7 @@ def _phase_compile(
unused_dependency_checker_mode,
unused_dependency_checker_ignored_targets,
deps_providers,
default_classpath,
)

# TODO: simplify the return values and use provider
Expand All @@ -181,7 +182,8 @@ def _compile_or_empty(
implicit_junit_deps_needed_for_java_compilation,
unused_dependency_checker_mode,
unused_dependency_checker_ignored_targets,
deps_providers):
deps_providers,
default_classpath):
# We assume that if a srcjar is present, it is not empty
if len(ctx.files.srcs) + len(srcjars.to_list()) == 0:
_build_nosrc_jar(ctx)
Expand Down Expand Up @@ -271,6 +273,7 @@ def _compile_or_empty(
all_srcjars,
java_srcs,
implicit_junit_deps_needed_for_java_compilation,
default_classpath,
)

full_jars = [ctx.outputs.jar]
Expand Down Expand Up @@ -429,7 +432,8 @@ def _try_to_compile_java_jar(
scala_output,
all_srcjars,
java_srcs,
implicit_junit_deps_needed_for_java_compilation):
implicit_junit_deps_needed_for_java_compilation,
default_classpath):
if not java_srcs and (not (all_srcjars and ctx.attr.expect_java_output)):
return False

Expand All @@ -438,7 +442,7 @@ def _try_to_compile_java_jar(
implicit_junit_deps_needed_for_java_compilation,
)
providers_of_dependencies += _collect_java_providers_of(
_get_scalac_provider(ctx).default_classpath,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

note this is possibly the only interesting change in this PR since it moves something from a method call to taking it from a previous phase and still I'm confident

default_classpath,
)
scala_sources_java_provider = _interim_java_provider_for_java_compilation(
scala_output,
Expand Down