feat: now builds with cargo-msfs

Navigraph · Dec 4, 2024 · 9270ca3 · 9270ca3
1 parent b2dd233
commit 9270ca3
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,4 +8,4 @@ lto = true
 strip = true
 
 [patch.crates-io]
-rusqlite = { git = "https://github.com/navigraph/rusqlite", rev = "7921774" }
+rusqlite = { git = "https://github.com/navigraph/rusqlite", rev = "f716d5c" }
diff --git a/package.json b/package.json
@@ -9,7 +9,9 @@
     "lint:js": "eslint \"src/js/**/*.ts\"",
     "build:gauge": ".\\scripts\\build_gauge.bat",
     "build:js": ".\\scripts\\build_js.bat",
-    "build:wasm": ".\\scripts\\build.bat",
+    "build:wasm": ".\\scripts\\build.bat 2020",
+    "build:wasm:2020": ".\\scripts\\build.bat 2020",
+    "build:wasm:2024": ".\\scripts\\build.bat 2024",
     "build:wasm-workflow": "./scripts/run_docker_cmd.sh ./scripts/build.sh",
     "jest": "jest --verbose --runInBand",
     "test": ".\\scripts\\test.bat",

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
 profile = "default"
-channel = "1.79.0"
-targets = ["wasm32-wasi"]
+channel = "1.83"
+targets = ["wasm32-wasip1"]
diff --git a/scripts/build.bat b/scripts/build.bat
@@ -2,7 +2,8 @@
 
 cd %~dp0
 
-call .\run_docker_cmd.bat ./scripts/build.sh
+call cargo-msfs build msfs%1
+call wasm-opt -O1 --signext-lowering --enable-bulk-memory -o ../out/msfs_navigation_data_interface.wasm ../target/wasm32-wasip1/release/msfs_navigation_data_interface.wasm
 
 cd %~dp0
 

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -3,4 +3,4 @@
 # Flags needed to get sqlite3 to work in the sim
 export LIBSQLITE3_FLAGS="-DSQLITE_OMIT_SHARED_CACHE -D_LARGEFILE64_SOURCE"
 
-cargo build --target wasm32-wasi --release && wasm-opt -O1 --signext-lowering --enable-bulk-memory -o /out/msfs_navigation_data_interface.wasm /external/target/wasm32-wasi/release/msfs_navigation_data_interface.wasm
+cargo-msfs build msfs2020 && wasm-opt -O1 --signext-lowering --enable-bulk-memory -o /out/msfs_navigation_data_interface.wasm /external/target/wasm32-wasi/release/msfs_navigation_data_interface.wasm
diff --git a/src/database/Cargo.toml b/src/database/Cargo.toml
@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rusqlite = { version = "0.30.0", features = ["bundled"] }
-serde_rusqlite = "0.34.0"
+rusqlite = { version = "0.32", features = ["bundled"] }
+serde_rusqlite = "0.36.0"
 serde = { version = "1.0.190", features = ["derive"] }
 serde_json = "1.0.108"
 serde_with = "3.4.0"