Skip to content

Makefile: update protobuf generation instructions #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kevinburke1 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Makefile: update protobuf generation instructions #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e10923c
Makefile: update protobuf generation instructions
kevinburke1 Jun 4, 2021
b151811
phonenumberutil: update package references
kevinburke1 Jun 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 37 additions & 9 deletions Gopkg.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@


[[constraint]]
name = "github.com/golang/protobuf"
name = "google.golang.org/protobuf"
version = "1.0.0"

[[constraint]]
Expand Down
5 changes: 1 addition & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ endif
nothing:

generate_proto:
docker run --rm -v $(PWD):$(PWD) -w $(PWD) znly/protoc -I. --go_out=Mgoogle/protobuf/field_mask.proto=github.com/google/go-genproto/protobuf/field_mask,plugins=grpc:./ ./google_libphonenumber/resources/*.proto
mv ./google_libphonenumber/resources/*.pb.go ./
sudo chown -R $(WHOAMI) *
$(SED_I) -E 's/package i18n_phonenumbers/package libphonenumber/g' $(shell ls *.pb.go)
protoc -I. --go_out=. --go_opt=Mgoogle_libphonenumber/resources/phonemetadata.proto=../libphonenumber --go_opt=Mgoogle_libphonenumber/resources/phonenumber.proto=../libphonenumber ./google_libphonenumber/resources/*.proto
awk '/static const unsigned char/ { show=1 } show; /}/ { show=0 }' ./google_libphonenumber/cpp/src/phonenumbers/metadata.cc | tail -n +2 | sed '$$d' | sed -E 's/([^,])$$/\1,/g' | awk 'BEGIN{print "package libphonenumber\nvar metaData = []byte{"}; {print}; END{print "}"}' > metagen.go
go fmt ./metagen.go

Expand Down
26,240 changes: 13,497 additions & 12,743 deletions metagen.go
View file
Open in desktop

Large diffs are not rendered by default.

Loading