Improve some bazel-to-cmake translation affecting AOM.

This mainly affects proto generation; if a strip_import_prefix path is used the output files should be generated in a path which does not require the strip_import_prefix to be proppagated in the target includes.

Also fixed an issue where the empty source was not added to alwayslink targets.
Basically, alwayslink cannot be INTERFACE targets in CMake.

Finally, changed includes to look at public/private header paths when choosing whether to add includes as public/private.

PiperOrigin-RevId: 895497540
Change-Id: Ic679b5de863bab74281fb0186ae69a362741e598

Author: laramiel

tools/cmake/bazel_to_cmake/bzl_library/grpc_generate_cc.py

@@ -1,21 +1,8 @@
-# Copyright 2022 The TensorStore Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"""CMake implementation of "@tensorstore//bazel:cc_grpc_library.bzl"."""
-
 # pylint: disable=invalid-name,missing-function-docstring,relative-beyond-top-level,g-long-lambda
+
+from collections.abc import Sequence
 import io
-from typing import Any, List, Optional, cast
+from typing import Any, cast
 
 from ..cmake_builder import CMakeBuilder
 from ..cmake_provider import CMakeAddDependenciesProvider
@@ -25,26 +12,41 @@
 from ..native_aspect_proto import btc_protobuf
 from ..native_aspect_proto import plugin_generated_files
 from ..native_aspect_proto import PluginSettings
-from ..native_aspect_proto import maybe_augment_output_dir
-from ..starlark.scope_common import ScopeCommon
 from ..starlark.bazel_target import RepositoryId
 from ..starlark.bazel_target import TargetId
 from ..starlark.common_providers import FilesProvider
 from ..starlark.common_providers import ProtoLibraryProvider
 from ..starlark.invocation_context import InvocationContext
 from ..starlark.invocation_context import RelativeLabel
 from ..starlark.provider import TargetInfo
+from ..starlark.scope_common import ScopeCommon
 from ..starlark.select import Configurable
 from ..util import quote_path
 from .register import register_bzl_library
 from .upb_proto_library import UPB_PLUGIN  # pylint: disable=unused-import
 
+
+# Copyright 2022 The TensorStore Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""CMake implementation of "@tensorstore//bazel:cc_grpc_library.bzl"."""
+
 GRPC_REPO = RepositoryId("grpc")
 
 _SEP = "\n        "
 
 
-def _empty_target_list(t: TargetId) -> List[TargetId]:
+def _empty_target_list(t: TargetId) -> list[TargetId]:
   del t
   return []
 
@@ -66,7 +68,7 @@ def bazel_generate_cc(
       self,
       well_known_protos: Any,
       name: str,
-      visibility: Optional[List[RelativeLabel]] = None,
+      visibility: Sequence[RelativeLabel] | None = None,
       **kwargs,
   ):
     context = self._context.snapshot()
