Support rust api.

.gitlab-ci.yml

@@ -0,0 +1,57 @@
+
+image: "harbor.rongcloud.net/library/rust/wcdb:0.1.4"
+
+cache:
+  paths:
+    - CargoHome/registry/index/
+    - CargoHome/registry/cache/
+    - src/rust/target/
+    - src/rust/Cargo.lock
+
+stages:
+  - check
+  - test
+
+variables:
+  GIT_DEPTH: 1
+
+run_check_unsafe_keywords:
+  stage: check
+  script: |
+    echo "Check danger function..."
+    if find src/rust/wcdb/src -name '*.rs' | xargs -P4 grep -n '\bc_long\b|\.unwrap()\|\.expect(\|unreachable!\|panic!'; then
+      echo "Error: banned c_long/unwrap/expect/unreachable!/panic!"
+      exit 1
+    fi
+  rules:
+    - changes:
+       - "src/rust/wcdb/src/**/*.rs"
+
+run_test:
+  stage: test
+  before_script:
+    - export http_proxy=http://172.19.23.87:7890
+    - export https_proxy=http://172.19.23.87:7890
+    - export NO_PROXY=localhost,127.0.0.1,rsproxy.cn
+    - git submodule update --init openssl sqlcipher zstd
+    - npm config set registry https://registry.npmmirror.com
+    - npm install --save-dev @commitlint/config-conventional @commitlint/cli
+  script:
+    - export CARGO_HOME=${CI_PROJECT_DIR}/CargoHome
+    - export RUSTFLAGS="-D warnings -A unused -A deprecated"
+    - export CC=`which cc`
+    - export CXX=`which c++`
+    - cd src/rust
+    - echo "${CI_COMMIT_MESSAGE}" | npx commitlint
+    - autocorrect --lint
+    - FILES=$(git ls-files '*.c' '*.cpp' '*.h')
+    - for file in $FILES; do
+        clang-format "$file" | colordiff -u "$file" -;
+      done
+    - cargo fmt -- --check
+    - cargo test -- --test-threads=1
+    - TARGET_SIZE=$(du -sm target 2>/dev/null | awk '{print $1}')
+    - echo "target:${TARGET_SIZE}m"
+    - if [ "$TARGET_SIZE" -gt 2048 ]; then
+        rm -rf target;
+      fi

src/CMakeLists.txt

@@ -55,6 +55,10 @@ file(GLOB_RECURSE WCDB_BRIDGE_SRC
     ${WCDB_SRC_DIR}/bridge/winqbridge/*.[ch]pp
 )
 recursive_subdirs(WCDB_BRIDGE_INCLUDES ${WCDB_SRC_DIR}/bridge)
+if (WIN32) 
+    # Ignore symlinks in src/brideg/include for windows to avoid redefinition errors
+    list(FILTER WCDB_BRIDGE_INCLUDES EXCLUDE REGEX ".*[\\\\/]include")
+endif()
 
 # Copy all headers to include folder
 file(GLOB_RECURSE WCDB_PUBLIC_HEADERS
@@ -523,12 +527,21 @@ elseif (APPLE AND NOT WCONAN_MODE)
     target_sources(${TARGET_NAME} PUBLIC ${WCDB_PUBLIC_HEADERS})
     file(STRINGS "../VERSION" WCDB_VERSION)
     message(STATUS "Xcode ${TARGET_NAME}.framework version ${WCDB_VERSION}")
-    set_target_properties(${TARGET_NAME} PROPERTIES
-        FRAMEWORK TRUE
-        FRAMEWORK_VERSION ${WCDB_VERSION}
-        MACOSX_FRAMEWORK_IDENTIFIER com.tencent.${TARGET_NAME}
-        PUBLIC_HEADER "${WCDB_PUBLIC_HEADERS}"
-    )
+    if(BUILD_FROM_CARGO)
+        message(STATUS "---- BUILD FOR APPLE FROM CARGO ----")
+        if (BUILD_SHARED_LIBS)
+            target_link_libraries(${TARGET_NAME} PRIVATE crypto z)
+        else()
+            target_link_libraries(${TARGET_NAME} PUBLIC crypto z)
+        endif()
+    else()
+        set_target_properties(${TARGET_NAME} PROPERTIES
+            FRAMEWORK TRUE
+            FRAMEWORK_VERSION ${WCDB_VERSION}
+            MACOSX_FRAMEWORK_IDENTIFIER com.tencent.${TARGET_NAME}
+            PUBLIC_HEADER "${WCDB_PUBLIC_HEADERS}"
+        )
+    endif()
 elseif (OHOS)
     message(STATUS "---- BUILD FOR OPENHARMONY ----")
     target_link_libraries(${TARGET_NAME} PUBLIC

src/bridge/base/ErrorBridge.cpp

@@ -29,6 +29,8 @@
 #include "Notifier.hpp"
 #include "ObjectBridge.hpp"
 
+#include <climits>
+
 long WCDBErrorGetCode(CPPError error)
 {
     WCDBGetObjectOrReturnValue(error, WCDB::Error, cppError, INT_MAX);

src/common/platform/CrossPlatform.c

@@ -28,7 +28,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 30
+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 32
 #include <sys/syscall.h>
 #define gettid() syscall(SYS_gettid)
 #endif

src/rust/.gitignore

@@ -0,0 +1,4 @@
+target/
+cmake-build-*/
+
+*.sqlite3*1