Merge pull request #944 from swiftlang/t/vendor

Switch protobuf from submodule to subtree vendoring

Author: dmbryson

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "thirdparty/protobuf"]
-	path = thirdparty/protobuf
-	url = https://github.com/protocolbuffers/protobuf.git
-[submodule "thirdparty/swift-protobuf"]
-	path = thirdparty/swift-protobuf
-	url = https://github.com/apple/swift-protobuf.git

thirdparty/protobuf

@@ -0,0 +1,4 @@
+# These are fetched as external repositories.
+third_party/abseil-cpp
+third_party/googletest
+_build/

thirdparty/protobuf/.bazelignore

@@ -0,0 +1,34 @@
+build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
+
+build:dbg --compilation_mode=dbg
+
+build:opt --compilation_mode=opt
+
+build:san-common --config=dbg --strip=never --copt=-O0 --copt=-fno-omit-frame-pointer
+
+build:asan --config=san-common --copt=-fsanitize=address --linkopt=-fsanitize=address
+# ASAN hits ODR violations with shared linkage due to rules_proto.
+build:asan --dynamic_mode=off
+
+build:msan --config=san-common --copt=-fsanitize=memory --linkopt=-fsanitize=memory
+build:msan --copt=-fsanitize-memory-track-origins
+build:msan --copt=-fsanitize-memory-use-after-dtor
+build:msan --action_env=MSAN_OPTIONS=poison_in_dtor=1
+
+build:tsan --config=san-common --copt=-fsanitize=thread --linkopt=-fsanitize=thread
+
+build:ubsan --config=san-common --copt=-fsanitize=undefined --linkopt=-fsanitize=undefined
+build:ubsan --action_env=UBSAN_OPTIONS=halt_on_error=1:print_stacktrace=1
+# Workaround for the fact that Bazel links with $CC, not $CXX
+# https://github.com/bazelbuild/bazel/issues/11122#issuecomment-613746748
+build:ubsan --copt=-fno-sanitize=function --copt=-fno-sanitize=vptr
+
+# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel
+# https://github.com/protocolbuffers/protobuf/issues/14313
+common --noenable_bzlmod
+
+# Important: this flag ensures that we remain compliant with the C++ layering
+# check.
+build --features=layering_check
+
+common --repo_env=BAZEL_NO_APPLE_CPP_TOOLCHAIN=1

thirdparty/protobuf/.bazelrc

@@ -0,0 +1,8 @@
+# Bazel Central Registry
+
+When protobuf is released, we want it to be published to the Bazel Central
+Registry automatically: <https://registry.bazel.build>
+
+This folder contains configuration files to automate the publish step. See
+<https://github.com/bazel-contrib/publish-to-bcr/blob/main/templates/README.md>
+for authoritative documentation about these files.

thirdparty/protobuf/.bcr/README.md

@@ -0,0 +1,23 @@
+{
+  "homepage": "https://github.com/protocolbuffers/protobuf",
+  "maintainers": [
+    {
+      "email": "[email protected]",
+      "github": "zhangskz",
+      "name": "Sandy Zhang"
+    },
+    {
+      "email": "[email protected]",
+      "github": "mkruskal-google",
+      "name": "Mike Kruskal"
+    },
+    {
+      "email": "[email protected]",
+      "github": "googleberg",
+      "name": "Jerry Berg"
+    }
+  ],
+  "repository": ["github:protocolbuffers/protobuf"],
+  "versions": [],
+  "yanked_versions": {}
+}

thirdparty/protobuf/.bcr/metadata.template.json

@@ -0,0 +1,35 @@
+matrix:
+  platform: ["debian10", "macos", "ubuntu2004", "windows"]
+  bazel: [6.x, 7.x]
+
+tasks:
+  verify_targets:
+    name: "Verify build targets"
+    platform: ${{ platform }}
+    bazel: ${{ bazel }}
+    build_flags:
+    - '--host_cxxopt=-std=c++14'
+    - '--cxxopt=-std=c++14'
+    build_targets:
+    - '@protobuf//:protobuf'
+    - '@protobuf//:protobuf_lite'
+    - '@protobuf//:protoc'
+    - '@protobuf//:test_messages_proto2_cc_proto'
+    - '@protobuf//:test_messages_proto3_cc_proto'
+
+bcr_test_module:
+  module_path: "examples"
+  matrix:
+
+    platform: ["debian10", "macos", "ubuntu2004", "windows"]
+    bazel: [6.x, 7.x]
+  tasks:
+    run_test_module:
+      name: "Run test module"
+      platform: ${{ platform }}
+      bazel: ${{ bazel }}
+      build_flags:
+      - '--host_cxxopt=-std=c++14'
+      - '--cxxopt=-std=c++14'
+      build_targets:
+      - "//..."

thirdparty/protobuf/.bcr/presubmit.yml

@@ -0,0 +1,5 @@
+{
+  "integrity": "**leave this alone**",
+  "strip_prefix": "{REPO}-{VERSION}",
+  "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/{REPO}-{VERSION}.zip"
+}

thirdparty/protobuf/.bcr/source.template.json

@@ -0,0 +1,3 @@
+BasedOnStyle: Google
+DerivePointerAlignment: false
+PointerAlignment: Left

thirdparty/protobuf/.clang-format

@@ -0,0 +1,54 @@
+# This information is extracted from the MacOS runner specs located at:
+# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
+#
+# When updating, also ensure the "xcode_destination" entries in
+# `.github/workflows/test_objectivec.yml` are supported for the given versions
+# of Xcode.
+xcode_version(
+    name = "version15_2_15C500b",
+    aliases = [
+        "15C500b",
+        "15.2",
+    ],
+    default_ios_sdk_version = "17.2",
+    default_macos_sdk_version = "14.2",
+    default_tvos_sdk_version = "17.2",
+    default_watchos_sdk_version = "10.2",
+    version = "15.2.0.15C500b",
+)
+
+xcode_version(
+    name = "version14_2_14C18",
+    aliases = [
+        "14C18",
+        "14.2",
+    ],
+    default_ios_sdk_version = "16.2",
+    default_macos_sdk_version = "13.1",
+    default_tvos_sdk_version = "16.1",
+    default_watchos_sdk_version = "9.1",
+    version = "14.2.0.14C18",
+)
+
+xcode_version(
+    name = "version14_1_0_14B47b",
+    aliases = [
+        "14B47b",
+        "14.1",
+    ],
+    default_ios_sdk_version = "16.1",
+    default_macos_sdk_version = "13.0",
+    default_tvos_sdk_version = "16.1",
+    default_watchos_sdk_version = "9.1",
+    version = "14.1.0.14B47b",
+)
+
+xcode_config(
+    name = "host_xcodes",
+    default = ":version14_2_14C18",
+    versions = [
+        ":version15_2_15C500b",
+        ":version14_2_14C18",
+        ":version14_1_0_14B47b",
+    ],
+)