Move some deps to MODULE.bazel

All deps are suppose to be able to use module instead of workspace except for spirv-headers.
s-perron · May 27, 2024 · a242be4 · a242be4
1 parent 1c9bc3f
commit a242be4
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 40 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -92,10 +92,10 @@ py_binary(
 
 genrule(
     name = "generators_inc",
-    srcs = ["@spirv_headers//:spirv_xml_registry"],
+    srcs = ["@spirv-headers//:spirv_xml_registry"],
     outs = ["generators.inc"],
-    cmd = "$(location :generate_registry_tables) --xml=$(location @spirv_headers//:spirv_xml_registry) --generator-output=$(location generators.inc)",
-    cmd_bat = "$(location :generate_registry_tables) --xml=$(location @spirv_headers//:spirv_xml_registry) --generator-output=$(location generators.inc)",
+    cmd = "$(location :generate_registry_tables) --xml=$(location @spirv-headers//:spirv_xml_registry) --generator-output=$(location generators.inc)",
+    cmd_bat = "$(location :generate_registry_tables) --xml=$(location @spirv-headers//:spirv_xml_registry) --generator-output=$(location generators.inc)",
     tools = [":generate_registry_tables"],
 )
 
@@ -171,8 +171,8 @@ cc_library(
     copts = COMMON_COPTS,
     includes = ["include"],
     deps = [
-        "@spirv_headers//:spirv_common_headers",
-        "@spirv_headers//:spirv_cpp11_headers",
+        "@spirv-headers//:spirv_common_headers",
+        "@spirv-headers//:spirv_cpp11_headers",
     ],
 )
 
@@ -203,7 +203,7 @@ cc_library(
     copts = COMMON_COPTS,
     deps = [
         ":spirv_tools_internal",
-        "@spirv_headers//:spirv_common_headers",
+        "@spirv-headers//:spirv_common_headers",
     ],
 )
 
@@ -319,7 +319,7 @@ cc_binary(
         ":spirv_tools_opt_internal",
         ":tools_io",
         ":tools_util",
-        "@spirv_headers//:spirv_cpp_headers",
+        "@spirv-headers//:spirv_cpp_headers",
     ],
 )
 
@@ -472,7 +472,7 @@ cc_test(
         ":spirv_tools_opt_internal",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
-        "@spirv_headers//:spirv_cpp11_headers",
+        "@spirv-headers//:spirv_cpp11_headers",
     ],
 )
 
@@ -498,8 +498,8 @@ cc_library(
         ":spirv_tools_internal",
         ":spirv_tools_link",
         ":test_lib",
-        "@com_google_effcee//:effcee",
-        "@com_googlesource_code_re2//:re2",
+        "@effcee//:effcee",
+        "@re2//:re2",
     ],
 )
 
@@ -552,7 +552,7 @@ cc_library(
     deps = [
         ":spirv_tools_internal",
         ":spirv_tools_opt_internal",
-        "@com_google_effcee//:effcee",
+        "@effcee//:effcee",
         "@googletest//:gtest",
     ],
 )
@@ -568,7 +568,7 @@ cc_library(
         ":spirv_tools_internal",
         ":spirv_tools_opt_internal",
         ":test_lib",
-        "@com_google_effcee//:effcee",
+        "@effcee//:effcee",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
@@ -601,7 +601,7 @@ cc_library(
         ":opt_test_lib",
         ":spirv_tools",
         ":spirv_tools_opt_internal",
-        "@com_google_effcee//:effcee",
+        "@effcee//:effcee",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -1,7 +1,25 @@
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
 
+bazel_dep(name = "abseil-cpp", dev_dependency = True)
+local_path_override(
+    module_name = "abseil-cpp",
+    path = "external/abseil_cpp",
+)
+
+bazel_dep(name = "re2", dev_dependency = True)
+local_path_override(
+    module_name = "re2",
+    path = "external/re2",
+)
+
 bazel_dep(name = "googletest", dev_dependency = True)
 local_path_override(
     module_name = "googletest",
     path = "external/googletest",
 )
+
+bazel_dep(name = "effcee", dev_dependency = True)
+local_path_override(
+    module_name = "effcee",
+    path = "external/effcee",
+)
diff --git a/WORKSPACE b/WORKSPACE
diff --git a/build_defs.bzl b/build_defs.bzl
@@ -47,9 +47,9 @@ def incompatible_with(incompatible_constraints):
         for constraint in incompatible_constraints
     }]))
 
