fully move client config into client-sdk include directories

cwaldren-ld · cwaldren-ld · commit 938aa7cda941 · 2023-08-25T14:20:53.000-07:00
diff --git a/examples/hello-c-client/main.c b/examples/hello-c-client/main.c
@@ -1,7 +1,7 @@
 #include <launchdarkly/client_side/bindings/c/sdk.h>
 
-#include <launchdarkly/bindings/c/config/builder.h>
 #include <launchdarkly/bindings/c/context_builder.h>
+#include <launchdarkly/client_side/bindings/c/config/builder.h>
 
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/libs/client-sdk/include/launchdarkly/client_side/bindings/c/config/builder.h b/libs/client-sdk/include/launchdarkly/client_side/bindings/c/config/builder.h
@@ -3,8 +3,9 @@
 
 #pragma once
 
-#include <launchdarkly/bindings/c/config/client_side/config.h>
-#include <launchdarkly/bindings/c/config/common/logging_builder.h>
+#include <launchdarkly/client_side/bindings/c/config/config.h>
+
+#include <launchdarkly/bindings/c/config/logging_builder.h>
 #include <launchdarkly/bindings/c/export.h>
 #include <launchdarkly/bindings/c/status.h>
 
diff --git a/libs/client-sdk/include/launchdarkly/client_side/bindings/c/config/config.h b/libs/client-sdk/include/launchdarkly/client_side/bindings/c/config/config.h
diff --git a/libs/client-sdk/include/launchdarkly/client_side/bindings/c/sdk.h b/libs/client-sdk/include/launchdarkly/client_side/bindings/c/sdk.h
@@ -4,7 +4,8 @@
 // NOLINTBEGIN modernize-use-using
 #pragma once
 
-#include <launchdarkly/bindings/c/config/client_side/config.h>
+#include <launchdarkly/client_side/bindings/c/config/config.h>
+
 #include <launchdarkly/bindings/c/context.h>
 #include <launchdarkly/bindings/c/data/evaluation_detail.h>
 #include <launchdarkly/bindings/c/export.h>
diff --git a/libs/client-sdk/src/CMakeLists.txt b/libs/client-sdk/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 file(GLOB HEADER_LIST CONFIGURE_DEPENDS
         "${LaunchDarklyCPPClient_SOURCE_DIR}/include/launchdarkly/client_side/*.hpp"
-        )
+)
 
 # Automatic library: static or dynamic based on user config.
 
