prepare for conan

d-led · d-led · commit a91d74532d62 · 2025-11-01T15:26:03.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,56 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+
+## [1.0.0] - 2025-11-01
+
+### Added
+
+- Initial Conan package release for Conan 2.0
+- C++20 client library (`influxdb-cpp-rest`) for InfluxDB
+- C wrapper library (`influx-c-rest`) providing a C API over the asynchronous C++ API
+- Support for InfluxDB 1.x (tested with InfluxDB 1.8+)
+- Synchronous and asynchronous (batched) insertion APIs
+- Query API support
+- Basic authentication support
+- CMake integration via `find_package(influxdb-cpp-rest)`
+
+### Technical Details
+
+- **C++ Standard**: Requires C++20 or later
+  - Minimum compiler versions:
+    - GCC 11+
+    - Clang 14+
+    - MSVC 2019+ (19.29+) with `/std:c++20` or later
+- **InfluxDB Compatibility**: Supports InfluxDB 1.x (tested with v1.8+)
+- **Libraries Included**:
+  - `influxdb-cpp-rest`: Static C++ library providing the core functionality
+  - `influx-c-rest`: Shared C wrapper library for C interoperability
+- **Dependencies**: 
+  - cpprestsdk/2.10.19 (HTTP client)
+  - rxcpp/4.1.1 (Reactive Extensions for asynchronous operations)
+
+### Notes
+
+- This package replaces the legacy C++03 version available as [`v0.0.1-legacy`](https://github.com/d-led/influxdb-cpp-rest/releases/tag/v0.0.1-legacy)
+- The modern C++20 version provides improved performance, type safety, and modern C++ features
+- The C wrapper (`influx-c-rest`) enables integration from C projects while maintaining the performance benefits of the underlying C++ implementation
+
+---
+
+## Legacy Versions
+
+### [0.0.1-legacy] - Legacy Release
+
+- Legacy C++03 compatible version
+- Available as a GitHub release tag
+- Not available as a Conan package
+
+[1.0.0]: https://github.com/d-led/influxdb-cpp-rest/releases/tag/v1.0.0
+[0.0.1-legacy]: https://github.com/d-led/influxdb-cpp-rest/releases/tag/v0.0.1-legacy
+
+---
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -169,32 +169,65 @@ target_link_libraries(influxdb-cpp-rest
     PUBLIC
         ${CONAN_LIBS}
 )
-# Workaround: Conan OpenSSL CMakeDeps doesn't set include directories
-if(TARGET OpenSSL::SSL)
-    # Read openssl package folder from the data file
-    file(GLOB _OPENSSL_DATA_FILES "${CMAKE_BINARY_DIR}/OpenSSL-*-data.cmake")
-    if(_OPENSSL_DATA_FILES)
-        list(GET _OPENSSL_DATA_FILES 0 _OPENSSL_DATA_FILE)
-        message(STATUS "Found OpenSSL data file: ${_OPENSSL_DATA_FILE}")
-        file(READ "${_OPENSSL_DATA_FILE}" _OPENSSL_DATA_CONTENT)
-        string(REGEX MATCH "set\\(openssl_PACKAGE_FOLDER_RELEASE \"([^\"]+)\"\\)" _MATCH "${_OPENSSL_DATA_CONTENT}")
-        if(_MATCH)
-            string(REGEX REPLACE ".*openssl_PACKAGE_FOLDER_RELEASE \"([^\"]+)\".*" "\\1" OPENSSL_PKG_FOLDER "${_MATCH}")
-            set(OPENSSL_INCLUDE_DIR "${OPENSSL_PKG_FOLDER}/include")
-            message(STATUS "OpenSSL pkg folder: ${OPENSSL_PKG_FOLDER}, include: ${OPENSSL_INCLUDE_DIR}")
-            if(EXISTS "${OPENSSL_INCLUDE_DIR}")
-                set_target_properties(OpenSSL::SSL OpenSSL::Crypto PROPERTIES
-                    INTERFACE_INCLUDE_DIRECTORIES "${OPENSSL_INCLUDE_DIR}"
-                )
-                message(STATUS "Set OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}")
-            else()
-                message(WARNING "OpenSSL include dir does not exist: ${OPENSSL_INCLUDE_DIR}")
+# Workaround: Ensure OpenSSL include directories are available
+# Boost (via cpprestsdk) requires OpenSSL headers, but Conan's OpenSSL CMakeDeps 
+# might not properly set INTERFACE_INCLUDE_DIRECTORIES
+if(TARGET OpenSSL::SSL AND USE_CONAN)
+    # Find OpenSSL include directory - try multiple methods
+    set(_OPENSSL_INCLUDE_DIR "")
+    
+    # Method 1: Check CMAKE_PREFIX_PATH (set by Conan generators)
+    foreach(_PREFIX_PATH ${CMAKE_PREFIX_PATH})
+        set(_POSSIBLE_INCLUDE "${_PREFIX_PATH}/include")
+        if(EXISTS "${_POSSIBLE_INCLUDE}/openssl/ssl.h")
+            set(_OPENSSL_INCLUDE_DIR "${_POSSIBLE_INCLUDE}")
+            message(STATUS "Found OpenSSL includes via CMAKE_PREFIX_PATH: ${_OPENSSL_INCLUDE_DIR}")
+            break()
+        endif()
+    endforeach()
+    
+    # Method 2: Read from Conan's generator data files
+    if(NOT _OPENSSL_INCLUDE_DIR)
+        file(GLOB _OPENSSL_DATA_FILES 
+            "${CMAKE_BINARY_DIR}/OpenSSL-*-data.cmake"
+            "${CMAKE_BINARY_DIR}/generators/OpenSSL-*-data.cmake"
+            "${CMAKE_BINARY_DIR}/build/Release/generators/OpenSSL-*-data.cmake"
+            "${CMAKE_BINARY_DIR}/build/${CMAKE_BUILD_TYPE}/generators/OpenSSL-*-data.cmake"
+        )
+        if(_OPENSSL_DATA_FILES)
+            list(GET _OPENSSL_DATA_FILES 0 _OPENSSL_DATA_FILE)
+            file(READ "${_OPENSSL_DATA_FILE}" _OPENSSL_DATA_CONTENT)
+            # Match both lowercase and mixed case variants
+            string(REGEX MATCH "set\\([Oo]pen[Ss][Ss][Ll]_PACKAGE_FOLDER_RELEASE \"([^\"]+)\"\\)" _MATCH "${_OPENSSL_DATA_CONTENT}")
+            if(_MATCH)
+                string(REGEX REPLACE ".*PACKAGE_FOLDER_RELEASE \"([^\"]+)\".*" "\\1" _OPENSSL_PKG_FOLDER "${_MATCH}")
+                set(_OPENSSL_INCLUDE_DIR "${_OPENSSL_PKG_FOLDER}/include")
+                message(STATUS "Found OpenSSL includes via data file: ${_OPENSSL_INCLUDE_DIR}")
             endif()
-        else()
-            message(WARNING "Could not extract OpenSSL package folder from data file")
         endif()
+    endif()
+    
+    # Method 3: Use find_path to search in known locations
+    if(NOT _OPENSSL_INCLUDE_DIR)
+        find_path(_OPENSSL_INCLUDE_DIR 
+            NAMES openssl/ssl.h
+            PATHS ${CMAKE_PREFIX_PATH}
+            PATH_SUFFIXES include
+            NO_DEFAULT_PATH
+        )
+        if(_OPENSSL_INCLUDE_DIR)
+            message(STATUS "Found OpenSSL includes via find_path: ${_OPENSSL_INCLUDE_DIR}")
+        endif()
+    endif()
+    
+    # Add the include directory directly to our target
+    # This is critical because Boost's ASIO SSL tries to include openssl headers directly
+    if(_OPENSSL_INCLUDE_DIR AND EXISTS "${_OPENSSL_INCLUDE_DIR}")
+        target_include_directories(influxdb-cpp-rest PRIVATE "${_OPENSSL_INCLUDE_DIR}")
+        message(STATUS "Added OpenSSL include directory to influxdb-cpp-rest: ${_OPENSSL_INCLUDE_DIR}")
     else()
-        message(WARNING "Could not find OpenSSL data file")
+        message(WARNING "Could not find OpenSSL include directory - compilation may fail")
+        message(WARNING "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
     endif()
 endif()
 
@@ -343,33 +376,35 @@ if(BUILD_TESTING)
     endif()
 endif()
 
-# Enable testing
-enable_testing()
+# Enable testing and register tests (only if BUILD_TESTING is ON)
+if(BUILD_TESTING)
+    enable_testing()
 
-# Register tests with CTest
-add_test(NAME test-influxdb-cpp-rest COMMAND ${CMAKE_BINARY_DIR}/bin/test-influxdb-cpp-rest)
-add_test(NAME test-influx-c-rest COMMAND ${CMAKE_BINARY_DIR}/bin/test-influx-c-rest)
-add_test(NAME test-influxdb-cpp-auth COMMAND ${CMAKE_BINARY_DIR}/bin/test-influxdb-cpp-auth)
+    # Register tests with CTest
+    add_test(NAME test-influxdb-cpp-rest COMMAND ${CMAKE_BINARY_DIR}/bin/test-influxdb-cpp-rest)
+    add_test(NAME test-influx-c-rest COMMAND ${CMAKE_BINARY_DIR}/bin/test-influx-c-rest)
+    add_test(NAME test-influxdb-cpp-auth COMMAND ${CMAKE_BINARY_DIR}/bin/test-influxdb-cpp-auth)
 
-# Set output directories for executables - match influx-c-rest DLL location
-if(CMAKE_CONFIGURATION_TYPES)
-    # Multi-config generator (Visual Studio, Xcode)
-    set_target_properties(test-influxdb-cpp-rest test-influx-c-rest test-influxdb-cpp-auth
-        PROPERTIES
-        RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>"
-    )
-else()
-    # Single-config generator
-    if(CMAKE_BUILD_TYPE)
+    # Set output directories for executables - match influx-c-rest DLL location
+    if(CMAKE_CONFIGURATION_TYPES)
+        # Multi-config generator (Visual Studio, Xcode)
         set_target_properties(test-influxdb-cpp-rest test-influx-c-rest test-influxdb-cpp-auth
             PROPERTIES
-            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}"
+            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/$<CONFIG>"
         )
     else()
-        set_target_properties(test-influxdb-cpp-rest test-influx-c-rest test-influxdb-cpp-auth
-            PROPERTIES
-            RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
-        )
+        # Single-config generator
+        if(CMAKE_BUILD_TYPE)
+            set_target_properties(test-influxdb-cpp-rest test-influx-c-rest test-influxdb-cpp-auth
+                PROPERTIES
+                RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}"
+            )
+        else()
+            set_target_properties(test-influxdb-cpp-rest test-influx-c-rest test-influxdb-cpp-auth
+                PROPERTIES
+                RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+            )
+        endif()
     endif()
 endif()
 
