Skip to content

Commit

Permalink
Update files for future Bazel changes (#645)
Browse files Browse the repository at this point in the history 
* Format all bzl files with Buildifier

* Fix issues related to --incompatible_no_support_tools_in_action_inputs

Also, remove unused loads
  • Loading branch information
@laurentlb @ittaiz
laurentlb authored and ittaiz committed Nov 22, 2018
1 parent 4be5086 commit ad41d0c
Show file tree
Hide file tree
Showing 23 changed files with 3,200 additions and 2,754 deletions.
254 changes: 130 additions & 124 deletions jmh/jmh.bzl
View file
Original file line number Diff line number Diff line change
@@ -1,101 +1,104 @@
load("//scala:scala.bzl", "scala_binary", "scala_library")

def jmh_repositories():
native.maven_jar(
name = "io_bazel_rules_scala_org_openjdk_jmh_jmh_core",
artifact = "org.openjdk.jmh:jmh-core:1.20",
sha1 = "5f9f9839bda2332e9acd06ce31ad94afa7d6d447",
)
native.bind(
name = 'io_bazel_rules_scala/dependency/jmh/jmh_core',
actual = '@io_bazel_rules_scala_org_openjdk_jmh_jmh_core//jar',
)
native.maven_jar(
name = "io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_asm",
artifact = "org.openjdk.jmh:jmh-generator-asm:1.20",
sha1 = "3c43040e08ae68905657a375e669f11a7352f9db",
)
native.bind(
name = 'io_bazel_rules_scala/dependency/jmh/jmh_generator_asm',
actual = '@io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_asm//jar',
)
native.maven_jar(
name = "io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_reflection",
artifact = "org.openjdk.jmh:jmh-generator-reflection:1.20",
sha1 = "f2154437b42426a48d5dac0b3df59002f86aed26",
)
native.bind(
name = 'io_bazel_rules_scala/dependency/jmh/jmh_generator_reflection',
actual =
'@io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_reflection//jar',
)
native.maven_jar(
name = "io_bazel_rules_scala_org_ows2_asm_asm",
artifact = "org.ow2.asm:asm:6.1.1",
sha1 = "264754515362d92acd39e8d40395f6b8dee7bc08",
)
native.bind(
name = "io_bazel_rules_scala/dependency/jmh/org_ows2_asm_asm",
actual = '@io_bazel_rules_scala_org_ows2_asm_asm//jar',
)
native.maven_jar(
name = "io_bazel_rules_scala_net_sf_jopt_simple_jopt_simple",
artifact = "net.sf.jopt-simple:jopt-simple:5.0.3",
sha1 = "cdd846cfc4e0f7eefafc02c0f5dce32b9303aa2a",
)
native.bind(
name =
"io_bazel_rules_scala/dependency/jmh/net_sf_jopt_simple_jopt_simple",
actual = '@io_bazel_rules_scala_net_sf_jopt_simple_jopt_simple//jar',
)
native.maven_jar(
name = "io_bazel_rules_scala_org_apache_commons_commons_math3",
artifact = "org.apache.commons:commons-math3:3.6.1",
sha1 = "e4ba98f1d4b3c80ec46392f25e094a6a2e58fcbf",
)
native.bind(
name =
"io_bazel_rules_scala/dependency/jmh/org_apache_commons_commons_math3",
actual = '@io_bazel_rules_scala_org_apache_commons_commons_math3//jar',
)
native.maven_jar(
name = "io_bazel_rules_scala_org_openjdk_jmh_jmh_core",
artifact = "org.openjdk.jmh:jmh-core:1.20",
sha1 = "5f9f9839bda2332e9acd06ce31ad94afa7d6d447",
)
native.bind(
name = "io_bazel_rules_scala/dependency/jmh/jmh_core",
actual = "@io_bazel_rules_scala_org_openjdk_jmh_jmh_core//jar",
)
native.maven_jar(
name = "io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_asm",
artifact = "org.openjdk.jmh:jmh-generator-asm:1.20",
sha1 = "3c43040e08ae68905657a375e669f11a7352f9db",
)
native.bind(
name = "io_bazel_rules_scala/dependency/jmh/jmh_generator_asm",
actual = "@io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_asm//jar",
)
native.maven_jar(
name = "io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_reflection",
artifact = "org.openjdk.jmh:jmh-generator-reflection:1.20",
sha1 = "f2154437b42426a48d5dac0b3df59002f86aed26",
)
native.bind(
name = "io_bazel_rules_scala/dependency/jmh/jmh_generator_reflection",
actual =
"@io_bazel_rules_scala_org_openjdk_jmh_jmh_generator_reflection//jar",
)
native.maven_jar(
name = "io_bazel_rules_scala_org_ows2_asm_asm",
artifact = "org.ow2.asm:asm:6.1.1",
sha1 = "264754515362d92acd39e8d40395f6b8dee7bc08",
)
native.bind(
name = "io_bazel_rules_scala/dependency/jmh/org_ows2_asm_asm",
actual = "@io_bazel_rules_scala_org_ows2_asm_asm//jar",
)
native.maven_jar(
name = "io_bazel_rules_scala_net_sf_jopt_simple_jopt_simple",
artifact = "net.sf.jopt-simple:jopt-simple:5.0.3",
sha1 = "cdd846cfc4e0f7eefafc02c0f5dce32b9303aa2a",
)
native.bind(
name =
"io_bazel_rules_scala/dependency/jmh/net_sf_jopt_simple_jopt_simple",
actual = "@io_bazel_rules_scala_net_sf_jopt_simple_jopt_simple//jar",
)
native.maven_jar(
name = "io_bazel_rules_scala_org_apache_commons_commons_math3",
artifact = "org.apache.commons:commons-math3:3.6.1",
sha1 = "e4ba98f1d4b3c80ec46392f25e094a6a2e58fcbf",
)
native.bind(
name =
"io_bazel_rules_scala/dependency/jmh/org_apache_commons_commons_math3",
actual = "@io_bazel_rules_scala_org_apache_commons_commons_math3//jar",
)

def _scala_construct_runtime_classpath(deps):
scala_targets = [d.scala for d in deps if hasattr(d, "scala")]
java_targets = [d.java for d in deps if hasattr(d, "java")]
files = []
for scala in scala_targets:
files.append(scala.transitive_runtime_jars)
for java in java_targets:
files.append(java.transitive_runtime_deps)
return depset(transitive = files)
scala_targets = [d.scala for d in deps if hasattr(d, "scala")]
java_targets = [d.java for d in deps if hasattr(d, "java")]
files = []
for scala in scala_targets:
files.append(scala.transitive_runtime_jars)
for java in java_targets:
files.append(java.transitive_runtime_deps)
return depset(transitive = files)

def _scala_generate_benchmark(ctx):
class_jar = ctx.attr.src.scala.outputs.class_jar
classpath = _scala_construct_runtime_classpath([ctx.attr.src])
ctx.actions.run(
outputs = [ctx.outputs.src_jar, ctx.outputs.resource_jar],
inputs = depset([class_jar], transitive = [classpath]),
executable = ctx.executable._generator,
arguments = [ctx.attr.generator_type] + [
f.path
for f in [class_jar, ctx.outputs.src_jar, ctx.outputs.resource_jar] +
classpath.to_list()
],
progress_message = "Generating benchmark code for %s" % ctx.label,
)
class_jar = ctx.attr.src.scala.outputs.class_jar
classpath = _scala_construct_runtime_classpath([ctx.attr.src])
ctx.actions.run(
outputs = [ctx.outputs.src_jar, ctx.outputs.resource_jar],
inputs = depset([class_jar], transitive = [classpath]),
executable = ctx.executable._generator,
arguments = [ctx.attr.generator_type] + [
f.path
for f in [class_jar, ctx.outputs.src_jar, ctx.outputs.resource_jar] +
classpath.to_list()
],
progress_message = "Generating benchmark code for %s" % ctx.label,
)

scala_generate_benchmark = rule(
implementation = _scala_generate_benchmark,
attrs = {
"src": attr.label(allow_single_file = True, mandatory = True),
"generator_type": attr.string(
default = 'reflection', mandatory = False),
default = "reflection",
mandatory = False,
),
"_generator": attr.label(
executable = True,
cfg = "host",
default = Label(
"//src/scala/io/bazel/rules_scala/jmh_support:benchmark_generator"
))
"//src/scala/io/bazel/rules_scala/jmh_support:benchmark_generator",
),
),
},
outputs = {
"src_jar": "%{name}.srcjar",
Expand All @@ -104,48 +107,51 @@ scala_generate_benchmark = rule(
)

def scala_benchmark_jmh(**kw):
name = kw["name"]
deps = kw.get("deps", [])
srcs = kw["srcs"]
generator_type = kw.get("generator_type", "reflection")
lib = "%s_generator" % name
scalacopts = kw.get("scalacopts", [])
main_class = kw.get("main_class", "org.openjdk.jmh.Main")
name = kw["name"]
deps = kw.get("deps", [])
srcs = kw["srcs"]
generator_type = kw.get("generator_type", "reflection")
lib = "%s_generator" % name
scalacopts = kw.get("scalacopts", [])
main_class = kw.get("main_class", "org.openjdk.jmh.Main")

scala_library(
name = lib,
srcs = srcs,
deps = deps + [
"//external:io_bazel_rules_scala/dependency/jmh/jmh_core",
],
scalacopts = scalacopts,
resources = kw.get("resources", []),
resource_jars = kw.get("resource_jars", []),
visibility = ["//visibility:public"],
unused_dependency_checker_mode = "off",
)
scala_library(
name = lib,
srcs = srcs,
deps = deps + [
"//external:io_bazel_rules_scala/dependency/jmh/jmh_core",
],
scalacopts = scalacopts,
resources = kw.get("resources", []),
resource_jars = kw.get("resource_jars", []),
visibility = ["//visibility:public"],
unused_dependency_checker_mode = "off",
)

codegen = name + "_codegen"
scala_generate_benchmark(
name = codegen, src = lib, generator_type = generator_type)
compiled_lib = name + "_compiled_benchmark_lib"
scala_library(
name = compiled_lib,
srcs = ["%s.srcjar" % codegen],
deps = deps + [
"//external:io_bazel_rules_scala/dependency/jmh/jmh_core",
lib,
],
resource_jars = ["%s_resources.jar" % codegen],
unused_dependency_checker_mode = "off",
)
scala_binary(
name = name,
deps = [
"//external:io_bazel_rules_scala/dependency/jmh/net_sf_jopt_simple_jopt_simple",
"//external:io_bazel_rules_scala/dependency/jmh/org_apache_commons_commons_math3",
compiled_lib,
],
main_class = main_class,
unused_dependency_checker_mode = "off",
)
codegen = name + "_codegen"
scala_generate_benchmark(
name = codegen,
src = lib,
generator_type = generator_type,
)
compiled_lib = name + "_compiled_benchmark_lib"
scala_library(
name = compiled_lib,
srcs = ["%s.srcjar" % codegen],
deps = deps + [
"//external:io_bazel_rules_scala/dependency/jmh/jmh_core",
lib,
],
resource_jars = ["%s_resources.jar" % codegen],
unused_dependency_checker_mode = "off",
)
scala_binary(
name = name,
deps = [
"//external:io_bazel_rules_scala/dependency/jmh/net_sf_jopt_simple_jopt_simple",
"//external:io_bazel_rules_scala/dependency/jmh/org_apache_commons_commons_math3",
compiled_lib,
],
main_class = main_class,
unused_dependency_checker_mode = "off",
)
34 changes: 18 additions & 16 deletions junit/junit.bzl
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
def junit_repositories():
native.maven_jar(
name = "io_bazel_rules_scala_junit_junit",
artifact = "junit:junit:4.12",
sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec",
)
native.bind(
name = 'io_bazel_rules_scala/dependency/junit/junit',
actual = '@io_bazel_rules_scala_junit_junit//jar')
native.maven_jar(
name = "io_bazel_rules_scala_junit_junit",
artifact = "junit:junit:4.12",
sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec",
)
native.bind(
name = "io_bazel_rules_scala/dependency/junit/junit",
actual = "@io_bazel_rules_scala_junit_junit//jar",
)

native.maven_jar(
name = "io_bazel_rules_scala_org_hamcrest_hamcrest_core",
artifact = "org.hamcrest:hamcrest-core:1.3",
sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0",
)
native.bind(
name = 'io_bazel_rules_scala/dependency/hamcrest/hamcrest_core',
actual = '@io_bazel_rules_scala_org_hamcrest_hamcrest_core//jar')
native.maven_jar(
name = "io_bazel_rules_scala_org_hamcrest_hamcrest_core",
artifact = "org.hamcrest:hamcrest-core:1.3",
sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0",
)
native.bind(
name = "io_bazel_rules_scala/dependency/hamcrest/hamcrest_core",
actual = "@io_bazel_rules_scala_org_hamcrest_hamcrest_core//jar",
)
Loading

0 comments on commit ad41d0c

Please sign in to comment.