From aedd16a33adce824dfedbba579ac8c92f3f33de5 Mon Sep 17 00:00:00 2001 From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com> Date: Tue, 4 Jul 2023 18:02:46 +0800 Subject: [PATCH] fix: fix cmd filename Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com> --- cmd/{api => openim_api}/Makefile | 0 cmd/{api => openim_api}/deploy.Dockerfile | 0 cmd/{api => openim_api}/main.go | 0 cmd/{cmdutils => openim_cmdutils}/Makefile | 0 cmd/{cmdutils => openim_cmdutils}/main.go | 0 cmd/{crontask => openim_crontask}/Makefile | 0 cmd/{crontask => openim_crontask}/deploy.Dockerfile | 0 cmd/{crontask => openim_crontask}/main.go | 0 cmd/{msggateway => openim_msggateway}/Makefile | 0 cmd/{msggateway => openim_msggateway}/deploy.Dockerfile | 0 cmd/{msggateway => openim_msggateway}/main.go | 0 cmd/{msgtransfer => openim_msgtransfer}/Makefile | 0 cmd/{msgtransfer => openim_msgtransfer}/deploy.Dockerfile | 0 cmd/{msgtransfer => openim_msgtransfer}/main.go | 0 cmd/{push => openim_push}/Makefile | 0 cmd/{push => openim_push}/deploy.Dockerfile | 0 cmd/{push => openim_push}/main.go | 0 cmd/{rpc/auth => openim_rpc/openim_rpc_auth}/Makefile | 0 .../auth => openim_rpc/openim_rpc_auth}/deploy.Dockerfile | 0 cmd/{rpc/auth => openim_rpc/openim_rpc_auth}/main.go | 0 .../openim_rpc_conversation}/Makefile | 0 .../openim_rpc_conversation}/deploy.Dockerfile | 0 .../openim_rpc_conversation}/main.go | 0 cmd/{rpc/friend => openim_rpc/openim_rpc_friend}/Makefile | 0 .../friend => openim_rpc/openim_rpc_friend}/deploy.Dockerfile | 0 cmd/{rpc/friend => openim_rpc/openim_rpc_friend}/main.go | 0 cmd/{rpc/group => openim_rpc/openim_rpc_group}/Makefile | 0 .../group => openim_rpc/openim_rpc_group}/deploy.Dockerfile | 0 cmd/{rpc/group => openim_rpc/openim_rpc_group}/main.go | 0 cmd/{rpc/msg => openim_rpc/openim_rpc_msg}/Makefile | 0 cmd/{rpc/msg => openim_rpc/openim_rpc_msg}/deploy.Dockerfile | 0 cmd/{rpc/msg => openim_rpc/openim_rpc_msg}/main.go | 0 cmd/{rpc/third => openim_rpc/openim_rpc_third}/Makefile | 0 .../third => openim_rpc/openim_rpc_third}/deploy.Dockerfile | 0 cmd/{rpc/third => openim_rpc/openim_rpc_third}/main.go | 0 cmd/{rpc/user => openim_rpc/openim_rpc_user}/Makefile | 0 .../user => openim_rpc/openim_rpc_user}/deploy.Dockerfile | 0 cmd/{rpc/user => openim_rpc/openim_rpc_user}/main.go | 0 scripts/make-rules/common.mk | 4 ++-- scripts/make-rules/golang.mk | 4 ++-- 40 files changed, 4 insertions(+), 4 deletions(-) rename cmd/{api => openim_api}/Makefile (100%) rename cmd/{api => openim_api}/deploy.Dockerfile (100%) rename cmd/{api => openim_api}/main.go (100%) rename cmd/{cmdutils => openim_cmdutils}/Makefile (100%) rename cmd/{cmdutils => openim_cmdutils}/main.go (100%) rename cmd/{crontask => openim_crontask}/Makefile (100%) rename cmd/{crontask => openim_crontask}/deploy.Dockerfile (100%) rename cmd/{crontask => openim_crontask}/main.go (100%) rename cmd/{msggateway => openim_msggateway}/Makefile (100%) rename cmd/{msggateway => openim_msggateway}/deploy.Dockerfile (100%) rename cmd/{msggateway => openim_msggateway}/main.go (100%) rename cmd/{msgtransfer => openim_msgtransfer}/Makefile (100%) rename cmd/{msgtransfer => openim_msgtransfer}/deploy.Dockerfile (100%) rename cmd/{msgtransfer => openim_msgtransfer}/main.go (100%) rename cmd/{push => openim_push}/Makefile (100%) rename cmd/{push => openim_push}/deploy.Dockerfile (100%) rename cmd/{push => openim_push}/main.go (100%) rename cmd/{rpc/auth => openim_rpc/openim_rpc_auth}/Makefile (100%) rename cmd/{rpc/auth => openim_rpc/openim_rpc_auth}/deploy.Dockerfile (100%) rename cmd/{rpc/auth => openim_rpc/openim_rpc_auth}/main.go (100%) rename cmd/{rpc/conversation => openim_rpc/openim_rpc_conversation}/Makefile (100%) rename cmd/{rpc/conversation => openim_rpc/openim_rpc_conversation}/deploy.Dockerfile (100%) rename cmd/{rpc/conversation => openim_rpc/openim_rpc_conversation}/main.go (100%) rename cmd/{rpc/friend => openim_rpc/openim_rpc_friend}/Makefile (100%) rename cmd/{rpc/friend => openim_rpc/openim_rpc_friend}/deploy.Dockerfile (100%) rename cmd/{rpc/friend => openim_rpc/openim_rpc_friend}/main.go (100%) rename cmd/{rpc/group => openim_rpc/openim_rpc_group}/Makefile (100%) rename cmd/{rpc/group => openim_rpc/openim_rpc_group}/deploy.Dockerfile (100%) rename cmd/{rpc/group => openim_rpc/openim_rpc_group}/main.go (100%) rename cmd/{rpc/msg => openim_rpc/openim_rpc_msg}/Makefile (100%) rename cmd/{rpc/msg => openim_rpc/openim_rpc_msg}/deploy.Dockerfile (100%) rename cmd/{rpc/msg => openim_rpc/openim_rpc_msg}/main.go (100%) rename cmd/{rpc/third => openim_rpc/openim_rpc_third}/Makefile (100%) rename cmd/{rpc/third => openim_rpc/openim_rpc_third}/deploy.Dockerfile (100%) rename cmd/{rpc/third => openim_rpc/openim_rpc_third}/main.go (100%) rename cmd/{rpc/user => openim_rpc/openim_rpc_user}/Makefile (100%) rename cmd/{rpc/user => openim_rpc/openim_rpc_user}/deploy.Dockerfile (100%) rename cmd/{rpc/user => openim_rpc/openim_rpc_user}/main.go (100%) diff --git a/cmd/api/Makefile b/cmd/openim_api/Makefile similarity index 100% rename from cmd/api/Makefile rename to cmd/openim_api/Makefile diff --git a/cmd/api/deploy.Dockerfile b/cmd/openim_api/deploy.Dockerfile similarity index 100% rename from cmd/api/deploy.Dockerfile rename to cmd/openim_api/deploy.Dockerfile diff --git a/cmd/api/main.go b/cmd/openim_api/main.go similarity index 100% rename from cmd/api/main.go rename to cmd/openim_api/main.go diff --git a/cmd/cmdutils/Makefile b/cmd/openim_cmdutils/Makefile similarity index 100% rename from cmd/cmdutils/Makefile rename to cmd/openim_cmdutils/Makefile diff --git a/cmd/cmdutils/main.go b/cmd/openim_cmdutils/main.go similarity index 100% rename from cmd/cmdutils/main.go rename to cmd/openim_cmdutils/main.go diff --git a/cmd/crontask/Makefile b/cmd/openim_crontask/Makefile similarity index 100% rename from cmd/crontask/Makefile rename to cmd/openim_crontask/Makefile diff --git a/cmd/crontask/deploy.Dockerfile b/cmd/openim_crontask/deploy.Dockerfile similarity index 100% rename from cmd/crontask/deploy.Dockerfile rename to cmd/openim_crontask/deploy.Dockerfile diff --git a/cmd/crontask/main.go b/cmd/openim_crontask/main.go similarity index 100% rename from cmd/crontask/main.go rename to cmd/openim_crontask/main.go diff --git a/cmd/msggateway/Makefile b/cmd/openim_msggateway/Makefile similarity index 100% rename from cmd/msggateway/Makefile rename to cmd/openim_msggateway/Makefile diff --git a/cmd/msggateway/deploy.Dockerfile b/cmd/openim_msggateway/deploy.Dockerfile similarity index 100% rename from cmd/msggateway/deploy.Dockerfile rename to cmd/openim_msggateway/deploy.Dockerfile diff --git a/cmd/msggateway/main.go b/cmd/openim_msggateway/main.go similarity index 100% rename from cmd/msggateway/main.go rename to cmd/openim_msggateway/main.go diff --git a/cmd/msgtransfer/Makefile b/cmd/openim_msgtransfer/Makefile similarity index 100% rename from cmd/msgtransfer/Makefile rename to cmd/openim_msgtransfer/Makefile diff --git a/cmd/msgtransfer/deploy.Dockerfile b/cmd/openim_msgtransfer/deploy.Dockerfile similarity index 100% rename from cmd/msgtransfer/deploy.Dockerfile rename to cmd/openim_msgtransfer/deploy.Dockerfile diff --git a/cmd/msgtransfer/main.go b/cmd/openim_msgtransfer/main.go similarity index 100% rename from cmd/msgtransfer/main.go rename to cmd/openim_msgtransfer/main.go diff --git a/cmd/push/Makefile b/cmd/openim_push/Makefile similarity index 100% rename from cmd/push/Makefile rename to cmd/openim_push/Makefile diff --git a/cmd/push/deploy.Dockerfile b/cmd/openim_push/deploy.Dockerfile similarity index 100% rename from cmd/push/deploy.Dockerfile rename to cmd/openim_push/deploy.Dockerfile diff --git a/cmd/push/main.go b/cmd/openim_push/main.go similarity index 100% rename from cmd/push/main.go rename to cmd/openim_push/main.go diff --git a/cmd/rpc/auth/Makefile b/cmd/openim_rpc/openim_rpc_auth/Makefile similarity index 100% rename from cmd/rpc/auth/Makefile rename to cmd/openim_rpc/openim_rpc_auth/Makefile diff --git a/cmd/rpc/auth/deploy.Dockerfile b/cmd/openim_rpc/openim_rpc_auth/deploy.Dockerfile similarity index 100% rename from cmd/rpc/auth/deploy.Dockerfile rename to cmd/openim_rpc/openim_rpc_auth/deploy.Dockerfile diff --git a/cmd/rpc/auth/main.go b/cmd/openim_rpc/openim_rpc_auth/main.go similarity index 100% rename from cmd/rpc/auth/main.go rename to cmd/openim_rpc/openim_rpc_auth/main.go diff --git a/cmd/rpc/conversation/Makefile b/cmd/openim_rpc/openim_rpc_conversation/Makefile similarity index 100% rename from cmd/rpc/conversation/Makefile rename to cmd/openim_rpc/openim_rpc_conversation/Makefile diff --git a/cmd/rpc/conversation/deploy.Dockerfile b/cmd/openim_rpc/openim_rpc_conversation/deploy.Dockerfile similarity index 100% rename from cmd/rpc/conversation/deploy.Dockerfile rename to cmd/openim_rpc/openim_rpc_conversation/deploy.Dockerfile diff --git a/cmd/rpc/conversation/main.go b/cmd/openim_rpc/openim_rpc_conversation/main.go similarity index 100% rename from cmd/rpc/conversation/main.go rename to cmd/openim_rpc/openim_rpc_conversation/main.go diff --git a/cmd/rpc/friend/Makefile b/cmd/openim_rpc/openim_rpc_friend/Makefile similarity index 100% rename from cmd/rpc/friend/Makefile rename to cmd/openim_rpc/openim_rpc_friend/Makefile diff --git a/cmd/rpc/friend/deploy.Dockerfile b/cmd/openim_rpc/openim_rpc_friend/deploy.Dockerfile similarity index 100% rename from cmd/rpc/friend/deploy.Dockerfile rename to cmd/openim_rpc/openim_rpc_friend/deploy.Dockerfile diff --git a/cmd/rpc/friend/main.go b/cmd/openim_rpc/openim_rpc_friend/main.go similarity index 100% rename from cmd/rpc/friend/main.go rename to cmd/openim_rpc/openim_rpc_friend/main.go diff --git a/cmd/rpc/group/Makefile b/cmd/openim_rpc/openim_rpc_group/Makefile similarity index 100% rename from cmd/rpc/group/Makefile rename to cmd/openim_rpc/openim_rpc_group/Makefile diff --git a/cmd/rpc/group/deploy.Dockerfile b/cmd/openim_rpc/openim_rpc_group/deploy.Dockerfile similarity index 100% rename from cmd/rpc/group/deploy.Dockerfile rename to cmd/openim_rpc/openim_rpc_group/deploy.Dockerfile diff --git a/cmd/rpc/group/main.go b/cmd/openim_rpc/openim_rpc_group/main.go similarity index 100% rename from cmd/rpc/group/main.go rename to cmd/openim_rpc/openim_rpc_group/main.go diff --git a/cmd/rpc/msg/Makefile b/cmd/openim_rpc/openim_rpc_msg/Makefile similarity index 100% rename from cmd/rpc/msg/Makefile rename to cmd/openim_rpc/openim_rpc_msg/Makefile diff --git a/cmd/rpc/msg/deploy.Dockerfile b/cmd/openim_rpc/openim_rpc_msg/deploy.Dockerfile similarity index 100% rename from cmd/rpc/msg/deploy.Dockerfile rename to cmd/openim_rpc/openim_rpc_msg/deploy.Dockerfile diff --git a/cmd/rpc/msg/main.go b/cmd/openim_rpc/openim_rpc_msg/main.go similarity index 100% rename from cmd/rpc/msg/main.go rename to cmd/openim_rpc/openim_rpc_msg/main.go diff --git a/cmd/rpc/third/Makefile b/cmd/openim_rpc/openim_rpc_third/Makefile similarity index 100% rename from cmd/rpc/third/Makefile rename to cmd/openim_rpc/openim_rpc_third/Makefile diff --git a/cmd/rpc/third/deploy.Dockerfile b/cmd/openim_rpc/openim_rpc_third/deploy.Dockerfile similarity index 100% rename from cmd/rpc/third/deploy.Dockerfile rename to cmd/openim_rpc/openim_rpc_third/deploy.Dockerfile diff --git a/cmd/rpc/third/main.go b/cmd/openim_rpc/openim_rpc_third/main.go similarity index 100% rename from cmd/rpc/third/main.go rename to cmd/openim_rpc/openim_rpc_third/main.go diff --git a/cmd/rpc/user/Makefile b/cmd/openim_rpc/openim_rpc_user/Makefile similarity index 100% rename from cmd/rpc/user/Makefile rename to cmd/openim_rpc/openim_rpc_user/Makefile diff --git a/cmd/rpc/user/deploy.Dockerfile b/cmd/openim_rpc/openim_rpc_user/deploy.Dockerfile similarity index 100% rename from cmd/rpc/user/deploy.Dockerfile rename to cmd/openim_rpc/openim_rpc_user/deploy.Dockerfile diff --git a/cmd/rpc/user/main.go b/cmd/openim_rpc/openim_rpc_user/main.go similarity index 100% rename from cmd/rpc/user/main.go rename to cmd/openim_rpc/openim_rpc_user/main.go diff --git a/scripts/make-rules/common.mk b/scripts/make-rules/common.mk index 568b019ca..72b395e28 100644 --- a/scripts/make-rules/common.mk +++ b/scripts/make-rules/common.mk @@ -85,9 +85,9 @@ GOBIN=$(shell go env GOBIN) endif # The OS must be linux when building docker images -PLATFORMS ?= linux_amd64 linux_arm64 +# PLATFORMS ?= linux_amd64 linux_arm64 # The OS can be linux/windows/darwin when building binaries -# PLATFORMS ?= darwin_amd64 windows_amd64 linux_amd64 linux_arm64 +PLATFORMS ?= linux_s390x linux_mips64 linux_mips64le darwin_amd64 windows_amd64 linux_amd64 linux_arm64 # only support linux GOOS=linux diff --git a/scripts/make-rules/golang.mk b/scripts/make-rules/golang.mk index bf503db63..03be95a91 100644 --- a/scripts/make-rules/golang.mk +++ b/scripts/make-rules/golang.mk @@ -113,8 +113,8 @@ go.build.%: @mkdir -p $(BIN_DIR)/platforms/$(OS)/$(ARCH) @if [ "$(COMMAND)" == "openim-sdk-core" ]; then \ echo "===========> DEBUG: Compilation is not yet supported $(COMMAND)"; \ - elif [ "$(COMMAND)" == "rpc" ]; then \ - for d in $(wildcard $(ROOT_DIR)/cmd/rpc/*); do \ + elif [ "$(COMMAND)" == "openim_rpc" ]; then \ + for d in $(wildcard $(ROOT_DIR)/cmd/openim_rpc/*); do \ cd $${d} && CGO_ENABLED=0 GOOS=$(OS) GOARCH=$(ARCH) $(GO) build $(GO_BUILD_FLAGS) -o \ $(BIN_DIR)/platforms/$(OS)/$(ARCH)/$$(basename $${d})$(GO_OUT_EXT) $${d}/main.go; \ done; \