diff --git a/conanfile.py b/conanfile.py
@@ -1,6 +1,5 @@
 from conan import ConanFile
-from conan.tools.cmake import CMake, cmake_layout
-from conan.tools.files import copy
+from conan.tools.cmake import CMake, cmake_layout, CMakeDeps, CMakeToolchain
 
 
 class InfluxdbCppRestConan(ConanFile):
@@ -14,7 +13,9 @@ class InfluxdbCppRestConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
     options = {"shared": [True, False], "fPIC": [True, False]}
     default_options = {"shared": False, "fPIC": True}
-    generators = "CMakeDeps", "CMakeToolchain"
+    
+    # Export source files needed for building
+    exports_sources = "CMakeLists.txt", "src/*"
 
     def config_options(self):
         if self.settings.os == "Windows":
@@ -25,23 +26,43 @@ def configure(self):
             self.options["cpprestsdk"].shared = True
 
     def requirements(self):
-        self.requires("cpprestsdk/2.10.19")  # Latest stable version
-        self.requires("rxcpp/4.1.1")  # Latest stable version
+        self.requires("cpprestsdk/2.10.19")
+        self.requires("rxcpp/4.1.1")
     
     def build_requirements(self):
         # Only for tests - not linked to the library
         self.test_requires("catch2/3.11.0")
 
