From d2a5852860b83eefcc25f81c6383b5ae85b0e30d Mon Sep 17 00:00:00 2001 From: Jovi Hsu Date: Mon, 29 Nov 2021 16:16:25 +0800 Subject: [PATCH] add command to build release target --- Makefile.toml | 9 ++++++--- README.md | 2 +- backend/Makefile.toml | 19 +++++++++++++++++-- frontend/Makefile.toml | 13 ++++++++++--- run.sh | 8 +++++++- 5 files changed, 41 insertions(+), 10 deletions(-) diff --git a/Makefile.toml b/Makefile.toml index 87e2a58..21a3e9d 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -1,8 +1,11 @@ -[tasks.install] -dependencies = ["build", "member_flow"] +[tasks.install-debug] +dependencies = ["build-debug", "member_flow"] + +[tasks.install-release] +dependencies = ["build-release", "member_flow"] [tasks.member_flow] -run_task = { name = "member_flow", fork = true } +run_task = { name = "member_flow", fork = true, parallel = true} [env] INSTALL_PATH= "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/build" diff --git a/README.md b/README.md index 2f5d1cc..80660ad 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ * Debug - sh run.sh * Relese - - TBD + - sh run.sh r ## Milestones diff --git a/backend/Makefile.toml b/backend/Makefile.toml index f9a9887..2728eba 100644 --- a/backend/Makefile.toml +++ b/backend/Makefile.toml @@ -1,6 +1,21 @@ -[tasks.install] -dependencies = ["build"] +[tasks.build-debug] +command="cargo" +args=["build"] + +[tasks.build-release] +command="cargo" +args=["build", "--release"] + +[tasks.install-debug] +dependencies = ["build-debug"] script = ''' mkdir -p $INSTALL_PATH cp $CARGO_MAKE_CRATE_TARGET_DIRECTORY/debug/$CARGO_MAKE_CRATE_NAME $INSTALL_PATH + ''' + +[tasks.install-release] +dependencies = ["build-release"] +script = ''' + mkdir -p $INSTALL_PATH + cp $CARGO_MAKE_CRATE_TARGET_DIRECTORY/release/$CARGO_MAKE_CRATE_NAME $INSTALL_PATH ''' \ No newline at end of file diff --git a/frontend/Makefile.toml b/frontend/Makefile.toml index 0c7777b..3fad48a 100644 --- a/frontend/Makefile.toml +++ b/frontend/Makefile.toml @@ -1,9 +1,16 @@ -[tasks.build] +[tasks.build-debug] command = "wasm-pack" args = ["build", "--target", "web", "--out-name", "wasm", "--out-dir", "./pkg", "--dev"] -[tasks.install] -dependencies=["build", "install_wasm", "install_html"] +[tasks.build-release] +command = "wasm-pack" +args = ["build", "--target", "web", "--out-name", "wasm", "--out-dir", "./pkg"] + +[tasks.install-debug] +dependencies=["build-debug", "install_wasm", "install_html"] + +[tasks.install-release] +dependencies=["build-release", "install_wasm", "install_html"] [tasks.install_wasm] script = ''' diff --git a/run.sh b/run.sh index ad873ef..397bcb7 100644 --- a/run.sh +++ b/run.sh @@ -1,3 +1,9 @@ set -e -cargo make install + +if [ "r" = "$1" ]; then + cargo make install-release +else + cargo make install-debug +fi + cd build && ./webgateway-be