PYCBC-1699: Update SDK Build Setup

Changes
=======
* Update C++ Core
* Update CMakeLists.txt to handle C++ core changes
* Update Python version detection to allow pre-release versions of
  Python
* Update OpenSSL build path to use 3.x by default
* Added new build flag: PYCBC_USE_OPENSSLV1_1 to enable building against
  OpenSSL v1.1.
* Update default OpenSSL versions: 1.1.1w and 3.5.2

Change-Id: If6403314c27e7d44a93c57873df69493be736e13
Reviewed-on: https://review.couchbase.org/c/couchbase-python-client/+/232816
Reviewed-by: Dimitris Christodoulou <dimitris.christodoulou@couchbase.com>
Tested-by: Build Bot <build@couchbase.com>

Author: thejcfactor

CMakeLists.txt

@@ -29,10 +29,16 @@ function(get_python_version)
     set(PYTHON3_EXE "python3")
   endif()
 
-  execute_process(COMMAND ${PYTHON3_EXE} -c "import platform;print(platform.python_version())"
-                  OUTPUT_VARIABLE local_python_version)
-  string(STRIP "${local_python_version}" PYTHON_VERSION)
-  set(LOCAL_PYTHON_VERSION "${PYTHON_VERSION}" PARENT_SCOPE)
+  # Be careful with whitespace
+  execute_process(COMMAND ${PYTHON3_EXE} -c
+                  "import platform
+import re
+version = platform.python_version()
+match = re.search(r'\\d+\\.\\d+\\.\\d+', version)
+print(match.group())"
+                  OUTPUT_VARIABLE local_python_version
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+  set(LOCAL_PYTHON_VERSION "${local_python_version}" PARENT_SCOPE)
 endfunction()
 
 if(WIN32)
@@ -53,7 +59,7 @@ message(STATUS "LOCAL_PYTHON_VERSION=${LOCAL_PYTHON_VERSION}")
 
 if(LOCAL_PYTHON_VERSION)
   set(Python3_FIND_VIRTUALENV FIRST)
-  message("finding python version ${LOCAL_PYTHON_VERSION}")
+  message(STATUS "Attempting to find python version: ${LOCAL_PYTHON_VERSION}")
   find_package(Python3 ${LOCAL_PYTHON_VERSION} EXACT COMPONENTS Interpreter Development.Module)
 else()
   find_package(Python3 COMPONENTS Interpreter Development.Module)
@@ -99,7 +105,7 @@ if(NOT USE_STATIC_BORINGSSL)
       if(NOT OPENSSL_VERSION)
         message(STATUS "No OpenSSL version set...cannot attempt to download.")
       else()
-        # default version is currently 1.1.1g (see setup.py)
+        # see pycbc_build_setup.py for default OpenSSL versions
         FetchContent_Declare(openssl
                              URL https://github.com/python/cpython-bin-deps/archive/openssl-bin-${OPENSSL_VERSION}.zip)
         message(STATUS "fetching OpenSSL version: ${OPENSSL_VERSION}")
@@ -112,8 +118,15 @@ if(NOT USE_STATIC_BORINGSSL)
       find_program(BREW_COMMAND brew)
       if(BREW_COMMAND)
         message(STATUS "brew command: ${BREW_COMMAND}")
+        set(BREW_OPENSSL "openssl@3")
+        if(USE_OPENSSLV1_1)
+          set(BREW_OPENSSL "openssl@1.1")
+          message(STATUS "Using OpenSSL v1.1 from homebrew")
+        else()
+          message(STATUS "Using OpenSSL v3 from homebrew")
+        endif()
         execute_process(
-          COMMAND ${BREW_COMMAND} --prefix openssl@1.1
+          COMMAND ${BREW_COMMAND} --prefix ${BREW_OPENSSL}
           OUTPUT_VARIABLE BREW_OPENSSL_PREFIX
           RESULT_VARIABLE BREW_RESULT
           OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -132,7 +145,7 @@ if(NOT USE_STATIC_BORINGSSL)
   endif()
 
   message(STATUS "Adding ${OPENSSL_INCLUDE_DIR} to include dirs...")
-  include_directories(${OPENSSL_INCLUDE_DIR})
+  include_directories(SYSTEM ${OPENSSL_INCLUDE_DIR})
 else()
   set(COUCHBASE_CXX_CLIENT_POST_LINKED_OPENSSL
       OFF
@@ -244,7 +257,7 @@ target_include_directories(
   "${COUCHBASE_CXX_SOURCE_DIR}/third_party/cxx_function"
   "${COUCHBASE_CXX_SOURCE_DIR}/third_party/expected/include")
 
-set(COUCHBASE_CXX_CLIENT_TARGET couchbase_cxx_client::couchbase_cxx_client_static)
+set(COUCHBASE_CXX_CLIENT_TARGET couchbase_cxx_client_static_intermediate)
 
 if(WIN32)
   target_link_libraries(

deps/couchbase-cxx-client

@@ -71,12 +71,20 @@ def process_build_env_vars():  # noqa: C901
 
     # We use OpenSSL by default if building the SDK; however, starting with v4.1.9 we build our wheels using BoringSSL.
     pycbc_use_openssl = os.getenv('PYCBC_USE_OPENSSL', 'true').lower() in ENV_TRUE
-    if pycbc_use_openssl is True:
+    pycbc_use_opensslv1_1 = os.getenv('PYCBC_USE_OPENSSLV1_1', 'false').lower() in ENV_TRUE
+    if pycbc_use_openssl is True or pycbc_use_opensslv1_1:
         cmake_extra_args += ['-DUSE_STATIC_BORINGSSL:BOOL=OFF']
         ssl_version = os.getenv('PYCBC_OPENSSL_VERSION', None)
-        if not ssl_version:
-            ssl_version = '1.1.1w'
+        if pycbc_use_opensslv1_1 is True:
+            cmake_extra_args += ['-DUSE_OPENSSLV1_1:BOOL=ON']
+            if not ssl_version:
+                # lastest 1.1 version: https://github.com/openssl/openssl/releases/tag/OpenSSL_1_1_1w
+                ssl_version = '1.1.1w'
+        elif not ssl_version:
+            # lastest 3.x version: https://github.com/openssl/openssl/releases/tag/openssl-3.5.2
+            ssl_version = '3.5.2'
         cmake_extra_args += [f'-DOPENSSL_VERSION={ssl_version}']
+
     else:
         cmake_extra_args += ['-DUSE_STATIC_BORINGSSL:BOOL=ON']