From 61bfe7e520a527171e84452b7326cc06e7e590de Mon Sep 17 00:00:00 2001 From: Paolo Tranquilli Date: Wed, 21 Feb 2024 16:48:23 +0100 Subject: [PATCH] Bazel: rename internal module to `semmle_code` --- .bazelrc | 2 +- MODULE.bazel | 4 +- javascript/BUILD.bazel | 6 +-- javascript/downgrades/BUILD.bazel | 2 +- javascript/externs/BUILD.bazel | 2 +- javascript/extractor/BUILD.bazel | 48 +++++++++---------- .../extractor/lib/typescript/BUILD.bazel | 2 +- .../com/semmle/js/extractor/test/BUILD.bazel | 2 +- .../MODULE.bazel | 2 +- .../WORKSPACE.bazel | 0 10 files changed, 35 insertions(+), 35 deletions(-) rename misc/bazel/{codeql_internal_stub => semmle_code_stub}/MODULE.bazel (50%) rename misc/bazel/{codeql_internal_stub => semmle_code_stub}/WORKSPACE.bazel (100%) diff --git a/.bazelrc b/.bazelrc index af3769c38ff..754f85b0542 100644 --- a/.bazelrc +++ b/.bazelrc @@ -2,7 +2,7 @@ common --enable_platform_specific_config --experimental_enable_bzlmod # when using repo standalone, we want still to unlock loading the internal repository module # actually using things from that module will obviously end up in an error -common --override_module=codeql_internal=%workspace%/misc/bazel/codeql_internal_stub +common --override_module=semmle_code=%workspace%/misc/bazel/semmle_code_stub build --repo_env=CC=clang --repo_env=CXX=clang++ diff --git a/MODULE.bazel b/MODULE.bazel index 02cd6a8baa4..a8f2f1515b2 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -5,9 +5,9 @@ module( # this points to our internal repository when `codeql` is checked out as a submodule thereof # when building things from `codeql` independently this is stubbed out in `.bazelrc` -bazel_dep(name = "codeql_internal", version = "0.0") +bazel_dep(name = "semmle_code", version = "0.0") local_path_override( - module_name = "codeql_internal", + module_name = "semmle_code", path = "..", ) diff --git a/javascript/BUILD.bazel b/javascript/BUILD.bazel index d0469367741..eacfa554a8e 100644 --- a/javascript/BUILD.bazel +++ b/javascript/BUILD.bazel @@ -1,6 +1,6 @@ -load("@codeql_internal//:dist.bzl", "dist") +load("@semmle_code//:dist.bzl", "dist") load("@rules_pkg//pkg:mappings.bzl", "pkg_files") -load("@codeql_internal//buildutils-internal:zipmerge.bzl", "zipmerge") +load("@semmle_code//buildutils-internal:zipmerge.bzl", "zipmerge") package(default_visibility = ["//visibility:public"]) @@ -30,7 +30,7 @@ dist( "//javascript/downgrades", "//javascript/externs", "//javascript/extractor:tools-extractor", - "@codeql_internal//language-packs/javascript:resources", + "@semmle_code//language-packs/javascript:resources", ], prefix = "javascript", ) diff --git a/javascript/downgrades/BUILD.bazel b/javascript/downgrades/BUILD.bazel index 73cc099d08e..3d56c33c359 100644 --- a/javascript/downgrades/BUILD.bazel +++ b/javascript/downgrades/BUILD.bazel @@ -1,4 +1,4 @@ -load("@codeql_internal//:dist.bzl", "pack_zip") +load("@semmle_code//:dist.bzl", "pack_zip") pack_zip( name = "downgrades", diff --git a/javascript/externs/BUILD.bazel b/javascript/externs/BUILD.bazel index 5ee0c396b6e..233cf242b53 100644 --- a/javascript/externs/BUILD.bazel +++ b/javascript/externs/BUILD.bazel @@ -1,4 +1,4 @@ -load("@codeql_internal//:dist.bzl", "pack_zip") +load("@semmle_code//:dist.bzl", "pack_zip") pack_zip( name = "externs", diff --git a/javascript/extractor/BUILD.bazel b/javascript/extractor/BUILD.bazel index 433d70a815e..bd7159eea11 100644 --- a/javascript/extractor/BUILD.bazel +++ b/javascript/extractor/BUILD.bazel @@ -1,21 +1,21 @@ -load("@codeql_internal//:common.bzl", "codeql_fat_jar", "codeql_java_project") +load("@semmle_code//:common.bzl", "codeql_fat_jar", "codeql_java_project") load("@rules_pkg//pkg:mappings.bzl", "pkg_files") java_library( name = "deps", visibility = [":__subpackages__"], exports = [ - "@codeql_internal//extractor:html", - "@codeql_internal//extractor:yaml", - "@codeql_internal//resources/lib/java:commons-compress", - "@codeql_internal//resources/lib/java:gson", - "@codeql_internal//resources/lib/java:jericho-html", - "@codeql_internal//resources/lib/java:slf4j-api", - "@codeql_internal//resources/lib/java:snakeyaml", - "@codeql_internal//third_party:jackson", - "@codeql_internal//third_party:logback", - "@codeql_internal//util-java7", - "@codeql_internal//util-java8", + "@semmle_code//extractor:html", + "@semmle_code//extractor:yaml", + "@semmle_code//resources/lib/java:commons-compress", + "@semmle_code//resources/lib/java:gson", + "@semmle_code//resources/lib/java:jericho-html", + "@semmle_code//resources/lib/java:slf4j-api", + "@semmle_code//resources/lib/java:snakeyaml", + "@semmle_code//third_party:jackson", + "@semmle_code//third_party:logback", + "@semmle_code//util-java7", + "@semmle_code//util-java8", ], ) @@ -36,18 +36,18 @@ codeql_fat_jar( name = "extractor-javascript", srcs = [ ":extractor", - "@codeql_internal//extractor:html", - "@codeql_internal//extractor:xml-trap-writer", - "@codeql_internal//extractor:yaml", - "@codeql_internal//resources/lib/java:commons-compress", - "@codeql_internal//resources/lib/java:gson", - "@codeql_internal//resources/lib/java:jericho-html", - "@codeql_internal//resources/lib/java:slf4j-api", - "@codeql_internal//resources/lib/java:snakeyaml", - "@codeql_internal//third_party:jackson", - "@codeql_internal//third_party:logback", - "@codeql_internal//util-java7", - "@codeql_internal//util-java8", + "@semmle_code//extractor:html", + "@semmle_code//extractor:xml-trap-writer", + "@semmle_code//extractor:yaml", + "@semmle_code//resources/lib/java:commons-compress", + "@semmle_code//resources/lib/java:gson", + "@semmle_code//resources/lib/java:jericho-html", + "@semmle_code//resources/lib/java:slf4j-api", + "@semmle_code//resources/lib/java:snakeyaml", + "@semmle_code//third_party:jackson", + "@semmle_code//third_party:logback", + "@semmle_code//util-java7", + "@semmle_code//util-java8", ], files = [":javascript-extractor-resources"], main_class = "com.semmle.js.extractor.Main", diff --git a/javascript/extractor/lib/typescript/BUILD.bazel b/javascript/extractor/lib/typescript/BUILD.bazel index 4bee768f93b..904331e4c64 100644 --- a/javascript/extractor/lib/typescript/BUILD.bazel +++ b/javascript/extractor/lib/typescript/BUILD.bazel @@ -1,4 +1,4 @@ -load("@codeql_internal//:common.bzl", "on_windows") +load("@semmle_code//:common.bzl", "on_windows") # Builds a zip file of the compiled typscript-parser-wrapper and its dependencies. genrule( diff --git a/javascript/extractor/test/com/semmle/js/extractor/test/BUILD.bazel b/javascript/extractor/test/com/semmle/js/extractor/test/BUILD.bazel index 1c865c31d7f..45d6790e8a9 100644 --- a/javascript/extractor/test/com/semmle/js/extractor/test/BUILD.bazel +++ b/javascript/extractor/test/com/semmle/js/extractor/test/BUILD.bazel @@ -16,6 +16,6 @@ java_test( "//javascript/extractor", "//javascript/extractor:deps", "@bazel_tools//tools/java/runfiles", - "@codeql_internal//resources/lib/java/DO_NOT_DISTRIBUTE:junit", + "@semmle_code//resources/lib/java/DO_NOT_DISTRIBUTE:junit", ], ) diff --git a/misc/bazel/codeql_internal_stub/MODULE.bazel b/misc/bazel/semmle_code_stub/MODULE.bazel similarity index 50% rename from misc/bazel/codeql_internal_stub/MODULE.bazel rename to misc/bazel/semmle_code_stub/MODULE.bazel index 412f621a5ae..4efbb69d1bb 100644 --- a/misc/bazel/codeql_internal_stub/MODULE.bazel +++ b/misc/bazel/semmle_code_stub/MODULE.bazel @@ -1,4 +1,4 @@ module( - name = "codeql_internal", + name = "semmle_code", version = "0.0", ) diff --git a/misc/bazel/codeql_internal_stub/WORKSPACE.bazel b/misc/bazel/semmle_code_stub/WORKSPACE.bazel similarity index 100% rename from misc/bazel/codeql_internal_stub/WORKSPACE.bazel rename to misc/bazel/semmle_code_stub/WORKSPACE.bazel