Remove emcc requirement (#157)

* Remove emcc requirement

* Clean emscripten define

* Remove emcc requirement for sqite-wasm-vec

* Remove docsrs workaround

* Update rusqlite test

* Fix atomics ci

* Clean workflow

* Update README

* Add changelog

Author: Spxg

.github/actions/setup-emscripten/action.yml

@@ -10,14 +10,12 @@ jobs:
   test_bundled:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
     - name: Install wasm-pack
       run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-    - name: Setup emscripten
-      uses: ./.github/actions/setup-emscripten
     - name: Test bundled
       run: |
         wasm-pack test --chrome --headless
@@ -30,14 +28,12 @@ jobs:
   test_bundled_sqlite3mc:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
     - name: Install wasm-pack
       run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-    - name: Setup emscripten
-      uses: ./.github/actions/setup-emscripten
     - name: Test bundled sqlite3mc
       run: |
         wasm-pack test --chrome --headless --features sqlite3mc
@@ -46,8 +42,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Setup emscripten
-      uses: ./.github/actions/setup-emscripten
     - name: Run diesel tests
       run: |
         git clone https://github.com/diesel-rs/diesel.git
@@ -64,15 +58,13 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install wasm-pack
       run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-    - name: Setup emscripten
-      uses: ./.github/actions/setup-emscripten
     - name: Run rusqlite tests
       run: |
-        git clone https://github.com/Spxg/rusqlite.git
+        git clone https://github.com/rusqlite/rusqlite.git
         cd rusqlite
         printf "[patch.crates-io]\n" >> Cargo.toml
         printf "sqlite-wasm-rs = { path = \"..\" }\n" >> Cargo.toml
-        WASM_BINDGEN_TEST_TIMEOUT=60 wasm-pack test --chrome --headless --features modern-base
+        WASM_BINDGEN_TEST_TIMEOUT=60 wasm-pack test --chrome --headless --features modern-full
 
   test_clippy:
     runs-on: ubuntu-latest
@@ -81,16 +73,14 @@ jobs:
     - name: Check clippy
       run: |
         rustup target add wasm32-unknown-unknown
-        cargo clippy --no-default-features --config docsrs.toml --target wasm32-unknown-unknown -- -D warnings
+        cargo clippy --no-default-features --target wasm32-unknown-unknown -- -D warnings
 
   test_implement_a_vfs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: Install wasm-pack
       run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-    - name: Setup emscripten
-      uses: ./.github/actions/setup-emscripten
     - name: Test implement-a-vfs example
       run: |
         cd examples/implement-a-vfs
@@ -112,13 +102,12 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install wasm-pack
       run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-    - name: Setup emscripten
-      uses: ./.github/actions/setup-emscripten
     - name: Test
       run: |
         rustup toolchain install nightly
         rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
-        RUSTFLAGS='-Ctarget-feature=+atomics -Clink-args=--shared-memory -Clink-args=--max-memory=1073741824 -Clink-args=--import-memory -Clink-args=--export=__wasm_init_tls -Clink-args=--export=__tls_size -Clink-args=--export=__tls_align -Clink-args=--export=__tls_base' rustup run nightly wasm-pack test --chrome --headless -Z build-std=panic_abort,std
+        cd tests
+        CFLAGS_wasm32_unknown_unknown='-matomics' RUSTFLAGS='-Ctarget-feature=+atomics -Clink-args=--shared-memory -Clink-args=--max-memory=1073741824 -Clink-args=--import-memory -Clink-args=--export=__wasm_init_tls -Clink-args=--export=__tls_size -Clink-args=--export=__tls_align -Clink-args=--export=__tls_base' rustup run nightly wasm-pack test --chrome --headless -Z build-std=panic_abort,std
 
   test_msrv:
     strategy:
@@ -129,10 +118,6 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install wasm-pack
       run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-    - name: Setup emscripten
-      uses: ./.github/actions/setup-emscripten
-      with:
-        version: '3.1.52'
     - name: Test MSRV
       run: |
         rustup toolchain install 1.82.0
@@ -149,8 +134,6 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install wasm-pack
       run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-    - name: Setup emscripten
-      uses: ./.github/actions/setup-emscripten
     - name: Test
       run: |
         cd examples/nodejs
@@ -160,14 +143,12 @@ jobs:
   test_sqlite_wasm_vec:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
     - name: Install wasm-pack
       run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-    - name: Setup emscripten
-      uses: ./.github/actions/setup-emscripten
     - name: Test
       run: |
         cd extensions/sqlite-vec
@@ -176,14 +157,12 @@ jobs:
   test_sqlite_wasm_vfs:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
     - name: Install wasm-pack
       run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-    - name: Setup emscripten
-      uses: ./.github/actions/setup-emscripten
     - name: Test
       run: |
         cd crates/sqlite-wasm-vfs
@@ -198,8 +177,6 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install wasm-pack
       run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-    - name: Setup emscripten
-      uses: ./.github/actions/setup-emscripten
     - name: Test
       run: |
         cd tests

.github/workflows/test.yml

@@ -9,6 +9,9 @@
 
 ### Changed
 
+* Removed emcc requirement.
+  [#157](https://github.com/Spxg/sqlite-wasm-rs/pull/157)
+
 --------------------------------------------------------------------------------
 
 ## [0.5.0](https://github.com/Spxg/sqlite-wasm-rs/compare/0.4.8...0.5.0)

CHANGELOG.md

@@ -23,8 +23,6 @@ include = [
     'Cargo.toml',
     '/README.md',
     'LICENSE',
-    # use to build docs
-    'docsrs.toml',
 ]
 
 [dependencies]
@@ -46,10 +44,6 @@ wasm-bindgen-test = "0.3.54"
 cc = "1.2.27"
 bindgen = { version = "0.72", optional = true }
 
-[package.metadata.docs.rs]
-targets = ["wasm32-unknown-unknown"]
-cargo-args = ["--config", "docsrs.toml"]
-
 [workspace]
 resolver = "2"
 members = [

Cargo.toml

@@ -4,8 +4,6 @@
 
 ## Usage
 
-Due to restrictions on the target platform, the [emscripten](https://emscripten.org/docs/getting_started/downloads.html) toolchain needs to be installed for compilation.
-
 ```toml
 [dependencies]
 sqlite-wasm-rs = "0.5"

README.md

@@ -189,8 +189,6 @@ fn bindgen(output: &std::path::PathBuf) {
 }
 
 fn compile() {
-    use std::collections::HashSet;
-
     const C_SOURCE: [&str; 36] = [
         // string
         "string/memchr.c",
@@ -242,31 +240,21 @@ fn compile() {
     const SQLITE3_SOURCE: &str = "sqlite3mc/sqlite3mc_amalgamation.c";
 
     let mut cc = cc::Build::new();
-    cc.warnings(false).target("wasm32-unknown-emscripten");
-
-    if cc.get_compiler().to_command().status().is_err() {
-        panic!("It looks like you don't have the emscripten toolchain: https://emscripten.org/docs/getting_started/downloads.html");
-    }
-
-    cc.file(SQLITE3_SOURCE)
+    cc.warnings(false)
+        .flag("-Wno-macro-redefined")
+        .include("shim")
+        .include("shim/musl/arch/generic")
+        .include("shim/musl/include")
+        .file("shim/printf/printf.c")
+        .file(SQLITE3_SOURCE)
         .files(C_SOURCE.map(|s| format!("shim/musl/{s}")))
-        .file("shim/printf/printf.c");
+        .flag("-DPRINTF_ALIAS_STANDARD_FUNCTION_NAMES_HARD")
+        .flag("-include")
+        .flag("shim/wasm-shim.h");
+
     cc.flags(FULL_FEATURED);
     #[cfg(feature = "sqlite3mc")]
     cc.flags(SQLITE3_MC_FEATURED);
 
-    let target_features = std::env::var("CARGO_CFG_TARGET_FEATURE").unwrap_or_default();
-    let target_features = target_features
-        .split(',')
-        .map(str::trim)
-        .collect::<HashSet<_>>();
-
-    if target_features.contains("atomics") {
-        cc.flag("-pthread");
-    }
-    cc.include("shim")
-        .flag("-DPRINTF_ALIAS_STANDARD_FUNCTION_NAMES_HARD")
-        .flag("-include")
-        .flag("shim/wasm-shim.h")
-        .compile("wsqlite3");
+    cc.compile("wsqlite3");
 }

build.rs

@@ -33,7 +33,3 @@ indexed_db_futures = "0.6.4"
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.54"
-
-[package.metadata.docs.rs]
-targets = ["wasm32-unknown-unknown"]
-cargo-args = ["--config", "docsrs.toml"]

crates/sqlite-wasm-vfs/Cargo.toml

@@ -19,7 +19,3 @@ cc = "1.2.44"
 [dev-dependencies]
 sqlite-wasm-rs = { path = "../../" }
 wasm-bindgen-test = "0.3.55"
-
-[package.metadata.docs.rs]
-targets = ["wasm32-unknown-unknown"]
-cargo-args = ["--config", "docsrs.toml"]