From 78299a6e7d54a87a92827a1822cb1e557e375f0b Mon Sep 17 00:00:00 2001 From: c9s Date: Tue, 6 Sep 2022 18:57:40 +0800 Subject: [PATCH] makefile: fix frontend app path --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index a11e68fe4..bdd1b9efe 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ OSX_APP_CODESIGN_IDENTITY ?= # OSX_APP_GUI ?= lorca OSX_APP_GUI ?= webview -FRONTEND_EXPORT_DIR = frontend/out +FRONTEND_EXPORT_DIR = apps/frontend/out BACKTEST_REPORT_APP_DIR = apps/backtest-report BACKTEST_REPORT_EXPORT_DIR = apps/backtest-report/out @@ -224,13 +224,13 @@ docker-push: docker push yoanlin/bbgo bash -c "[[ -n $(DOCKER_TAG) ]] && docker push yoanlin/bbgo:$(DOCKER_TAG)" -frontend/node_modules: - cd frontend && yarn install +apps/frontend/node_modules: + cd apps/frontend && yarn install -frontend/out/index.html: frontend/node_modules - cd frontend && yarn export +apps/frontend/out/index.html: apps/frontend/node_modules + cd apps/frontend && yarn export -pkg/server/assets.go: frontend/out/index.html +pkg/server/assets.go: apps/frontend/out/index.html go run ./utils/embed -package server -tag web -output $@ $(FRONTEND_EXPORT_DIR) $(BACKTEST_REPORT_APP_DIR)/node_modules: @@ -244,7 +244,7 @@ pkg/backtest/assets.go: $(BACKTEST_REPORT_APP_DIR)/out/index.html embed: pkg/server/assets.go pkg/backtest/assets.go -static: frontend/out/index.html pkg/server/assets.go pkg/backtest/assets.go +static: apps/frontend/out/index.html pkg/server/assets.go pkg/backtest/assets.go PROTOS := \ $(wildcard pkg/pb/*.proto)