Merge branch 'master' into fix/swagger-camelcase

.gitignore

@@ -0,0 +1 @@
+_output/

.travis.yml

@@ -19,8 +19,8 @@ install:
 - go get github.com/gengo/grpc-gateway/examples/server
 script:
 - make realclean && make examples
-- test -z "$(git status --porcelain)" || (git status; git diff; exit 1)
-- env GLOG_logtostderr=1 go test -v github.com/gengo/grpc-gateway/...
+- if ! go version | grep devel; then test -z "$(git status --porcelain)" || (git status; git diff; exit 1); fi
+- env GLOG_logtostderr=1 go test -race -v github.com/gengo/grpc-gateway/...
 - golint github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway/...
 - golint github.com/gengo/grpc-gateway/runtime/...
 - golint github.com/gengo/grpc-gateway/utilities/...

Makefile

@@ -39,6 +39,7 @@ GATEWAY_PLUGIN_SRC= utilities/doc.go \
 GOOGLEAPIS_DIR=third_party/googleapis
 OPTIONS_PROTO=$(GOOGLEAPIS_DIR)/google/api/annotations.proto $(GOOGLEAPIS_DIR)/google/api/http.proto
 OPTIONS_GO=$(OPTIONS_PROTO:.proto=.pb.go)
+OUTPUT_DIR=_output
 
 PKGMAP=Mgoogle/protobuf/descriptor.proto=$(GO_PLUGIN_PKG)/descriptor,Mgoogle/api/annotations.proto=$(PKG)/$(GOOGLEAPIS_DIR)/google/api,Mexamples/sub/message.proto=$(PKG)/examples/sub
 SWAGGER_EXAMPLES=examples/examplepb/echo_service.proto \
@@ -49,7 +50,7 @@ EXAMPLES=examples/examplepb/echo_service.proto \
 EXAMPLE_SVCSRCS=$(EXAMPLES:.proto=.pb.go)
 EXAMPLE_GWSRCS=$(EXAMPLES:.proto=.pb.gw.go)
 EXAMPLE_SWAGGERSRCS=$(EXAMPLES:.proto=.swagger.json)
-EXAMPLE_DEPS=examples/sub/message.proto
+EXAMPLE_DEPS=examples/sub/message.proto examples/sub2/message.proto
 EXAMPLE_DEPSRCS=$(EXAMPLE_DEPS:.proto=.pb.go)
 PROTOC_INC_PATH=$(dir $(shell which protoc))/../include
 
@@ -73,15 +74,17 @@ $(SWAGGER_PLUGIN): $(OPTIONS_GO) $(SWAGGER_PLUGIN_SRC)
 $(EXAMPLE_SVCSRCS): $(GO_PLUGIN) $(EXAMPLES)
 	protoc -I $(PROTOC_INC_PATH) -I. -I$(GOOGLEAPIS_DIR) --plugin=$(GO_PLUGIN) --go_out=$(PKGMAP),plugins=grpc:. $(EXAMPLES)
 $(EXAMPLE_DEPSRCS): $(GO_PLUGIN) $(EXAMPLE_DEPS)
-	protoc -I $(PROTOC_INC_PATH) -I. --plugin=$(GO_PLUGIN) --go_out=$(PKGMAP),plugins=grpc:. $(EXAMPLE_DEPS)
+	mkdir -p $(OUTPUT_DIR)
+	protoc -I $(PROTOC_INC_PATH) -I. --plugin=$(GO_PLUGIN) --go_out=$(PKGMAP),plugins=grpc:$(OUTPUT_DIR) $(@:.pb.go=.proto)
+	cp $(OUTPUT_DIR)/$(PKG)/$@ $@ || cp $(OUTPUT_DIR)/$@ $@
 $(EXAMPLE_GWSRCS): $(GATEWAY_PLUGIN) $(EXAMPLES)
 	protoc -I $(PROTOC_INC_PATH) -I. -I$(GOOGLEAPIS_DIR) --plugin=$(GATEWAY_PLUGIN) --grpc-gateway_out=logtostderr=true,$(PKGMAP):. $(EXAMPLES)
 $(EXAMPLE_SWAGGERSRCS): $(SWAGGER_PLUGIN) $(SWAGGER_EXAMPLES)
 	protoc -I $(PROTOC_INC_PATH) -I. -I$(GOOGLEAPIS_DIR) --plugin=$(SWAGGER_PLUGIN) --swagger_out=logtostderr=true,$(PKGMAP):. $(SWAGGER_EXAMPLES)
 
 examples: $(EXAMPLE_SVCSRCS) $(EXAMPLE_GWSRCS) $(EXAMPLE_DEPSRCS) $(EXAMPLE_SWAGGERSRCS)
 test: examples
-	go test $(PKG)/...
+	go test -race $(PKG)/...
 
 clean distclean:
 	rm -f $(GATEWAY_PLUGIN)
@@ -91,5 +94,6 @@ realclean: distclean
 	rm -f $(EXAMPLE_GWSRCS)
 	rm -f $(EXAMPLE_SWAGGERSRCS)
 	rm -f $(GO_PLUGIN)
+	rm -f $(SWAGGER_PLUGIN)
 
 .PHONY: generate examples test clean distclean realclean

README.md

@@ -213,4 +213,4 @@ But patch is welcome.
 
 # License
 grpc-gateway is licensed under the BSD 3-Clause License.
-See `LICENSE.txt` for more details.
+See [LICENSE.txt](https://github.com/gengo/grpc-gateway/blob/master/LICENSE.txt) for more details.