@@ -86,9 +88,9 @@ def bazel_generate_cc(
 def _generate_grpc_cc_impl(
     _context: InvocationContext,
     _target: TargetId,
-    srcs: Optional[Configurable[List[RelativeLabel]]] = None,
-    plugin: Optional[Configurable[RelativeLabel]] = None,
-    flags: Optional[List[str]] = None,
+    srcs: Configurable[Sequence[RelativeLabel]] | None = None,
+    plugin: Configurable[RelativeLabel] | None = None,
+    flags: Sequence[str] | None = None,
     **kwargs,
 ):
   del kwargs
@@ -153,6 +155,7 @@ def _generate_grpc_cc_impl(
         src,
         plugin_settings,
         repo.cmake_binary_dir,
+        proto_library_provider,
     ):
       _context.add_analyzed_target(
           t[0],
@@ -177,12 +180,9 @@ def _generate_grpc_cc_impl(
   src_collector = state.collect_targets(srcs_with_service)
   state.collect_deps(UPB_PLUGIN.aspectdeps(srcs_with_service[0]))
 
-  # Augment output with strip import prefix
-  output_dir = repo.replace_with_cmake_macro_dirs([
-      maybe_augment_output_dir(
-          _context, proto_library_provider, repo.cmake_binary_dir
-      )
-  ])[0]
+  # The generated files should be in a directory with the strip_import_prefix
+  # already removed.
+  output_dir = repo.replace_with_cmake_macro_dirs([repo.cmake_binary_dir])[0]
 
   # Emit.
   out = io.StringIO()

tools/cmake/bazel_to_cmake/bzl_library/rules_nasm.py

@@ -15,12 +15,13 @@
 
 # pylint: disable=relative-beyond-top-level,invalid-name,missing-function-docstring,missing-class-docstring
 
+from collections.abc import Callable, Collection
 import hashlib
 import io
 import itertools
 import os
 import pathlib
-from typing import Callable, Collection, List, Optional, cast
+from typing import cast
 
 from .. import native_rules_cc
 from ..cmake_builder import CMakeBuilder
@@ -40,6 +41,7 @@
 from ..starlark.scope_common import ScopeCommon
 from ..starlark.select import Configurable
 from ..util import cmake_is_true
+from ..util import make_relative_path
 from ..util import partition_by
 from ..util import quote_list
 from ..util import quote_path
@@ -68,7 +70,7 @@ class RulesNasmLibrary(ScopeCommon):
   def bazel_nasm_library(
       self,
       name: str,
-      visibility: Optional[List[RelativeLabel]] = None,
+      visibility: list[RelativeLabel] | None = None,
       **kwargs,
   ):
     context = self._context.snapshot()
@@ -89,7 +91,7 @@ class RulesNasmCcLibrary(ScopeCommon):
   def bazel_nasm_cc_library(
       self,
       name: str,
-      visibility: Optional[List[RelativeLabel]] = None,
+      visibility: list[RelativeLabel] | None = None,
       **kwargs,
   ):
     context = self._context.snapshot()
@@ -145,11 +147,11 @@ def _common_nasm_resolve(
     _next: Callable[..., None],
     _context: InvocationContext,
     _target: TargetId,
-    srcs: Optional[Configurable[List[RelativeLabel]]] = None,
-    hdrs: Optional[Configurable[List[RelativeLabel]]] = None,
-    preincs: Optional[Configurable[List[RelativeLabel]]] = None,
-    copts: Optional[Configurable[List[str]]] = None,
-    includes: Optional[Configurable[List[str]]] = None,
+    srcs: Configurable[list[RelativeLabel]] | None = None,
+    hdrs: Configurable[list[RelativeLabel]] | None = None,
+    preincs: Configurable[list[RelativeLabel]] | None = None,
+    copts: Configurable[list[str]] | None = None,
+    includes: Configurable[list[str]] | None = None,
     **kwargs,
 ):
   """Applies evaluate_configurable to common (and uncommon) nasm arguments."""
@@ -175,7 +177,7 @@ def _construct_nasm_includes(
     current_package_id: PackageId,
     source_directory: pathlib.PurePath,
     cmake_binary_dir: pathlib.PurePath,
-    includes: Optional[Collection[str]] = None,
+    includes: Collection[str] | None = None,
 ):
   """Returns the set of includes for the configuration."""
 
@@ -212,11 +214,11 @@ def _nasm_library_impl(
     _context: InvocationContext,
     _target: TargetId,
     *,
-    srcs: List[TargetId],
-    hdrs: List[TargetId],
-    preincs: List[TargetId],
-    copts: List[str],
-    includes: List[str],
+    srcs: list[TargetId],
+    hdrs: list[TargetId],
+    preincs: list[TargetId],
+    copts: list[str],
+    includes: list[str],
     **kwargs,
 ):
   del kwargs
@@ -229,7 +231,7 @@ def _nasm_library_impl(
   srcs_collector = state.collect_targets(srcs)
   preincs_collector = state.collect_targets(preincs)
 
-  cmake_deps: List[CMakeTarget] = list(
+  cmake_deps: list[CMakeTarget] = list(
       itertools.chain(
           srcs_collector.add_dependencies(),
           preincs_collector.add_dependencies(),
@@ -259,12 +261,18 @@ def _nasm_library_impl(
   o_ext = _get_obj_suffix(state)
 
   def _output_file(src: pathlib.PurePath):
+    # Use relative path for hashing to ensure stability across workspaces.
+    _, relative_src = make_relative_path(
+        src,
+        (None, repo.source_directory),
+        (None, repo.cmake_binary_dir),
+    )
     return os.path.join(
         repo.cmake_binary_dir,
         "_nasm",
         _target.target_name,
         hashlib.sha256(
-            (_target.as_label() + str(src)).encode("utf-8")
+            f"{_target.as_label()}{relative_src.as_posix()}".encode("utf-8")
         ).hexdigest()[:8],
         os.path.basename(src) + o_ext,
     )
@@ -304,13 +312,13 @@ def _emit_nasm_assemble(
     out: io.StringIO,
     src: pathlib.PurePath,
     generated_obj: pathlib.PurePath,
-    copts: List[str],
-    cmake_deps: List[CMakeTarget],
+    copts: list[str],
+    cmake_deps: list[CMakeTarget],
 ):
   """Generates an NASM library target."""
   out.write(f"""add_custom_command(
   OUTPUT {quote_path(generated_obj)}
-  DEPENDS {quote_path_list([src] + cast(List[str], cmake_deps))}
+  DEPENDS {quote_path_list([src] + cast(list[str], cmake_deps))}
   COMMAND ${{CMAKE_ASM_NASM_COMPILER}}
           -f ${{CMAKE_ASM_NASM_OBJECT_FORMAT}}
           ${{CMAKE_ASM_NASM_FLAGS}}
@@ -329,11 +337,11 @@ def _nasm_cc_library_builtin_impl(
     _context: InvocationContext,
     _target: TargetId,
     *,
-    srcs: List[TargetId],
-    hdrs: List[TargetId],
-    preincs: List[TargetId],
-    copts: List[str],
-    includes: List[str],
+    srcs: list[TargetId],
+    hdrs: list[TargetId],
+    preincs: list[TargetId],
+    copts: list[str],
+    includes: list[str],
     alwayslink: bool = False,
     linkstatic: bool = False,
     **kwargs,
@@ -348,7 +356,7 @@ def _nasm_cc_library_builtin_impl(
   srcs_collector = state.collect_targets(srcs)
   preincs_collector = state.collect_targets(preincs)
 
-  cmake_deps: List[CMakeTarget] = list(
+  cmake_deps: list[CMakeTarget] = list(
       itertools.chain(
           srcs_collector.add_dependencies(),
           preincs_collector.add_dependencies(),
@@ -430,9 +438,9 @@ def _emit_nasm_sources(
     out: io.StringIO,
     target_name: CMakeTarget,
     srcs: set[pathlib.PurePath],
-    includes: List[pathlib.PurePath],
-    copts: List[str],
-    cmake_deps: List[CMakeTarget],
+    includes: list[pathlib.PurePath],
+    copts: list[str],
+    cmake_deps: list[CMakeTarget],
 ):
   """Generates an NASM library target."""
   _sep = "\n    "