From 884fa288d0cbec904782db7a5045d448721007a3 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 21 Oct 2024 18:28:59 -0500 Subject: [PATCH] build using google.golang.org Signed-off-by: Jeff Carr --- Makefile | 8 +++++++- configfile/main.go | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 43c32d0..80c27a3 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,13 @@ clean: cd configfile && make clean droplet.pb.go: droplet.proto - protoc --go_out=. droplet.proto + # protoc --go_out=. droplet.proto + # This is switched over to use the new protoc-gen-go from google.golang.org/protobuf/cmd/protoc-gen-go + # the debian one (2024/10/21) seems to be the older/original one from github.com/golang/protobuf/protoc-gen-go + cd ~/go/src && protoc --go_out=. --proto_path=go.wit.com/lib/protobuf/virtbuf \ + --go_opt=Mdroplet.proto=go.wit.com/lib/protobuf/virtbuf \ + droplet.proto + events.pb.go: events.proto protoc --go_out=. events.proto diff --git a/configfile/main.go b/configfile/main.go index 3cc713c..56a0d28 100644 --- a/configfile/main.go +++ b/configfile/main.go @@ -6,8 +6,7 @@ import "os" import "bufio" import "io/ioutil" -import "github.com/golang/protobuf/proto" -// import "google.golang.org/protobuf/proto" +import "google.golang.org/protobuf/proto" import pb "go.wit.com/lib/protobuf/virtbuf" //