From 105680bc0b2b8de626a40da25b9314c448ab38cc Mon Sep 17 00:00:00 2001 From: Falcon Date: Wed, 29 Jan 2025 15:37:31 -0800 Subject: [PATCH] workflow(fix): now autocreates the out folder --- .github/workflows/pre-release.yml | 2 +- package.json | 2 +- scripts/build.bat | 4 ++-- scripts/build.sh | 19 ------------------- scripts/build_workflow.bat | 7 +++++++ 5 files changed, 11 insertions(+), 23 deletions(-) delete mode 100755 scripts/build.sh create mode 100644 scripts/build_workflow.bat diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 6f37085..40ca76e 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -29,7 +29,7 @@ jobs: run: npm run setup - name: Build WASM module - run: npm run build:wasm + run: npm run build:wasm-workflow - name: Pre-Release uses: softprops/action-gh-release@v1 diff --git a/package.json b/package.json index 3c4aff1..7889841 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "lint:js": "eslint \"src/js/**/*.ts\"", "setup": ".\\scripts\\setup.bat", "build:wasm": ".\\scripts\\build.bat", - "build:wasm-workflow": "./scripts/build.sh", + "build:wasm-workflow": ".\\scripts\\build_workflow.bat", "build:js": "cd .\\src\\js && npm run build", "build:gauge": "cd .\\examples\\gauge && npm run build", "dev:gauge": "cd .\\examples\\gauge && npm run dev", diff --git a/scripts/build.bat b/scripts/build.bat index 82fdeda..0be6712 100644 --- a/scripts/build.bat +++ b/scripts/build.bat @@ -2,8 +2,8 @@ cd %~dp0 -cargo-msfs build msfs2020 -i .. -o ..\out\msfs_navigation_data_interface.wasm +mkdir ..\out -cd %~dp0 +cargo-msfs build msfs2020 -i .. -o ..\out\msfs_navigation_data_interface.wasm copy ..\out\msfs_navigation_data_interface.wasm ..\examples\aircraft\PackageSources\SimObjects\Airplanes\Navigraph_Navigation_Data_Interface_Aircraft\panel \ No newline at end of file diff --git a/scripts/build.sh b/scripts/build.sh deleted file mode 100755 index 60fe832..0000000 --- a/scripts/build.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -cd "$(dirname "$0")" - -echo "Installing cargo-msfs" - -# Required for compilation -cargo install --git https://github.com/navigraph/cargo-msfs - -cargo-msfs install msfs2020 - -cd .. - -echo "Starting build from $(pwd)" - -# Flags needed to get sqlite3 to work in the sim -export LIBSQLITE3_FLAGS="-DSQLITE_OMIT_SHARED_CACHE -D_LARGEFILE64_SOURCE" - -cargo-msfs build msfs2020 -i . -o ./out/msfs_navigation_data_interface.wasm diff --git a/scripts/build_workflow.bat b/scripts/build_workflow.bat new file mode 100644 index 0000000..b258040 --- /dev/null +++ b/scripts/build_workflow.bat @@ -0,0 +1,7 @@ +@echo off + +cd %~dp0 + +mkdir ..\out + +cargo-msfs build msfs2020 -i .. -o ..\out\msfs_navigation_data_interface.wasm