refactor: use docker to build, bump rust version

Author: pepperoni505

PackageSources/SimObjects/Airplanes/Navigraph_Navdata_Updater_Aircraft/panel/navdata_updater.wasm

@@ -1,2 +1,9 @@
+[target.wasm32-wasi]
+rustflags = [
+  "-Clink-arg=--export-table",
+  "-Clink-arg=--export=malloc",
+  "-Clink-arg=--export=free",
+]
+
 [build]
 target = "wasm32-wasi"

Sources/Code/WASM/navdata_updater/.cargo/config.toml

@@ -1,6 +1,4 @@
-run `rustup toolchain install 1.65`, `rustup target add wasm32-wasi`
+Building:
 
-building: `.\build.bat`
-
-you need clang v15 to compile this properly. you MUST build with the release flag or the sim crashes
-you need wasi sdk v19 and set a WASI_SDK environment variable to its install location
+- Install Docker
+- Run `.\build.bat` to build, and `.\run_cargo_cmd.bat` followed by a Cargo command to run a specified command (e.g `.\run_cargo_cmd.bat clippy`)

Sources/Code/WASM/navdata_updater/README.md

@@ -1,2 +1 @@
-call run_cargo_cmd.bat build --release
-copy "target\wasm32-wasi\release\navdata_updater.wasm" "..\..\..\..\PackageSources\SimObjects\Airplanes\Navigraph_Navdata_Updater_Aircraft\panel\navdata_updater.wasm"
+.\scripts\run_docker_cmd.bat ./scripts/build.sh

Sources/Code/WASM/navdata_updater/build.bat

@@ -1,17 +1,7 @@
 @echo off
 
-set "CLANG_LIB_WASI=%WASI_SDK%\\lib\\clang\\15.0.7\\lib\\wasi"
-set "WASI_SYSROOT=%WASI_SDK%\\share\\wasi-sysroot"
-set "CC=%WASI_SDK%\\bin\\clang --sysroot=%WASI_SYSROOT%"
-set "AR=%WASI_SDK%\\bin\\llvm-ar"
-set "CC_wasm32_wasi=%WASI_SDK%\\bin\\clang"
-set "LIBSQLITE3_FLAGS=-DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_SHARED_CACHE -D_LARGEFILE64_SOURCE"
-set "RUSTFLAGS=-Clink-arg=-L%CLANG_LIB_WASI% -Clink-arg=-lclang_rt.builtins-wasm32 -Clink-arg=--export-table -Clink-arg=--export=malloc -Clink-arg=--export=free"
-
-
-:: Run the Cargo command passed as an argument
 if "%1"=="" (
-    echo No Cargo command specified.
+        echo No Cargo command specified
 ) else (
-    cargo %*
+    .\scripts\run_docker_cmd.bat ./scripts/cargo_cmd.sh %*
 )

Sources/Code/WASM/navdata_updater/run_cargo_cmd.bat

@@ -1,3 +1,3 @@
 [toolchain]
 profile = "default"
-channel = "1.65"
+channel = "1.72.1"

Sources/Code/WASM/navdata_updater/rust-toolchain.toml

@@ -0,0 +1,4 @@
+# Flags needed to get sqlite3 to work in the sim
+export LIBSQLITE3_FLAGS="-DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_SHARED_CACHE -D_LARGEFILE64_SOURCE"
+
+cargo build --target wasm32-wasi --release && wasm-opt -O1 --signext-lowering --enable-bulk-memory -o /out/navdata_updater.wasm /external/target/wasm32-wasi/release/navdata_updater.wasm

Sources/Code/WASM/navdata_updater/scripts/build.sh

@@ -0,0 +1 @@
+cargo "$@"

Sources/Code/WASM/navdata_updater/scripts/cargo_cmd.sh

@@ -0,0 +1,4 @@
+@echo off
+
+set image="ghcr.io/flybywiresim/dev-env@sha256:528f8e1ca9063b9346c7d4f684d7aadbcb58ca1fba2b1a3c2cdd9c820c4236f4"
+docker run --rm -it -v "%cd%:/external" -v "%cd%\..\..\..\..\PackageSources\SimObjects\Airplanes\Navigraph_Navdata_Updater_Aircraft\panel:/out" %image% %*