From 173cf742b50ae46d6b91e86dc7e8b6ddb65c4d9e Mon Sep 17 00:00:00 2001 From: Andre Brisco Date: Thu, 21 Jan 2021 07:26:05 -0800 Subject: [PATCH 1/3] Standardized cargo-raze setup for complex_sys example --- examples/complex_sys/Cargo.toml | 9 ++++++--- examples/complex_sys/repositories.bzl | 18 ++++++++++++++++++ examples/examples_deps.bzl | 4 ++-- examples/examples_repositories.bzl | 9 --------- .../{openssl.BUILD => BUILD.openssl.bazel} | 0 5 files changed, 26 insertions(+), 14 deletions(-) create mode 100644 examples/complex_sys/repositories.bzl rename examples/third_party/openssl/{openssl.BUILD => BUILD.openssl.bazel} (100%) diff --git a/examples/complex_sys/Cargo.toml b/examples/complex_sys/Cargo.toml index d0247b7dbe..f7f4a7bdc1 100644 --- a/examples/complex_sys/Cargo.toml +++ b/examples/complex_sys/Cargo.toml @@ -20,6 +20,9 @@ package_aliases_dir = "raze" default_gen_buildrs = true [package.metadata.raze.crates.openssl-sys.'0.9.60'] -additional_deps = [ - "@openssl//:openssl", -] +build_data_dependencies = ["@openssl"] +additional_deps = ["@openssl"] +buildrs_additional_environment_variables = { OPENSSL_DIR="../openssl/openssl" } + +[package.metadata.raze.crates.libssh2-sys.'0.2.20'] +build_data_dependencies = ["@openssl"] diff --git a/examples/complex_sys/repositories.bzl b/examples/complex_sys/repositories.bzl new file mode 100644 index 0000000000..067292b44a --- /dev/null +++ b/examples/complex_sys/repositories.bzl @@ -0,0 +1,18 @@ +# buildifier: disable=module-docstring +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") +load("//complex_sys/raze:crates.bzl", "rules_rust_examples_complex_sys_fetch_remote_crates") + +def rules_rust_examples_complex_sys_repositories(): + """Define repository dependencies for the `complex_sys` example""" + + rules_rust_examples_complex_sys_fetch_remote_crates() + + maybe( + http_archive, + name = "openssl", + strip_prefix = "openssl-OpenSSL_1_1_1d", + urls = ["https://github.com/openssl/openssl/archive/OpenSSL_1_1_1d.tar.gz"], + sha256 = "23011a5cc78e53d0dc98dfa608c51e72bcd350aa57df74c5d5574ba4ffb62e74", + build_file = "@examples//third_party/openssl:BUILD.openssl.bazel", + ) diff --git a/examples/examples_deps.bzl b/examples/examples_deps.bzl index 0aa569e2a2..a566d40697 100644 --- a/examples/examples_deps.bzl +++ b/examples/examples_deps.bzl @@ -4,7 +4,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories") load("@examples//hello_sys/raze:crates.bzl", "rules_rust_examples_hello_sys_fetch_remote_crates") -load("@examples//complex_sys/raze:crates.bzl", "rules_rust_examples_complex_sys_fetch_remote_crates") +load("@examples//complex_sys:repositories.bzl", "rules_rust_examples_complex_sys_repositories") load("@io_bazel_rules_rust//bindgen:repositories.bzl", "rust_bindgen_repositories") load("@io_bazel_rules_rust//proto:repositories.bzl", "rust_proto_repositories") load("@io_bazel_rules_rust//rust:repositories.bzl", "rust_repositories", "rust_repository_set") @@ -41,7 +41,7 @@ def deps(): rules_rust_examples_hello_sys_fetch_remote_crates() - rules_rust_examples_complex_sys_fetch_remote_crates() + rules_rust_examples_complex_sys_repositories() maybe( http_archive, diff --git a/examples/examples_repositories.bzl b/examples/examples_repositories.bzl index 41add837e4..6622f854e6 100644 --- a/examples/examples_repositories.bzl +++ b/examples/examples_repositories.bzl @@ -36,12 +36,3 @@ def repositories(): url = "https://github.com/bazelbuild/rules_foreign_cc/archive/d54c78ab86b40770ee19f0949db9d74a831ab9f0.zip", sha256 = "3c6445404e9e5d17fa0ecdef61be00dd93b20222c11f45e146a98c0a3f67defa", ) - - maybe( - http_archive, - name = "openssl", - strip_prefix = "openssl-OpenSSL_1_1_1d", - urls = ["https://github.com/openssl/openssl/archive/OpenSSL_1_1_1d.tar.gz"], - sha256 = "23011a5cc78e53d0dc98dfa608c51e72bcd350aa57df74c5d5574ba4ffb62e74", - build_file = "@examples//third_party/openssl:openssl.BUILD", - ) diff --git a/examples/third_party/openssl/openssl.BUILD b/examples/third_party/openssl/BUILD.openssl.bazel similarity index 100% rename from examples/third_party/openssl/openssl.BUILD rename to examples/third_party/openssl/BUILD.openssl.bazel From cab7acd9c5895224a1831f8c0df60a208d43d1da Mon Sep 17 00:00:00 2001 From: Andre Brisco Date: Thu, 21 Jan 2021 07:45:28 -0800 Subject: [PATCH 2/3] Regenerated raze outputs --- examples/complex_sys/Cargo.lock | 57 ++++++++++-- examples/complex_sys/raze/BUILD.bazel | 26 ++++++ examples/complex_sys/raze/crates.bzl | 80 +++++++++++++--- .../raze/remote/BUILD.cc-1.0.66.bazel | 1 - .../raze/remote/BUILD.cfg-if-1.0.0.bazel | 55 +++++++++++ .../remote/BUILD.foreign-types-0.3.2.bazel | 54 +++++++++++ .../BUILD.foreign-types-shared-0.1.1.bazel | 53 +++++++++++ .../raze/remote/BUILD.git2-0.13.12.bazel | 6 +- .../raze/remote/BUILD.jobserver-0.1.21.bazel | 2 +- .../raze/remote/BUILD.lazy_static-1.4.0.bazel | 57 ++++++++++++ ...c-0.2.81.bazel => BUILD.libc-0.2.82.bazel} | 4 +- ... => BUILD.libgit2-sys-0.12.18+1.1.0.bazel} | 6 +- .../remote/BUILD.libssh2-sys-0.2.20.bazel | 5 +- .../raze/remote/BUILD.libz-sys-1.1.2.bazel | 2 +- ...og-0.4.11.bazel => BUILD.log-0.4.13.bazel} | 4 +- .../raze/remote/BUILD.openssl-0.10.32.bazel | 91 +++++++++++++++++++ .../remote/BUILD.openssl-sys-0.9.60.bazel | 10 +- examples/hello_sys/raze/BUILD.bazel | 8 ++ .../raze/remote/BUILD.cc-1.0.60.bazel | 1 - 19 files changed, 475 insertions(+), 47 deletions(-) create mode 100644 examples/complex_sys/raze/remote/BUILD.cfg-if-1.0.0.bazel create mode 100644 examples/complex_sys/raze/remote/BUILD.foreign-types-0.3.2.bazel create mode 100644 examples/complex_sys/raze/remote/BUILD.foreign-types-shared-0.1.1.bazel create mode 100644 examples/complex_sys/raze/remote/BUILD.lazy_static-1.4.0.bazel rename examples/complex_sys/raze/remote/{BUILD.libc-0.2.81.bazel => BUILD.libc-0.2.82.bazel} (97%) rename examples/complex_sys/raze/remote/{BUILD.libgit2-sys-0.12.17+1.1.0.bazel => BUILD.libgit2-sys-0.12.18+1.1.0.bazel} (97%) rename examples/complex_sys/raze/remote/{BUILD.log-0.4.11.bazel => BUILD.log-0.4.13.bazel} (97%) create mode 100644 examples/complex_sys/raze/remote/BUILD.openssl-0.10.32.bazel diff --git a/examples/complex_sys/Cargo.lock b/examples/complex_sys/Cargo.lock index 8e57369fd0..1d3b0efd91 100644 --- a/examples/complex_sys/Cargo.lock +++ b/examples/complex_sys/Cargo.lock @@ -27,6 +27,27 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.0.0" @@ -72,17 +93,23 @@ dependencies = [ "libc", ] +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + [[package]] name = "libc" -version = "0.2.81" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" +checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929" [[package]] name = "libgit2-sys" -version = "0.12.17+1.1.0" +version = "0.12.18+1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ebdf65ca745126df8824688637aa0535a88900b83362d8ca63893bcf4e8841" +checksum = "3da6a42da88fc37ee1ecda212ffa254c25713532980005d5f7c0b0fbe7e6e885" dependencies = [ "cc", "libc", @@ -120,11 +147,11 @@ dependencies = [ [[package]] name = "log" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -133,6 +160,20 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +[[package]] +name = "openssl" +version = "0.10.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "foreign-types", + "lazy_static", + "libc", + "openssl-sys", +] + [[package]] name = "openssl-probe" version = "0.1.2" @@ -169,6 +210,8 @@ name = "rules_rust_examples_complex_sys" version = "0.0.1" dependencies = [ "git2", + "openssl", + "openssl-sys", ] [[package]] diff --git a/examples/complex_sys/raze/BUILD.bazel b/examples/complex_sys/raze/BUILD.bazel index c7d3bc47ab..2a4af58dd8 100644 --- a/examples/complex_sys/raze/BUILD.bazel +++ b/examples/complex_sys/raze/BUILD.bazel @@ -20,3 +20,29 @@ alias( "manual", ], ) + +alias( + name = "openssl", + actual = "@rules_rust_examples_complex_sys__openssl__0_10_32//:openssl", + tags = [ + "cargo-raze", + "manual", + ], +) + +alias( + name = "openssl_sys", + actual = "@rules_rust_examples_complex_sys__openssl_sys__0_9_60//:openssl_sys", + tags = [ + "cargo-raze", + "manual", + ], +) + +# Export file for Stardoc support +exports_files( + [ + "crates.bzl", + ], + visibility = ["//visibility:public"], +) diff --git a/examples/complex_sys/raze/crates.bzl b/examples/complex_sys/raze/crates.bzl index 000a35a214..94ae57e0f2 100644 --- a/examples/complex_sys/raze/crates.bzl +++ b/examples/complex_sys/raze/crates.bzl @@ -51,6 +51,36 @@ def rules_rust_examples_complex_sys_fetch_remote_crates(): build_file = Label("//complex_sys/raze/remote:BUILD.cfg-if-0.1.10.bazel"), ) + maybe( + http_archive, + name = "rules_rust_examples_complex_sys__cfg_if__1_0_0", + url = "https://crates.io/api/v1/crates/cfg-if/1.0.0/download", + type = "tar.gz", + sha256 = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd", + strip_prefix = "cfg-if-1.0.0", + build_file = Label("//complex_sys/raze/remote:BUILD.cfg-if-1.0.0.bazel"), + ) + + maybe( + http_archive, + name = "rules_rust_examples_complex_sys__foreign_types__0_3_2", + url = "https://crates.io/api/v1/crates/foreign-types/0.3.2/download", + type = "tar.gz", + sha256 = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1", + strip_prefix = "foreign-types-0.3.2", + build_file = Label("//complex_sys/raze/remote:BUILD.foreign-types-0.3.2.bazel"), + ) + + maybe( + http_archive, + name = "rules_rust_examples_complex_sys__foreign_types_shared__0_1_1", + url = "https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download", + type = "tar.gz", + sha256 = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b", + strip_prefix = "foreign-types-shared-0.1.1", + build_file = Label("//complex_sys/raze/remote:BUILD.foreign-types-shared-0.1.1.bazel"), + ) + maybe( http_archive, name = "rules_rust_examples_complex_sys__form_urlencoded__1_0_0", @@ -93,22 +123,32 @@ def rules_rust_examples_complex_sys_fetch_remote_crates(): maybe( http_archive, - name = "rules_rust_examples_complex_sys__libc__0_2_81", - url = "https://crates.io/api/v1/crates/libc/0.2.81/download", + name = "rules_rust_examples_complex_sys__lazy_static__1_4_0", + url = "https://crates.io/api/v1/crates/lazy_static/1.4.0/download", + type = "tar.gz", + sha256 = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646", + strip_prefix = "lazy_static-1.4.0", + build_file = Label("//complex_sys/raze/remote:BUILD.lazy_static-1.4.0.bazel"), + ) + + maybe( + http_archive, + name = "rules_rust_examples_complex_sys__libc__0_2_82", + url = "https://crates.io/api/v1/crates/libc/0.2.82/download", type = "tar.gz", - sha256 = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb", - strip_prefix = "libc-0.2.81", - build_file = Label("//complex_sys/raze/remote:BUILD.libc-0.2.81.bazel"), + sha256 = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929", + strip_prefix = "libc-0.2.82", + build_file = Label("//complex_sys/raze/remote:BUILD.libc-0.2.82.bazel"), ) maybe( http_archive, - name = "rules_rust_examples_complex_sys__libgit2_sys__0_12_17_1_1_0", - url = "https://crates.io/api/v1/crates/libgit2-sys/0.12.17+1.1.0/download", + name = "rules_rust_examples_complex_sys__libgit2_sys__0_12_18_1_1_0", + url = "https://crates.io/api/v1/crates/libgit2-sys/0.12.18+1.1.0/download", type = "tar.gz", - sha256 = "f4ebdf65ca745126df8824688637aa0535a88900b83362d8ca63893bcf4e8841", - strip_prefix = "libgit2-sys-0.12.17+1.1.0", - build_file = Label("//complex_sys/raze/remote:BUILD.libgit2-sys-0.12.17+1.1.0.bazel"), + sha256 = "3da6a42da88fc37ee1ecda212ffa254c25713532980005d5f7c0b0fbe7e6e885", + strip_prefix = "libgit2-sys-0.12.18+1.1.0", + build_file = Label("//complex_sys/raze/remote:BUILD.libgit2-sys-0.12.18+1.1.0.bazel"), ) maybe( @@ -133,12 +173,12 @@ def rules_rust_examples_complex_sys_fetch_remote_crates(): maybe( http_archive, - name = "rules_rust_examples_complex_sys__log__0_4_11", - url = "https://crates.io/api/v1/crates/log/0.4.11/download", + name = "rules_rust_examples_complex_sys__log__0_4_13", + url = "https://crates.io/api/v1/crates/log/0.4.13/download", type = "tar.gz", - sha256 = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b", - strip_prefix = "log-0.4.11", - build_file = Label("//complex_sys/raze/remote:BUILD.log-0.4.11.bazel"), + sha256 = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2", + strip_prefix = "log-0.4.13", + build_file = Label("//complex_sys/raze/remote:BUILD.log-0.4.13.bazel"), ) maybe( @@ -151,6 +191,16 @@ def rules_rust_examples_complex_sys_fetch_remote_crates(): build_file = Label("//complex_sys/raze/remote:BUILD.matches-0.1.8.bazel"), ) + maybe( + http_archive, + name = "rules_rust_examples_complex_sys__openssl__0_10_32", + url = "https://crates.io/api/v1/crates/openssl/0.10.32/download", + type = "tar.gz", + sha256 = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70", + strip_prefix = "openssl-0.10.32", + build_file = Label("//complex_sys/raze/remote:BUILD.openssl-0.10.32.bazel"), + ) + maybe( http_archive, name = "rules_rust_examples_complex_sys__openssl_probe__0_1_2", diff --git a/examples/complex_sys/raze/remote/BUILD.cc-1.0.66.bazel b/examples/complex_sys/raze/remote/BUILD.cc-1.0.66.bazel index 6476620ece..47109ed800 100644 --- a/examples/complex_sys/raze/remote/BUILD.cc-1.0.66.bazel +++ b/examples/complex_sys/raze/remote/BUILD.cc-1.0.66.bazel @@ -52,7 +52,6 @@ rust_binary( version = "1.0.66", # buildifier: leave-alone deps = [ - # Binaries get an implicit dependency on their crate's lib ":cc", "@rules_rust_examples_complex_sys__jobserver__0_1_21//:jobserver", ], diff --git a/examples/complex_sys/raze/remote/BUILD.cfg-if-1.0.0.bazel b/examples/complex_sys/raze/remote/BUILD.cfg-if-1.0.0.bazel new file mode 100644 index 0000000000..08d85c0f4f --- /dev/null +++ b/examples/complex_sys/raze/remote/BUILD.cfg-if-1.0.0.bazel @@ -0,0 +1,55 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//complex_sys/raze", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets + +rust_library( + name = "cfg_if", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + crate_type = "lib", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "1.0.0", + # buildifier: leave-alone + deps = [ + ], +) + +# Unsupported target "xcrate" with type "test" omitted diff --git a/examples/complex_sys/raze/remote/BUILD.foreign-types-0.3.2.bazel b/examples/complex_sys/raze/remote/BUILD.foreign-types-0.3.2.bazel new file mode 100644 index 0000000000..9d51a11bcd --- /dev/null +++ b/examples/complex_sys/raze/remote/BUILD.foreign-types-0.3.2.bazel @@ -0,0 +1,54 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//complex_sys/raze", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets + +rust_library( + name = "foreign_types", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + crate_type = "lib", + data = [], + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.3.2", + # buildifier: leave-alone + deps = [ + "@rules_rust_examples_complex_sys__foreign_types_shared__0_1_1//:foreign_types_shared", + ], +) diff --git a/examples/complex_sys/raze/remote/BUILD.foreign-types-shared-0.1.1.bazel b/examples/complex_sys/raze/remote/BUILD.foreign-types-shared-0.1.1.bazel new file mode 100644 index 0000000000..68580e2c65 --- /dev/null +++ b/examples/complex_sys/raze/remote/BUILD.foreign-types-shared-0.1.1.bazel @@ -0,0 +1,53 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//complex_sys/raze", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets + +rust_library( + name = "foreign_types_shared", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + crate_type = "lib", + data = [], + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.1.1", + # buildifier: leave-alone + deps = [ + ], +) diff --git a/examples/complex_sys/raze/remote/BUILD.git2-0.13.12.bazel b/examples/complex_sys/raze/remote/BUILD.git2-0.13.12.bazel index 69efe76714..c6b2eb8cdf 100644 --- a/examples/complex_sys/raze/remote/BUILD.git2-0.13.12.bazel +++ b/examples/complex_sys/raze/remote/BUILD.git2-0.13.12.bazel @@ -86,9 +86,9 @@ rust_library( # buildifier: leave-alone deps = [ "@rules_rust_examples_complex_sys__bitflags__1_2_1//:bitflags", - "@rules_rust_examples_complex_sys__libc__0_2_81//:libc", - "@rules_rust_examples_complex_sys__libgit2_sys__0_12_17_1_1_0//:libgit2_sys", - "@rules_rust_examples_complex_sys__log__0_4_11//:log", + "@rules_rust_examples_complex_sys__libc__0_2_82//:libc", + "@rules_rust_examples_complex_sys__libgit2_sys__0_12_18_1_1_0//:libgit2_sys", + "@rules_rust_examples_complex_sys__log__0_4_13//:log", "@rules_rust_examples_complex_sys__url__2_2_0//:url", ] + selects.with_or({ # cfg(all(unix, not(target_os = "macos"))) diff --git a/examples/complex_sys/raze/remote/BUILD.jobserver-0.1.21.bazel b/examples/complex_sys/raze/remote/BUILD.jobserver-0.1.21.bazel index 1063bce924..7b71f75642 100644 --- a/examples/complex_sys/raze/remote/BUILD.jobserver-0.1.21.bazel +++ b/examples/complex_sys/raze/remote/BUILD.jobserver-0.1.21.bazel @@ -71,7 +71,7 @@ rust_library( "@io_bazel_rules_rust//rust/platform:x86_64-unknown-freebsd", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@rules_rust_examples_complex_sys__libc__0_2_81//:libc", + "@rules_rust_examples_complex_sys__libc__0_2_82//:libc", ], "//conditions:default": [], }), diff --git a/examples/complex_sys/raze/remote/BUILD.lazy_static-1.4.0.bazel b/examples/complex_sys/raze/remote/BUILD.lazy_static-1.4.0.bazel new file mode 100644 index 0000000000..28ad895e71 --- /dev/null +++ b/examples/complex_sys/raze/remote/BUILD.lazy_static-1.4.0.bazel @@ -0,0 +1,57 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//complex_sys/raze", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets + +rust_library( + name = "lazy_static", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + crate_type = "lib", + data = [], + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "1.4.0", + # buildifier: leave-alone + deps = [ + ], +) + +# Unsupported target "no_std" with type "test" omitted + +# Unsupported target "test" with type "test" omitted diff --git a/examples/complex_sys/raze/remote/BUILD.libc-0.2.81.bazel b/examples/complex_sys/raze/remote/BUILD.libc-0.2.82.bazel similarity index 97% rename from examples/complex_sys/raze/remote/BUILD.libc-0.2.81.bazel rename to examples/complex_sys/raze/remote/BUILD.libc-0.2.82.bazel index f09891dc51..0e316421f0 100644 --- a/examples/complex_sys/raze/remote/BUILD.libc-0.2.81.bazel +++ b/examples/complex_sys/raze/remote/BUILD.libc-0.2.82.bazel @@ -54,7 +54,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.2.81", + version = "0.2.82", visibility = ["//visibility:private"], deps = [ ], @@ -78,7 +78,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.2.81", + version = "0.2.82", # buildifier: leave-alone deps = [ ":libc_build_script", diff --git a/examples/complex_sys/raze/remote/BUILD.libgit2-sys-0.12.17+1.1.0.bazel b/examples/complex_sys/raze/remote/BUILD.libgit2-sys-0.12.18+1.1.0.bazel similarity index 97% rename from examples/complex_sys/raze/remote/BUILD.libgit2-sys-0.12.17+1.1.0.bazel rename to examples/complex_sys/raze/remote/BUILD.libgit2-sys-0.12.18+1.1.0.bazel index 2c2a85f159..e041a05af9 100644 --- a/examples/complex_sys/raze/remote/BUILD.libgit2-sys-0.12.17+1.1.0.bazel +++ b/examples/complex_sys/raze/remote/BUILD.libgit2-sys-0.12.18+1.1.0.bazel @@ -57,7 +57,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.12.17+1.1.0", + version = "0.12.18+1.1.0", visibility = ["//visibility:private"], deps = [ "@rules_rust_examples_complex_sys__cc__1_0_66//:cc", @@ -113,11 +113,11 @@ rust_library( "cargo-raze", "manual", ], - version = "0.12.17+1.1.0", + version = "0.12.18+1.1.0", # buildifier: leave-alone deps = [ ":libgit2_sys_build_script", - "@rules_rust_examples_complex_sys__libc__0_2_81//:libc", + "@rules_rust_examples_complex_sys__libc__0_2_82//:libc", "@rules_rust_examples_complex_sys__libssh2_sys__0_2_20//:libssh2_sys", "@rules_rust_examples_complex_sys__libz_sys__1_1_2//:libz_sys", ] + selects.with_or({ diff --git a/examples/complex_sys/raze/remote/BUILD.libssh2-sys-0.2.20.bazel b/examples/complex_sys/raze/remote/BUILD.libssh2-sys-0.2.20.bazel index a44b3ad492..ba18c5fb09 100644 --- a/examples/complex_sys/raze/remote/BUILD.libssh2-sys-0.2.20.bazel +++ b/examples/complex_sys/raze/remote/BUILD.libssh2-sys-0.2.20.bazel @@ -43,12 +43,9 @@ cargo_build_script( crate_features = [ ], crate_root = "build.rs", - # MODIFIED MANUALLY # - links = "ssh2", data = glob(["**"]) + [ "@openssl", ], - # / MODIFIED MANUALLY # edition = "2015", rustc_flags = [ "--cap-lints=allow", @@ -120,7 +117,7 @@ rust_library( # buildifier: leave-alone deps = [ ":libssh2_sys_build_script", - "@rules_rust_examples_complex_sys__libc__0_2_81//:libc", + "@rules_rust_examples_complex_sys__libc__0_2_82//:libc", "@rules_rust_examples_complex_sys__libz_sys__1_1_2//:libz_sys", ] + selects.with_or({ # cfg(target_env = "msvc") diff --git a/examples/complex_sys/raze/remote/BUILD.libz-sys-1.1.2.bazel b/examples/complex_sys/raze/remote/BUILD.libz-sys-1.1.2.bazel index aee187c135..5583e5e392 100644 --- a/examples/complex_sys/raze/remote/BUILD.libz-sys-1.1.2.bazel +++ b/examples/complex_sys/raze/remote/BUILD.libz-sys-1.1.2.bazel @@ -93,7 +93,7 @@ rust_library( # buildifier: leave-alone deps = [ ":libz_sys_build_script", - "@rules_rust_examples_complex_sys__libc__0_2_81//:libc", + "@rules_rust_examples_complex_sys__libc__0_2_82//:libc", ] + selects.with_or({ # cfg(target_env = "msvc") ( diff --git a/examples/complex_sys/raze/remote/BUILD.log-0.4.11.bazel b/examples/complex_sys/raze/remote/BUILD.log-0.4.13.bazel similarity index 97% rename from examples/complex_sys/raze/remote/BUILD.log-0.4.11.bazel rename to examples/complex_sys/raze/remote/BUILD.log-0.4.13.bazel index 2b14958cdd..4ec24a9f48 100644 --- a/examples/complex_sys/raze/remote/BUILD.log-0.4.11.bazel +++ b/examples/complex_sys/raze/remote/BUILD.log-0.4.13.bazel @@ -52,7 +52,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.4.11", + version = "0.4.13", visibility = ["//visibility:private"], deps = [ ], @@ -74,7 +74,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.4.11", + version = "0.4.13", # buildifier: leave-alone deps = [ ":log_build_script", diff --git a/examples/complex_sys/raze/remote/BUILD.openssl-0.10.32.bazel b/examples/complex_sys/raze/remote/BUILD.openssl-0.10.32.bazel new file mode 100644 index 0000000000..e60181fe0c --- /dev/null +++ b/examples/complex_sys/raze/remote/BUILD.openssl-0.10.32.bazel @@ -0,0 +1,91 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//complex_sys/raze", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # Apache-2.0 from expression "Apache-2.0" +]) + +# Generated Targets +# buildifier: disable=load-on-top +load( + "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "openssl_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.10.32", + visibility = ["//visibility:private"], + deps = [ + "@rules_rust_examples_complex_sys__openssl_sys__0_9_60//:openssl_sys", + ], +) + +# Unsupported target "mk_certs" with type "example" omitted + +rust_library( + name = "openssl", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + crate_type = "lib", + data = [], + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.10.32", + # buildifier: leave-alone + deps = [ + ":openssl_build_script", + "@rules_rust_examples_complex_sys__bitflags__1_2_1//:bitflags", + "@rules_rust_examples_complex_sys__cfg_if__1_0_0//:cfg_if", + "@rules_rust_examples_complex_sys__foreign_types__0_3_2//:foreign_types", + "@rules_rust_examples_complex_sys__lazy_static__1_4_0//:lazy_static", + "@rules_rust_examples_complex_sys__libc__0_2_82//:libc", + "@rules_rust_examples_complex_sys__openssl_sys__0_9_60//:openssl_sys", + ], +) diff --git a/examples/complex_sys/raze/remote/BUILD.openssl-sys-0.9.60.bazel b/examples/complex_sys/raze/remote/BUILD.openssl-sys-0.9.60.bazel index a37302c018..552efb2b6a 100644 --- a/examples/complex_sys/raze/remote/BUILD.openssl-sys-0.9.60.bazel +++ b/examples/complex_sys/raze/remote/BUILD.openssl-sys-0.9.60.bazel @@ -38,19 +38,15 @@ load( cargo_build_script( name = "openssl_sys_build_script", srcs = glob(["**/*.rs"]), - # MODIFIED MANUALLY # build_script_env = { "OPENSSL_DIR": "../openssl/openssl", }, - # / MODIFIED MANUALLY # crate_features = [ ], crate_root = "build/main.rs", - # MODIFIED MANUALLY # data = glob(["**"]) + [ - "@openssl", + "@openssl", ], - # / MODIFIED MANUALLY # edition = "2015", rustc_flags = [ "--cap-lints=allow", @@ -99,8 +95,8 @@ rust_library( # buildifier: leave-alone deps = [ ":openssl_sys_build_script", - "@rules_rust_examples_complex_sys__libc__0_2_81//:libc", - "@openssl//:openssl", + "@openssl", + "@rules_rust_examples_complex_sys__libc__0_2_82//:libc", ] + selects.with_or({ # cfg(target_env = "msvc") ( diff --git a/examples/hello_sys/raze/BUILD.bazel b/examples/hello_sys/raze/BUILD.bazel index 07ee1960bb..72090bf00a 100644 --- a/examples/hello_sys/raze/BUILD.bazel +++ b/examples/hello_sys/raze/BUILD.bazel @@ -20,3 +20,11 @@ alias( "manual", ], ) + +# Export file for Stardoc support +exports_files( + [ + "crates.bzl", + ], + visibility = ["//visibility:public"], +) diff --git a/examples/hello_sys/raze/remote/BUILD.cc-1.0.60.bazel b/examples/hello_sys/raze/remote/BUILD.cc-1.0.60.bazel index 6298ad04e8..a828a6f4d0 100644 --- a/examples/hello_sys/raze/remote/BUILD.cc-1.0.60.bazel +++ b/examples/hello_sys/raze/remote/BUILD.cc-1.0.60.bazel @@ -50,7 +50,6 @@ rust_binary( version = "1.0.60", # buildifier: leave-alone deps = [ - # Binaries get an implicit dependency on their crate's lib ":cc", ], ) From 912886145f7dd536bfd924cad7c81d743e4c42de Mon Sep 17 00:00:00 2001 From: Andre Brisco Date: Thu, 21 Jan 2021 08:30:10 -0800 Subject: [PATCH 3/3] Manually updated raze outputs See https://github.com/google/cargo-raze/issues/344 --- .../complex_sys/raze/remote/BUILD.libssh2-sys-0.2.20.bazel | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/complex_sys/raze/remote/BUILD.libssh2-sys-0.2.20.bazel b/examples/complex_sys/raze/remote/BUILD.libssh2-sys-0.2.20.bazel index ba18c5fb09..97d09c2fae 100644 --- a/examples/complex_sys/raze/remote/BUILD.libssh2-sys-0.2.20.bazel +++ b/examples/complex_sys/raze/remote/BUILD.libssh2-sys-0.2.20.bazel @@ -47,6 +47,9 @@ cargo_build_script( "@openssl", ], edition = "2015", + # TODO: This must be manually added until a feature in cargo-raze is implemented + # https://github.com/google/cargo-raze/issues/344 + links = "ssh2", rustc_flags = [ "--cap-lints=allow", ],