Harmonize license rules between google3 and OSS

This simplifies upb by removing differences between google3 and OSS. This also points upb at the protobuf license, instead of keeping a separate copy around for upb. PiperOrigin-RevId: 669447145
7 months ago · e4449ba248
parent 593bcfaf57
commit e4449ba248
37 changed files with 79 additions and 70 deletions
--- a/BUILD.bazel
+++ b/BUILD.bazel
@ -1,6 +1,7 @@
 # Bazel (https://bazel.build/) BUILD file for Protobuf.

 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
+load("@rules_license//rules:license.bzl", "license")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files", "strip_prefix")
 load("//bazel:cc_proto_library.bzl", "cc_proto_library")
 load("//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
@ -17,6 +18,12 @@ exports_files([
    "PrivacyInfo.xcprivacy",
 ])

+license(
+    name = "license",
+    package_name = "protobuf",
+    license_text = ":LICENSE",
+)
+
 ################################################################################
 # Well Known Types Proto Library Rules
 #
--- a/MODULE.bazel
+++ b/MODULE.bazel
@ -53,6 +53,11 @@ bazel_dep(
    version = "1.9.0",
 )

+bazel_dep(
+    name = "rules_license",
+    version = "0.0.8",
+)
+
 bazel_dep(
    name = "rules_pkg",
    version = "0.7.0",
--- a/bazel/common/BUILD
+++ b/bazel/common/BUILD
@ -1,5 +1,7 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")

+package(default_applicable_licenses = ["//:license"])
+
 bzl_library(
    name = "proto_common_bzl",
    srcs = [
--- a/bazel/private/BUILD
+++ b/bazel/private/BUILD
@ -1,6 +1,8 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("//bazel/private:native_bool_flag.bzl", "native_bool_flag")

+package(default_applicable_licenses = ["//:license"])
+
 toolchain_type(
    name = "proto_toolchain_type",
 )
--- a/bazel/tests/BUILD
+++ b/bazel/tests/BUILD
@ -1,3 +1,5 @@
 load(":proto_common_compile_tests.bzl", "proto_common_compile_test_suite")

+package(default_applicable_licenses = ["//:license"])
+
 proto_common_compile_test_suite(name = "proto_common_compile_test_suite")
--- a/bazel/tests/testdata/BUILD
+++ b/bazel/tests/testdata/BUILD
@ -1,4 +1,7 @@
-package(default_visibility = ["//visibility:public"])
+package(
+    default_applicable_licenses = ["//:license"],
+    default_visibility = ["//visibility:public"],
+)

 proto_lang_toolchain(
    name = "toolchain",
--- a/bazel/toolchains/BUILD
+++ b/bazel/toolchains/BUILD
@ -1,5 +1,7 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")

+package(default_applicable_licenses = ["//:license"])
+
 bzl_library(
    name = "proto_toolchain_bzl",
    srcs = [
--- a/benchmarks/BUILD
+++ b/benchmarks/BUILD
@ -20,9 +20,7 @@ load(
    "tmpl_cc_binary",
 )

-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 licenses(["notice"])

--- a/editions/codegen_tests/BUILD
+++ b/editions/codegen_tests/BUILD
@ -1,5 +1,9 @@
 load("//bazel:cc_proto_library.bzl", "cc_proto_library")

+package(
+    default_applicable_licenses = ["//:license"],
+)
+
 exports_files(
    glob(["*.proto"]),
    visibility = [
--- a/hpb/BUILD
+++ b/hpb/BUILD
@ -15,7 +15,7 @@ load(
 )

 # begin:google_only
-# package(default_applicable_licenses = ["//src/google/protobuf:license"])
+# package(default_applicable_licenses = ["//:license"])
 # end:google_only

 licenses(["notice"])
--- a/hpb/backend/upb/BUILD
+++ b/hpb/backend/upb/BUILD
@ -6,7 +6,7 @@
 # https://developers.google.com/open-source/licenses/bsd

 # begin:google_only
-# package(default_applicable_licenses = ["//src/google/protobuf:license"])
+# package(default_applicable_licenses = ["//:license"])
 # end:google_only

 cc_library(
--- a/hpb/bazel/BUILD
+++ b/hpb/bazel/BUILD
@ -7,9 +7,7 @@

 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")

-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 licenses(["notice"])

--- a/hpb/internal/BUILD
+++ b/hpb/internal/BUILD
@ -11,7 +11,7 @@ load(
 )

 # begin:google_only
-# package(default_applicable_licenses = ["//src/google/protobuf:license"])
+# package(default_applicable_licenses = ["//:license"])
 # end:google_only

 cc_library(
--- a/hpb_generator/BUILD
+++ b/hpb_generator/BUILD
@ -11,7 +11,7 @@ load(
 )

 # begin:google_only
-# package(default_applicable_licenses = ["//src/google/protobuf:license"])
+# package(default_applicable_licenses = ["//:license"])
 # end:google_only

 licenses(["notice"])
--- a/hpb_generator/tests/BUILD
+++ b/hpb_generator/tests/BUILD
@ -25,9 +25,7 @@
 # )
 # end:google_only

-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 # todo: re-add post migration
 # begin:google_only
--- a/protobuf_deps.bzl
+++ b/protobuf_deps.bzl
@ -178,6 +178,16 @@ def protobuf_deps():
            url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.9.0/rules_kotlin-v1.9.0.tar.gz",
        )

+    if not native.existing_rule("rules_license"):
+        http_archive(
+            name = "rules_license",
+            urls = [
+                "https://mirror.bazel.build/github.com/bazelbuild/rules_license/releases/download/0.0.8/rules_license-0.0.8.tar.gz",
+                "https://github.com/bazelbuild/rules_license/releases/download/0.0.8/rules_license-0.0.8.tar.gz",
+            ],
+            sha256 = "241b06f3097fd186ff468832150d6cc142247dc42a32aaefb56d0099895fd229",
+        )
+
    # Python Downloads
    python_source_archive(
        name = "python-3.8.0",
--- a/protos/BUILD
+++ b/protos/BUILD
@ -11,7 +11,7 @@
 #     "UPB_DEFAULT_CPPOPTS",
 # )
 #
-# package(default_applicable_licenses = ["//upb:license"])
+# package(default_applicable_licenses = ["//:license"])
 #
 # licenses(["notice"])
 #
--- a/python/BUILD.bazel
+++ b/python/BUILD.bazel
@ -20,9 +20,7 @@ build_targets(name = "python")
 licenses(["notice"])

 package(
-    # begin:google_only
-    #     default_applicable_licenses = ["//upb:license"],
-    # end:google_only
+    default_applicable_licenses = ["//:license"],
    default_visibility = ["//python/dist:__pkg__"],
 )

--- a/python/pb_unit_tests/BUILD
+++ b/python/pb_unit_tests/BUILD
@ -11,9 +11,7 @@ load("@pip_deps//:requirements.bzl", "requirement")

 load(":pyproto_test_wrapper.bzl", "pyproto_test_wrapper")

-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 licenses(["notice"])

--- a/rust/test/upb/BUILD
+++ b/rust/test/upb/BUILD
@ -19,6 +19,8 @@

 load("@rules_rust//rust:defs.bzl", "rust_test")

+package(default_applicable_licenses = ["//:license"])
+
 licenses(["notice"])

 # TODO: Enable this for the cpp kernel and move these tests to shared.
--- a/rust/upb/BUILD
+++ b/rust/upb/BUILD
@ -10,9 +10,7 @@ load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix

 load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test")

-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 rust_library(
    name = "upb",
--- a/third_party/utf8_range/BUILD.bazel
+++ b/third_party/utf8_range/BUILD.bazel
@ -4,13 +4,23 @@
 # license that can be found in the LICENSE file or at
 # https://opensource.org/licenses/MIT.

+load("@rules_license//rules:license.bzl", "license")
+
 DEFAULT_VISIBILITY = [
    "//src/google/protobuf:__subpackages__",
    "//third_party/utf8_range:__subpackages__",
    "//util/utf8/internal:__subpackages__",
 ]

-package(default_visibility = ["//visibility:public"])
+package(
+    default_applicable_licenses = ["//third_party/utf8_range:license"],
+    default_visibility = ["//visibility:public"],
+)
+
+license(
+    name = "license",
+    package_name = "utf8_range",
+)

 licenses(["notice"])

--- a/third_party/utf8_range/fuzz/BUILD.bazel
+++ b/third_party/utf8_range/fuzz/BUILD.bazel
@ -1,5 +1,7 @@
 load("@rules_fuzzing//fuzzing:cc_defs.bzl", "cc_fuzz_test")

+package(default_applicable_licenses = ["//third_party/utf8_range:license"])
+
 cc_fuzz_test(
    name = "utf8_validity_fuzzer",
    testonly = 1,
--- a/upb/BUILD
+++ b/upb/BUILD
@ -12,7 +12,6 @@ load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")

 # begin:google_only
 # load("//tools/build_defs/kotlin/native:rules.bzl", "kt_native_interop_hint")
-# load("//tools/build_defs/license:license.bzl", "license")
 # end:google_only

 # begin:github_only
@ -22,14 +21,7 @@ load(
 )
 # end:github_only

-# begin:google_only
-# package(default_applicable_licenses = [":license"])
-#
-# license(
-#     name = "license",
-#     package_name = "upb",
-# )
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 licenses(["notice"])

--- a/upb/bazel/BUILD
+++ b/upb/bazel/BUILD
@ -8,9 +8,7 @@
 load("@bazel_skylib//lib:selects.bzl", "selects")
 load("@rules_python//python:defs.bzl", "py_binary")

-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 licenses(["notice"])

--- a/upb/cmake/make_cmakelists.py
+++ b/upb/cmake/make_cmakelists.py
@ -238,6 +238,8 @@ class BuildFileFunctions(object):
  def alias(self, **kwargs):
    pass

+  def package(self, **kwargs):
+    pass

 class Converter(object):
  def __init__(self):
--- a/upb/conformance/BUILD
+++ b/upb/conformance/BUILD
@ -16,9 +16,7 @@ load(
    "make_shell_script",
 )

-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 licenses(["notice"])

--- a/upb/hash/BUILD
+++ b/upb/hash/BUILD
@ -7,9 +7,7 @@

 load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")

-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 cc_library(
    name = "hash",
--- a/upb/io/BUILD
+++ b/upb/io/BUILD
@ -1,6 +1,4 @@
-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 cc_library(
    name = "string",
--- a/upb/json/BUILD
+++ b/upb/json/BUILD
@ -7,9 +7,7 @@ load(
 )
 load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")

-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 cc_library(
    name = "json",
--- a/upb/lex/BUILD
+++ b/upb/lex/BUILD
@ -7,9 +7,7 @@

 load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")

-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 cc_library(
    name = "lex",
--- a/upb/test/BUILD
+++ b/upb/test/BUILD
@ -19,9 +19,7 @@ load(
    "UPB_DEFAULT_CPPOPTS",
 )

-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 cc_library(
    name = "parse_text_proto",
--- a/upb/util/BUILD
+++ b/upb/util/BUILD
@ -4,9 +4,7 @@ load(
    "upb_proto_reflection_library",
 )

-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 licenses(["notice"])

--- a/upb_generator/BUILD
+++ b/upb_generator/BUILD
@ -25,9 +25,7 @@ load(
    "bootstrap_upb_proto_library",
 )

-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 licenses(["notice"])

--- a/upb_generator/c/BUILD
+++ b/upb_generator/c/BUILD
@ -8,9 +8,7 @@ load(
    "bootstrap_cc_library",
 )

-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 licenses(["notice"])

--- a/upb_generator/minitable/BUILD
+++ b/upb_generator/minitable/BUILD
@ -12,9 +12,7 @@ load(
    "bootstrap_cc_library",
 )

-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 licenses(["notice"])

--- a/upb_generator/reflection/BUILD
+++ b/upb_generator/reflection/BUILD
@ -7,9 +7,7 @@

 load("//upb/bazel:build_defs.bzl", "UPB_DEFAULT_CPPOPTS")

-# begin:google_only
-# package(default_applicable_licenses = ["//upb:license"])
-# end:google_only
+package(default_applicable_licenses = ["//:license"])

 licenses(["notice"])