Adding dependency build for initial install, updating to changes in g…

…rpc github URLs
simonovic86 · Jul 27, 2016 · 4e1be99 · 4e1be99
1 parent e4c1c71
commit 4e1be99
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 17 deletions.
diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ server:
 
 proto_build: 
 	cd task-execution-schemas/proto && protoc $(PROTO_INC) \
-		--go_out=Mgoogle/api/annotations.proto=github.com/gengo/grpc-gateway/third_party/googleapis/google/api,plugins=grpc:../../src/ga4gh-tasks/ \
+		--go_out=Mgoogle/api/annotations.proto=github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api,plugins=grpc:../../src/ga4gh-tasks/ \
 		--grpc-gateway_out=logtostderr=true:../../src/ga4gh-tasks/ \
 		task_execution.proto
 	cd proto && protoc \
@@ -23,5 +23,10 @@ proto_build:
 
 grpc:
 	go get -u github.com/golang/protobuf/protoc-gen-go
-	go get -u github.com/gengo/grpc-gateway/protoc-gen-swagger
-	go get -u github.com/gengo/grpc-gateway/protoc-gen-grpc-gateway
+	go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger
+	go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
+
+depends: grpc
+	go get -d ga4gh-taskserver/
+	go get -d ga4gh-worker/
+
diff --git a/src/ga4gh-server/proto/task_worker.pb.go b/src/ga4gh-server/proto/task_worker.pb.go
diff --git a/src/ga4gh-tasks/task_execution.pb.go b/src/ga4gh-tasks/task_execution.pb.go
diff --git a/src/ga4gh-tasks/task_execution.pb.gw.go b/src/ga4gh-tasks/task_execution.pb.gw.go
diff --git a/src/ga4gh-taskserver/server.go b/src/ga4gh-taskserver/server.go
@@ -9,7 +9,7 @@ import (
 	"golang.org/x/net/context"
 	"github.com/gorilla/mux"
 	"google.golang.org/grpc"
-	"github.com/gengo/grpc-gateway/runtime"
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"ga4gh-tasks"
 	"ga4gh-server"
 	"runtime/debug"