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

Reviewed-on: #18

.gitea/workflows/release.yml

@@ -0,0 +1,87 @@
+name: Release
+on:
+  push:
+    branches: [main]
+
+jobs:
+  release:
+    runs-on: ubuntu-builder
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Verify merge commit
+        run: |
+          PARENTS=$(git log --format="%P" -1 | wc -w)
+          [ "$PARENTS" -ge 2 ] || exit 78
+
+      - name: Read tag from HEAD
+        id: tag
+        run: |
+          TAG=$(git tag --points-at HEAD | grep '^v' | head -n1)
+          [ -n "$TAG" ] || exit 78
+          echo "tag=$TAG" >> "$GITHUB_OUTPUT"
+
+      - name: Install cross-compilers
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            gcc-arm-linux-gnueabihf \
+            gcc-aarch64-linux-gnu \
+            gcc-mingw-w64-x86-64 \
+            gcc-arm-none-eabi
+
+      - name: Build all targets
+        run: |
+          for entry in \
+            "linux-amd64|ON|" \
+            "linux-arm64|OFF|-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-linux-arm64.cmake" \
+            "linux-armhf|OFF|-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-linux-armhf.cmake" \
+            "windows-amd64|OFF|-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-windows-amd64.cmake -DBUILD_EXAMPLES=OFF" \
+            "baremetal-arm32|OFF|-DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-baremetal-arm32.cmake -DBUILD_EXAMPLES=OFF -DBUILD_SHARED=OFF"
+          do
+            IFS='|' read -r name testing extra <<< "$entry"
+            echo ">>> Building $name"
+            cmake -S . -B "build-$name" -DBUILD_TESTING=$testing $extra
+            cmake --build "build-$name"
+            [ "$testing" = "ON" ] && ctest --test-dir "build-$name" --output-on-failure
+
+            pkg="datarouter-$name"
+            cmake --install "build-$name" --prefix "dist/$pkg"
+          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 }}"
+
+          # Check if release already exists
+          echo "=== Checking existing releases for $TAG ==="
+          EXISTING=$(curl -s -H "Authorization: token ${TOKEN}" "${API}" | \
+            python3 -c "import sys,json;rels=json.load(sys.stdin);print(next((r['id'] for r in rels if r['tag_name']=='${TAG}'),''))")
+
+          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 ${TOKEN}" \
+              -H "Content-Type: application/octet-stream" \
+              --data-binary @"/tmp/$name" \
+              "${API}/${ID}/assets?name=${name}"
+          done

.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

@@ -3,20 +3,81 @@ project(DataRouter C)
 
 set(CMAKE_C_STANDARD 11)
 
+# ======== 静态库 ========
 add_library(DataRouter STATIC datarouter.c)
+target_include_directories(DataRouter PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<INSTALL_INTERFACE:include>
+)
 
-# 将库源码目录暴露给使用者，使其可通过 #include <datarouter_config.h>
+# ======== 共享库（可选，通过 BUILD_SHARED 控制） ========
-# 从自身 include path 覆盖默认配置。如果使用者未提供，则回退到库自带版本。
+option(BUILD_SHARED "Build shared library" ON)
-target_include_directories(DataRouter PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+if(BUILD_SHARED)
+    add_library(DataRouter_shared SHARED datarouter.c)
+    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()
 
+# ======== 示例程序 ========
 if(BUILD_EXAMPLES OR NOT DEFINED BUILD_EXAMPLES)
     add_executable(example example.c)
     target_link_libraries(example DataRouter)
 endif()
 
+# ======== 测试 ========
 if(BUILD_TESTING OR NOT DEFINED BUILD_TESTING)
     enable_testing()
     add_executable(test_datarouter tests/test_datarouter.c)
     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)

cmake/toolchain-baremetal-arm32.cmake

@@ -0,0 +1,7 @@
+set(CMAKE_SYSTEM_NAME Generic)
+set(CMAKE_SYSTEM_PROCESSOR arm)
+set(CMAKE_C_COMPILER arm-none-eabi-gcc)
+set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

cmake/toolchain-linux-arm64.cmake

@@ -0,0 +1,6 @@
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc)
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

cmake/toolchain-linux-armhf.cmake

@@ -0,0 +1,6 @@
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR arm)
+set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

cmake/toolchain-windows-amd64.cmake

@@ -0,0 +1,6 @@
+set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSTEM_PROCESSOR amd64)
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)