From ba5ce10a15f25bbfbfc902419c0891d6e36fa5b3 Mon Sep 17 00:00:00 2001 From: "insanity@loafle.com" Date: Tue, 27 Jun 2017 16:08:17 +0900 Subject: [PATCH] tttt --- echoserver/Makefile | 10 +++----- echoserver/echoserver.pb.go | 47 +++++++++++++++++----------------- echoserver/echoserver.pb.gw.go | 2 +- 3 files changed, 28 insertions(+), 31 deletions(-) diff --git a/echoserver/Makefile b/echoserver/Makefile index 8498799..4e0b366 100644 --- a/echoserver/Makefile +++ b/echoserver/Makefile @@ -1,6 +1,4 @@ -all: - protoc -I/usr/local/include -I. \ - -I${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \ - --go_out=plugins=grpc:. \ - --grpc-gateway_out=logtostderr=true:. \ - echoserver.proto +protoc -I/usr/local/include -I. -I${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis --go_out=plugins=grpc:. --grpc-gateway_out=logtostderr=true:. echoserver/echoserver.proto + +protoc -I/usr/local/include -I. -I$GOPATH/src -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis + -I grpc/ grpc/grpc.proto --go_out=plugins=grpc:grpc diff --git a/echoserver/echoserver.pb.go b/echoserver/echoserver.pb.go index 144516d..2b4177e 100644 --- a/echoserver/echoserver.pb.go +++ b/echoserver/echoserver.pb.go @@ -1,12 +1,11 @@ -// Code generated by protoc-gen-go. -// source: echoserver.proto -// DO NOT EDIT! +// Code generated by protoc-gen-go. DO NOT EDIT. +// source: echoserver/echoserver.proto /* Package echoserver is a generated protocol buffer package. It is generated from these files: - echoserver.proto + echoserver/echoserver.proto It has these top-level messages: EchoRequest @@ -348,30 +347,30 @@ var _EchoService_serviceDesc = grpc.ServiceDesc{ ClientStreams: true, }, }, - Metadata: "echoserver.proto", + Metadata: "echoserver/echoserver.proto", } -func init() { proto.RegisterFile("echoserver.proto", fileDescriptor0) } +func init() { proto.RegisterFile("echoserver/echoserver.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 300 bytes of a gzipped FileDescriptorProto + // 303 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xc1, 0x4a, 0xc3, 0x40, - 0x10, 0x86, 0xdd, 0x62, 0x13, 0x3a, 0xb5, 0x12, 0x57, 0xc4, 0x50, 0x2a, 0xc8, 0x5e, 0x0c, 0x1e, + 0x10, 0x86, 0xdd, 0x62, 0x13, 0x3a, 0xb5, 0x52, 0x57, 0xc4, 0x52, 0x2b, 0xc8, 0x5e, 0x2c, 0x1e, 0x92, 0x52, 0x3d, 0x79, 0xaf, 0x08, 0x85, 0x04, 0x52, 0xc4, 0xab, 0xdb, 0x30, 0x24, 0x01, 0x93, - 0x8d, 0xbb, 0xdb, 0x82, 0x57, 0x5f, 0xc1, 0x47, 0xf3, 0x15, 0x7c, 0x07, 0xaf, 0x92, 0xac, 0xc6, - 0x88, 0xa5, 0xc7, 0x99, 0xfd, 0xe6, 0x9f, 0xff, 0xdf, 0x01, 0x07, 0x93, 0x4c, 0x28, 0x94, 0x1b, - 0x94, 0x7e, 0x25, 0x85, 0x16, 0x14, 0x7e, 0x3b, 0xe3, 0x49, 0x2a, 0x44, 0xfa, 0x84, 0x01, 0xaf, - 0xf2, 0x80, 0x97, 0xa5, 0xd0, 0x5c, 0xe7, 0xa2, 0x54, 0x86, 0x64, 0x17, 0x30, 0x9c, 0x27, 0x99, - 0x88, 0xf1, 0x79, 0x8d, 0x4a, 0x53, 0x17, 0xec, 0x02, 0x95, 0xe2, 0x29, 0xba, 0xe4, 0x9c, 0x78, - 0x83, 0xf8, 0xa7, 0x64, 0x1e, 0x1c, 0x18, 0x50, 0x55, 0xa2, 0x54, 0xb8, 0x83, 0x7c, 0x84, 0xc1, - 0x1d, 0x72, 0xa9, 0x57, 0xc8, 0x35, 0xbd, 0x06, 0x4b, 0x69, 0xae, 0xd7, 0xaa, 0xa1, 0x0e, 0x67, - 0x13, 0xbf, 0x63, 0xb6, 0xc5, 0xfc, 0x65, 0xc3, 0xc4, 0xdf, 0x2c, 0x3b, 0x03, 0xcb, 0x74, 0xe8, - 0x10, 0xec, 0xfb, 0x70, 0x11, 0x46, 0x0f, 0xa1, 0xb3, 0x47, 0x2d, 0xe8, 0x45, 0x0b, 0x87, 0x30, - 0x1b, 0xfa, 0xf3, 0xa2, 0xd2, 0x2f, 0xb3, 0x4f, 0x62, 0xec, 0x2f, 0x51, 0x6e, 0xf2, 0x04, 0x69, - 0x04, 0xfb, 0x75, 0x49, 0x4f, 0xbb, 0x5b, 0x3a, 0xf9, 0xc6, 0xee, 0xff, 0x07, 0x93, 0x87, 0x39, - 0xaf, 0xef, 0x1f, 0x6f, 0x3d, 0x60, 0xfd, 0xa0, 0x26, 0x6e, 0xc8, 0xa5, 0x47, 0xa6, 0x84, 0xde, - 0xd6, 0x46, 0x24, 0xf2, 0x82, 0x1e, 0xfd, 0x99, 0xac, 0xb7, 0xef, 0x10, 0x1b, 0x35, 0x62, 0x36, - 0x35, 0x62, 0x53, 0x42, 0x23, 0x80, 0x36, 0xac, 0xda, 0xa6, 0x75, 0xb2, 0xf5, 0x5f, 0xd8, 0x71, - 0x23, 0x34, 0x62, 0xc3, 0x20, 0x6b, 0xc7, 0x6b, 0x63, 0x2b, 0xab, 0x39, 0xdf, 0xd5, 0x57, 0x00, - 0x00, 0x00, 0xff, 0xff, 0xd4, 0x6a, 0xec, 0x7b, 0xfc, 0x01, 0x00, 0x00, + 0x8d, 0xbb, 0xdb, 0x82, 0x57, 0x5f, 0xc1, 0x47, 0xf3, 0x15, 0x7c, 0x07, 0xaf, 0x92, 0x5d, 0x4d, + 0x23, 0x96, 0xde, 0x32, 0x93, 0x6f, 0xfe, 0xf9, 0xff, 0x59, 0x38, 0xc3, 0x38, 0x15, 0x0a, 0xe5, + 0x1a, 0xa5, 0xbf, 0xf9, 0xf4, 0x4a, 0x29, 0xb4, 0xa0, 0xb0, 0xe9, 0x0c, 0x47, 0x89, 0x10, 0xc9, + 0x33, 0xfa, 0xbc, 0xcc, 0x7c, 0x5e, 0x14, 0x42, 0x73, 0x9d, 0x89, 0x42, 0x59, 0x92, 0x5d, 0x42, + 0x77, 0x16, 0xa7, 0x22, 0xc2, 0x97, 0x15, 0x2a, 0x4d, 0x07, 0xe0, 0xe6, 0xa8, 0x14, 0x4f, 0x70, + 0x40, 0x2e, 0xc8, 0xb8, 0x13, 0xfd, 0x96, 0x6c, 0x0c, 0x07, 0x16, 0x54, 0xa5, 0x28, 0x14, 0xee, + 0x20, 0x9f, 0xa0, 0x73, 0x8f, 0x5c, 0xea, 0x25, 0x72, 0x4d, 0x6f, 0xc0, 0x51, 0x9a, 0xeb, 0x95, + 0x32, 0xd4, 0xe1, 0x74, 0xe4, 0x35, 0xcc, 0xd6, 0x98, 0xb7, 0x30, 0x4c, 0xf4, 0xc3, 0xb2, 0x73, + 0x70, 0x6c, 0x87, 0x76, 0xc1, 0x7d, 0x08, 0xe6, 0x41, 0xf8, 0x18, 0xf4, 0xf7, 0xa8, 0x03, 0xad, + 0x70, 0xde, 0x27, 0xcc, 0x85, 0xf6, 0x2c, 0x2f, 0xf5, 0xeb, 0xf4, 0x8b, 0x58, 0xfb, 0x0b, 0x94, + 0xeb, 0x2c, 0x46, 0x1a, 0xc2, 0x7e, 0x55, 0xd2, 0xd3, 0xe6, 0x96, 0x46, 0xbe, 0xe1, 0xe0, 0xff, + 0x0f, 0x9b, 0x87, 0xf5, 0xdf, 0x3e, 0x3e, 0xdf, 0x5b, 0xc0, 0xda, 0xe6, 0x9a, 0xb7, 0xe4, 0x6a, + 0x4c, 0x26, 0x84, 0xde, 0x55, 0x46, 0x24, 0xf2, 0x9c, 0x1e, 0xfd, 0x99, 0xac, 0xb6, 0xef, 0x10, + 0xeb, 0x19, 0x31, 0x97, 0x5a, 0xb1, 0x09, 0xa1, 0x21, 0x40, 0x1d, 0x56, 0x6d, 0xd3, 0x3a, 0xd9, + 0x7a, 0x17, 0x76, 0x6c, 0x84, 0x7a, 0xac, 0xeb, 0xa7, 0xf5, 0x78, 0x65, 0x6c, 0xe9, 0x98, 0xe7, + 0xbb, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x38, 0x67, 0x6f, 0x07, 0x07, 0x02, 0x00, 0x00, } diff --git a/echoserver/echoserver.pb.gw.go b/echoserver/echoserver.pb.gw.go index f261ede..2688b8c 100644 --- a/echoserver/echoserver.pb.gw.go +++ b/echoserver/echoserver.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway -// source: echoserver.proto +// source: echoserver/echoserver.proto // DO NOT EDIT! /*