From 091c237451e71080353931352ce1f49f6f9b22e9 Mon Sep 17 00:00:00 2001
From: "Xinwei Xiong(cubxxw)" <3293172751nss@gmail.com>
Date: Thu, 8 Jun 2023 05:58:27 +0800
Subject: [PATCH] feat(main): optimize build design

Signed-off-by: Xinwei Xiong(cubxxw) <3293172751nss@gmail.com>
---
 docker-compose.yaml         | 2 --
 script/make-rules/golang.mk | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 5fa6eff13..b1e4d689e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -65,7 +65,6 @@ services:
       TZ: Asia/Shanghai
     restart: always
 
-
   kafka:
     image: wurstmeister/kafka
     container_name: kafka
@@ -113,7 +112,6 @@ services:
     restart: always
     command: minio server /data --console-address ':9090'
 
-
   open_im_server:
     image: openim/open_im_server:v2.3.9
     container_name: open_im_server
diff --git a/script/make-rules/golang.mk b/script/make-rules/golang.mk
index 715a8e328..395fdb143 100644
--- a/script/make-rules/golang.mk
+++ b/script/make-rules/golang.mk
@@ -110,11 +110,11 @@ go.build.%:
 	@echo "=====> PLATFORM=$(PLATFORM)"
 	@echo "=====> BIN_DIR=$(BIN_DIR)"
 	@echo "===========> Building binary $(COMMAND) $(VERSION) for $(OS)_$(ARCH)"
-	@mkdir -p $(OUTPUT_DIR)/platforms/$(OS)/$(ARCH)
+	@mkdir -p $(BIN_DIR)/platforms/$(OS)/$(ARCH)
 	@if [ "$(COMMAND)" == "rpc" ] || [ "$(COMMAND)" == "Open-IM-SDK-Core" ]; then \
 		echo "===========> Compilation is not yet supported $(COMMAND)"; \
 	else \
-		CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) $(GO) build $(GO_BUILD_FLAGS) -o $(OUTPUT_DIR)/platforms/$(OS)/$(ARCH)/$(COMMAND)$(GO_OUT_EXT) $(ROOT_DIR)/cmd/$(COMMAND)/main.go; \
+		CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) $(GO) build $(GO_BUILD_FLAGS) -o $(BIN_DIR)/platforms/$(OS)/$(ARCH)/$(COMMAND)$(GO_OUT_EXT) $(ROOT_DIR)/cmd/$(COMMAND)/main.go; \
 	fi
 
 ## go.multiarch: Build multi-arch binaries
@@ -147,7 +147,7 @@ go.test.junit-report: tools.verify.go-junit-report
 	@echo "===========> Run unit test > $(TMP_DIR)/report.xml"
 	@$(GO) test -v -coverprofile=$(TMP_DIR)/coverage.out 2>&1 ./... | $(TOOLS_DIR)/go-junit-report -set-exit-code > $(OUTPUT_DIR)/report.xml
 	@sed -i '/mock_.*.go/d' $(TMP_DIR)/coverage.out
-	@echo "===========> Test coverage of Go code is reported to $(OUTPUT_DIR)/coverage.html by generating HTML"
+	@echo "===========> Test coverage of Go code is reported to $(TMP_DIR)/coverage.html by generating HTML"
 	@$(GO) tool cover -html=$(TMP_DIR)/coverage.out -o $(TMP_DIR)/coverage.html
 
 ## go.test.cover: Run unit test with coverage