-DEBUGINFO_GRAMMAR_JSON_FILE = "@spirv_headers//:spirv_ext_inst_debuginfo_grammar_unified1"
-CLDEBUGINFO100_GRAMMAR_JSON_FILE = "@spirv_headers//:spirv_ext_inst_opencl_debuginfo_100_grammar_unified1"
-SHDEBUGINFO100_GRAMMAR_JSON_FILE = "@spirv_headers//:spirv_ext_inst_nonsemantic_shader_debuginfo_100_grammar_unified1"
+DEBUGINFO_GRAMMAR_JSON_FILE = "@spirv-headers//:spirv_ext_inst_debuginfo_grammar_unified1"
+CLDEBUGINFO100_GRAMMAR_JSON_FILE = "@spirv-headers//:spirv_ext_inst_opencl_debuginfo_100_grammar_unified1"
+SHDEBUGINFO100_GRAMMAR_JSON_FILE = "@spirv-headers//:spirv_ext_inst_nonsemantic_shader_debuginfo_100_grammar_unified1"
 
 def _merge_dicts(dicts):
     merged = {}
@@ -62,7 +62,7 @@ def generate_core_tables(version):
         fail("Must specify version", "version")
 
     grammars = dict(
-        core_grammar = "@spirv_headers//:spirv_core_grammar_{}".format(version),
+        core_grammar = "@spirv-headers//:spirv_core_grammar_{}".format(version),
         debuginfo_grammar = DEBUGINFO_GRAMMAR_JSON_FILE,
         cldebuginfo_grammar = CLDEBUGINFO100_GRAMMAR_JSON_FILE,
     )
@@ -97,7 +97,7 @@ def generate_enum_string_mapping(version):
         fail("Must specify version", "version")
 
     grammars = dict(
-        core_grammar = "@spirv_headers//:spirv_core_grammar_{}".format(version),
+        core_grammar = "@spirv-headers//:spirv_core_grammar_{}".format(version),
         debuginfo_grammar = DEBUGINFO_GRAMMAR_JSON_FILE,
         cldebuginfo_grammar = CLDEBUGINFO100_GRAMMAR_JSON_FILE,
     )
@@ -132,7 +132,7 @@ def generate_opencl_tables(version):
         fail("Must specify version", "version")
 
     grammars = dict(
-        opencl_grammar = "@spirv_headers//:spirv_opencl_grammar_{}".format(version),
+        opencl_grammar = "@spirv-headers//:spirv_opencl_grammar_{}".format(version),
     )
 
     outs = dict(
@@ -160,7 +160,7 @@ def generate_glsl_tables(version):
         fail("Must specify version", "version")
 
     grammars = dict(
-        gsls_grammar = "@spirv_headers//:spirv_glsl_grammar_{}".format(version),
+        gsls_grammar = "@spirv-headers//:spirv_glsl_grammar_{}".format(version),
     )
     outs = dict(
         gsls_insts_outs = "glsl.std.450.insts.inc",
@@ -189,7 +189,7 @@ def generate_vendor_tables(extension, operand_kind_prefix = ""):
 
     extension_rule = extension.replace("-", "_").replace(".", "_")
     grammars = dict(
-        vendor_grammar = "@spirv_headers//:spirv_ext_inst_{}_grammar_unified1".format(extension_rule),
+        vendor_grammar = "@spirv-headers//:spirv_ext_inst_{}_grammar_unified1".format(extension_rule),
     )
     outs = dict(
         vendor_insts_output = "{}.insts.inc".format(extension),