@@ -35,6 +35,8 @@ add_library(${LIBNAME}
         flag_manager/flag_updater.hpp
         event_processor.hpp
         bindings/c/sdk.cpp
+        bindings/c/builder.cpp
+        bindings/c/config.cpp
         data_sources/null_data_source.cpp
         flag_manager/context_index.cpp
         serialization/json_all_flags.hpp
@@ -43,21 +45,21 @@ add_library(${LIBNAME}
         flag_manager/flag_persistence.cpp
         bindings/c/sdk.cpp)
 
-if(MSVC OR (NOT BUILD_SHARED_LIBS))
-        target_link_libraries(${LIBNAME}
-                PUBLIC launchdarkly::common
-                PRIVATE Boost::headers Boost::json Boost::url launchdarkly::sse launchdarkly::internal foxy)
-else()
-        # The default static lib builds, for linux, are positition independent.
-        # So they do not link into a shared object without issues. So, when
-        # building shared objects do not link the static libraries and instead
-        # use the "src.hpp" files for required libraries.
-        # macOS shares the same path for simplicity.
-        target_link_libraries(${LIBNAME}
-        PUBLIC launchdarkly::common
-        PRIVATE Boost::headers launchdarkly::sse launchdarkly::internal foxy)
+if (MSVC OR (NOT BUILD_SHARED_LIBS))
+    target_link_libraries(${LIBNAME}
+            PUBLIC launchdarkly::common
+            PRIVATE Boost::headers Boost::json Boost::url launchdarkly::sse launchdarkly::internal foxy)
+else ()
+    # The default static lib builds, for linux, are positition independent.
+    # So they do not link into a shared object without issues. So, when
+    # building shared objects do not link the static libraries and instead
+    # use the "src.hpp" files for required libraries.
+    # macOS shares the same path for simplicity.
+    target_link_libraries(${LIBNAME}
+            PUBLIC launchdarkly::common
+            PRIVATE Boost::headers launchdarkly::sse launchdarkly::internal foxy)
 
-        target_sources(${LIBNAME} PRIVATE boost.cpp)
+    target_sources(${LIBNAME} PRIVATE boost.cpp)
 endif ()
 
 add_library(launchdarkly::client ALIAS ${LIBNAME})
@@ -67,14 +69,14 @@ set_property(TARGET ${LIBNAME} PROPERTY
 
 install(TARGETS ${LIBNAME})
 if (BUILD_SHARED_LIBS AND MSVC)
-        install(FILES $<TARGET_PDB_FILE:${LIBNAME}> DESTINATION bin OPTIONAL)
+    install(FILES $<TARGET_PDB_FILE:${LIBNAME}> DESTINATION bin OPTIONAL)
 endif ()
 # Using PUBLIC_HEADERS would flatten the include.
 # This will preserve it, but dependencies must do the same.
 
 install(DIRECTORY "${LaunchDarklyCPPClient_SOURCE_DIR}/include/launchdarkly"
         DESTINATION "include"
-        )
+)
 
 # Need the public headers to build.
 target_include_directories(${LIBNAME} PUBLIC ../include)
diff --git a/libs/client-sdk/src/bindings/c/builder.cpp b/libs/client-sdk/src/bindings/c/builder.cpp
@@ -1,13 +1,12 @@
 // NOLINTBEGIN cppcoreguidelines-pro-type-reinterpret-cast
 // NOLINTBEGIN OCInconsistentNamingInspection
 
-#include <launchdarkly/bindings/c/config/client_side/builder.h>
+#include <launchdarkly/client_side/bindings/c/config/builder.h>
+
 #include <launchdarkly/config/client.hpp>
 #include <launchdarkly/detail/c_binding_helpers.hpp>
 #include <launchdarkly/persistence/persistence.hpp>
 
-#include "../common/log_backend_wrapper.hpp"
-
 using namespace launchdarkly::client_side;
 
 #define TO_BUILDER(ptr) (reinterpret_cast<ConfigBuilder*>(ptr))
diff --git a/libs/client-sdk/src/bindings/c/config.cpp b/libs/client-sdk/src/bindings/c/config.cpp
@@ -1,7 +1,7 @@
 // NOLINTBEGIN cppcoreguidelines-pro-type-reinterpret-cast
 // NOLINTBEGIN OCInconsistentNamingInspection
 
-#include <launchdarkly/bindings/c/config/client_side/config.h>
+#include <launchdarkly/client_side/bindings/c/config/config.h>
 #include <launchdarkly/config/client.hpp>
 
 #define TO_CONFIG(ptr) (reinterpret_cast<Config*>(ptr))
diff --git a/libs/client-sdk/tests/client_c_bindings_test.cpp b/libs/client-sdk/tests/client_c_bindings_test.cpp
@@ -1,8 +1,10 @@
 #include <gtest/gtest.h>
 
-#include <launchdarkly/bindings/c/config/client_side/builder.h>
-#include <launchdarkly/bindings/c/context_builder.h>
+#include <launchdarkly/client_side/bindings/c/config/builder.h>
 #include <launchdarkly/client_side/bindings/c/sdk.h>
+
+#include <launchdarkly/bindings/c/context_builder.h>
+
 #include <launchdarkly/client_side/data_source_status.hpp>
 
 #include <chrono>
diff --git a/libs/client-sdk/tests/client_config_test.cpp b/libs/client-sdk/tests/client_config_test.cpp
@@ -1,6 +1,7 @@
 #include <gtest/gtest.h>
-#include <launchdarkly/bindings/c/config/client_side/builder.h>
-#include "launchdarkly/config/client.hpp"
+
+#include <launchdarkly/client_side/bindings/c/config/builder.h>
+#include <launchdarkly/config/client.hpp>
 
 TEST(ClientConfigBindings, ConfigBuilderNewFree) {
     LDClientConfigBuilder builder = LDClientConfigBuilder_New("sdk-123");
diff --git a/libs/common/include/launchdarkly/bindings/c/config/builder.h b/libs/common/include/launchdarkly/bindings/c/config/builder.h
@@ -1,16 +1,14 @@
 /** @file
- * This file exists solely for backwards compatibility purposes
- * and will be removed in the next major release.
+ * This header for the LaunchDarkly C++ Client-side SDK has moved!
  *
- * Please use 'launchdarkly/bindings/c/config/client_side/builder.h' instead.
+ * Please use 'launchdarkly/client_side/bindings/c/config/builder.h' instead.
  *
  * The original C++ Client-side 1.0 release shipped builder.h at this location,
- * but it was moved to the client_side subdirectory for distinction with the C++
+ * but it was moved to the client_side subdirectory to accommodate the C++
  * Server-side SDK. */
 #pragma once
 
-#include <launchdarkly/bindings/c/config/client_side/builder.h>
 #pragma message( \
-        "LaunchDarkly Client-side C++ SDK: The config/builder.h header is being removed in the next major version")
+    "LaunchDarkly Client-side C++ SDK: ACTION REQUIRED: This header has moved!")
 #pragma message( \
