fix wasm tests

tursodatabase · Nov 20, 2023 · 5ee3bcc · 5ee3bcc
1 parent 9fd18b0
commit 5ee3bcc
Show file tree

Hide file tree

Showing 15 changed files with 1,197 additions and 4,816 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libsql-ffi/Cargo.toml b/libsql-ffi/Cargo.toml
@@ -7,10 +7,12 @@ build = "build.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+libsql-wasmtime-bindings = { version = "0.2.1", optional = true }
 
 [build-dependencies]
 bindgen = "0.66.1"
 cc = "1.0"
 
 [features]
 session = []
+wasmtime-bindings = ["dep:libsql-wasmtime-bindings"]
diff --git a/libsql-ffi/build.rs b/libsql-ffi/build.rs
@@ -11,7 +11,7 @@ fn main() {
     let out_dir = env::var("OUT_DIR").unwrap();
     let out_path = Path::new(&out_dir).join("bindgen.rs");
     println!("cargo:rerun-if-changed={BUNDLED_DIR}/src/");
-    if std::env::var("LIBSQL_DEV").is_ok() {
+    if std::env::var("LIBSQL_DEV").is_ok() || cfg!(feature = "wasmtime-bindings") {
         println!("cargo:rerun-if-changed={SQLITE_DIR}/src/");
         make_amalgation();
     }
@@ -20,9 +20,22 @@ fn main() {
 }
 
 fn make_amalgation() {
+    let flags = [
+        "-DSQLITE_ENABLE_COLUMN_METADATA=1",
+        "-DSQLITE_ENABLE_WASM_RUNTIME=1",
+    ];
+
+    Command::new("make")
+        .current_dir(SQLITE_DIR)
+        .arg("clean")
+        .output()
+        .unwrap();
+
     Command::new("./configure")
         .current_dir(SQLITE_DIR)
-        .env("CFLAGS", "-DSQLITE_ENABLE_COLUMN_METADATA=1")
+        .env("CFLAGS", flags.join(" "))
+        // .arg("--enable-all")
+        // .arg("--enable-wasm-runtime")
         .output()
         .unwrap();
     Command::new("make")
@@ -81,7 +94,7 @@ pub fn build_bundled(out_dir: &str, out_path: &Path) {
         .flag("-D_POSIX_THREAD_SAFE_FUNCTIONS") // cross compile with MinGW
         .warnings(false);
 
-    if cfg!(feature = "libsql-wasm-experimental") {
+    if cfg!(feature = "wasmtime-bindings") {
         cfg.flag("-DLIBSQL_ENABLE_WASM_RUNTIME=1");
     }