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

Merge pull request #6536 from grpc/release-0_14 

Release 0.14 upmerge
This commit is contained in:
Nicolas Noble 2016-05-11 10:45:37 -07:00
parent 1d4c8d4c2f 01c1746826
commit 7fa94b4eed
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/bin/protoc.js
View File

@ -47,10 +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);
execFile(protoc, process.argv.slice(2), function(error, stdout, stderr) { var child_process = execFile(protoc, process.argv.slice(2), function(error, stdout, stderr) {
if (error) { if (error) {
throw error; throw error;
} }
console.log(stdout);
console.log(stderr);
}); });
child_process.stdout.pipe(process.stdout);
child_process.stderr.pipe(process.stderr);

8
tools/bin/protoc_plugin.js
View File

@ -47,10 +47,12 @@ var exe_ext = process.platform === 'win32' ? '.exe' : '';
var plugin = path.resolve(__dirname, 'grpc_node_plugin' + exe_ext); var plugin = path.resolve(__dirname, 'grpc_node_plugin' + exe_ext);
execFile(plugin, process.argv.slice(2), function(error, stdout, stderr) { var child_process = execFile(plugin, process.argv.slice(2), {encoding: 'buffer'}, function(error, stdout, stderr) {
if (error) { if (error) {
throw error; throw error;
} }
console.log(stdout);
console.log(stderr);
}); });
process.stdin.pipe(child_process.stdin);
child_process.stdout.pipe(process.stdout);
child_process.stderr.pipe(process.stderr);