Skip to content
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

Jump to bottom

Move library rules #827

Merged
merged 6 commits into from
Aug 21, 2019
Merged

Move library rules #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f84e8c3
move library_attrs to common_attributes.bzl
long-stripe Aug 20, 2019
43466d0
move scala_macro_library rule to its own file
long-stripe Aug 20, 2019
0cbe2a6
move all _library rules to scala_library.bzl, private stuff too
long-stripe Aug 20, 2019
4772f72
move _lib into scala_library.bzl
long-stripe Aug 20, 2019
b145c7e
alphasort
long-stripe Aug 20, 2019
da58a6c
Merge branch 'master' into move-scala_macro_library_rule
long-stripe Aug 20, 2019
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
1 change: 1 addition & 0 deletions scala/private/common_attributes.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ launcher_template = {
),
}


# Single dep to allow IDEs to pickup all the implicit dependencies.
resolve_deps = {
"_scala_toolchain": attr.label_list(
Expand Down
129 changes: 6 additions & 123 deletions scala/private/rule_impls.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ def collect_java_providers_of(deps):
providers.append(dep[JavaInfo])
return providers

def _compile_or_empty(
def compile_or_empty(
ctx,
manifest,
jars,
Expand Down Expand Up @@ -548,7 +548,7 @@ def _create_scala_compilation_provider(ctx, ijar, source_jar, deps_providers):
runtime_deps = runtime_deps,
)

def _build_deployable(ctx, jars_list):
def build_deployable(ctx, jars_list):
Copy link
Member

Choose a reason for hiding this comment

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

if we are going to make this public, we could actually comment it and improve the arguments. One api could be:

def merge_jars(single_jar, actions, deploy_jar, main_class, jars):

Without taking the full ctx we prevent limit what the function can do and make it clearer what the dependencies are.

Then call it with:

merge_jars(ctx.executable._singlejar, ctx.actions, ctx.outputs.deploy_jar, getattr(ctx.attr, "main_class", None), jars_list)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll see if I can follow up with a PR for this next.

# This calls bazels singlejar utility.
# For a full list of available command line options see:
# https://github.com/bazelbuild/bazel/blob/master/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/SingleJar.java#L311
Expand Down Expand Up @@ -795,129 +795,12 @@ def collect_jars_from_common_ctx(
deps_providers = deps_providers,
)

def _lib(
ctx,
base_classpath,
non_macro_lib,
unused_dependency_checker_mode,
unused_dependency_checker_ignored_targets):
# Build up information from dependency-like attributes

# This will be used to pick up srcjars from non-scala library
# targets (like thrift code generation)
srcjars = collect_srcjars(ctx.attr.deps)

unused_dependency_checker_is_off = unused_dependency_checker_mode == "off"
jars = collect_jars_from_common_ctx(
ctx,
base_classpath,
unused_dependency_checker_is_off = unused_dependency_checker_is_off,
)

(cjars, transitive_rjars) = (jars.compile_jars, jars.transitive_runtime_jars)

write_manifest(ctx)
outputs = _compile_or_empty(
ctx,
ctx.outputs.manifest,
cjars,
srcjars,
non_macro_lib,
jars.transitive_compile_jars,
jars.jars2labels.jars_to_labels,
[],
unused_dependency_checker_ignored_targets = [
target.label
for target in base_classpath + ctx.attr.exports +
unused_dependency_checker_ignored_targets
],
unused_dependency_checker_mode = unused_dependency_checker_mode,
deps_providers = jars.deps_providers,
)

transitive_rjars = depset(outputs.full_jars, transitive = [transitive_rjars])

_build_deployable(ctx, transitive_rjars.to_list())

# Using transitive_files since transitive_rjars a depset and avoiding linearization
runfiles = ctx.runfiles(
transitive_files = transitive_rjars,
collect_data = True,
)

# Add information from exports (is key that AFTER all build actions/runfiles analysis)
# Since after, will not show up in deploy_jar or old jars runfiles
# Notice that compile_jars is intentionally transitive for exports
exports_jars = collect_jars(ctx.attr.exports)
transitive_rjars = depset(
transitive = [transitive_rjars, exports_jars.transitive_runtime_jars],
)

source_jars = _pack_source_jars(ctx) + outputs.source_jars

scalaattr = create_scala_provider(
class_jar = outputs.class_jar,
compile_jars = depset(
outputs.ijars,
transitive = [exports_jars.compile_jars],
),
deploy_jar = ctx.outputs.deploy_jar,
full_jars = outputs.full_jars,
ijar = outputs.ijar,
source_jars = source_jars,
statsfile = ctx.outputs.statsfile,
transitive_runtime_jars = transitive_rjars,
)

return struct(
files = depset([ctx.outputs.jar] + outputs.full_jars), # Here is the default output
instrumented_files = outputs.coverage.instrumented_files,
jars_to_labels = jars.jars2labels,
providers = [outputs.merged_provider, jars.jars2labels] + outputs.coverage.providers,
runfiles = runfiles,
scala = scalaattr,
)

def get_unused_dependency_checker_mode(ctx):
if ctx.attr.unused_dependency_checker_mode:
return ctx.attr.unused_dependency_checker_mode
else:
return ctx.toolchains["@io_bazel_rules_scala//scala:toolchain_type"].unused_dependency_checker_mode

def scala_library_impl(ctx):
if ctx.attr.jvm_flags:
print("'jvm_flags' for scala_library is deprecated. It does nothing today and will be removed from scala_library to avoid confusion.")
scalac_provider = get_scalac_provider(ctx)
unused_dependency_checker_mode = get_unused_dependency_checker_mode(ctx)
return _lib(
ctx,
scalac_provider.default_classpath,
True,
unused_dependency_checker_mode,
ctx.attr.unused_dependency_checker_ignored_targets,
)

def scala_library_for_plugin_bootstrapping_impl(ctx):
scalac_provider = get_scalac_provider(ctx)
return _lib(
ctx,
scalac_provider.default_classpath,
True,
unused_dependency_checker_ignored_targets = [],
unused_dependency_checker_mode = "off",
)

def scala_macro_library_impl(ctx):
scalac_provider = get_scalac_provider(ctx)
unused_dependency_checker_mode = get_unused_dependency_checker_mode(ctx)
return _lib(
ctx,
scalac_provider.default_macro_classpath,
False, # don't build the ijar for macros
unused_dependency_checker_mode,
ctx.attr.unused_dependency_checker_ignored_targets,
)

# Common code shared by all scala binary implementations.
def scala_binary_common(
ctx,
Expand All @@ -933,7 +816,7 @@ def scala_binary_common(
implicit_junit_deps_needed_for_java_compilation = [],
runfiles_ext = []):
write_manifest(ctx)
outputs = _compile_or_empty(
outputs = compile_or_empty(
ctx,
ctx.outputs.manifest,
cjars,
Expand All @@ -949,7 +832,7 @@ def scala_binary_common(
) # no need to build an ijar for an executable
rjars = depset(outputs.full_jars, transitive = [rjars])

_build_deployable(ctx, rjars.to_list())
build_deployable(ctx, rjars.to_list())
Copy link
Member

Choose a reason for hiding this comment

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

we should probably look at all the linearization of depsets we do in these rules and see if it is avoidable at all. It is a shame you can't lazily linearize a depset into args so it can happen at build time not analysis time... maybe you can.

Copy link
Member

Choose a reason for hiding this comment

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

totally agree. I have a feeling our analysis perf can be greatly improved but I haven't gotten around to profiling it


runfiles = ctx.runfiles(
transitive_files = depset(
Expand All @@ -959,7 +842,7 @@ def scala_binary_common(
collect_data = True,
)

source_jars = _pack_source_jars(ctx) + outputs.source_jars
source_jars = pack_source_jars(ctx) + outputs.source_jars

scalaattr = create_scala_provider(
class_jar = outputs.class_jar,
Expand Down Expand Up @@ -1009,7 +892,7 @@ def _pack_source_jar(ctx):

return scala_source_jar

def _pack_source_jars(ctx):
def pack_source_jars(ctx):
source_jar = _pack_source_jar(ctx)
#_pack_source_jar may return None if java_common.pack_sources returned None (and it can)
return [source_jar] if source_jar else []
Expand Down
Loading