Skip to content

Commit 99745f8

Browse files
committed
Remove wsqlite3-sys
Since `rsqlite-vfs` no longer depends on `*-sys`, `wsqlite3-sys` has become irrelevant
1 parent 0ea60f4 commit 99745f8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+28
-51
lines changed

Cargo.toml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[package]
22
name = "sqlite-wasm-rs"
3+
links = "wsqlite3"
34
version = "0.5.1"
45
authors = ["Spxg <unsafe@outlook.es>"]
56
repository = "https://github.com/Spxg/sqlite-wasm-rs"
@@ -15,15 +16,17 @@ include.workspace = true
1516
[dependencies]
1617
wasm-bindgen = { version = "0.2.104", default-features = false }
1718
js-sys = { version = "0.3.81", default-features = false }
18-
wsqlite3-sys = { path = "crates/wsqlite3-sys" }
1919
rsqlite-vfs = { path = "crates/rsqlite-vfs" }
2020

2121
[features]
2222
# SQLite3MultipleCiphers
2323
# <https://github.com/utelle/SQLite3MultipleCiphers>
2424
# <https://utelle.github.io/SQLite3MultipleCiphers>
25-
sqlite3mc = ["wsqlite3-sys/sqlite3mc"]
26-
bindgen = ["wsqlite3-sys/bindgen"]
25+
sqlite3mc = []
26+
27+
[build-dependencies]
28+
cc = "1.2.27"
29+
bindgen = { version = "0.72", optional = true }
2730

2831
[dev-dependencies]
2932
wasm-bindgen-test = "0.3.54"
@@ -35,10 +38,9 @@ targets = ["wasm32-unknown-unknown"]
3538
resolver = "2"
3639
members = [
3740
"tests",
41+
"crates/rsqlite-vfs",
3842
"crates/sqlite-wasm-libc",
3943
"crates/sqlite-wasm-vfs",
40-
"crates/rsqlite-vfs",
41-
"crates/wsqlite3-sys",
4244
"extensions/sqlite-vec",
4345
"examples/implement-a-vfs",
4446
"examples/nodejs",
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ fn main() {
5555

5656
if update_bindgen {
5757
#[cfg(not(feature = "sqlite3mc"))]
58-
const SQLITE3_BINDGEN: &str = "src/sqlite3_bindgen.rs";
58+
const SQLITE3_BINDGEN: &str = "src/bindings/sqlite3_bindgen.rs";
5959
#[cfg(feature = "sqlite3mc")]
60-
const SQLITE3_BINDGEN: &str = "src/sqlite3mc_bindgen.rs";
60+
const SQLITE3_BINDGEN: &str = "src/bindings/sqlite3mc_bindgen.rs";
6161
std::fs::copy(&output, SQLITE3_BINDGEN).unwrap();
6262
}
6363
}

crates/wsqlite3-sys/Cargo.toml

Lines changed: 0 additions & 25 deletions
This file was deleted.

extensions/sqlite-vec/cc/shim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../crates/wsqlite3-sys/shim
1+
../../../shim

extensions/sqlite-vec/cc/sqlite3.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../crates/wsqlite3-sys/sqlite3/sqlite3.h
1+
../../../sqlite3/sqlite3.h

script/printf.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
TAG=6.3.0
22
curl -L https://github.com/eyalroz/printf/archive/refs/tags/v$TAG.zip > $TAG.zip
3-
unzip -p "$TAG.zip" "printf-$TAG/src/printf/printf.c" > "crates/wsqlite3-sys/shim/printf/printf.c"
4-
unzip -p "$TAG.zip" "printf-$TAG/src/printf/printf.h" > "crates/wsqlite3-sys/shim/printf/printf.h"
3+
unzip -p "$TAG.zip" "printf-$TAG/src/printf/printf.c" > "shim/printf/printf.c"
4+
unzip -p "$TAG.zip" "printf-$TAG/src/printf/printf.h" > "shim/printf/printf.h"
55
rm $TAG.zip

script/sqlite3_upgrade.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SQLITE=sqlite-amalgamation-3510100
22
curl -O https://sqlite.org/2025/$SQLITE.zip
3-
unzip -p "$SQLITE.zip" "$SQLITE/sqlite3.c" > "crates/wsqlite3-sys/sqlite3/sqlite3.c"
4-
unzip -p "$SQLITE.zip" "$SQLITE/sqlite3.h" > "crates/wsqlite3-sys/sqlite3/sqlite3.h"
5-
unzip -p "$SQLITE.zip" "$SQLITE/sqlite3ext.h" > "crates/wsqlite3-sys/sqlite3/sqlite3ext.h"
3+
unzip -p "$SQLITE.zip" "$SQLITE/sqlite3.c" > "sqlite3/sqlite3.c"
4+
unzip -p "$SQLITE.zip" "$SQLITE/sqlite3.h" > "sqlite3/sqlite3.h"
5+
unzip -p "$SQLITE.zip" "$SQLITE/sqlite3ext.h" > "sqlite3/sqlite3ext.h"
66
rm -f "$SQLITE.zip"

script/sqlite3mc_upgrade.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
SQLITE=sqlite3mc-2.2.6-sqlite-3.51.1-amalgamation
22
curl -L https://github.com/utelle/SQLite3MultipleCiphers/releases/latest/download/$SQLITE.zip > $SQLITE.zip
3-
unzip -p "$SQLITE.zip" "sqlite3mc_amalgamation.c" > "crates/wsqlite3-sys/sqlite3mc/sqlite3mc_amalgamation.c"
4-
unzip -p "$SQLITE.zip" "sqlite3mc_amalgamation.h" > "crates/wsqlite3-sys/sqlite3mc/sqlite3mc_amalgamation.h"
3+
unzip -p "$SQLITE.zip" "sqlite3mc_amalgamation.c" > "sqlite3mc/sqlite3mc_amalgamation.c"
4+
unzip -p "$SQLITE.zip" "sqlite3mc_amalgamation.h" > "sqlite3mc/sqlite3mc_amalgamation.h"
55
rm -f "$SQLITE.zip"
File renamed without changes.

0 commit comments

Comments
 (0)