Remove Python-based SAPI generator (version 1).

This change removes the deprecated Python-based code generator (generator_version=1) and all related build rules, release configurations, and documentation. The generator_version=1 is no longer supported in Bazel and CMake build systems.

PiperOrigin-RevId: 903825693
Change-Id: I1182c6fde69336300c31684dabee13f490f90474

Author: Sandboxed API Team

README.md

@@ -91,8 +91,7 @@ sudo apt-get install -qy
 
 #### LLVM
 
-SAPI offers two header generators, based on
-[Python](tools/python_generator/BUILD) and
+SAPI offers a header generator based on
 [LLVM Libtooling](tools/clang_generator/BUILD).
 
 We aim to provide support for at least the latest three LLVM release and

cmake/SapiBuildDefs.cmake

@@ -98,18 +98,14 @@ function(add_sapi_library)
                         "${_sapi_one_value}" "${_sapi_multi_value}")
   set(_sapi_NAME "${ARGV0}")
 
-  if(_sapi_GENERATOR_VERSION AND (_sapi_GENERATOR_VERSION VERSION_LESS "1" OR _sapi_GENERATOR_VERSION VERSION_GREATER "3"))
-    message(FATAL_ERROR "GENERATOR_VERSION must be \"1\", \"2\" or \"3\"")
+  if(_sapi_GENERATOR_VERSION AND (_sapi_GENERATOR_VERSION VERSION_LESS "2" OR _sapi_GENERATOR_VERSION VERSION_GREATER "3"))
+    message(FATAL_ERROR "GENERATOR_VERSION must be \"2\" or \"3\"")
   endif()
 
   if(_sapi_GENERATOR_VERSION)
     set(_sapi_use_generator_version ${_sapi_GENERATOR_VERSION})
   else()
-    if(SAPI_ENABLE_CLANG_TOOL)
-      set(_sapi_use_generator_version "2")
-    else()
-      set(_sapi_use_generator_version "1")
-    endif()
+    set(_sapi_use_generator_version "2")
   endif()
 
   set(_sapi_gen_header "${_sapi_NAME}.sapi.h")
@@ -187,60 +183,39 @@ function(add_sapi_library)
     "--sapi_functions=${_sapi_funcs}"
     "--sapi_ns=${_sapi_NAMESPACE}"
   )
