From abd4299df3c513d7aed02108eec68c46d25b2c5f Mon Sep 17 00:00:00 2001 From: Jovi Hsu Date: Tue, 2 Nov 2021 13:07:32 +0800 Subject: [PATCH] make install --- .gitignore | 1 + Makefile.toml | 8 ++++++++ backend/Makefile.toml | 5 +++++ frontend/Makefile.toml | 24 ++++++++++++++++++++++++ frontend/www/index.js | 2 +- 5 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 Makefile.toml create mode 100644 backend/Makefile.toml create mode 100644 frontend/Makefile.toml diff --git a/.gitignore b/.gitignore index ed768f3..fa7bac9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /target/ +/build/ Cargo.lock \ No newline at end of file diff --git a/Makefile.toml b/Makefile.toml new file mode 100644 index 0000000..87e2a58 --- /dev/null +++ b/Makefile.toml @@ -0,0 +1,8 @@ +[tasks.install] +dependencies = ["build", "member_flow"] + +[tasks.member_flow] +run_task = { name = "member_flow", fork = true } + +[env] +INSTALL_PATH= "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/build" diff --git a/backend/Makefile.toml b/backend/Makefile.toml new file mode 100644 index 0000000..43dbacd --- /dev/null +++ b/backend/Makefile.toml @@ -0,0 +1,5 @@ +[tasks.install] +script = ''' + mkdir -p $INSTALL_PATH + cp $CARGO_MAKE_CRATE_TARGET_DIRECTORY/debug/$CARGO_MAKE_CRATE_NAME $INSTALL_PATH + ''' \ No newline at end of file diff --git a/frontend/Makefile.toml b/frontend/Makefile.toml new file mode 100644 index 0000000..fcebf15 --- /dev/null +++ b/frontend/Makefile.toml @@ -0,0 +1,24 @@ +[tasks.build] +command = "wasm-pack" +args = ["build"] + +[tasks.install] +dependencies=["install_wasm", "install_static"] + +[tasks.install_wasm] +script = ''' + mkdir -p $FE_WASM_INSTALL_PATH + cp -r ./pkg $FE_WASM_INSTALL_PATH + + ''' + +[tasks.install_static] +script = ''' + mkdir -p $FE_STATIC_INSTALL_PATH + cp www/index.* $FE_STATIC_INSTALL_PATH + cp www/bootstrap.js $FE_STATIC_INSTALL_PATH + ''' + +[env] +FE_WASM_INSTALL_PATH="${INSTALL_PATH}/html" +FE_STATIC_INSTALL_PATH="${INSTALL_PATH}/html/www" \ No newline at end of file diff --git a/frontend/www/index.js b/frontend/www/index.js index b5c99e1..8b0b73c 100644 --- a/frontend/www/index.js +++ b/frontend/www/index.js @@ -1,4 +1,4 @@ -import { run_app } from '../pkg/webgateway_bg.js'; +import { run_app } from '../pkg/webgateway_fe_bg.js'; async function main() { run_app(); }