-        "LaunchDarkly Client-side C++ SDK: Please use config/client_side/builder.h instead")
+    "LaunchDarkly Client-side C++ SDK: Please import 'launchdarkly/client_side/bindings/c/config/builder.h' instead")
diff --git a/libs/common/include/launchdarkly/bindings/c/config/config.h b/libs/common/include/launchdarkly/bindings/c/config/config.h
@@ -0,0 +1,14 @@
+/** @file
+ * This header for the LaunchDarkly C++ Client-side SDK has moved!
+ *
+ * Please use 'launchdarkly/client_side/bindings/c/config/config.h' instead.
+ *
+ * The original C++ Client-side 1.0 release shipped config.h at this location,
+ * but it was moved to the client_side subdirectory to accommodate the C++
+ * Server-side SDK. */
+#pragma once
+
+#pragma message( \
+    "LaunchDarkly Client-side C++ SDK: ACTION REQUIRED: This header has moved!")
+#pragma message( \
+    "LaunchDarkly Client-side C++ SDK: Please import 'launchdarkly/client_side/bindings/c/config/config.h' instead")
diff --git a/libs/common/include/launchdarkly/bindings/c/config/logging_builder.h b/libs/common/include/launchdarkly/bindings/c/config/logging_builder.h
diff --git a/libs/common/src/CMakeLists.txt b/libs/common/src/CMakeLists.txt
@@ -11,7 +11,7 @@ file(GLOB HEADER_LIST CONFIGURE_DEPENDS
         "${LaunchDarklyCommonSdk_SOURCE_DIR}/include/launchdarkly/config/shared/built/*.hpp"
         "${LaunchDarklyCommonSdk_SOURCE_DIR}/include/launchdarkly/data/*.hpp"
         "${LaunchDarklyCommonSdk_SOURCE_DIR}/include/launchdarkly/logging/*.hpp"
-        )
+)
 
 # Automatic library: static or dynamic based on user config.
 add_library(${LIBNAME} OBJECT
@@ -43,15 +43,14 @@ add_library(${LIBNAME} OBJECT
         bindings/c/context_builder.cpp
         bindings/c/status.cpp
         bindings/c/context.cpp
-        bindings/c/config/client_side/builder.cpp
-        bindings/c/config/client_side/config.cpp
-        bindings/c/config/common/logging_builder.cpp
-        log_level.cpp
-        config/persistence_builder.cpp
+        bindings/c/config/logging_builder.cpp
         bindings/c/data/evaluation_detail.cpp
+        bindings/c/listener_connection.cpp
         bindings/c/memory_routines.cpp
+        log_level.cpp
+        config/persistence_builder.cpp
         config/logging_builder.cpp
-        bindings/c/listener_connection.cpp)
+)
 
 add_library(launchdarkly::common ALIAS ${LIBNAME})
 
@@ -64,7 +63,7 @@ install(TARGETS ${LIBNAME})
 # This will preserve it, but dependencies must do the same.
 install(DIRECTORY "${LaunchDarklyCommonSdk_SOURCE_DIR}/include/launchdarkly"
         DESTINATION "include"
-        )
+)
 
 message(STATUS "LaunchDarklyCommonSdk_SOURCE_DIR=${LaunchDarklyCommonSdk_SOURCE_DIR}")
 
diff --git a/libs/common/src/bindings/c/config/log_backend_wrapper.hpp b/libs/common/src/bindings/c/config/log_backend_wrapper.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <launchdarkly/bindings/c/config/logging_builder.h>
+#include <launchdarkly/logging/log_backend.hpp>
 /**
  * Utility class to allow user-provided backends to satisfy the ILogBackend
  * interface.
diff --git a/libs/common/src/bindings/c/config/logging_builder.cpp b/libs/common/src/bindings/c/config/logging_builder.cpp
@@ -1,4 +1,4 @@
-#include <launchdarkly/bindings/c/config/common/logging_builder.h>
+#include <launchdarkly/bindings/c/config/logging_builder.h>
 #include <launchdarkly/config/shared/builders/logging_builder.hpp>
 
 #include <launchdarkly/detail/c_binding_helpers.hpp>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <launchdarkly/bindings/c/config/common/logging_builder.h>`
	`1`	`+#include <launchdarkly/bindings/c/config/logging_builder.h>`
`2`	`2`	`#include <launchdarkly/config/shared/builders/logging_builder.hpp>`
`3`	`3`
`4`	`4`	`#include <launchdarkly/detail/c_binding_helpers.hpp>`