firestore_snappy.patch.txt: remove the patching for firebase/firebase-ios-sdk#9662 (Create individual Python virtualenv's in cmake builds) since it's incorporated into the CocoaPods-9.0.0.nightly tag

Author: dconeybe

cmake/external/firestore_snappy.patch.txt

@@ -19,7 +19,7 @@ diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt
 index 2179633a8..c1de37b6d 100644
 --- a/cmake/external/CMakeLists.txt
 +++ b/cmake/external/CMakeLists.txt
-@@ -30,6 +30,7 @@ include(c-ares)
+@@ -35,6 +35,7 @@ include(c-ares)
  include(googletest)
  include(GoogleUtilities)
  include(grpc)
@@ -617,273 +617,3 @@ index 000000000..28bfb0837
 +   const uint8_t*& ip = *ip_p;
 +   // This section is crucial for the throughput of the decompression loop.
 +   // The latency of an iteration is fundamentally constrained by the
-diff --git a/Firestore/Protos/CMakeLists.txt b/Firestore/Protos/CMakeLists.txt
-index 85589b35f..96da74110 100644
---- a/Firestore/Protos/CMakeLists.txt
-+++ b/Firestore/Protos/CMakeLists.txt
-@@ -12,7 +12,12 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--include(FindPythonInterp)
-+include(python_setup)
-+FirebaseSetupPythonInterpreter(
-+  OUTVAR MY_PYTHON_EXECUTABLE
-+  KEY FirestoreProtos
-+  REQUIREMENTS six
-+)
- 
- # Generate output in-place. So long as the build is idempotent this helps
- # verify that the protoc-generated output isn't changing.
-@@ -200,7 +205,7 @@ if(FIREBASE_IOS_PROTOC_GENERATE_SOURCES)
-     COMMENT "Generating nanopb sources"
-     OUTPUT ${NANOPB_GENERATED_SOURCES}
-     COMMAND
--      ${PYTHON_EXECUTABLE}
-+      ${MY_PYTHON_EXECUTABLE}
-         ${CMAKE_CURRENT_SOURCE_DIR}/build_protos.py
-         --nanopb
-         --protoc=$<TARGET_FILE:protoc>
-@@ -232,7 +237,7 @@ if(FIREBASE_IOS_PROTOC_GENERATE_SOURCES)
-     COMMENT "Generating C++ protobuf sources"
-     OUTPUT ${PROTOBUF_CPP_GENERATED_SOURCES}
-     COMMAND
--      ${PYTHON_EXECUTABLE}
-+      ${MY_PYTHON_EXECUTABLE}
-         ${CMAKE_CURRENT_SOURCE_DIR}/build_protos.py
-         --cpp
-         --protoc=$<TARGET_FILE:protoc>
-diff --git a/Firestore/core/CMakeLists.txt b/Firestore/core/CMakeLists.txt
-index aeb96431b..a1f477cbe 100644
---- a/Firestore/core/CMakeLists.txt
-+++ b/Firestore/core/CMakeLists.txt
-@@ -14,8 +14,12 @@
- 
- include(CheckSymbolExists)
- include(CheckIncludeFiles)
--include(FindPythonInterp)
- 
-+include(python_setup)
-+FirebaseSetupPythonInterpreter(
-+  OUTVAR MY_PYTHON_EXECUTABLE
-+  KEY FirestoreCore
-+)
- 
- ## firestore_util
- 
-@@ -286,7 +290,7 @@ add_custom_command(
-   OUTPUT
-   ${GRPC_ROOT_CERTIFICATE_SOURCES}
-   COMMAND
--  ${PYTHON_EXECUTABLE} ${FIREBASE_SOURCE_DIR}/scripts/binary_to_array.py
-+  ${MY_PYTHON_EXECUTABLE} ${FIREBASE_SOURCE_DIR}/scripts/binary_to_array.py
-   --output_header=${OUTPUT_DIR}/grpc_root_certificates_generated.h
-   --output_source=${OUTPUT_DIR}/grpc_root_certificates_generated.cc
-   --cpp_namespace=firebase::firestore::remote
-diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt
-index 2179633a8..794936fe4 100644
---- a/cmake/external/CMakeLists.txt
-+++ b/cmake/external/CMakeLists.txt
-@@ -15,7 +15,12 @@
- cmake_minimum_required(VERSION 3.5.1)
- project(Firebase-download C CXX)
- 
--list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-+list(
-+  APPEND
-+  CMAKE_MODULE_PATH
-+  ${CMAKE_CURRENT_LIST_DIR}
-+  ${CMAKE_CURRENT_LIST_DIR}/..
-+)
- 
- set(
-   FIREBASE_DOWNLOAD_DIR
-diff --git a/cmake/python_setup.cmake b/cmake/python_setup.cmake
-new file mode 100644
-index 000000000..bdb7b9f6a
---- /dev/null
-+++ b/cmake/python_setup.cmake
-@@ -0,0 +1,183 @@
-+# Copyright 2022 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
-+#
-+#      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.
-+
-+# Sets up an isolated Python interpreter, installing required dependencies.
-+#
-+# This function does the following:
-+# 1. Finds a Python interpreter using the best-available built-in cmake
-+#      mechanism do do so. This is referred to as the "host" interpreter.
-+# 2. Creates a Python virtualenv in the cmake binary directory using the
-+#      host Python interpreter found in the previous step.
-+# 3. Locates the Python interpreter in the virtualenv and sets its path in
-+#      the specified OUTVAR variable.
-+# 4. Runs `pip install` to install the specified required dependencies, if any,
-+#      in the virtualenv.
-+#
-+# This function also writes "stamp files" into the virtualenv. These files
-+# are used to determine if the virtualenv is up-to-date from a previous cmake
-+# run or if it needs to be recreated from scratch. It will simply be re-used if
-+# possible.
-+#
-+# If any errors occur (e.g. cannot install one of the given requirements) then a
-+# fatal error is logged, causing the cmake processing to terminate.
-+#
-+# See https://docs.python.org/3/library/venv.html for details about virtualenv.
-+#
-+# Arguments:
-+#   OUTVAR - The name of the variable into which to store the path of the
-+#     Python executable from the virtualenv.
-+#   KEY - A unique key to ensure isolation from other Python virtualenv
-+#     environments created by this function. This value will be incorporated
-+#     into the path of the virtualenv and incorporated into the name of the
-+#     cmake cache variable that stores its path.
-+#   REQUIREMENTS - (Optional) A list of Python packages to install in the
-+#     virtualenv. These will be given as arguments to `pip install`.
-+#
-+# Example:
-+#   include(python_setup)
-+#   FirebaseSetupPythonInterpreter(
-+#     OUTVAR MY_PYTHON_EXECUTABLE
-+#     KEY ScanStuff
-+#     REQUIREMENTS six absl-py
-+#   )
-+#   execute_process(COMMAND "${MY_PYTHON_EXECUTABLE}" scan_stuff.py)
-+function(FirebaseSetupPythonInterpreter)
-+  cmake_parse_arguments(
-+    PARSE_ARGV 0
-+    ARG
-+    "" # zero-value arguments
-+    "OUTVAR;KEY" # single-value arguments
-+    "REQUIREMENTS" # multi-value arguments
-+  )
-+
-+  # Validate this function's arguments.
-+  if("${ARG_OUTVAR}" STREQUAL "")
-+    message(FATAL_ERROR "OUTVAR must be specified to ${CMAKE_CURRENT_FUNCTION}")
-+  elseif("${ARG_KEY}" STREQUAL "")
-+    message(FATAL_ERROR "KEY must be specified to ${CMAKE_CURRENT_FUNCTION}")
-+  endif()
-+
-+  # Calculate the name of the cmake *cache* variable into which to store the
-+  # path of the Python interpreter from the virtualenv.
-+  set(CACHEVAR "FIREBASE_PYTHON_EXECUTABLE_${ARG_KEY}")
-+
-+  set(LOG_PREFIX "${CMAKE_CURRENT_FUNCTION}(${ARG_KEY})")
-+
-+  # Find a "host" Python interpreter using the best available mechanism.
-+  if(${CMAKE_VERSION} VERSION_LESS "3.12")
-+    include(FindPythonInterp)
-+    set(DEFAULT_PYTHON_HOST_EXECUTABLE "${PYTHON_EXECUTABLE}")
-+  else()
-+    find_package(Python3 COMPONENTS Interpreter REQUIRED)
-+    set(DEFAULT_PYTHON_HOST_EXECUTABLE "${Python3_EXECUTABLE}")
-+  endif()
-+
-+  # Get the host Python interpreter on the host system to use.
-+  set(
-+    FIREBASE_PYTHON_HOST_EXECUTABLE
-+    "${DEFAULT_PYTHON_HOST_EXECUTABLE}"
-+    CACHE FILEPATH
-+    "The Python interpreter on the host system to use"
-+  )
-+
-+  # Check if the virtualenv is already up-to-date by examining the contents of
-+  # its stamp files. The stamp files store the path of the host Python
-+  # interpreter and the dependencies that were installed by pip. If both of
-+  # these files exist and contain the same Python interpreter and dependencies
-+  # then just re-use the virtualenv; otherwise, re-create it.
-+  set(PYVENV_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/pyvenv/${ARG_KEY}")
-+  set(STAMP_FILE1 "${PYVENV_DIRECTORY}/cmake_firebase_python_stamp1.txt")
-+  set(STAMP_FILE2 "${PYVENV_DIRECTORY}/cmake_firebase_python_stamp2.txt")
-+
-+  if(EXISTS "${STAMP_FILE1}" AND EXISTS "${STAMP_FILE2}")
-+    file(READ "${STAMP_FILE1}" STAMP_FILE1_CONTENTS)
-+    file(READ "${STAMP_FILE2}" STAMP_FILE2_CONTENTS)
-+    if(
-+      ("${STAMP_FILE1_CONTENTS}" STREQUAL "${FIREBASE_PYTHON_HOST_EXECUTABLE}")
-+      AND
-+      ("${STAMP_FILE2_CONTENTS}" STREQUAL "${ARG_REQUIREMENTS}")
-+    )
-+      set("${ARG_OUTVAR}" "$CACHE{${CACHEVAR}}" PARENT_SCOPE)
-+      message(STATUS "${LOG_PREFIX}: Using Python interpreter: $CACHE{${CACHEVAR}}")
-+      return()
-+    endif()
-+  endif()
-+
-+  # Create the virtualenv.
-+  message(STATUS
-+    "${LOG_PREFIX}: Creating Python virtualenv in ${PYVENV_DIRECTORY} "
-+    "using ${FIREBASE_PYTHON_HOST_EXECUTABLE}"
-+  )
-+  file(REMOVE_RECURSE "${PYVENV_DIRECTORY}")
-+  execute_process(
-+    COMMAND
-+      "${FIREBASE_PYTHON_HOST_EXECUTABLE}"
-+      -m
-+      venv
-+      "${PYVENV_DIRECTORY}"
-+    RESULT_VARIABLE
-+      FIREBASE_PYVENV_CREATE_RESULT
-+  )
-+  if(NOT FIREBASE_PYVENV_CREATE_RESULT EQUAL 0)
-+    message(FATAL_ERROR
-+      "Failed to create a Python virtualenv in ${PYVENV_DIRECTORY} "
-+      "using ${FIREBASE_PYTHON_HOST_EXECUTABLE}")
-+  endif()
-+
-+  # Find the Python interpreter in the virtualenv.
-+  find_program(
-+    "${CACHEVAR}"
-+    DOC "The Python interpreter to use for ${ARG_KEY}"
-+    NAMES python3 python
-+    PATHS "${PYVENV_DIRECTORY}"
-+    PATH_SUFFIXES bin Scripts
-+    NO_DEFAULT_PATH
-+  )
-+  if(NOT ${CACHEVAR})
-+    message(FATAL_ERROR "Unable to find Python executable in ${PYVENV_DIRECTORY}")
-+  else()
-+    set(PYTHON_EXECUTABLE "$CACHE{${CACHEVAR}}")
-+    message(STATUS "${LOG_PREFIX}: Found Python executable in virtualenv: ${PYTHON_EXECUTABLE}")
-+  endif()
-+
-+  # Install the dependencies in the virtualenv, if any are requested.
-+  if(NOT ("${ARG_REQUIREMENTS}" STREQUAL ""))
-+    message(STATUS
-+      "${LOG_PREFIX}: Installing Python dependencies into "
-+      "${PYVENV_DIRECTORY}: ${ARG_REQUIREMENTS}"
-+    )
-+    execute_process(
-+      COMMAND
-+        "${PYTHON_EXECUTABLE}"
-+        -m
-+        pip
-+        install
-+        ${ARG_REQUIREMENTS}
-+      RESULT_VARIABLE
-+        PIP_INSTALL_RESULT
-+    )
-+    if(NOT PIP_INSTALL_RESULT EQUAL 0)
-+      message(FATAL_ERROR
-+        "Failed to install Python dependencies into "
-+        "${PYVENV_DIRECTORY}: ${ARG_REQUIREMENTS}"
-+      )
-+    endif()
-+  endif()
-+
-+  # Write the stamp files.
-+  file(WRITE "${STAMP_FILE1}" "${FIREBASE_PYTHON_HOST_EXECUTABLE}")
-+  file(WRITE "${STAMP_FILE2}" "${ARG_REQUIREMENTS}")
-+
-+  set("${ARG_OUTVAR}" "${PYTHON_EXECUTABLE}" PARENT_SCOPE)
-+endfunction(FirebaseSetupPythonInterpreter)