From 4f88cf13e62761e5be11717efb3a3271feacf607 Mon Sep 17 00:00:00 2001 From: Kelwan Date: Thu, 20 Jun 2024 10:32:34 -0700 Subject: [PATCH] chore: update deps --- .bazelrc | 5 +- .gitignore | 2 +- Cargo.lock | 254 ++++++++++++++------ MODULE.bazel | 35 +++ WORKSPACE.bazel | 61 ++--- codegen_plugin.bzl | 2 +- ecsact/BUILD.bazel | 10 +- ecsact_dylib_runtime/BUILD.bazel | 19 +- ecsact_macro/BUILD.bazel | 10 +- ecsact_rtb/BUILD.bazel | 10 +- ecsact_rust_codegen/BUILD.bazel | 12 +- ecsact_system_execution_context/BUILD.bazel | 21 +- 12 files changed, 292 insertions(+), 149 deletions(-) create mode 100644 MODULE.bazel diff --git a/.bazelrc b/.bazelrc index a8ddfdf..4008a86 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,6 +1,9 @@ startup --windows_enable_symlinks + +common --registry=https://raw.githubusercontent.com/ecsact-dev/bazel_registry/main +common --registry=https://raw.githubusercontent.com/bazelboost/registry/main +common --registry=https://bcr.bazel.build build --enable_platform_specific_config -build --incompatible_use_platforms_repo_for_constraints build --incompatible_enable_cc_toolchain_resolution build --incompatible_strict_action_env build --enable_runfiles diff --git a/.gitignore b/.gitignore index 55b611e..89a7233 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ /target /bazel-* /user.bazelrc - +*.bazel.lock diff --git a/Cargo.lock b/Cargo.lock index 8962d48..016a594 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,13 +2,22 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + [[package]] name = "bindgen" version = "0.63.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -20,7 +29,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 1.0.105", + "syn 1.0.109", "which", ] @@ -30,11 +39,17 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + [[package]] name = "cc" -version = "1.0.78" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" [[package]] name = "cexpr" @@ -53,9 +68,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clang-sys" -version = "1.4.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -76,7 +91,6 @@ dependencies = [ "bindgen", "cc", "ecsact", - "ecsact_env", "json", ] @@ -106,7 +120,7 @@ dependencies = [ "ecsact", "proc-macro2", "quote", - "syn 1.0.105", + "syn 1.0.109", ] [[package]] @@ -136,21 +150,39 @@ version = "0.1.0" dependencies = [ "bindgen", "ecsact", - "ecsact_env", "json", ] [[package]] name = "either" -version = "1.8.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" + +[[package]] +name = "errno" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +dependencies = [ + "libc", + "windows-sys", +] [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys", +] [[package]] name = "indented" @@ -160,9 +192,9 @@ checksum = "5e7dcbfe0e83f0f757cdaea15d49cad72918fdec1bc9b0ace04268d382d2e1c6" [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "json" @@ -184,34 +216,37 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.138" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "winapi", + "windows-targets", ] +[[package]] +name = "linux-raw-sys" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" + [[package]] name = "log" -version = "0.4.17" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "minimal-lexical" @@ -221,9 +256,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", @@ -231,9 +266,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.16.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "pathdiff" @@ -249,36 +284,50 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "proc-macro2" -version = "1.0.54" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] [[package]] name = "regex" -version = "1.7.0" +version = "1.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ + "aho-corasick", + "memchr", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rustc-hash" @@ -286,37 +335,50 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustix" +version = "0.38.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", +] + [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.11", + "syn 2.0.66", ] [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", "ryu", @@ -325,15 +387,15 @@ dependencies = [ [[package]] name = "shlex" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "syn" -version = "1.0.105" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", @@ -342,9 +404,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.11" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -353,39 +415,91 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "which" -version = "4.3.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix", ] [[package]] -name = "winapi" -version = "0.3.9" +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows_x86_64_msvc" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" diff --git a/MODULE.bazel b/MODULE.bazel new file mode 100644 index 0000000..e128185 --- /dev/null +++ b/MODULE.bazel @@ -0,0 +1,35 @@ +bazel_dep(name = "ecsact_runtime", version = "0.6.5") +bazel_dep(name = "rules_rust", version = "0.46.0") +bazel_dep(name = "ecsact_codegen", version = "0.2.0") +bazel_dep(name = "rules_cc", version = "0.0.9") +bazel_dep(name = "bazel_skylib", version = "1.7.1") + +rust = use_extension("@rules_rust//rust:extensions.bzl", "rust") +rust.toolchain(edition = "2021") +use_repo( + rust, + "rust_toolchains", +) + +register_toolchains("@rust_toolchains//:all") + +crate = use_extension( + "@rules_rust//crate_universe:extension.bzl", + "crate", +) +crate.from_cargo( + name = "crates", + cargo_lockfile = "//:Cargo.lock", + manifests = [ + "//:ecsact_env/Cargo.toml", + "//:Cargo.toml", + "//ecsact_dylib_runtime:Cargo.toml", + "//ecsact_macro:Cargo.toml", + "//ecsact_rtb:Cargo.toml", + "//ecsact_system_execution_context:Cargo.toml", + "//example:Cargo.toml", + "//ecsact:Cargo.toml", + "//ecsact_rust_codegen:Cargo.toml", + ], +) +use_repo(crate, "crates") diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index c44162b..f65c902 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -1,48 +1,33 @@ workspace(name = "ecsact_lang_rust") -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +# load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains") -http_archive( - name = "ecsact_runtime", - sha256 = "f470781217ac73f204f5727f4f9531787f477578aa3f6d7ad452a67e7cb1f26f", - strip_prefix = "ecsact_runtime-85de12005c177e2a1d735095ee134cfda86a7dae", - urls = ["https://github.com/ecsact-dev/ecsact_runtime/archive/85de12005c177e2a1d735095ee134cfda86a7dae.zip"], -) +# rules_rust_dependencies() -http_archive( - name = "rules_rust", - sha256 = "2466e5b2514772e84f9009010797b9cd4b51c1e6445bbd5b5e24848d90e6fb2e", - urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.18.0/rules_rust-v0.18.0.tar.gz"], -) +# rust_register_toolchains(edition = "2021") -load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains") +# load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies") -rules_rust_dependencies() +# crate_universe_dependencies() -rust_register_toolchains(edition = "2021") +# load("@rules_rust//crate_universe:defs.bzl", "crates_repository") -load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies") +# crates_repository( +# name = "crate_index", +# cargo_lockfile = "//:Cargo.lock", +# lockfile = "//:Cargo.Bazel.lock", +# manifests = [ +# "//:Cargo.toml", +# "//ecsact_dylib_runtime:Cargo.toml", +# "//ecsact_macro:Cargo.toml", +# "//ecsact_rtb:Cargo.toml", +# "//ecsact_system_execution_context:Cargo.toml", +# "//example:Cargo.toml", +# "//ecsact:Cargo.toml", +# "//ecsact_rust_codegen:Cargo.toml", +# ], +# ) -crate_universe_dependencies() +# load("@crates//:defs.bzl", "crate_repositories") -load("@rules_rust//crate_universe:defs.bzl", "crates_repository") - -crates_repository( - name = "crate_index", - cargo_lockfile = "//:Cargo.lock", - lockfile = "//:Cargo.Bazel.lock", - manifests = [ - "//:Cargo.toml", - "//ecsact_dylib_runtime:Cargo.toml", - "//ecsact_macro:Cargo.toml", - "//ecsact_rtb:Cargo.toml", - "//ecsact_system_execution_context:Cargo.toml", - "//example:Cargo.toml", - "//ecsact:Cargo.toml", - "//ecsact_rust_codegen:Cargo.toml", - ], -) - -load("@crate_index//:defs.bzl", "crate_repositories") - -crate_repositories() +# crate_repositories() diff --git a/codegen_plugin.bzl b/codegen_plugin.bzl index 3fce3d8..8a44205 100644 --- a/codegen_plugin.bzl +++ b/codegen_plugin.bzl @@ -1,4 +1,4 @@ -load("@ecsact_runtime//:codegen_plugin.bzl", "EcsactCodegenPluginInfo") +load("@ecsact_codegen//:codegen_plugin.bzl", "EcsactCodegenPluginInfo") def _rust_ecsact_codegen_plugin_impl(ctx): plugin = None diff --git a/ecsact/BUILD.bazel b/ecsact/BUILD.bazel index 457f371..3efbf61 100644 --- a/ecsact/BUILD.bazel +++ b/ecsact/BUILD.bazel @@ -1,16 +1,16 @@ -load("@crate_index//:defs.bzl", "aliases", "all_crate_deps") +load("@crates//:defs.bzl", "aliases", "all_crate_deps") load("@rules_rust//rust:defs.bzl", "rust_library") package(default_visibility = ["//visibility:public"]) rust_library( name = "ecsact", - aliases = aliases(), srcs = glob(["src/*.rs"]), - deps = all_crate_deps( - normal = True, - ), + aliases = aliases(), proc_macro_deps = all_crate_deps( proc_macro = True, ), + deps = all_crate_deps( + normal = True, + ), ) diff --git a/ecsact_dylib_runtime/BUILD.bazel b/ecsact_dylib_runtime/BUILD.bazel index 1975a08..e224614 100644 --- a/ecsact_dylib_runtime/BUILD.bazel +++ b/ecsact_dylib_runtime/BUILD.bazel @@ -1,6 +1,6 @@ -load("@crate_index//:defs.bzl", "aliases", "all_crate_deps") -load("@rules_rust//rust:defs.bzl", "rust_library") +load("@crates//:defs.bzl", "aliases", "all_crate_deps") load("@rules_rust//cargo:defs.bzl", "cargo_build_script") +load("@rules_rust//rust:defs.bzl", "rust_library") package(default_visibility = ["//visibility:public"]) @@ -8,26 +8,29 @@ cargo_build_script( name = "build_script", srcs = ["build.rs"], aliases = aliases(), - deps = ["@rules_rust//tools/runfiles"] + all_crate_deps( - build = True, - ), build_script_env = { "ECSACT_RUNTIME_HEADERS": "$(execpaths @ecsact_runtime//:headers)", "ECSACT_RUST_DYLIB_CC": "$(execpath src/dylib.cc)", "ECSACT_RUST_DYLIB_WRAPPER_H": "$(execpath src/dylib_wrapper.h)", }, data = [ - "@ecsact_runtime//:headers", "src/dylib.cc", "src/dylib_wrapper.h", + "@ecsact_runtime//:headers", ], + deps = ["@rules_rust//tools/runfiles"] + all_crate_deps( + build = True, + ), ) rust_library( name = "ecsact_dylib_runtime", - aliases = aliases(), srcs = glob(["src/*.rs"]), - deps = [":build_script", "//ecsact"] + all_crate_deps( + aliases = aliases(), + deps = [ + ":build_script", + "//ecsact", + ] + all_crate_deps( normal = True, ), ) diff --git a/ecsact_macro/BUILD.bazel b/ecsact_macro/BUILD.bazel index 45c101b..0f514ff 100644 --- a/ecsact_macro/BUILD.bazel +++ b/ecsact_macro/BUILD.bazel @@ -1,16 +1,16 @@ -load("@crate_index//:defs.bzl", "aliases", "all_crate_deps") +load("@crates//:defs.bzl", "aliases", "all_crate_deps") load("@rules_rust//rust:defs.bzl", "rust_proc_macro") package(default_visibility = ["//visibility:public"]) rust_proc_macro( name = "ecsact_macro", - aliases = aliases(), srcs = glob(["src/*.rs"]), - deps = ["//ecsact"] + all_crate_deps( - normal = True, - ), + aliases = aliases(), proc_macro_deps = all_crate_deps( proc_macro = True, ), + deps = ["//ecsact"] + all_crate_deps( + normal = True, + ), ) diff --git a/ecsact_rtb/BUILD.bazel b/ecsact_rtb/BUILD.bazel index a566206..7f5900a 100644 --- a/ecsact_rtb/BUILD.bazel +++ b/ecsact_rtb/BUILD.bazel @@ -1,17 +1,17 @@ -load("@crate_index//:defs.bzl", "aliases", "all_crate_deps") +load("@crates//:defs.bzl", "aliases", "all_crate_deps") load("@rules_rust//rust:defs.bzl", "rust_library") package(default_visibility = ["//visibility:public"]) rust_library( name = "ecsact_rtb", - aliases = aliases(), srcs = glob(["src/**/*.rs"]), + aliases = aliases(), compile_data = ["src/wrapper.h"], - deps = all_crate_deps( - normal = True, - ), proc_macro_deps = all_crate_deps( proc_macro = True, ), + deps = all_crate_deps( + normal = True, + ), ) diff --git a/ecsact_rust_codegen/BUILD.bazel b/ecsact_rust_codegen/BUILD.bazel index c9f8a6d..29cd8c0 100644 --- a/ecsact_rust_codegen/BUILD.bazel +++ b/ecsact_rust_codegen/BUILD.bazel @@ -1,4 +1,4 @@ -load("@crate_index//:defs.bzl", "aliases", "all_crate_deps") +load("@crates//:defs.bzl", "aliases", "all_crate_deps") load("@rules_rust//rust:defs.bzl", "rust_shared_library") load("//:codegen_plugin.bzl", "rust_ecsact_codegen_plugin") @@ -6,21 +6,21 @@ package(default_visibility = ["//visibility:public"]) rust_shared_library( name = "ecsact_rust_codegen_bin", - aliases = aliases(), srcs = glob(["src/*.rs"]), + aliases = aliases(), + proc_macro_deps = ["//ecsact_macro"] + all_crate_deps( + proc_macro = True, + ), deps = [ "//ecsact", "//ecsact_dylib_runtime", ] + all_crate_deps( normal = True, ), - proc_macro_deps = ["//ecsact_macro"] + all_crate_deps( - proc_macro = True, - ), ) rust_ecsact_codegen_plugin( name = "ecsact_rust_codegen", - rust_shared_library = ":ecsact_rust_codegen_bin", output_extension = "rs", + rust_shared_library = ":ecsact_rust_codegen_bin", ) diff --git a/ecsact_system_execution_context/BUILD.bazel b/ecsact_system_execution_context/BUILD.bazel index 967e79c..539bc36 100644 --- a/ecsact_system_execution_context/BUILD.bazel +++ b/ecsact_system_execution_context/BUILD.bazel @@ -1,6 +1,6 @@ -load("@crate_index//:defs.bzl", "aliases", "all_crate_deps") -load("@rules_rust//rust:defs.bzl", "rust_library") +load("@crates//:defs.bzl", "aliases", "all_crate_deps") load("@rules_rust//cargo:defs.bzl", "cargo_build_script") +load("@rules_rust//rust:defs.bzl", "rust_library") package(default_visibility = ["//visibility:public"]) @@ -8,26 +8,29 @@ cargo_build_script( name = "build_script", srcs = ["build.rs"], aliases = aliases(), - deps = ["@rules_rust//tools/runfiles"] + all_crate_deps( - build = True, - ), build_script_env = { "ECSACT_RUNTIME_HEADERS": "$(execpaths @ecsact_runtime//:headers)", "ECSACT_RUST_WRAPPER_H": "$(execpath src/wrapper.h)", }, data = [ - "@ecsact_runtime//:headers", "src/wrapper.h", + "@ecsact_runtime//:headers", ], tags = ["manual"], + deps = ["@rules_rust//tools/runfiles"] + all_crate_deps( + build = True, + ), ) rust_library( name = "ecsact_system_execution_context", - aliases = aliases(), srcs = glob(["src/*.rs"]), - deps = [":build_script", "//ecsact"] + all_crate_deps( + aliases = aliases(), + tags = ["manual"], + deps = [ + ":build_script", + "//ecsact", + ] + all_crate_deps( normal = True, ), - tags = ["manual"], )