Skip to content

Commit d856821

Browse files
mikedanesesparkprime
authored andcommitted
update bazel build to latest version of bazel
* explicitly load git_repository rule * load googletest as a git_repository * stop using bind (see bazelbuild/bazel#1952)
1 parent 2fca28b commit d856821

File tree

4 files changed

+10
-631
lines changed

4 files changed

+10
-631
lines changed

WORKSPACE

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,19 @@
11
workspace(name = "jsonnet")
22

3-
# This local_repository looks silly but it makes io_bazel_rules_jsonnet use
4-
# _this_ jsonnet, not another downloaded copy.
5-
local_repository(
6-
name = "jsonnet",
7-
path = ".",
8-
)
3+
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
94

105
git_repository(
116
name = "io_bazel_rules_jsonnet",
127
commit = "09ec18db5b9ad3129810f5f0ccc86363a8bfb6be",
138
remote = "https://github.com/bazelbuild/rules_jsonnet.git",
149
)
1510

16-
new_git_repository(
11+
git_repository(
1712
name = "com_google_googletest",
1813
remote = "https://github.com/google/googletest.git",
1914

2015
# If updating googletest version, also update CMakeLists.txt.in.
21-
tag = "release-1.8.0",
22-
build_file = "gmock.BUILD",
23-
)
24-
25-
bind(
26-
name = "googletest",
27-
actual = "@com_google_googletest//:googletest_no_main",
28-
)
29-
30-
bind(
31-
name = "googletest_main",
32-
actual = "@com_google_googletest//:googletest",
16+
tag = "release-1.8.1",
3317
)
3418

3519
load("//tools/build_defs:python_repo.bzl", "python_interpreter")

core/BUILD

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ cc_library(
2828
"unicode.h",
2929
"vm.h",
3030
],
31+
includes = ["."],
32+
linkopts = ["-lm"],
3133
deps = [
3234
"//include:libjsonnet",
3335
"//include:libjsonnet_fmt",
3436
"//stdlib:std",
35-
"//third_party/json:json",
37+
"//third_party/json",
3638
"//third_party/md5:libmd5",
3739
],
38-
linkopts = ["-lm"],
39-
includes = ["."],
4040
)
4141

4242
cc_test(
@@ -45,7 +45,7 @@ cc_test(
4545
deps = [
4646
":libjsonnet",
4747
# Note: On Ubuntu, apt-get install libgtest-dev google-mock
48-
"//external:googletest_main",
48+
"@com_google_googletest//:gtest_main",
4949
],
5050
)
5151

@@ -54,7 +54,7 @@ cc_test(
5454
srcs = ["parser_test.cpp"],
5555
deps = [
5656
":libjsonnet",
57-
"//external:googletest_main",
57+
"@com_google_googletest//:gtest_main",
5858
],
5959
)
6060

@@ -63,6 +63,6 @@ cc_test(
6363
srcs = ["libjsonnet_test.cpp"],
6464
deps = [
6565
":libjsonnet",
66-
"//external:googletest_main",
66+
"@com_google_googletest//:gtest_main",
6767
],
6868
)

cpp/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ cc_test(
1515
data = ["//cpp/testdata"],
1616
deps = [
1717
":libjsonnet++",
18-
"//external:googletest_main",
18+
"@com_google_googletest//:gtest_main",
1919
],
2020
)

0 commit comments

Comments
 (0)