diff --git a/misc/bazel/csharp.bzl b/misc/bazel/csharp.bzl index 0cf2e30d0de7..50baafe0bf3b 100644 --- a/misc/bazel/csharp.bzl +++ b/misc/bazel/csharp.bzl @@ -10,8 +10,8 @@ def _gen_assembly_info(name): native.genrule( name = assembly_info_gen, outs = [name + "AssemblyInfo.cs"], - cmd = "$(execpath //csharp/scripts:gen-assembly-info) $@ " + name, - tools = ["//csharp/scripts:gen-assembly-info"], + cmd = "$(execpath //misc/bazel/csharp:gen-assembly-info) $@ " + name, + tools = ["//misc/bazel/csharp:gen-assembly-info"], ) return ":" + assembly_info_gen @@ -83,7 +83,7 @@ def codeql_csharp_binary(name, **kwargs): srcs.append(assembly_info_gen) # always add the assembly info file that sets the AssemblyInformationalVersion attribute to the extractor version - srcs.append("//csharp/scripts:git-assembly-info-src") + srcs.append("//misc/bazel/csharp:git-assembly-info-src") csharp_binary_target = "bin/" + name publish_binary_target = "publish/" + name diff --git a/csharp/scripts/BUILD.bazel b/misc/bazel/csharp/BUILD.bazel similarity index 70% rename from csharp/scripts/BUILD.bazel rename to misc/bazel/csharp/BUILD.bazel index 8f4f239104e0..21f4990dcf05 100644 --- a/csharp/scripts/BUILD.bazel +++ b/misc/bazel/csharp/BUILD.bazel @@ -3,14 +3,12 @@ load("@rules_python//python:defs.bzl", "py_binary") py_binary( name = "gen-git-assembly-info", srcs = ["gen-git-assembly-info.py"], - deps = ["@rules_python//python/runfiles"], ) py_binary( name = "gen-assembly-info", srcs = ["gen-assembly-info.py"], - visibility = ["//csharp:__subpackages__"], - deps = ["@rules_python//python/runfiles"], + visibility = ["//visibility:public"], ) genrule( @@ -19,5 +17,5 @@ genrule( outs = ["GitAssemblyInfo.cs"], cmd = "$(execpath :gen-git-assembly-info) $@ $(SRCS)", tools = [":gen-git-assembly-info"], - visibility = ["//csharp:__subpackages__"], + visibility = ["//visibility:public"], ) diff --git a/csharp/scripts/gen-assembly-info.py b/misc/bazel/csharp/gen-assembly-info.py similarity index 100% rename from csharp/scripts/gen-assembly-info.py rename to misc/bazel/csharp/gen-assembly-info.py diff --git a/csharp/scripts/gen-git-assembly-info.py b/misc/bazel/csharp/gen-git-assembly-info.py similarity index 100% rename from csharp/scripts/gen-git-assembly-info.py rename to misc/bazel/csharp/gen-git-assembly-info.py diff --git a/misc/bazel/semmle_code_stub/BUILD.bazel b/misc/bazel/semmle_code_stub/BUILD.bazel new file mode 100644 index 000000000000..59ba493671b8 --- /dev/null +++ b/misc/bazel/semmle_code_stub/BUILD.bazel @@ -0,0 +1,22 @@ +# Stand-in for the `git_info` target provided by the internal repository, so that targets +# depending on it (e.g. `//misc/bazel/csharp:git-assembly-info-src`) can be built from this +# repository in isolation. +genrule( + name = "git-info-files", + outs = [ + "git-describe-all.log", + "git-ql-describe-all.log", + "git-ql-rev-parse.log", + ], + cmd = """ + echo unknown > $(location git-describe-all.log) + echo no-git > $(location git-ql-describe-all.log) + echo unknown > $(location git-ql-rev-parse.log) + """, +) + +filegroup( + name = "git_info", + srcs = [":git-info-files"], + visibility = ["//visibility:public"], +)