Skip to content

Commit

Permalink
Update Verible to latest.
Browse files Browse the repository at this point in the history
We don't need the version anymore that is compatible with old
logging. Also, this simplifies the patch we have to apply as
the installer-dependency (that we don't need and don't want to
import) is not referenced anymore in the toplevel BUILD file
of Verible.

PiperOrigin-RevId: 639905884
  • Loading branch information
hzeller authored and copybara-github committed Jun 3, 2024
1 parent eff2607 commit 2d2eb14
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 39 deletions.
16 changes: 8 additions & 8 deletions dependency_support/load_external.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -354,24 +354,24 @@ def load_external_repositories():
urls = ["https://github.com/grailbio/bazel-compilation-database/archive/940cedacdb8a1acbce42093bf67f3a5ca8b265f7.tar.gz"],
)

# 2023-12-15 Last version compatible with absl with or without VLOG()
# 2024-05-28
http_archive(
name = "verible",
sha256 = "133bb3f7b041ce5009f6bb369ed62f1d6c3760e3ab9b44ab08484a7245d096d3",
strip_prefix = "verible-0.0-3498-g82ac5189",
urls = ["https://github.com/chipsalliance/verible/archive/refs/tags/v0.0-3498-g82ac5189.tar.gz"],
sha256 = "a72b9e351f893ac62fac3c72227dc809e29460eb4ddac35e673d73627e9fab1f",
strip_prefix = "verible-0.0-3665-ga9394662",
urls = ["https://github.com/chipsalliance/verible/archive/refs/tags/v0.0-3665-ga9394662.tar.gz"],
patch_args = ["-p1"],
patches = ["//dependency_support/verible:visibility.patch"],
)

# Same as Verible as of 2023-05-18
# Same as Verible as of 2024-05-28
http_archive(
name = "jsonhpp",
build_file = "@verible//bazel:jsonhpp.BUILD",
sha256 = "081ed0f9f89805c2d96335c3acfa993b39a0a5b4b4cef7edb68dd2210a13458c",
strip_prefix = "json-3.10.2",
sha256 = "0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406",
strip_prefix = "json-3.11.3",
urls = [
"https://github.com/nlohmann/json/archive/refs/tags/v3.10.2.tar.gz",
"https://github.com/nlohmann/json/archive/refs/tags/v3.11.3.tar.gz",
],
)

Expand Down
33 changes: 3 additions & 30 deletions dependency_support/verible/visibility.patch
Original file line number Diff line number Diff line change
@@ -1,40 +1,13 @@
diff --git a/BUILD b/BUILD
index c10e3bf2..2eddb5ed 100644
--- a/BUILD
+++ b/BUILD
@@ -4,7 +4,6 @@
# Run tests with
# bazel test ...

-load("@com_github_google_rules_install//installer:def.bzl", "installer")
load("@rules_license//rules:license.bzl", "license")

package(
@@ -46,14 +45,6 @@ filegroup(
],
)

-installer(
- name = "install",
- data = [
- ":install-binaries",
- ":install-scripts",
- ],
-)
-
genrule(
name = "lint_doc",
outs = ["documentation_verible_lint_rules.md"],
diff --git a/common/lsp/BUILD b/common/lsp/BUILD
index 87d7969f..00b80158 100644
index 8273dc26..cf0b71ae 100644
--- a/common/lsp/BUILD
+++ b/common/lsp/BUILD
@@ -12,7 +12,7 @@ load("//common/tools:jcxxgen.bzl", "jcxxgen")
@@ -11,7 +11,7 @@ load("//bazel:sh_test_with_runfiles_lib.bzl", "sh_test_with_runfiles_lib")
package(
default_applicable_licenses = ["//:license"],
default_visibility = [
- "//verilog/tools/ls:__subpackages__",
+ "//visibility:public",
],
features = ["layering_check"],
)

2 changes: 1 addition & 1 deletion xls/dslx/lsp/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ cc_binary(
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/status",
"@com_google_absl//absl/strings",
"@jsonhpp",
"@jsonhpp//:json",
"//xls/common:exit_status",
"//xls/common:init_xls",
"//xls/dslx:default_dslx_stdlib_path",
Expand Down

0 comments on commit 2d2eb14

Please sign in to comment.