Update C++ core to 1.0.2

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

Author: thejcfactor

CMakeLists.txt

@@ -118,12 +118,24 @@ endif()
 set(COUCHBASE_CXX_CLIENT_PYTHON_WARNINGS
     ON
     CACHE INTERNAL "")
-set(COUCHBASE_CXX_CLIENT_BUILD_TESTS
+set(COUCHBASE_CXX_CLIENT_BUILD_STATIC
+    ON
+    CACHE BOOL "" FORCE)
+set(COUCHBASE_CXX_CLIENT_BUILD_SHARED
+    OFF
+    CACHE BOOL "" FORCE)
+set(COUCHBASE_CXX_CLIENT_BUILD_INSTALL
+    OFF
+    CACHE BOOL "" FORCE)
+set(COUCHBASE_CXX_CLIENT_BUILD_DOCS
     OFF
     CACHE BOOL "" FORCE)
 set(COUCHBASE_CXX_CLIENT_BUILD_EXAMPLES
     OFF
     CACHE BOOL "" FORCE)
+set(COUCHBASE_CXX_CLIENT_BUILD_TESTS
+    OFF
+    CACHE BOOL "" FORCE)
 set(COUCHBASE_CXX_CLIENT_BUILD_TOOLS
     OFF
     CACHE BOOL "" FORCE)
@@ -157,7 +169,9 @@ endif()
 add_subdirectory(deps/couchbase-cxx-client)
 
 set(COUCHBASE_CXX_BINARY_DIR "${CMAKE_BINARY_DIR}/deps/couchbase-cxx-client")
+set(COUCHBASE_CXX_SOURCE_DIR "${PROJECT_SOURCE_DIR}/deps/couchbase-cxx-client")
 message(STATUS "COUCHBASE_CXX_BINARY_DIR=${COUCHBASE_CXX_BINARY_DIR}")
+message(STATUS "COUCHBASE_CXX_SOURCE_DIR=${COUCHBASE_CXX_SOURCE_DIR}")
 if(DEFINED COUCHBASE_CXX_CPM_CACHE_DIR AND NOT COUCHBASE_CXX_CPM_CACHE_DIR STREQUAL "")
   file(COPY "${COUCHBASE_CXX_BINARY_DIR}/mozilla-ca-bundle.crt" "${COUCHBASE_CXX_BINARY_DIR}/mozilla-ca-bundle.sha256"
     DESTINATION "${COUCHBASE_CXX_CPM_CACHE_DIR}")
@@ -181,18 +195,33 @@ file(
   "src/transactions/*.cxx")
 add_library(pycbc_core SHARED ${SOURCE_FILES})
 
-target_include_directories(pycbc_core PRIVATE "${CB_CXX_DIR}/include" "${CB_CXX_DIR}/third_party/asio/asio/include")
+target_include_directories(
+  pycbc_core PRIVATE SYSTEM
+  "${COUCHBASE_CXX_SOURCE_DIR}"
+  "${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)
 
 if(WIN32)
   target_link_libraries(
-    pycbc_core
-    PRIVATE couchbase_cxx_client
-            ${Python3_LIBRARIES}
-            asio
-            Microsoft.GSL::GSL
-            taocpp::json)
+    pycbc_core PRIVATE
+    ${COUCHBASE_CXX_CLIENT_TARGET}
+    ${Python3_LIBRARIES}
+    asio
+    Microsoft.GSL::GSL
+    taocpp::json
+    fmt::fmt
+    spdlog::spdlog)
 else()
-  target_link_libraries(pycbc_core PRIVATE couchbase_cxx_client asio Microsoft.GSL::GSL taocpp::json)
+  target_link_libraries(
+    pycbc_core PRIVATE
+    ${COUCHBASE_CXX_CLIENT_TARGET}
+    asio
+    Microsoft.GSL::GSL
+    taocpp::json
+    fmt::fmt
+    spdlog::spdlog)
   if(APPLE)
     target_link_options(
       pycbc_core

MANIFEST.in

@@ -15,6 +15,8 @@ include deps/couchbase-cxx-cache/cpm/*.cmake
 include deps/couchbase-cxx-cache/asio/*/asio/COPYING
 include deps/couchbase-cxx-cache/asio/*/asio/LICENSE*
 include deps/couchbase-cxx-cache/asio/*/asio/asio/include/*.hpp
+include deps/couchbase-cxx-cache/asio/*/asio/asio/src/asio.cpp
+include deps/couchbase-cxx-cache/asio/*/asio/asio/src/asio_ssl.cpp
 recursive-include deps/couchbase-cxx-cache/asio/*/asio/asio/include/asio *.[hi]pp
 recursive-include deps/couchbase-cxx-cache/boringssl/*/boringssl *.[hcS]
 recursive-include deps/couchbase-cxx-cache/boringssl/*/boringssl *.cc

deps/couchbase-cxx-client

@@ -1,8 +1,8 @@
 [realserver]
 ; Set this to true if there is a real cluster available
-enabled = True
+enabled = False
 #Local
-host = 192.168.107.128
+host = 127.0.0.1
 port = 8091
 admin_username = Administrator
 ; The administrative password. This is the password used to
@@ -16,7 +16,7 @@ bucket_password = password
 
 [gocaves]
 ; Set this to enabled to use the GoCAVES mock
-enabled = False
+enabled = True
 ; Set the version of GoCAVES to use
 version = v0.0.1-78
 ; Local path for the GoCAVES mock, if not supplied, will be dowloaded