Merge pull request 'develop' (#18) from develop into main

Reviewed-on: #18

.gitea/workflows/release.yml

@@ -48,35 +48,39 @@ jobs:
             [ "$testing" = "ON" ] && ctest --test-dir "build-$name" --output-on-failure
 
             pkg="datarouter-$name"
-            mkdir -p "dist/$pkg"
+            cmake --install "build-$name" --prefix "dist/$pkg"
-            for f in datarouter.h datarouter_config_template.h LICENSE README.md; do
-              if [ -f "$f" ]; then cp "$f" "dist/$pkg/"; fi
-            done
-            for f in libDataRouter.a libDataRouter.so libDataRouter.dll libDataRouter.dll.a example example.exe; do
-              if [ -f "build-$name/$f" ]; then cp "build-$name/$f" "dist/$pkg/"; fi
-            done
           done
 
       - name: Create release & upload assets
         run: |
           TAG="${{ steps.tag.outputs.tag }}"
           API="${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases"
+          TOKEN="${{ gitea.token }}"
 
-          echo "=== Creating release $TAG ==="
+          # Check if release already exists
-          RESP=$(curl -s -X POST \
+          echo "=== Checking existing releases for $TAG ==="
-            -H "Authorization: token ${{ gitea.token }}" \
+          EXISTING=$(curl -s -H "Authorization: token ${TOKEN}" "${API}" | \
-            -H "Content-Type: application/json" \
+            python3 -c "import sys,json;rels=json.load(sys.stdin);print(next((r['id'] for r in rels if r['tag_name']=='${TAG}'),''))")
-            -d "{\"tag_name\":\"${TAG}\",\"name\":\"DataRouter ${TAG}\"}" \
-            "$API")
 
-          ID=$(echo "$RESP" | python3 -c "import sys,json;print(json.load(sys.stdin)['id'])")
+          if [ -n "$EXISTING" ]; then
+            ID="$EXISTING"
+            echo "Release already exists (ID=$ID), updating it"
+          else
+            echo "=== Creating release $TAG ==="
+            RESP=$(curl -s -X POST \
+              -H "Authorization: token ${TOKEN}" \
+              -H "Content-Type: application/json" \
+              -d "{\"tag_name\":\"${TAG}\",\"name\":\"DataRouter ${TAG}\"}" \
+              "$API")
+            ID=$(echo "$RESP" | python3 -c "import sys,json;d=json.loads(sys.stdin.read());print(d['id'])")
+          fi
 
           for dir in dist/*/; do
             name="$(basename "$dir").tar.gz"
             tar czf "/tmp/$name" -C "$dir" .
             echo "Uploading $name"
             curl -s -X POST \
-              -H "Authorization: token ${{ gitea.token }}" \
+              -H "Authorization: token ${TOKEN}" \
               -H "Content-Type: application/octet-stream" \
               --data-binary @"/tmp/$name" \
               "${API}/${ID}/assets?name=${name}"

.idea/ctestState.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CidrCTestProjectState">
+    <ctestState>
+      <lineNumber testId="path:null test:datarouter" value="28" />
+    </ctestState>
+  </component>
+</project>

CMakeLists.txt

@@ -5,13 +5,19 @@ set(CMAKE_C_STANDARD 11)
 
 # ======== 静态库 ========
 add_library(DataRouter STATIC datarouter.c)
-target_include_directories(DataRouter PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(DataRouter PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<INSTALL_INTERFACE:include>
+)
 
 # ======== 共享库（可选，通过 BUILD_SHARED 控制） ========
 option(BUILD_SHARED "Build shared library" ON)
 if(BUILD_SHARED)
     add_library(DataRouter_shared SHARED datarouter.c)
-    target_include_directories(DataRouter_shared PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+    target_include_directories(DataRouter_shared PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+        $<INSTALL_INTERFACE:include>
+    )
     set_target_properties(DataRouter_shared PROPERTIES OUTPUT_NAME DataRouter)
 endif()
 
@@ -28,3 +34,50 @@ if(BUILD_TESTING OR NOT DEFINED BUILD_TESTING)
     target_link_libraries(test_datarouter DataRouter)
     add_test(NAME datarouter COMMAND test_datarouter)
 endif()
+
+# ======== 安装规则 ========
+
+# 静态库 → lib/
+install(TARGETS DataRouter
+    EXPORT DataRouterTargets
+    ARCHIVE DESTINATION lib
+)
+
+# 共享库 → lib/（可选）
+if(TARGET DataRouter_shared)
+    install(TARGETS DataRouter_shared
+        EXPORT DataRouterTargets
+        ARCHIVE DESTINATION lib   # .lib (Windows import lib)
+        LIBRARY DESTINATION lib   # .so
+        RUNTIME DESTINATION lib   # .dll
+    )
+endif()
+
+# 示例 → bin/
+if(TARGET example)
+    install(TARGETS example RUNTIME DESTINATION bin)
+endif()
+
+# 头文件 → include/
+install(FILES datarouter.h DESTINATION include)
+
+# 文档 → share/
+install(FILES datarouter_config_template.h LICENSE DESTINATION share)
+if(EXISTS ${CMAKE_SOURCE_DIR}/README.md)
+    install(FILES README.md DESTINATION share)
+endif()
+
+# CMake 包配置文件 → cmake/
+set(INCLUDE_INSTALL_DIR include)
+set(LIB_INSTALL_DIR lib)
+
+include(CMakePackageConfigHelpers)
+configure_package_config_file(
+    cmake/DataRouterConfig.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/DataRouterConfig.cmake
+    INSTALL_DESTINATION cmake
+    PATH_VARS INCLUDE_INSTALL_DIR LIB_INSTALL_DIR
+)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/DataRouterConfig.cmake DESTINATION cmake)
+install(EXPORT DataRouterTargets FILE DataRouterTargets.cmake DESTINATION cmake)

cmake/DataRouterConfig.cmake.in

@@ -0,0 +1,16 @@
+@PACKAGE_INIT@
+
+set_and_check(DataRouter_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+set_and_check(DataRouter_LIBRARY_DIR "@PACKAGE_LIB_INSTALL_DIR@")
+
+include("${CMAKE_CURRENT_LIST_DIR}/DataRouterTargets.cmake" OPTIONAL)
+
+if(NOT TARGET DataRouter::DataRouter)
+    add_library(DataRouter::DataRouter STATIC IMPORTED)
+    set_target_properties(DataRouter::DataRouter PROPERTIES
+        IMPORTED_LOCATION "${DataRouter_LIBRARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}DataRouter${CMAKE_STATIC_LIBRARY_SUFFIX}"
+        INTERFACE_INCLUDE_DIRECTORIES "${DataRouter_INCLUDE_DIR}"
+    )
+endif()
+
+check_required_components(DataRouter)