From 6eb07870fd4a63b64303f3e965928fd034f40419 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Mon, 2 May 2016 13:57:57 -0700 Subject: [PATCH] Node tools: use the right extension for running protoc on Windows --- tools/bin/protoc.js | 4 +++- tools/bin/protoc_plugin.js | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/bin/protoc.js b/tools/bin/protoc.js index 0c6d7ce0..4d50c94b 100755 --- a/tools/bin/protoc.js +++ b/tools/bin/protoc.js @@ -43,7 +43,9 @@ var path = require('path'); var execFile = require('child_process').execFile; -var protoc = path.resolve(__dirname, 'protoc'); +var exe_ext = process.platform === 'win32' ? '.exe' : ''; + +var protoc = path.resolve(__dirname, 'protoc' + exe_ext); execFile(protoc, process.argv.slice(2), function(error, stdout, stderr) { if (error) { diff --git a/tools/bin/protoc_plugin.js b/tools/bin/protoc_plugin.js index 0e0bb940..281ec0d8 100755 --- a/tools/bin/protoc_plugin.js +++ b/tools/bin/protoc_plugin.js @@ -43,9 +43,11 @@ var path = require('path'); var execFile = require('child_process').execFile; -var protoc = path.resolve(__dirname, 'grpc_node_plugin'); +var exe_ext = process.platform === 'win32' ? '.exe' : ''; -execFile(protoc, process.argv.slice(2), function(error, stdout, stderr) { +var plugin = path.resolve(__dirname, 'grpc_node_plugin' + exe_ext); + +execFile(plugin, process.argv.slice(2), function(error, stdout, stderr) { if (error) { throw error; }