Skip to content

Commit b456565

Browse files
UebelAndreUebelAndre
authored
Updated some hand edited cargo-raze outputs (#557)
* Standardized cargo-raze setup for complex_sys example * Regenerated raze outputs * Manually updated raze outputs See google/cargo-raze#344
1 parent 951eae5 commit b456565

24 files changed

+504
-61
lines changed

‎examples/complex_sys/Cargo.lock

Lines changed: 50 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/complex_sys/Cargo.toml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ package_aliases_dir = "raze"
2020
default_gen_buildrs = true
2121

2222
[package.metadata.raze.crates.openssl-sys.'0.9.60']
23-
additional_deps = [
24-
"@openssl//:openssl",
25-
]
23+
build_data_dependencies = ["@openssl"]
24+
additional_deps = ["@openssl"]
25+
buildrs_additional_environment_variables = { OPENSSL_DIR="../openssl/openssl" }
26+
27+
[package.metadata.raze.crates.libssh2-sys.'0.2.20']
28+
build_data_dependencies = ["@openssl"]

‎examples/complex_sys/raze/BUILD.bazel

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,29 @@ alias(
2020
"manual",
2121
],
2222
)
23+
24+
alias(
25+
name = "openssl",
26+
actual = "@rules_rust_examples_complex_sys__openssl__0_10_32//:openssl",
27+
tags = [
28+
"cargo-raze",
29+
"manual",
30+
],
31+
)
32+
33+
alias(
34+
name = "openssl_sys",
35+
actual = "@rules_rust_examples_complex_sys__openssl_sys__0_9_60//:openssl_sys",
36+
tags = [
37+
"cargo-raze",
38+
"manual",
39+
],
40+
)
41+
42+
# Export file for Stardoc support
43+
exports_files(
44+
[
45+
"crates.bzl",
46+
],
47+
visibility = ["//visibility:public"],
48+
)

‎examples/complex_sys/raze/crates.bzl

Lines changed: 65 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,36 @@ def rules_rust_examples_complex_sys_fetch_remote_crates():
5151
build_file = Label("//complex_sys/raze/remote:BUILD.cfg-if-0.1.10.bazel"),
5252
)
5353

