Merge pull request #122 from Cryolitia-Forks/release

rfct(crates/lang_unicodes): migrate to opencc-rust

Author: KonghaYao

.github/workflows/cross-build.yml

@@ -91,13 +91,6 @@ jobs:
                   sudo apt update
                   sudo apt install -y nodejs llvm clang pkg-config libssl-dev
                   ${{ matrix.platform.setup }}
-
-            - name: Build Node
-              working-directory: ./crates/lang_unicodes
-              run: |
-                  npm i
-                  npm run build
-
             - name: Set up Homebrew
               id: set-up-homebrew
               if: ${{ runner.os == 'macOS' }}
@@ -120,19 +113,19 @@ jobs:
               with:
                   toolchain: stable
 
-            - name: BUILD PROTO
+            - name: BUILD PROTO & lang-unicodes
               run: |
+                  cargo build -p lang-unicodes
                   cargo build -p cn-font-proto
 
             - name: Build binary
               uses: houseabsolute/actions-rust-cross@v0
               with:
                   command: build
                   target: ${{ matrix.platform.target }}
-                  args: '--locked --release -p ffi'
+                  args: '--locked --release -p ffi --no-default-features'
                   strip: false
               env:
-                  CARGO_WITH_NO_EXTRA: 'True'
                   HARFBUZZ_SYS_NO_PKG_CONFIG: 'True'
 
             - name: Rename Package On Mac
@@ -186,12 +179,6 @@ jobs:
             - name: Update Rust
               run: /home/runner/.cargo/bin/rustup  target add wasm32-wasip1
 
-            - name: Build Node
-              working-directory: ./crates/lang_unicodes
-              run: |
-                  npm i
-                  npm run build
-
             - name: Build
               working-directory: ./packages/wasm-edge
               run: |

Cargo.lock

@@ -11,12 +11,12 @@ license = "Apache-2.0"
 [dependencies]
 cn-font-utils = { version = "0.1.0", path = "crates/cn_font_utils" }
 harfbuzz_rs_now = "2.2.6"
-lang-unicodes = { version = "0.1.0", path = "crates/lang_unicodes" }
+lang-unicodes = { version = "0.1.0", path = "crates/lang_unicodes", default-features = false }
 log = "0.4.22"
 md5 = "0.7.0"
 opentype = "0.38.1"
 prost = "0.13.3"
-cn-font-proto = { version = "0.1.1", path = "crates/proto" }
+cn-font-proto = { version = "0.1.1", path = "crates/proto", default-features = false }
 rayon = "1.10.0"
 unicode-range = { version = "0.1.0", path = "crates/unicode_range" }
 woff = "0.3.3"
@@ -27,11 +27,14 @@ chrono = "0.4.38"
 [dev-dependencies]
 env_logger = "0.11.5"
 
-
 [build-dependencies]
 cross = "0.2.5"
 tonic-build = "0.12.3"
 
+[features]
+default = ["with_extra"]
+with_extra = ["lang-unicodes/with_extra", "cn-font-proto/with_extra"]
+
 [workspace]
 members = [
     "crates/cn_font_utils",

Cargo.toml

@@ -5,31 +5,31 @@ zig = false       # do not use zig cc for the builds
 context = "."     # the context folder to build the script in. defaults to `.`
 
 [build.env]
-passthrough = ["CARGO_WITH_NO_EXTRA", "HARFBUZZ_SYS_NO_PKG_CONFIG"]
+passthrough = ["HARFBUZZ_SYS_NO_PKG_CONFIG"]
 
 [target.aarch64-unknown-linux-gnu]
 pre-build = [
-    "apt update && apt install -y nodejs llvm clang pkg-config libssl-dev",
+    "apt update && apt install -y llvm clang pkg-config libssl-dev",
 ]
 
 [target.x86_64-unknown-linux-gnu]
 pre-build = [
-    "apt update && apt install -y nodejs llvm clang pkg-config libssl-dev",
+    "apt update && apt install -y llvm clang pkg-config libssl-dev",
 ]
 
 [target.x86_64-unknown-linux-musl]
 pre-build = [
-    "apt update && apt install -y nodejs llvm clang pkg-config libssl-dev",
+    "apt update && apt install -y llvm clang pkg-config libssl-dev",
 ]
 
 [target.aarch64-unknown-linux-musl]
 pre-build = [
-    "apt update && apt install -y nodejs llvm clang pkg-config libssl-dev",
+    "apt update && apt install -y llvm clang pkg-config libssl-dev",
 ]
 
 [target.riscv64gc-unknown-linux-gnu]
 pre-build = [
-    "apt update && apt install -y nodejs llvm clang pkg-config libssl-dev",
+    "apt update && apt install -y llvm clang pkg-config libssl-dev",
 ]
 
 [target.x86_64-pc-windows-msvc]

Cross.toml

@@ -14,3 +14,11 @@ lazy_static = "1.5.0"
 
 [lib]
 path = "src/lib.rs"
+
+[build-dependencies]
+lazy_static = { version = "1.5.0", optional = true }
+opencc-rs =  { version = "0.4.7", optional = true }
+
+[features]
+default = [ "with_extra" ]
+with_extra = ["lazy_static", "opencc-rs"]

crates/lang_unicodes/Cargo.toml

@@ -72,9 +72,9 @@ mod tests {
     #[test]
     fn test() {
         assert_eq!(HIRAGANA_AND_KATAKANA.len(), 192);
-        assert_eq!(ZH_COMMON.len(), 4329);
-        assert_eq!(ZH_SC.len(), 2508);
-        assert_eq!(ZH_TC.len(), 2481);
+        assert_eq!(ZH_COMMON.len(), 4524);
+        assert_eq!(ZH_SC.len(), 2313);
+        assert_eq!(ZH_TC.len(), 2308);
         assert_eq!(HANGUL_SYL.len(), 2026);
     }
 }

crates/lang_unicodes/build.rs

@@ -15,10 +15,12 @@ prost = "0.13.3"
 prost-types = { version = "0.13.3", optional = true }
 
 [features]
+default = ["with_extra"]
 server = ["tonic"]
+with_extra = ["tonic-build"]
 
 [build-dependencies]
-tonic-build = "0.12.3"
+tonic-build = { version = "0.12.3", optional = true }
 
 [lib]
-path = "src/lib/mod.rs"
+path = "src/lib/mod.rs"