Skip to content

Commit

Permalink
Bump checkerframework to 2.2.2 and stop building from source
Browse files Browse the repository at this point in the history
Fixes: bazelbuild#4709.

This change stops building checker framework from the source and consumes
the artifacts from Central. As the consequence, the sources are removed
from the Bazel tree and we discontinue packaging the sources in Bazel
source artifact.

LGPL sources are still have to be included in embeded_tools archive. The
source jars are included in embedded_tools archive now:

$ unzip -t bazel-genfiles/src/embedded_tools.zip|grep checker_framework
testing: third_party/checker_framework_dataflow/dataflow-2.2.2-sources.jar
testing: third_party/checker_framework_javacutil/javacutil-2.2.2-sources.jar
  • Loading branch information
davido committed Mar 14, 2018
1 parent a2fc4e3 commit 117bc0c
Show file tree
Hide file tree
Showing 144 changed files with 13 additions and 21,364 deletions.
6 changes: 0 additions & 6 deletions src/main/tools/jdk.BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,6 @@ filegroup(
srcs = ["lib/tools.jar"],
)

java_import(
name = "langtools-neverlink",
jars = ["lib/tools.jar"],
neverlink = 1,
)

config_setting(
name = "windows",
values = {"cpu": "x64_windows"},
Expand Down
4 changes: 1 addition & 3 deletions third_party/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ filegroup(
"//third_party/java/jdk/javabuilder:srcs",
"//third_party/java/proguard:srcs",
"//third_party/javascript/bootstrap:srcs",
"//third_party/checker_framework_dataflow:srcs",
"//third_party/checker_framework_javacutil:srcs",
"//third_party/jformatstring:srcs",
"//third_party/protobuf:srcs",
"//third_party/py/abseil:srcs",
Expand Down Expand Up @@ -385,7 +383,7 @@ filegroup(
"jcip_annotations/jcip-annotations-1.0-1.jar",
"jsr305/jsr-305.jar",
"pcollections/pcollections-2.1.2.jar",
"//third_party/checker_framework_dataflow:bootstrap",
"//third_party/checker_framework_dataflow",
"//third_party/jformatstring:bootstrap",
],
)
Expand Down
19 changes: 6 additions & 13 deletions third_party/checker_framework_dataflow/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,16 @@ licenses(["restricted"]) # GNU GPL v2 with Classpath exception

filegroup(
name = "srcs",
srcs = glob(["**"]),
srcs = ["dataflow-2.2.2-sources.jar"],
)

java_library(
java_import(
name = "checker_framework_dataflow",
srcs = glob(["java/**"]),
javacopts = ["-Xep:MissingCasesInEnumSwitch:OFF"],
jars = [
"dataflow-2.2.2.jar",
],
srcjar = "dataflow-2.2.2-sources.jar",
deps = [
"//third_party/checker_framework_javacutil",
"@local_jdk//:langtools-neverlink",
],
)

load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library")

bootstrap_java_library(
name = "bootstrap",
srcs = glob(["java/**"]),
deps = ["//third_party/checker_framework_javacutil:bootstrap"],
)
Binary file not shown.
Binary file not shown.

This file was deleted.

Loading

0 comments on commit 117bc0c

Please sign in to comment.