grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge

This commit is contained in:
Nicolas "Pixel" Noble 2016-08-16 00:57:57 +02:00
parent 9474108971 5f3d234698
commit b4828c3762
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
health_check/package.json
View File

@ -15,9 +15,9 @@
} }
], ],
"dependencies": { "dependencies": {
"grpc": "^0.15.0", "grpc": "^1.1.0-dev",
"lodash": "^3.9.3", "lodash": "^3.9.3",
"google-protobuf": "^3.0.0-alpha.5" "google-protobuf": "^3.0.0"
}, },
"files": [ "files": [
"LICENSE", "LICENSE",

6
tools/bin/protoc.js
View File

@ -47,7 +47,11 @@ var exe_ext = process.platform === 'win32' ? '.exe' : '';
var protoc = path.resolve(__dirname, 'protoc' + exe_ext); var protoc = path.resolve(__dirname, 'protoc' + exe_ext);
var child_process = execFile(protoc, process.argv.slice(2), function(error, stdout, stderr) { var plugin = path.resolve(__dirname, 'grpc_node_plugin' + exe_ext);
var args = ['--plugin=protoc-gen-grpc=' + plugin].concat(process.argv.slice(2));
var child_process = execFile(protoc, args, function(error, stdout, stderr) {
if (error) { if (error) {
throw error; throw error;
} }