简化编译步骤，更新依赖

Author: wzv5

README.md

@@ -35,15 +35,18 @@ scoop install wzv5/regex-tool
 
 ## 编译
 
-安装 rust，并安装依赖：
+安装 rust，然后使用 cmake 编译。
 
-``` bash
-cargo install cxxbridge-cmd
-```
-
-之后直接使用 cmake 编译即可。
+Windows 编译示例：
 
-Windows 平台或许需要设置 `CMAKE_PREFIX_PATH`，添加 Qt 库的相关路径，如 `-DCMAKE_PREFIX_PATH=D:/Qt/6.0.0/msvc2019_64`。
+```shell
+git clone https://github.com/wzv5/regex_tool
+cd regex_tool
+mkdir build
+cd build
+cmake .. -G 'Visual Studio 17 2022' -DQt6_ROOT=D:\Qt\6.6.0\msvc2019_64
+cmake --build . --config Release
+```
 
 ## 已知问题
 

regex_engine/CMakeLists.txt

@@ -1,35 +1,26 @@
 find_program(CARGO cargo REQUIRED PATHS $ENV{HOME}/.cargo/bin)
 message(STATUS "Using cargo: ${CARGO}")
 
-find_program(CXXBRIDGE cxxbridge REQUIRED PATHS $ENV{HOME}/.cargo/bin)
-message(STATUS "Using cxxbridge: ${CXXBRIDGE}")
+set(CARGO_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR}/target)
+set(CARGO_PROFILE $<IF:$<CONFIG:Debug>,debug,release>)
+set(CXXBRIDGE_DIR ${CARGO_TARGET_DIR}/cxxbridge/regex_engine/src)
+set(CXXBRIDGE_CC ${CXXBRIDGE_DIR}/cppbridge.rs.cc)
 
-add_custom_target(regex_engine_target ALL
-  COMMAND ${CARGO} build --release --target-dir ${CMAKE_CURRENT_BINARY_DIR}
+add_custom_target(cargo_build_target
+  COMMAND ${CARGO} build $<$<NOT:$<CONFIG:Debug>>:--release> --target-dir ${CARGO_TARGET_DIR}
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  COMMENT "Runing cargo build"
-)
-
-set(cxxbridge_in ${CMAKE_CURRENT_SOURCE_DIR}/src/cppbridge.rs)
-set(cxxbridge_source_out ${CMAKE_CURRENT_BINARY_DIR}/bridge.cpp)
-set(cxxbridge_header_out ${CMAKE_CURRENT_BINARY_DIR}/bridge.h)
-
-add_custom_command(
-  OUTPUT ${cxxbridge_source_out} ${cxxbridge_header_out}
-  COMMAND ${CXXBRIDGE} ${cxxbridge_in} ${cxxbridge_args} --header --output ${cxxbridge_header_out}
-  COMMAND ${CXXBRIDGE} ${cxxbridge_in} ${cxxbridge_args} --output ${cxxbridge_source_out}
-  COMMENT "Generating CXX Bridge: ${cxxbridge_header_out} ${cxxbridge_source_out}"
-  DEPENDS ${cxxbridge_in}
+  BYPRODUCTS ${CXXBRIDGE_CC}
 )
 
 if (WIN32)
-  set(RUST_DEPEND ws2_32 userenv advapi32 bcrypt)
+  set(RUST_DEPEND ntdll ws2_32 userenv advapi32 bcrypt)
 else()
   set(RUST_DEPEND pthread m dl)
 endif()
 
-add_library(bridge STATIC ${cxxbridge_source_out})
-add_dependencies(bridge regex_engine_target)
-target_link_directories(bridge PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/release)
-target_include_directories(bridge PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
+add_library(bridge STATIC ${CXXBRIDGE_CC})
+add_dependencies(bridge cargo_build_target)
+target_link_directories(bridge PUBLIC ${CARGO_TARGET_DIR}/${CARGO_PROFILE})
+target_include_directories(bridge PUBLIC ${CXXBRIDGE_DIR})
 target_link_libraries(bridge PUBLIC regex_engine ${RUST_DEPEND})
+set_target_properties(bridge PROPERTIES ADDITIONAL_CLEAN_FILES ${CARGO_TARGET_DIR})

regex_engine/Cargo.lock

@@ -2,21 +2,16 @@
 name = "regex_engine"
 version = "0.1.0"
 authors = ["wzv5 <[email protected]>"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+edition = "2021"
 
 [lib]
-name = "regex_engine"
 crate-type = ["staticlib"]
 
 [dependencies]
-regex-syntax = "0.6"
-regex = "1.5"
-anyhow = "1.0"
-cxx = "1.0"
+regex-syntax = "0.8.2"
+regex = "1.10.2"
+anyhow = "1.0.75"
+cxx = "1.0.110"
 
-[profile.release]
-panic = "abort"
-lto = true
-codegen-units = 1
+[build-dependencies]
+cxx-build = "1.0.110"

regex_engine/Cargo.toml

@@ -0,0 +1,4 @@
+fn main() {
+    let _ = cxx_build::bridge("src/cppbridge.rs");
+    println!("cargo:rerun-if-changed=src/cppbridge.rs");
+}