File tree Expand file tree Collapse file tree 4 files changed +10
-631
lines changed Expand file tree Collapse file tree 4 files changed +10
-631
lines changed Original file line number Diff line number Diff line change 1
1
workspace (name = "jsonnet" )
2
2
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" )
9
4
10
5
git_repository (
11
6
name = "io_bazel_rules_jsonnet" ,
12
7
commit = "09ec18db5b9ad3129810f5f0ccc86363a8bfb6be" ,
13
8
remote = "https://github.com/bazelbuild/rules_jsonnet.git" ,
14
9
)
15
10
16
- new_git_repository (
11
+ git_repository (
17
12
name = "com_google_googletest" ,
18
13
remote = "https://github.com/google/googletest.git" ,
19
14
20
15
# 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" ,
33
17
)
34
18
35
19
load ("//tools/build_defs:python_repo.bzl" , "python_interpreter" )
Original file line number Diff line number Diff line change @@ -28,15 +28,15 @@ cc_library(
28
28
"unicode.h" ,
29
29
"vm.h" ,
30
30
],
31
+ includes = ["." ],
32
+ linkopts = ["-lm" ],
31
33
deps = [
32
34
"//include:libjsonnet" ,
33
35
"//include:libjsonnet_fmt" ,
34
36
"//stdlib:std" ,
35
- "//third_party/json:json " ,
37
+ "//third_party/json" ,
36
38
"//third_party/md5:libmd5" ,
37
39
],
38
- linkopts = ["-lm" ],
39
- includes = ["." ],
40
40
)
41
41
42
42
cc_test (
@@ -45,7 +45,7 @@ cc_test(
45
45
deps = [
46
46
":libjsonnet" ,
47
47
# Note: On Ubuntu, apt-get install libgtest-dev google-mock
48
- "//external:googletest_main " ,
48
+ "@com_google_googletest//:gtest_main " ,
49
49
],
50
50
)
51
51
@@ -54,7 +54,7 @@ cc_test(
54
54
srcs = ["parser_test.cpp" ],
55
55
deps = [
56
56
":libjsonnet" ,
57
- "//external:googletest_main " ,
57
+ "@com_google_googletest//:gtest_main " ,
58
58
],
59
59
)
60
60
@@ -63,6 +63,6 @@ cc_test(
63
63
srcs = ["libjsonnet_test.cpp" ],
64
64
deps = [
65
65
":libjsonnet" ,
66
- "//external:googletest_main " ,
66
+ "@com_google_googletest//:gtest_main " ,
67
67
],
68
68
)
Original file line number Diff line number Diff line change @@ -15,6 +15,6 @@ cc_test(
15
15
data = ["//cpp/testdata" ],
16
16
deps = [
17
17
":libjsonnet++" ,
18
- "//external:googletest_main " ,
18
+ "@com_google_googletest//:gtest_main " ,
19
19
],
20
20
)
You can’t perform that action at this time.
0 commit comments