From f8615b47822af9a35622a38f6afab44b83e1f24c Mon Sep 17 00:00:00 2001 From: Kevin Lubick Date: Tue, 19 Oct 2021 15:56:55 -0400 Subject: [PATCH] Run buildifier on bazel/ (#913) --- bazel/BUILD | 3 +- bazel/WORKSPACE | 2 ++ bazel/emscripten_deps.bzl | 4 +-- bazel/emscripten_toolchain/BUILD.bazel | 2 +- bazel/emscripten_toolchain/crosstool.bzl | 8 ++--- bazel/revisions.bzl | 38 ++++++++++++------------ bazel/test_external/BUILD | 2 +- bazel/test_external/WORKSPACE | 2 ++ scripts/update_bazel_workspace.sh | 2 +- 9 files changed, 33 insertions(+), 30 deletions(-) diff --git a/bazel/BUILD b/bazel/BUILD index 9aa46d9..c84bf3f 100644 --- a/bazel/BUILD +++ b/bazel/BUILD @@ -1,4 +1,4 @@ -package(default_visibility = ['//visibility:public']) +package(default_visibility = ["//visibility:public"]) config_setting( name = "linux", @@ -41,4 +41,3 @@ alias( ":windows": "@emscripten_npm_win//:node_modules", }), ) - diff --git a/bazel/WORKSPACE b/bazel/WORKSPACE index 22311ff..a33ee12 100644 --- a/bazel/WORKSPACE +++ b/bazel/WORKSPACE @@ -1,7 +1,9 @@ workspace(name = "emsdk") load(":deps.bzl", "deps") + deps() load(":emscripten_deps.bzl", "emscripten_deps") + emscripten_deps() diff --git a/bazel/emscripten_deps.bzl b/bazel/emscripten_deps.bzl index e6a30be..1a2b844 100644 --- a/bazel/emscripten_deps.bzl +++ b/bazel/emscripten_deps.bzl @@ -3,13 +3,13 @@ load("@build_bazel_rules_nodejs//:index.bzl", "npm_install") load(":revisions.bzl", "EMSCRIPTEN_TAGS") def _parse_version(v): - return [int(u) for u in v.split(".")] + return [int(u) for u in v.split(".")] def emscripten_deps(emscripten_version = "latest"): version = emscripten_version if version == "latest": - version = reversed(sorted(EMSCRIPTEN_TAGS.keys(), key=_parse_version))[0] + version = reversed(sorted(EMSCRIPTEN_TAGS.keys(), key = _parse_version))[0] if version not in EMSCRIPTEN_TAGS.keys(): error_msg = "Emscripten version {} not found.".format(version) diff --git a/bazel/emscripten_toolchain/BUILD.bazel b/bazel/emscripten_toolchain/BUILD.bazel index 488da5a..8b2ae7f 100644 --- a/bazel/emscripten_toolchain/BUILD.bazel +++ b/bazel/emscripten_toolchain/BUILD.bazel @@ -9,9 +9,9 @@ filegroup( "emcc.sh", "emscripten_config", "env.sh", - "@nodejs//:node_files", "@emsdk//:binaries", "@emsdk//:node_modules", + "@nodejs//:node_files", ], ) diff --git a/bazel/emscripten_toolchain/crosstool.bzl b/bazel/emscripten_toolchain/crosstool.bzl index 6e7be86..069ea70 100644 --- a/bazel/emscripten_toolchain/crosstool.bzl +++ b/bazel/emscripten_toolchain/crosstool.bzl @@ -437,7 +437,6 @@ def _impl(ctx): # https://emscripten.org/docs/debugging/Sanitizers.html feature(name = "wasm_asan"), feature(name = "wasm_ubsan"), - feature( name = "output_format_js", enabled = True, @@ -518,7 +517,7 @@ def _impl(ctx): # Language Features flag_set( actions = all_cpp_compile_actions, - flags = ["-std=gnu++17", "-nostdinc", "-nostdinc++",], + flags = ["-std=gnu++17", "-nostdinc", "-nostdinc++"], ), # Emscripten-specific settings: @@ -910,7 +909,8 @@ def _impl(ctx): "-iwithsysroot" + "/include/c++/v1", "-iwithsysroot" + "/include/compat", "-iwithsysroot" + "/include", - "-isystem", emscripten_dir + "/lib/clang/14.0.0/include", + "-isystem", + emscripten_dir + "/lib/clang/14.0.0/include", ], ), # Inputs and outputs @@ -1103,7 +1103,7 @@ emscripten_cc_toolchain_config_rule = rule( implementation = _impl, attrs = { "cpu": attr.string(mandatory = True, values = ["asmjs", "wasm"]), - "em_config": attr.label(mandatory = True, allow_single_file=True), + "em_config": attr.label(mandatory = True, allow_single_file = True), "emscripten_binaries": attr.label(mandatory = True), }, provides = [CcToolchainConfigInfo], diff --git a/bazel/revisions.bzl b/bazel/revisions.bzl index 91f418e..92c687d 100644 --- a/bazel/revisions.bzl +++ b/bazel/revisions.bzl @@ -2,115 +2,115 @@ # DO NOT MODIFY EMSCRIPTEN_TAGS = { - "2.0.31": struct( + "2.0.31": struct( hash = "597724ca3f6cd6e84bea73f1f519a3953b5c273d", sha_linux = "ef70c7733aa0df41cb4c812f5a89bf6b2ed13ca8aa252872396c0be271156d9e", sha_mac = "77e57c3e98758488ef676f8f58a85faa0bd65a1d326a91771ad83d7cb0e373ca", sha_win = "541605b740afccd08a39f5ae815978f699f350d621a1b2dfba0763970b56aee4", ), - "2.0.30": struct( + "2.0.30": struct( hash = "c69458f1bbf3ef5b8da4e934de210659cc9bca04", sha_linux = "ee1c8270096a728966ae38af548047d1f64c18318e06ba75952e657136f02537", sha_mac = "574a5819308eba6c8be6a780e26dff415a0e7178d3f44162dd8dca87eb40d4a7", sha_win = "242d244f4f5f5af08e6e6ac9c143aebf1b7bb2a23fd2992350731e59acfee07c", ), - "2.0.29": struct( + "2.0.29": struct( hash = "c2369dc425725fff86ba90a9007a4603ddf7941b", sha_linux = "7df4a8f3e25820becadfa7f1fe0d78e764102ec3ee50c474ca1634ed90d48890", sha_mac = "d998521ba95882a27792f0113ea2c972fbb891c240649f4c994f0260c0e1a213", sha_win = "c64aa3f2af6503f6711b2322986a45784e00d7c7fe13ec3f5c4f740472d065a0", ), - "2.0.28": struct( + "2.0.28": struct( hash = "866055ea639d64dfedc625d28ec981e47ce37168", sha_linux = "7dca7704eb14e367bb67e9abc9eaf59e75f59b74e32422e04556de10897a9a86", sha_mac = "370f76493e3805e2538290b698a381f04b6d78a77771e48fc0099cf89dad985f", sha_win = "e913c50ea5f196d36971f7cf5b1cf9a9ca27ce0818aba56be3a66e31e95c0e5b", ), - "2.0.27": struct( + "2.0.27": struct( hash = "1ac46e3b84955231ab4a4f4cbe0c7ac28c86b8cc", sha_linux = "3e124e278de168cf22e03b93b2f14a65a86777e428cdaab7e5e1c2289eb41605", sha_mac = "388262b9e1042ef9a3a1945d5a23dcd634c8042a225e8fdf80bcc2c1cb7e05cc", sha_win = "762276a332432e717afb988310d21ae10e36facc1e05bfd77042a364fb43cc3c", ), - "2.0.26": struct( + "2.0.26": struct( hash = "823d37b15d1ab61bc9ac0665ceef6951d3703842", sha_linux = "996e16d368a99dd4dd12126acbcb8bea9a607b5257cc7b747c4afc2f036fd8cf", sha_mac = "8b2d7e84cc449531e88034beb31da89a0b61ccaeaa1584ffb6da7842c6348fdc", sha_win = "095e772764d7f8c0f8228bda4b8500ae43aac2303567da5cdc9f8623f70a5743", ), - "2.0.25": struct( + "2.0.25": struct( hash = "f6f001b08fbb67935379cf13d17fd9bfdbaff791", sha_linux = "06d8e2f3d4f4b35a57de9c15e62a559c941cfba1dd7ec02353d815904d912c3b", sha_mac = "6541bf3a648aae7df84de424ff392dd1513ab5450203c84f72a6a03e321a301b", sha_win = "267fbfa809ec0eb911c1962b1b9768675cb82228e694a5f9ef570232ee71db76", ), - "2.0.24": struct( + "2.0.24": struct( hash = "6ab7fc5622a67e6111d07c4ba61c8d3c8fc33ed2", sha_linux = "e5daa0e87f3afd2197e7975297cb0cd4c245edccb964ca5f1f32ee7d985bf440", sha_mac = "e4b7f2a7b71d6ac4610ee7b14743570e0dfba3668dc6b4f984cbe7a135888527", sha_win = "db2aad422a3ca2295be6101b0151eeee55dcea29ba1f31b4594c02ba46591cbe", ), - "2.0.23": struct( + "2.0.23": struct( hash = "77b065ace39e6ab21446e13f92897f956c80476a", sha_linux = "7713a9a5572d839aea9eaa84a7c4779d11c6c8818ee64a0f443b62081fae6d47", sha_mac = "b793087462d581e25c8c267fca9d30519619e3272480862a56cc316a32c7afab", sha_win = "b8885cbb41a39e4734861462e05ee58c7ff7562016a842bcee2603f229940e8b", ), - "2.0.22": struct( + "2.0.22": struct( hash = "6465a9acb820207acf7da44661a7de52d0a1ae3c", sha_linux = "c079781124e763c53c9fc73781fcee40296ce3314276836bc694f07bd331a859", sha_mac = "ab95574dfc685b0300e37bea36aba413045bbfa2ab06b93eceb881670489eec1", sha_win = "ba142e7e380596cba763e3a414de6511bcb86de48e4b48cf393b1ea449a24aaa", ), - "2.0.21": struct( + "2.0.21": struct( hash = "72f4ec97fbc7ec16c15ae68a75b0a257b2835160", sha_linux = "741264f33f96ba4b785ed0b133861ebdfefbaefab76ddcfe7bde6522829d6f70", sha_mac = "b07c0d65ee7e2799170c6f3b2aacebfe070c2e4975088bcd1b3a4140fecd8418", sha_win = "dc3cbf47aa4be52a92526f1790a013734ecbd407f7f36286ed0283c96355999a", ), - "2.0.20": struct( + "2.0.20": struct( hash = "e0c15cd14170f407a9eb27fcbad22931dc67feb7", sha_linux = "a196504fd1095836ca3961208338ff9e292be7729ea529bc19800aa7c966d34a", sha_mac = "6cdbf17ed61486b38ea79d3f31d74483e7388d1e7468518dccba3f24e0ddd4c4", sha_win = "4d22a32c219dbe18c55b635d014b9eaf7da60536171b7af37d9a8099fd33794b", ), - "2.0.19": struct( + "2.0.19": struct( hash = "9b9ff2dabfb4a7fbacbc004c0bead12a60f9d05c", sha_linux = "bd7c2a38ac88d219a1ab5003ddbf8fdc66a6ba55bc69f99077346edf2753b4ea", sha_mac = "6cc44029c9052855a55938eb6496b5659da4b1ce9cb34502b740af5993a94f93", sha_win = "a1fa8b1c387b9307f9b87c43dc83c0ff1bc04b9f29fbe4f39aff2dd946ca4b70", ), - "2.0.18": struct( + "2.0.18": struct( hash = "c2ac7520fad29a7937ed60ab6a95b08eb374c7ba", sha_linux = "e9f777de592f606b10104b2efe5179a7a8f44e3a9dffa1e3aaf73e05eb8893d7", sha_mac = "86b1dd62e424e3788bf132292a694a25ca9b0875d06f50d0f5d424593697452c", sha_win = "49ce07bda6be070251db44a08fcc05cae21ffdbd7522423a0c79bde635e87e28", ), - "2.0.17": struct( + "2.0.17": struct( hash = "f5c45e60392b82f603e3a8039c62db294fab02d2", sha_linux = "b40a4874057e4cace600f8ee9787dcbe236e3dc5b2fff5c2ecb0e867e426f99c", sha_mac = "081f61abf7d5ac0ec31aaffc5550013d4093ea4ea39520b7a32b7448d2a6ee70", sha_win = "45d06e597e6a1185a76200bd0481495e7298800a4805045d9cdbcce6311c91b2", ), - "2.0.16": struct( + "2.0.16": struct( hash = "80d9674f2fafa6b9346d735c42d5c52b8cc8aa8e", sha_linux = "e527638b224d9a30dc7e5fa4b9bd2eb2ab76ad306739ba8cacf5a5e333933a2a", sha_mac = "061020eb0e3ee0611dc5a0008ccc7778168a4f838d49ca41c0aad8c52c1a01c9", sha_win = "99364ed0388f928e0594f790662bf3a30c2894b0eff81797e1b64f62128561cb", ), - "2.0.15": struct( + "2.0.15": struct( hash = "89202930a98fe7f9ed59b574469a9471b0bda7dd", sha_linux = "7ff49fc63adf29970f6e7af1df445d7f554bdbbb2606db1cb5d3567ce69df1db", sha_mac = "e35cced1514ad0da40584f8dd6f76aabf847ce0fa82c6dc8dd9442fb74ed6d0d", sha_win = "31d5f8107c87833cea57edc57613bba4b36b16152772f744c5ad204594b4e666", ), - "2.0.14": struct( + "2.0.14": struct( hash = "fc5562126762ab26c4757147a3b4c24e85a7289e", sha_linux = "e466cd47ddd4bf0acd645412fdf08eda6d232484e48e5a2643e08062a7a4cf56", sha_mac = "1c554c08459b7025638ca4eddba0d35babe8c26b202a70a74e9442d577896211", sha_win = "428bc6094671937af96f26d803871fc5cd83d4d2b1c1df45fa6873a9bc5cac51", ), - "2.0.13": struct( + "2.0.13": struct( hash = "ce0e4a4d1cab395ee5082a60ebb4f3891a94b256", sha_linux = "8986ed886e111c661099c5147126b8a379a4040aab6a1f572fe01f0f9b99a343", sha_mac = "88c91332c8c76fed14ebf0edc9a08f586012f54f04ad61e5b1b6d02bf96bdeab", diff --git a/bazel/test_external/BUILD b/bazel/test_external/BUILD index 77df5a2..136b805 100644 --- a/bazel/test_external/BUILD +++ b/bazel/test_external/BUILD @@ -17,7 +17,7 @@ cc_binary( # to add different linkopts to BASE_LINKOPTS depending on things # like a "opt" or "dbg" compilation mode. linkopts = [ - "--bind", # Enable embind + "--bind", # Enable embind "-sMODULARIZE", ], # This target won't build successfully on its own because of missing emscripten diff --git a/bazel/test_external/WORKSPACE b/bazel/test_external/WORKSPACE index f0a446c..4fe5772 100644 --- a/bazel/test_external/WORKSPACE +++ b/bazel/test_external/WORKSPACE @@ -4,7 +4,9 @@ local_repository( ) load("@emsdk//:deps.bzl", "deps") + deps() load("@emsdk//:emscripten_deps.bzl", "emscripten_deps") + emscripten_deps() diff --git a/scripts/update_bazel_workspace.sh b/scripts/update_bazel_workspace.sh index 42aaab7..ad2fd5f 100755 --- a/scripts/update_bazel_workspace.sh +++ b/scripts/update_bazel_workspace.sh @@ -50,7 +50,7 @@ get_sha () { revisions_item () { hash=$(get_hash $1) echo \ - "\ \"$1\": struct(\n" \ + "\ \"$1\": struct(\n" \ "\ hash = \"$(get_hash ${hash})\",\n" \ "\ sha_linux = \"$(get_sha linux ${hash})\",\n" \ "\ sha_mac = \"$(get_sha mac ${hash})\",\n" \