-
Notifications
You must be signed in to change notification settings - Fork 373
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* update protoc and related updated protoc to v25.2 updated protoc-gen-go to v1.32.0 added protoc-gen-go-grpc at v1.3.0 Modified the makefile to use "go install" to install tools. Use extended regular expressions in "sed" command. Fixes build on arm OSX host * fix github actions Always run "make build_go" on github actions Always update the timesptamp of spec.md/csi.proto to make sure lib/go is built on CI * remove github.com/golang/protobuf usage * simplify Makefile - use git to check for out-of-date generated files, avoids all the temp files and manual diff in the Makefile. - not specify version for protoc-gen-go, it will use the version from go.mod - do not copy over the protoc binary. Call it directly from unzipped path. So it can find the includes automatically, and we don't need the -I or --go_opts=Mxxx flags. - use paths=source_relative to generate go files directly into destination, avoid the copy. - simplify the sed command used to extract "csi.proto" file.
- Loading branch information
Showing
9 changed files
with
7,712 additions
and
4,615 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,14 +14,19 @@ GOPATH := $(word 1,$(subst :, ,$(GOPATH))) | |
| endif | ||
| export GOPATH | ||
|
|
||
| GOBIN := $(shell go env GOBIN) | ||
| ifeq (,$(strip $(GOBIN))) | ||
| GOBIN := $(GOPATH)/bin | ||
| endif | ||
|
|
||
|
|
||
| ######################################################################## | ||
| ## PROTOC ## | ||
| ######################################################################## | ||
|
|
||
| # Only set PROTOC_VER if it has an empty value. | ||
| ifeq (,$(strip $(PROTOC_VER))) | ||
| PROTOC_VER := 3.9.1 | ||
| PROTOC_VER := 25.2 | ||
| endif | ||
|
|
||
| PROTOC_OS := $(shell uname -s) | ||
|
|
@@ -32,95 +37,60 @@ endif | |
| PROTOC_ARCH := $(shell uname -m) | ||
| ifeq (i386,$(PROTOC_ARCH)) | ||
| PROTOC_ARCH := x86_32 | ||
| else ifeq (arm64,$(PROTOC_ARCH)) | ||
| PROTOC_ARCH := aarch_64 | ||
| endif | ||
|
|
||
| PROTOC := ./protoc | ||
| PROTOC_ZIP := protoc-$(PROTOC_VER)-$(PROTOC_OS)-$(PROTOC_ARCH).zip | ||
| PROTOC_URL := https://github.com/google/protobuf/releases/download/v$(PROTOC_VER)/$(PROTOC_ZIP) | ||
| PROTOC_URL := https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOC_VER)/$(PROTOC_ZIP) | ||
| PROTOC_TMP_DIR := .protoc | ||
| PROTOC_TMP_BIN := $(PROTOC_TMP_DIR)/bin/protoc | ||
| PROTOC := $(PROTOC_TMP_DIR)/bin/protoc | ||
|
|
||
| $(GOBIN)/protoc-gen-go: ../../go.mod | ||
| go install google.golang.org/protobuf/cmd/protoc-gen-go | ||
| $(GOBIN)/protoc-gen-go-grpc: | ||
| go install google.golang.org/grpc/cmd/[email protected] | ||
|
|
||
| $(PROTOC): | ||
| -mkdir -p "$(PROTOC_TMP_DIR)" && \ | ||
| curl -L $(PROTOC_URL) -o "$(PROTOC_TMP_DIR)/$(PROTOC_ZIP)" && \ | ||
| unzip "$(PROTOC_TMP_DIR)/$(PROTOC_ZIP)" -d "$(PROTOC_TMP_DIR)" && \ | ||
| chmod 0755 "$(PROTOC_TMP_BIN)" && \ | ||
| cp -f "$(PROTOC_TMP_BIN)" "$@" | ||
| chmod 0755 "$@" | ||
| stat "$@" > /dev/null 2>&1 | ||
|
|
||
|
|
||
| ######################################################################## | ||
| ## PROTOC-GEN-GO ## | ||
| ######################################################################## | ||
|
|
||
| # This is the recipe for getting and installing the go plug-in | ||
| # for protoc | ||
| PROTOC_GEN_GO_PKG := github.com/golang/protobuf/protoc-gen-go | ||
| PROTOC_GEN_GO := protoc-gen-go | ||
| $(PROTOC_GEN_GO): PROTOBUF_PKG := $(dir $(PROTOC_GEN_GO_PKG)) | ||
| $(PROTOC_GEN_GO): PROTOBUF_VERSION := v1.3.2 | ||
| $(PROTOC_GEN_GO): | ||
| mkdir -p $(dir $(GOPATH)/src/$(PROTOBUF_PKG)) | ||
| test -d $(GOPATH)/src/$(PROTOBUF_PKG)/.git || git clone https://$(PROTOBUF_PKG) $(GOPATH)/src/$(PROTOBUF_PKG) | ||
| (cd $(GOPATH)/src/$(PROTOBUF_PKG) && \ | ||
| (test "$$(git describe --tags | head -1)" = "$(PROTOBUF_VERSION)" || \ | ||
| (git fetch && git checkout tags/$(PROTOBUF_VERSION)))) | ||
| (cd $(GOPATH)/src/$(PROTOBUF_PKG) && go get -v -d $$(go list -f '{{ .ImportPath }}' ./...)) && \ | ||
| go build -o "$@" $(PROTOC_GEN_GO_PKG) | ||
|
|
||
| PROTOC_ALL := $(GOBIN)/protoc-gen-go $(GOBIN)/protoc-gen-go-grpc $(PROTOC) | ||
|
|
||
| ######################################################################## | ||
| ## PATH ## | ||
| ######################################################################## | ||
|
|
||
| # Update PATH with the current directory. This enables the protoc | ||
| # binary to discover the protoc-gen-go binary, built inside this | ||
| # directory. | ||
| export PATH := $(shell pwd):$(PATH) | ||
| # Update PATH with GOBIN. This enables the protoc binary to discover | ||
| # the protoc-gen-go binary | ||
| export PATH := $(GOBIN):$(PATH) | ||
|
|
||
|
|
||
| ######################################################################## | ||
| ## BUILD ## | ||
| ######################################################################## | ||
| CSI_PROTO := ../../csi.proto | ||
| CSI_PKG_ROOT := github.com/container-storage-interface/spec | ||
| CSI_PKG_SUB := $(shell cat $(CSI_PROTO) | sed -n -e 's/^package.\([^;]*\).v[0-9]\+;$$/\1/p'|tr '.' '/') | ||
| CSI_BUILD := $(CSI_PKG_SUB)/.build | ||
| CSI_PKG_SUB := csi | ||
| CSI_GO := $(CSI_PKG_SUB)/csi.pb.go | ||
| CSI_GO_TMP := $(CSI_BUILD)/$(CSI_PKG_ROOT)/csi.pb.go | ||
|
|
||
| # This recipe generates the go language bindings to a temp area. | ||
| $(CSI_GO_TMP): HERE := $(shell pwd) | ||
| $(CSI_GO_TMP): PTYPES_PKG := github.com/golang/protobuf/ptypes | ||
| $(CSI_GO_TMP): GO_OUT := plugins=grpc | ||
| $(CSI_GO_TMP): GO_OUT := $(GO_OUT),Mgoogle/protobuf/descriptor.proto=github.com/golang/protobuf/protoc-gen-go/descriptor | ||
| $(CSI_GO_TMP): GO_OUT := $(GO_OUT),Mgoogle/protobuf/wrappers.proto=$(PTYPES_PKG)/wrappers | ||
| $(CSI_GO_TMP): GO_OUT := $(GO_OUT):"$(HERE)/$(CSI_BUILD)" | ||
| $(CSI_GO_TMP): INCLUDE := -I$(GOPATH)/src -I$(HERE)/$(PROTOC_TMP_DIR)/include | ||
| $(CSI_GO_TMP): $(CSI_PROTO) | $(PROTOC) $(PROTOC_GEN_GO) | ||
| @mkdir -p "$(@D)" | ||
| (cd "$(GOPATH)/src" && \ | ||
| $(HERE)/$(PROTOC) $(INCLUDE) --go_out=$(GO_OUT) "$(CSI_PKG_ROOT)/$(<F)") | ||
|
|
||
| # The temp language bindings are compared to the ones that are | ||
| # versioned. If they are different then it means the language | ||
| # bindings were not updated prior to being committed. | ||
| $(CSI_GO): $(CSI_GO_TMP) | ||
| ifeq (true,$(GITHUB_ACTIONS)) | ||
| diff "$@" "$?" | ||
| else | ||
| @mkdir -p "$(@D)" | ||
| diff "$@" "$?" > /dev/null 2>&1 || cp -f "$?" "$@" | ||
| endif | ||
| CSI_GRPC := $(CSI_PKG_SUB)/csi_grpc.pb.go | ||
|
|
||
| # This recipe generates the go language bindings | ||
| $(CSI_GO) $(CSI_GRPC): $(CSI_PROTO) $(PROTOC_ALL) | ||
| @mkdir -p "$(@D)" | ||
| $(PROTOC) -I../.. --go-grpc_out=$(CSI_PKG_SUB) --go_out=$(CSI_PKG_SUB) \ | ||
| --go_opt=paths=source_relative --go-grpc_opt=paths=source_relative \ | ||
| "$(<F)" | ||
|
|
||
| build: $(CSI_GO) | ||
| build: $(CSI_GO) $(CSI_GRPC) | ||
|
|
||
| clean: | ||
| go clean -i ./... | ||
| rm -rf "$(CSI_GO)" "$(CSI_BUILD)" | ||
| rm -rf "$(CSI_PKG_SUB)" | ||
|
|
||
| clobber: clean | ||
| rm -fr "$(PROTOC)" "$(PROTOC_GEN_GO)" "$(CSI_PKG_SUB)" | ||
| rm -fr "$(PROTOC_TMP_DIR)" | ||
|
|
||
| .PHONY: clean clobber | ||
Oops, something went wrong.