-  if(_sapi_use_generator_version VERSION_GREATER_EQUAL "2")
-    if(_sapi_API_VERSION)
-      list(APPEND _sapi_generator_args "--sapi_api_version=${_sapi_API_VERSION}")
-    endif()
-    if(_sapi_use_generator_version VERSION_EQUAL "3")
-      list(APPEND _sapi_generator_args
-        "--sapi_sandboxee_src_out=${_sapi_gen_sandboxee_src}"
-      )
-    endif()
-    set(_sapi_isystem_args ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
-    list(TRANSFORM _sapi_isystem_args PREPEND --extra-arg-before=-isystem)
-    if(SAPI_CLANG_TOOL_EXECUTABLE)
-      list(APPEND _sapi_generator_command "${SAPI_CLANG_TOOL_EXECUTABLE}")
-    else()
-      list(APPEND _sapi_generator_command sapi_generator_tool)
-    endif()
-    list(APPEND _sapi_generator_command
-      -p "${CMAKE_CURRENT_BINARY_DIR}"
-      ${_sapi_generator_args}
-      ${_sapi_isystem_args}
-      ${_sapi_full_inputs}
-    )
-    list(APPEND _sapi_custom_command_output "${_sapi_gen_header}")
-    if (_sapi_use_generator_version VERSION_EQUAL "3")
-      list(APPEND _sapi_custom_command_output "${_sapi_gen_sandboxee_src}")
-    endif()
-    add_custom_command(
-      OUTPUT ${_sapi_custom_command_output}
-      COMMAND ${_sapi_generator_command}
-      COMMENT "Generating interface"
-      DEPENDS ${_sapi_INPUTS}
-      VERBATIM
+
+  if(_sapi_API_VERSION)
+    list(APPEND _sapi_generator_args "--sapi_api_version=${_sapi_API_VERSION}")
+  endif()
+  if(_sapi_use_generator_version VERSION_EQUAL "3")
+    list(APPEND _sapi_generator_args
+      "--sapi_sandboxee_src_out=${_sapi_gen_sandboxee_src}"
     )
+  endif()
+  set(_sapi_isystem_args ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
+  list(TRANSFORM _sapi_isystem_args PREPEND --extra-arg-before=-isystem)
+  if(SAPI_CLANG_TOOL_EXECUTABLE)
+    list(APPEND _sapi_generator_command "${SAPI_CLANG_TOOL_EXECUTABLE}")
   else()
-    set(_sapi_isystem "${_sapi_NAME}.isystem")
-    list(JOIN _sapi_full_inputs "," _sapi_full_inputs)
-    list(APPEND _sapi_generator_command
-      "${SAPI_PYTHON3_EXECUTABLE}" -B
-      "${SAPI_SOURCE_DIR}/sandboxed_api/tools/python_generator/sapi_generator.py"
-      ${_sapi_generator_args}
-      "--sapi_isystem=${_sapi_isystem}"
-      "--sapi_in=${_sapi_full_inputs}"
-    )
-    add_custom_command(
-      OUTPUT "${_sapi_gen_header}" "${_sapi_isystem}"
-      COMMAND sh -c
-              "printf '${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}' | \
-               sed \"s/;/\\n/g\" > \"${_sapi_isystem}\""
-      COMMAND ${_sapi_generator_command}
-      COMMENT "Generating interface"
-      DEPENDS ${_sapi_INPUTS}
-      VERBATIM
-    )
+    list(APPEND _sapi_generator_command sapi_generator_tool)
   endif()
+  list(APPEND _sapi_generator_command
+    -p "${CMAKE_CURRENT_BINARY_DIR}"
+    ${_sapi_generator_args}
+    ${_sapi_isystem_args}
+    ${_sapi_full_inputs}
+  )
+  list(APPEND _sapi_custom_command_output "${_sapi_gen_header}")
+  if (_sapi_use_generator_version VERSION_EQUAL "3")
+    list(APPEND _sapi_custom_command_output "${_sapi_gen_sandboxee_src}")
+  endif()
+  add_custom_command(
+    OUTPUT ${_sapi_custom_command_output}
+    COMMAND ${_sapi_generator_command}
+    COMMENT "Generating interface"
+    DEPENDS ${_sapi_INPUTS}
+    VERBATIM
+  )
 
   # Library with the interface
   if(NOT _sapi_SOURCES)

sandboxed_api/bazel/sapi.bzl

@@ -55,8 +55,6 @@ def make_exec_label(label):
 
 # buildifier: disable=function-docstring
 def select_generator(ctx):
-    if ctx.attr.generator_version == 1:
-        return ctx.executable._generator_v1
     return ctx.executable._generator_v2
 
 def sort_deps(deps):
@@ -149,12 +147,8 @@ def _clang_format_file(src, out, **kwargs):
     )
 
 def _sapi_interface_impl(ctx):
-    if ctx.attr.generator_version == 1 and ctx.label.package not in [
-        "sandboxed_api/tools/python_generator",
-        "sandboxed_api/examples/stringop",
-    ]:
-        # TODO(b/500992305): Remove this temporary check once the python code generator is completely deleted.
-        fail("generator_version=1 is deprecated and cannot be used outside of internal tests.")
+    if ctx.attr.generator_version == 1:
+        fail("generator_version=1 is no longer supported.")
 
     cpp_toolchain = find_cpp_toolchain(ctx)
     generator = select_generator(ctx)
@@ -265,10 +259,7 @@ sapi_interface = rule(
         ),
         "generator_version": attr.int(
             default = 2,  # Note: always set by sapi_library
-            values = [1, 2, 3],
-        ),
-        "_generator_v1": make_exec_label(
-            "//sandboxed_api/tools/python_generator:sapi_generator",
+            values = [2, 3],
         ),
         "sandbox_mode": attr.string(default = "sandbox2"),
         "symbol_list_gen": attr.bool(default = False),