-    # Don't use cmake_layout when consuming dependencies - it creates nested build directories
-    # def layout(self):
-    #     cmake_layout(self)
+    def layout(self):
+        cmake_layout(self)
+
+    def generate(self):
+        deps = CMakeDeps(self)
+        deps.generate()
+        tc = CMakeToolchain(self)
+        tc.generate()
 
     def build(self):
         cmake = CMake(self)
-        cmake.configure()
+        # Disable tests and demo for packaging
+        cmake.configure(variables={"BUILD_TESTING": "OFF", "BUILD_DEMO": "OFF"})
         cmake.build()
 
     def package(self):
         cmake = CMake(self)
         cmake.install()
 
+    def package_info(self):
+        self.cpp_info.set_property("cmake_file_name", "influxdb-cpp-rest")
+        self.cpp_info.set_property("cmake_target_name", "influxdb-cpp-rest::influxdb-cpp-rest")
+        
+        # Libraries to link
+        self.cpp_info.libs = ["influxdb-cpp-rest"]
+        
+        # Include directories
+        self.cpp_info.includedirs = ["include"]
+        
+        # System dependencies (if any)
+        if self.settings.os == "Linux":
+            self.cpp_info.system_libs = ["pthread"]
+
diff --git a/scripts/tag-version.sh b/scripts/tag-version.sh
@@ -107,13 +107,6 @@ bump_version() {
 # Update version in all files
 update_version_files() {
     local new_version="$1"
-    local sed_in_place
-    
-    if [[ "$(uname)" == "Darwin" ]]; then
-        sed_in_place="sed -i ''"
-    else
-        sed_in_place="sed -i"
-    fi
     
     if [ "$DRY_RUN" = true ]; then
         echo "[DRY RUN] Would update versions to: ${new_version}"
@@ -141,13 +134,21 @@ update_version_files() {
     
     # Update conanfile.py
     if [ -f "${CONANFILE}" ]; then
-        $sed_in_place "s/version = \"[^\"]*\"/version = \"${new_version}\"/" "${CONANFILE}"
+        if [[ "$(uname)" == "Darwin" ]]; then
+            sed -i '' "s/version = \"[^\"]*\"/version = \"${new_version}\"/" "${CONANFILE}"
+        else
+            sed -i "s/version = \"[^\"]*\"/version = \"${new_version}\"/" "${CONANFILE}"
+        fi
         echo "✓ Updated ${CONANFILE} to version ${new_version}"
     fi
     
     # Update CMakeLists.txt (project VERSION)
     if [ -f "${CMAKELISTS}" ]; then
-        $sed_in_place -E "s/VERSION [0-9]+\\.[0-9]+\\.[0-9]+(-rc[0-9]+)?/VERSION ${new_version}/" "${CMAKELISTS}"
+        if [[ "$(uname)" == "Darwin" ]]; then
+            sed -i '' -E "s/VERSION [0-9]+\\.[0-9]+\\.[0-9]+(-rc[0-9]+)?/VERSION ${new_version}/" "${CMAKELISTS}"
+        else
+            sed -i -E "s/VERSION [0-9]+\\.[0-9]+\\.[0-9]+(-rc[0-9]+)?/VERSION ${new_version}/" "${CMAKELISTS}"
+        fi
         echo "✓ Updated ${CMAKELISTS} to version ${new_version}"
     fi
 }
@@ -389,10 +390,9 @@ main() {
     # Update all version files
     update_version_files "$NEW_VERSION"
     
-    # Commit version changes
-    commit_version_changes "$NEW_VERSION"
-    
     if [ "$DRY_RUN" = true ]; then
+        echo ""
+        commit_version_changes "$NEW_VERSION"
         echo ""
         create_tag "$NEW_VERSION"
         if [ "$PUSH" = true ]; then
@@ -404,9 +404,13 @@ main() {
         exit 0
     fi
     
-    # Create git tag
+    # Ask for confirmation to commit and tag
     if [ "$YES" = true ]; then
         # Auto-confirm, skip prompt
+        # Commit version changes
+        commit_version_changes "$NEW_VERSION"
+        
+        # Create git tag
         create_tag "$NEW_VERSION"
         
         # Push tag if --push flag was set
@@ -415,16 +419,22 @@ main() {
             push_tag "$NEW_VERSION"
             echo ""
             echo "✓ Version bumped to ${NEW_VERSION}"
+            echo "✓ Changes committed"
             echo "✓ Git tag v${NEW_VERSION} created and pushed"
         else
             echo ""
             echo "✓ Version bumped to ${NEW_VERSION}"
+            echo "✓ Changes committed"
             echo "✓ Git tag v${NEW_VERSION} created"
         fi
     else
-        read -p "Create git tag v${NEW_VERSION}? (y/N) " -n 1 -r
+        read -p "Commit and tag v${NEW_VERSION}? (y/N) " -n 1 -r
         echo
         if [[ $REPLY =~ ^[Yy]$ ]]; then
+            # Commit version changes
+            commit_version_changes "$NEW_VERSION"
+            
+            # Create git tag
             create_tag "$NEW_VERSION"
             
             # Push tag if --push flag was set
@@ -433,14 +443,16 @@ main() {
                 push_tag "$NEW_VERSION"
                 echo ""
                 echo "✓ Version bumped to ${NEW_VERSION}"
+                echo "✓ Changes committed"
                 echo "✓ Git tag v${NEW_VERSION} created and pushed"
             else
                 echo ""
                 echo "✓ Version bumped to ${NEW_VERSION}"
+                echo "✓ Changes committed"
                 echo "✓ Git tag v${NEW_VERSION} created"
             fi
         else
-            echo "Tag creation cancelled. Version updated in files only."
+            echo "Cancelled. Version updated in files only."
         fi
     fi
 }
