CMake: Make the Clang tool generator the default

The Clang-based header generator (version 2) is now the default. Added a dependency on RE2 for the Clang generator tool to fix the CMake build.

PiperOrigin-RevId: 903209345
Change-Id: I22df09afa4ec142974ba0d3c0e303e648e087852

Author: cblichmann

.github/workflows/generator-tool.yml

@@ -47,7 +47,6 @@ jobs:
           -B "$GITHUB_WORKSPACE/build" \
           -G Ninja \
           -DCMAKE_BUILD_TYPE=Release \
-          -DSAPI_ENABLE_CLANG_TOOL=ON \
           -DSAPI_ENABLE_CLANG_TOOL_STATIC=ON
 
     - name: Build

cmake/SapiBuildDefs.cmake

@@ -89,8 +89,7 @@ endmacro()
 #   version "1" is defined.
 # GENERATOR_VERSION Which version of the SAPI generator to use. Currently, only
 #   version "1", "2", and "3" are defined. Note that if unset, this defaults to
-#   version "1" unless SAPI_ENABLE_CLANG_TOOL is set, in which case it defaults
-#   to version "2".
+#   version "2".
 function(add_sapi_library)
   set(_sapi_opts NOEMBED)
   set(_sapi_one_value LIBRARY LIBRARY_NAME NAMESPACE API_VERSION GENERATOR_VERSION)
@@ -99,14 +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"))
+  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\"")
   endif()
 
-  if (_sapi_GENERATOR_VERSION)
+  if(_sapi_GENERATOR_VERSION)
     set(_sapi_use_generator_version ${_sapi_GENERATOR_VERSION})
   else()
-    if (SAPI_ENABLE_CLANG_TOOL)
+    if(SAPI_ENABLE_CLANG_TOOL)
       set(_sapi_use_generator_version "2")
     else()
       set(_sapi_use_generator_version "1")
@@ -123,7 +122,7 @@ function(add_sapi_library)
   endif()
 
   # The sandboxee client library.
-  if (_sapi_use_generator_version VERSION_EQUAL "3")
+  if(_sapi_use_generator_version VERSION_EQUAL "3")
     set(_sapi_sandboxee_client_target "${_sapi_NAME}_sandboxee_gen")
     add_library("${_sapi_sandboxee_client_target}" STATIC
       "${_sapi_gen_sandboxee_src}"
@@ -139,7 +138,7 @@ function(add_sapi_library)
     )
     set(_sapi_sandboxee_client_lib "${_sapi_sandboxee_client_target}")
   else()
-    set (_sapi_sandboxee_client_lib "sapi::client_message_handler")
+    set(_sapi_sandboxee_client_lib "sapi::client_message_handler")
   endif()
 
   # The sandboxed binary
@@ -189,8 +188,10 @@ function(add_sapi_library)
     "--sapi_ns=${_sapi_NAMESPACE}"
   )
   if(_sapi_use_generator_version VERSION_GREATER_EQUAL "2")
-    list(APPEND _sapi_generator_args "--sapi_api_version=${_sapi_API_VERSION}")
-    if (_sapi_use_generator_version VERSION_EQUAL "3")
+    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}"
       )

cmake/SapiDeps.cmake

@@ -60,6 +60,11 @@ if(SAPI_DOWNLOAD_ABSL)
 endif()
 sapi_check_target(absl::core_headers)
 
+if(SAPI_DOWNLOAD_LIBUNWIND)
+  include(cmake/libunwind.cmake)
+endif()
+sapi_check_target(unwind_ptrace)
+
 if(SAPI_DOWNLOAD_LIBCAP)
   include(cmake/libcap.cmake)
   sapi_check_target(libcap::libcap)
@@ -74,16 +79,16 @@ else()
   find_package(Libffi REQUIRED)
 endif()
 
-if(SAPI_DOWNLOAD_LIBUNWIND)
-  include(cmake/libunwind.cmake)
-endif()
-sapi_check_target(unwind_ptrace)
-
 if(SAPI_DOWNLOAD_PROTOBUF)
   include(cmake/protobuf.cmake)
 endif()
 find_package(Protobuf REQUIRED)
 
+if(SAPI_DOWNLOAD_RE2)
+  include(cmake/re2.cmake)
+endif()
+sapi_check_target(re2)
+
 if(SAPI_BUILD_EXAMPLES)
   if(SAPI_DOWNLOAD_ZLIB)
     include(cmake/zlib.cmake)

cmake/SapiOptions.cmake

@@ -28,12 +28,13 @@ endif()
 # dependencies. This is useful for cases where embedding projects already
 # depend on some of these libraries (e.g. Abseil).
 option(SAPI_DOWNLOAD_ABSL "Download Abseil at config time" ON)
-option(SAPI_DOWNLOAD_GOOGLETEST "Download googletest at config time" ON)
 option(SAPI_DOWNLOAD_BENCHMARK "Download benchmark at config time" ON)
-option(SAPI_DOWNLOAD_PROTOBUF "Download protobuf at config time" ON)
-option(SAPI_DOWNLOAD_LIBUNWIND "Download libunwind at config time" ON)
+option(SAPI_DOWNLOAD_GOOGLETEST "Download googletest at config time" ON)
 option(SAPI_DOWNLOAD_LIBCAP "Download libcap at config time" ON)
 option(SAPI_DOWNLOAD_LIBFFI "Download libffi at config time" ON)
+option(SAPI_DOWNLOAD_LIBUNWIND "Download libunwind at config time" ON)
+option(SAPI_DOWNLOAD_PROTOBUF "Download protobuf at config time" ON)
+option(SAPI_DOWNLOAD_RE2 "Download re2 at config time" ON)
 
 # Options for building examples
 option(SAPI_BUILD_EXAMPLES
@@ -51,9 +52,7 @@ option(SAPI_BUILD_TESTING
 # Disabled by default, as this will download a lot of extra content.
 option(SAPI_CONTRIB_BUILD_TESTING "Build tests for sandboxes in 'contrib'" OFF)
 
-option(SAPI_ENABLE_CLANG_TOOL
-  "Use the new Clang tool based header generator" OFF
-)
+option(SAPI_ENABLE_CLANG_TOOL "Use the Clang tool header generator" ON)
 option(SAPI_ENABLE_CLANG_TOOL_STATIC
   "Link the Clang libraries statically into the tool" OFF
 )

cmake/re2.cmake

@@ -0,0 +1,21 @@
+# Copyright 2026 Google LLC
+#
+# 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
+#
+#     https://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.
+
+FetchContent_Declare(re2
+  URL https://github.com/google/re2/releases/download/2025-11-05/re2-2025-11-05.tar.gz
+  URL_HASH SHA256=87f6029d2f6de8aa023654240a03ada90e876ce9a4676e258dd01ea4c26ffd67
+)
+set(RE2_INSTALL OFF CACHE BOOL "" FORCE)
+
+FetchContent_MakeAvailable(re2)

sandboxed_api/tools/clang_generator/CMakeLists.txt

@@ -115,6 +115,7 @@ target_link_libraries(sapi_generator PUBLIC
   absl::status
   absl::statusor
   absl::strings
+  re2
   sapi::fileops
   sapi::status
   ${_sapi_generator_clang_libs}
@@ -163,6 +164,7 @@ if(BUILD_TESTING AND SAPI_BUILD_TESTING)
     sapi::file_helpers
     sapi::runfiles
     sapi::sapi
+    sapi::testing
     sapi::generator
     sapi::status
     sapi::test_main