Skip to content

Commit

Permalink
fix(core): generate metric.pb.go with protoc v14
Browse files Browse the repository at this point in the history
Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
  • Loading branch information
90dy committed Aug 5, 2019
1 parent cebf7f5 commit a9b1a3b
Show file tree
Hide file tree
Showing 21 changed files with 674 additions and 631 deletions.
12 changes: 7 additions & 5 deletions core/Makefile
Expand Up @@ -2,13 +2,15 @@ rwildcard = $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subs
NAME ?= berty
# FIXME: create a everythingButVendor helper that runs a wildcard but ignores node_modules/ and vendor/, and simplify variables below
GOPATH ?= $(HOME)/go
GO_ROOT_PACKAGES := ../core ../network
GO_ROOT_PACKAGES_VENDORS := ../core/vendor/% ../network/vendor/%
BIN ?= $(GOPATH)/bin/berty
BUILD_MODE ?= dev
SOURCES = $(call rwildcard, ./, *.go)
OUR_SOURCES = $(filter-out $(call rwildcard,./vendor/, *.go),$(SOURCES))
PROTOS = $(strip $(call rwildcard, ./, *.proto))
OUR_PROTOS = $(filter-out $(call rwildcard,./vendor/, *.proto),$(PROTOS))
PROTOC_OPTS = --proto_path=/protobuf:./vendor/berty.tech:./vendor/github.com/gogo/protobuf:vendor:.
SOURCES = $(strip $(call rwildcard, $(GO_ROOT_PACKAGES), *.go))
OUR_SOURCES = $(filter-out $(GO_ROOT_PACKAGES_VENDORS),$(SOURCES))
PROTOS = $(strip $(call rwildcard, $(GO_ROOT_PACKAGES), *.proto))
OUR_PROTOS = $(filter-out $(GO_ROOT_PACKAGES_VENDORS),$(PROTOS))
PROTOC_OPTS = -I /protobuf:./vendor/berty.tech:./vendor/github.com/gogo/protobuf:vendor:../network:.
SERVICE_PROTOS = $(call rwildcard, api, *.proto)
GENERATED_PATTERNS = %.validate.gen.go %.service.gen.go %generated.gen.go %kind.gen.go %.pb.go %.gen.js
GENERATED_FILES = $(filter $(GENERATED_PATTERNS),$(filter-out $(call rwildcard ./vendor/,*),$(call rwildcard,./,*)))
Expand Down
52 changes: 26 additions & 26 deletions core/api/node/kind.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/api/node/kind.proto
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package berty.node;

import "network/metric/metric.proto";
import "berty.tech/network/metric/metric.proto";
import "gogoproto/gogo.proto";

option go_package = "berty.tech/core/api/node";
Expand Down

0 comments on commit a9b1a3b

Please sign in to comment.