54+
maybe(
55+
http_archive,
56+
name = "rules_rust_examples_complex_sys__cfg_if__1_0_0",
57+
url = "https://crates.io/api/v1/crates/cfg-if/1.0.0/download",
58+
type = "tar.gz",
59+
sha256 = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd",
60+
strip_prefix = "cfg-if-1.0.0",
61+
build_file = Label("//complex_sys/raze/remote:BUILD.cfg-if-1.0.0.bazel"),
62+
)
63+
64+
maybe(
65+
http_archive,
66+
name = "rules_rust_examples_complex_sys__foreign_types__0_3_2",
67+
url = "https://crates.io/api/v1/crates/foreign-types/0.3.2/download",
68+
type = "tar.gz",
69+
sha256 = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1",
70+
strip_prefix = "foreign-types-0.3.2",
71+
build_file = Label("//complex_sys/raze/remote:BUILD.foreign-types-0.3.2.bazel"),
72+
)
73+
74+
maybe(
75+
http_archive,
76+
name = "rules_rust_examples_complex_sys__foreign_types_shared__0_1_1",
77+
url = "https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download",
78+
type = "tar.gz",
79+
sha256 = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b",
80+
strip_prefix = "foreign-types-shared-0.1.1",
81+
build_file = Label("//complex_sys/raze/remote:BUILD.foreign-types-shared-0.1.1.bazel"),
82+
)
83+
5484
maybe(
5585
http_archive,
5686
name = "rules_rust_examples_complex_sys__form_urlencoded__1_0_0",
@@ -93,22 +123,32 @@ def rules_rust_examples_complex_sys_fetch_remote_crates():
93123

94124
maybe(
95125
http_archive,
96-
name = "rules_rust_examples_complex_sys__libc__0_2_81",
97-
url = "https://crates.io/api/v1/crates/libc/0.2.81/download",
126+
name = "rules_rust_examples_complex_sys__lazy_static__1_4_0",
127+
url = "https://crates.io/api/v1/crates/lazy_static/1.4.0/download",
128+
type = "tar.gz",
129+
sha256 = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646",
130+
strip_prefix = "lazy_static-1.4.0",
131+
build_file = Label("//complex_sys/raze/remote:BUILD.lazy_static-1.4.0.bazel"),
132+
)
133+
134+
maybe(
135+
http_archive,
136+
name = "rules_rust_examples_complex_sys__libc__0_2_82",
137+
url = "https://crates.io/api/v1/crates/libc/0.2.82/download",
98138
type = "tar.gz",
99-
sha256 = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb",
100-
strip_prefix = "libc-0.2.81",
101-
build_file = Label("//complex_sys/raze/remote:BUILD.libc-0.2.81.bazel"),
139+
sha256 = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929",
140+
strip_prefix = "libc-0.2.82",
141+
build_file = Label("//complex_sys/raze/remote:BUILD.libc-0.2.82.bazel"),
102142
)
103143

104144
maybe(
105145
http_archive,
106-
name = "rules_rust_examples_complex_sys__libgit2_sys__0_12_17_1_1_0",
107-
url = "https://crates.io/api/v1/crates/libgit2-sys/0.12.17+1.1.0/download",
146+
name = "rules_rust_examples_complex_sys__libgit2_sys__0_12_18_1_1_0",
147+
url = "https://crates.io/api/v1/crates/libgit2-sys/0.12.18+1.1.0/download",
108148
type = "tar.gz",
109-
sha256 = "f4ebdf65ca745126df8824688637aa0535a88900b83362d8ca63893bcf4e8841",
110-
strip_prefix = "libgit2-sys-0.12.17+1.1.0",
111-
build_file = Label("//complex_sys/raze/remote:BUILD.libgit2-sys-0.12.17+1.1.0.bazel"),
149+
sha256 = "3da6a42da88fc37ee1ecda212ffa254c25713532980005d5f7c0b0fbe7e6e885",
150+
strip_prefix = "libgit2-sys-0.12.18+1.1.0",
151+
build_file = Label("//complex_sys/raze/remote:BUILD.libgit2-sys-0.12.18+1.1.0.bazel"),
112152
)
113153

114154
maybe(
@@ -133,12 +173,12 @@ def rules_rust_examples_complex_sys_fetch_remote_crates():
133173

134174
maybe(
135175
http_archive,
136-
name = "rules_rust_examples_complex_sys__log__0_4_11",
137-
url = "https://crates.io/api/v1/crates/log/0.4.11/download",
176+
name = "rules_rust_examples_complex_sys__log__0_4_13",
177+
url = "https://crates.io/api/v1/crates/log/0.4.13/download",
138178
type = "tar.gz",
139-
sha256 = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b",
140-
strip_prefix = "log-0.4.11",
141-
build_file = Label("//complex_sys/raze/remote:BUILD.log-0.4.11.bazel"),
179+
sha256 = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2",
180+
strip_prefix = "log-0.4.13",
181+
build_file = Label("//complex_sys/raze/remote:BUILD.log-0.4.13.bazel"),
142182
)
143183

144184
maybe(
@@ -151,6 +191,16 @@ def rules_rust_examples_complex_sys_fetch_remote_crates():
151191
build_file = Label("//complex_sys/raze/remote:BUILD.matches-0.1.8.bazel"),
152192
)
153193

194+
maybe(
195+
http_archive,
196+
name = "rules_rust_examples_complex_sys__openssl__0_10_32",
197+
url = "https://crates.io/api/v1/crates/openssl/0.10.32/download",
198+
type = "tar.gz",
199+
sha256 = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70",
200+
strip_prefix = "openssl-0.10.32",
201+
build_file = Label("//complex_sys/raze/remote:BUILD.openssl-0.10.32.bazel"),
202+
)
203+
154204
maybe(
155205
http_archive,
156206
name = "rules_rust_examples_complex_sys__openssl_probe__0_1_2",

‎examples/complex_sys/raze/remote/BUILD.cc-1.0.66.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ rust_binary(
5252
version = "1.0.66",
5353
# buildifier: leave-alone
5454
deps = [
55-
# Binaries get an implicit dependency on their crate's lib
5655
":cc",
5756
"@rules_rust_examples_complex_sys__jobserver__0_1_21//:jobserver",
5857
],

‎examples/complex_sys/raze/remote/BUILD.cfg-if-1.0.0.bazel

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
"""
2+
@generated
3+
cargo-raze crate build file.
4+
5+
DO NOT EDIT! Replaced on runs of cargo-raze
6+
"""
7+
8+
# buildifier: disable=load
9+
load(
10+
"@io_bazel_rules_rust//rust:rust.bzl",
11+
"rust_binary",
12+
"rust_library",
13+
"rust_test",
14+
)
15+
16+
# buildifier: disable=load
17+
load("@bazel_skylib//lib:selects.bzl", "selects")
18+
19+
package(default_visibility = [
20+
# Public for visibility by "@raze__crate__version//" targets.
21+
#
22+
# Prefer access through "//complex_sys/raze", which limits external
23+
# visibility to explicit Cargo.toml dependencies.
24+
"//visibility:public",
25+
])
26+
27+
licenses([
28+
"notice", # MIT from expression "MIT OR Apache-2.0"
29+
])
30+
31+
# Generated Targets
32+
33+
rust_library(
34+
name = "cfg_if",
35+
srcs = glob(["**/*.rs"]),
36+
crate_features = [
37+
],
38+
crate_root = "src/lib.rs",
39+
crate_type = "lib",
40+
data = [],
41+
edition = "2018",
42+
rustc_flags = [
43+
"--cap-lints=allow",
44+
],
45+
tags = [
46+
"cargo-raze",
47+
"manual",
48+
],
49+
version = "1.0.0",
50+
# buildifier: leave-alone
51+
deps = [
52+
],
53+
)
54+
55+
# Unsupported target "xcrate" with type "test" omitted

‎examples/complex_sys/raze/remote/BUILD.foreign-types-0.3.2.bazel

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
"""
2+
@generated
3+
cargo-raze crate build file.
4+
5+
DO NOT EDIT! Replaced on runs of cargo-raze
6+
"""
7+
8+
# buildifier: disable=load
9+
load(
10+
"@io_bazel_rules_rust//rust:rust.bzl",
11+
"rust_binary",
12+
"rust_library",
13+
"rust_test",
14+
)
15+
16+
# buildifier: disable=load
17+
load("@bazel_skylib//lib:selects.bzl", "selects")
18+
19+
package(default_visibility = [
20+
# Public for visibility by "@raze__crate__version//" targets.
21+
#
22+
# Prefer access through "//complex_sys/raze", which limits external
23+
# visibility to explicit Cargo.toml dependencies.
24+
"//visibility:public",
25+
])
26+
27+
licenses([
28+
"notice", # MIT from expression "MIT OR Apache-2.0"
29+
])
30+
31+
# Generated Targets
32+
33+
rust_library(
34+
name = "foreign_types",
35+
srcs = glob(["**/*.rs"]),
36+
crate_features = [
37+
],
38+
crate_root = "src/lib.rs",
39+
crate_type = "lib",
40+
data = [],
41+
edition = "2015",
42+
rustc_flags = [
43+
"--cap-lints=allow",
44+
],
45+
tags = [
46+
"cargo-raze",
47+
"manual",
48+
],
49+
version = "0.3.2",
50+
# buildifier: leave-alone
51+
deps = [
52+
"@rules_rust_examples_complex_sys__foreign_types_shared__0_1_1//:foreign_types_shared",
53+
],
54+
)

0 commit comments

Comments
 (0)