prepare 2.1.3 release (#23)

Author: LaunchDarklyCI

CMakeLists.txt

@@ -25,7 +25,12 @@ if(NOT DEFINED MSVC)
 endif()
 
 set(LD_INCLUDE_PATHS
-    "src" "third-party/include" ${CURL_INCLUDE_DIR} ${PCRE_INCLUDE_DIR}
+    "src"
+    "third-party/include"
+    "c-sdk-common/include"
+    "c-sdk-common/src"
+    ${CURL_INCLUDE_DIR}
+    ${PCRE_INCLUDE_DIR}
 )
 
 if(APPLE)
@@ -36,7 +41,7 @@ if (REDIS_STORE)
     add_subdirectory(stores/redis)
 endif (REDIS_STORE)
 
-file(GLOB SOURCES "src/*" "third-party/src/*")
+file(GLOB SOURCES "src/*" "third-party/src/*" "c-sdk-common/src/*")
 
 if(NOT DEFINED MSVC)
     list(REMOVE_ITEM SOURCES
@@ -101,12 +106,18 @@ if(NOT SKIP_BASE_INSTALL)
         DESTINATION            include
         FILES_MATCHING PATTERN "*.h*"
     )
+
+    INSTALL(
+        DIRECTORY              ${PROJECT_SOURCE_DIR}/c-sdk-common/include/
+        DESTINATION            include
+        FILES_MATCHING PATTERN "*.h*"
+    )
 endif()
 
 # test targets ----------------------------------------------------------------
 
 if(BUILD_TESTING)
-    file(GLOB TEST_UTILS_SRC "test-utils/src/*")
+    file(GLOB TEST_UTILS_SRC "test-utils/src/*" "c-sdk-common/test-utils/src/*")
 
     add_library(test-utils STATIC ${TEST_UTILS_SRC})
 
@@ -115,6 +126,7 @@ if(BUILD_TESTING)
     target_include_directories(test-utils
         PUBLIC ${LD_INCLUDE_PATHS}
                "test-utils/include"
+               "c-sdk-common/test-utils/include"
     )
 
     target_compile_definitions(test-utils

Doxyfile

@@ -8,8 +8,8 @@ MACRO_EXPANSION        = YES
 PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS
 USE_MDFILE_AS_MAINPAGE = docs/mainpage.md
 RECURSIVE              = YES
-INCLUDE_PATH           = include
-INPUT                  = include docs/mainpage.md
+INCLUDE_PATH           = include c-sdk-common/include
+INPUT                  = include c-sdk-common/include docs/mainpage.md
 GENERATE_HTML          = YES
 GENERATE_LATEX         = NO
 GENERATE_TREEVIEW      = YES

c-sdk-common/.circleci/config.yml

@@ -0,0 +1,20 @@
+version: 2.1
+
+workflows:
+  version: 2
+  build_and_test_all:
+    jobs:
+      - build-test-linux
+jobs:
+  build-test-linux:
+    docker:
+      - image: ldcircleci/ld-c-sdk-ubuntu  # defined in sdks-ci-docker project
+    steps:
+      - checkout
+      - run:
+          name: Build
+          command: |
+            mkdir -p build
+            cd build
+            cmake ..
+            make

c-sdk-common/.gitignore

@@ -0,0 +1 @@
+build/

c-sdk-common/CMakeLists.txt

@@ -0,0 +1,61 @@
+cmake_minimum_required(VERSION 2.8.8)
+
+project(ldsharedapi)
+
+find_package(CURL REQUIRED)
+
+if(NOT DEFINED MSVC)
+    set(LD_LIBRARIES pthread m)
+endif()
+
+set(LD_INCLUDE_PATHS
+    "src"
+    "include"
+    ${CURL_INCLUDE_DIR}
+    "test-utils/include"
+    "test-utils/src"
+)
+
+if(APPLE)
+    set(LD_INCLUDE_PATHS ${LD_INCLUDE_PATHS} "/usr/local/include")
+    set(LD_PUBLIC_LIBRARIES "-framework CoreFoundation" "-framework IOKit")
+endif(APPLE)
+
+file(GLOB SOURCES "src/*" "test-utils/src/*")
+
+set(LD_LIBRARIES ${LD_LIBRARIES} ${CURL_LIBRARIES})
+
+# ldsharedapi target -----------------------------------------------------------
+
+add_library(ldsharedapi ${SOURCES})
+
+target_link_libraries(ldsharedapi
+    PUBLIC  ${LD_PUBLIC_LIBRARIES}
+    PRIVATE ${LD_LIBRARIES}
+)
+
+target_include_directories(ldsharedapi
+    PUBLIC  "include"
+    PRIVATE ${LD_INCLUDE_PATHS}
+)
+
+if(MSVC)
+    target_compile_definitions(ldsharedapi
+        PRIVATE -D CURL_STATICLIB
+                -D _CRT_SECURE_NO_WARNINGS
+                -D LAUNCHDARKLY_USE_ASSERT
+    )
+else()
+    target_compile_definitions(ldsharedapi
+        PRIVATE -D __USE_XOPEN
+                -D _GNU_SOURCE
+                -D LAUNCHDARKLY_USE_ASSERT
+    )
+
+    target_compile_options(ldsharedapi
+        PRIVATE -fno-omit-frame-pointer
+                -pedantic
+                -Wall
+                -Wextra
+    )
+endif(MSVC)

c-sdk-common/README.md

@@ -0,0 +1,7 @@
+# C SDK Common
+
+Shared components for `c-server-sdk`, and `c-client-sdk`. This repository is *private* because it is intended to be used as a git subtree.
+
+## Updating
+
+A git subtree is not automatically updated. From either the `c-client-sdk` or `c-server-sdk` repository run: `git subtree pull --prefix c-sdk-common git@github.com:launchdarkly/c-sdk-common.git master --squash`.

c-sdk-common/attribution/cjson.txt

@@ -0,0 +1,19 @@
+Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

include/launchdarkly/boolean.h renamed to c-sdk-common/include/launchdarkly/boolean.h

@@ -10,7 +10,7 @@
     #define LD_EXPORT(x) x
 #else
     #ifdef _WIN32
-        #define LD_EXPORT(x) __declspec(dllexport) x __stdcall
+        #define LD_EXPORT(x) __declspec(dllexport) x
     #else
         #define LD_EXPORT(x) __attribute__((visibility("default"))) x
     #endif

include/launchdarkly/export.h renamed to c-sdk-common/include/launchdarkly/export.h

@@ -55,7 +55,7 @@ LD_EXPORT(struct LDJSON *) LDNewBool(const LDBoolean boolean);
 LD_EXPORT(struct LDJSON *) LDNewNumber(const double number);
 
 /**
- * @brief Returns a a new constructed JSON node of type `LDJSONText`.
+ * @brief Returns a new constructed JSON node of type `LDJSONText`.
  * @param[in] text The text to copy and then assign the new node.
  * May not be `NULL`.
  * @return `NULL` on failure.
@@ -223,7 +223,7 @@ LD_EXPORT(struct LDJSON *) LDCollectionDetachIter(
  * @param[in] array May not be `NULL`.
  * must be of type `LDJSONArray`.
  * @param[in] index The index to lookup in the array
- * @return Item if it exists, otherwise `NULL if does not exist, or on failure.`
+ * @return Item if it exists, otherwise `NULL` if does not exist, or on failure.
  */
 LD_EXPORT(struct LDJSON *) LDArrayLookup(const struct LDJSON *const array,
     const unsigned int index);
@@ -314,7 +314,7 @@ LD_EXPORT(LDBoolean) LDObjectMerge(struct LDJSON *const to,
  ******************************************************************************/
 
 /**
- * @brief Serialize JSON text into a JSON structure.
+ * @brief Serialize JSON structure into JSON text.
  * @param[in] json Structure to serialize.
  * May be `NULL`.
  * @return `NULL` on failure