From 4a79cccffd6cd20e42271eada567c4b8c0edc2f4 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 29 Nov 2024 18:15:25 -0600 Subject: attempt to use go.wit.com/apps/autogenpb for sort --- Makefile | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cefd157..0f39f91 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ # go install -all: refs.pb.go gitTags.pb.go godep.pb.go repo.pb.go +all: gitTag.pb.go goDep.pb.go repo.pb.go make -C scanGoSrc/ vet: lint @@ -29,26 +29,28 @@ clean: -rm -f go.* make -C scanGoSrc clean -refs.pb.go: refs.proto - cd ~/go/src && protoc --go_out=. --proto_path=go.wit.com/lib/protobuf/gitpb \ - --go_opt=Mrefs.proto=go.wit.com/lib/protobuf/gitpb \ - refs.proto +#refs.pb.go: refs.proto +# cd ~/go/src && protoc --go_out=. --proto_path=go.wit.com/lib/protobuf/gitpb \ +# --go_opt=Mrefs.proto=go.wit.com/lib/protobuf/gitpb \ +# refs.proto -gitTags.pb.go: gitTags.proto +gitTag.pb.go: gitTag.proto cd ~/go/src && protoc --go_out=. --proto_path=go.wit.com/lib/protobuf/gitpb \ - --go_opt=MgitTags.proto=go.wit.com/lib/protobuf/gitpb \ - gitTags.proto + --go_opt=MgitTag.proto=go.wit.com/lib/protobuf/gitpb \ + gitTag.proto + autogenpb --proto gitTag.proto --sort "ByName,Refname" --sort "ByHash,Hash" --no-marshal -godep.pb.go: godep.proto +goDep.pb.go: goDep.proto cd ~/go/src && protoc --go_out=. --proto_path=go.wit.com/lib/protobuf/gitpb \ - --go_opt=Mgodep.proto=go.wit.com/lib/protobuf/gitpb \ - godep.proto + --go_opt=MgoDep.proto=go.wit.com/lib/protobuf/gitpb \ + goDep.proto + autogenpb --proto goDep.proto --sort "ByPath,GoPath" --no-marshal repo.pb.go: repo.proto cd ~/go/src && protoc --go_out=. --proto_path=go.wit.com/lib/protobuf/gitpb \ --go_opt=Mrefs.proto=go.wit.com/lib/protobuf/gitpb \ - --go_opt=Mgodep.proto=go.wit.com/lib/protobuf/gitpb \ + --go_opt=MgoDep.proto=go.wit.com/lib/protobuf/gitpb \ --go_opt=Mrepo.proto=go.wit.com/lib/protobuf/gitpb \ - --go_opt=MgitTags.proto=go.wit.com/lib/protobuf/gitpb \ + --go_opt=MgitTag.proto=go.wit.com/lib/protobuf/gitpb \ repo.proto autogenpb --proto repo.proto --sort "ByPath,GoPath" -- cgit v1.2.3