From afd0bd642841f4dee9ca29c4913a26319aa28dd9 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Sun, 1 Dec 2024 18:41:00 -0600
Subject: switched to autogenpb

---
 Makefile | 42 ++++++++----------------------------------
 1 file changed, 8 insertions(+), 34 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 317ce8b..7540aeb 100644
--- a/Makefile
+++ b/Makefile
@@ -3,27 +3,15 @@
 # cd ~/go/src/google.golang.org/protobuf/cmd/protoc-gen-go
 # go install
 
-check-for-protoc-gen-go:
-	@if [ -f "/usr/bin/protoc-gen-go" ]; then \
-		echo "the protoc-gen-go package is old in debian sid right now"; \
-		echo "for now, remove it"; \
-		echo "and install protoc-gen-go-wit from mirrors.wit.com"; \
-	fi
-	make all
+all: droplet.pb.go hypervisor.pb.go event.pb.go experiments.pb.go vet
 
-all: droplet.pb.go hypervisor.pb.go event.pb.go experiments.pb.go
-	make -C example
-
-vet: lint
-	GO111MODULE=off go vet
-
-lint:
-	-buf lint droplet.proto
+vet:
+	@GO111MODULE=off go vet
+	@echo this go library package builds okay
 
 # autofixes your import headers in your golang files
 goimports:
 	goimports -w *.go
-	make -C example goimports
 
 redomod:
 	rm -f go.*
@@ -33,32 +21,18 @@ redomod:
 clean:
 	rm -f *.pb.go
 	-rm -f go.*
-	make -C example clean
 
 droplet.pb.go: 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
+	autogenpb --proto droplet.proto --mutex
 
 hypervisor.pb.go: hypervisor.proto
-	cd ~/go/src && protoc --go_out=. --proto_path=go.wit.com/lib/protobuf/virtbuf \
-		--go_opt=Mhypervisor.proto=go.wit.com/lib/protobuf/virtbuf \
-		hypervisor.proto
+	autogenpb --proto hypervisor.proto --mutex
 
 event.pb.go: event.proto
-	cd ~/go/src && protoc --go_out=. \
-		--proto_path=go.wit.com/lib/protobuf/virtbuf \
-		--go_opt=Mevent.proto=go.wit.com/lib/protobuf/virtbuf \
-		event.proto
+	autogenpb --proto event.proto --mutex
 
 experiments.pb.go: experiments.proto
-	cd ~/go/src && protoc --go_out=. \
-		--proto_path=go.wit.com/lib/protobuf/virtbuf \
-		--go_opt=Mexperiments.proto=go.wit.com/lib/protobuf/virtbuf \
-		experiments.proto
+	autogenpb --proto experiments.proto --no-marshal --no-sort
 
 deps:
 	apt install golang-goprotobuf-dev
-- 
cgit v1.2.3