aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2016-05-09 23:14:22 -0700
committerGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2016-05-09 23:14:22 -0700
commit6915e6b96f607d01e674dbb22855b84bc7b2bfc1 (patch)
treee68a565739a92d6e453979e86fb9f4d833496b16
parent8770f8fe9ed07b89f8382106d6026eb271372a17 (diff)
parentf08d3af2077447f9b3161a529f4b35bb93f06fc7 (diff)
Merge pull request #6495 from murgatroid99/backport_tools_package_bin_namespacing
Backport tools package bin namespacing
-rw-r--r--src/node/tools/package.json4
-rwxr-xr-xsrc/ruby/tools/bin/grpc_tools_ruby_protoc.rb (renamed from src/ruby/tools/bin/protoc.rb)0
-rwxr-xr-xsrc/ruby/tools/bin/grpc_tools_ruby_protoc_plugin.rb (renamed from src/ruby/tools/bin/protoc_grpc_ruby_plugin.rb)0
-rw-r--r--templates/src/node/tools/package.json.template4
4 files changed, 4 insertions, 4 deletions
diff --git a/src/node/tools/package.json b/src/node/tools/package.json
index 9bca5eab6f..b8b4c9aea1 100644
--- a/src/node/tools/package.json
+++ b/src/node/tools/package.json
@@ -16,8 +16,8 @@
}
],
"bin": {
- "grpc-tools-protoc": "./bin/protoc.js",
- "grpc-tools-plugin": "./bin/protoc_plugin.js"
+ "grpc_tools_node_protoc": "./bin/protoc.js",
+ "grpc_tools_node_protoc_plugin": "./bin/protoc_plugin.js"
},
"scripts": {
"install": "./node_modules/.bin/node-pre-gyp install"
diff --git a/src/ruby/tools/bin/protoc.rb b/src/ruby/tools/bin/grpc_tools_ruby_protoc.rb
index 3a2a5b8dc9..3a2a5b8dc9 100755
--- a/src/ruby/tools/bin/protoc.rb
+++ b/src/ruby/tools/bin/grpc_tools_ruby_protoc.rb
diff --git a/src/ruby/tools/bin/protoc_grpc_ruby_plugin.rb b/src/ruby/tools/bin/grpc_tools_ruby_protoc_plugin.rb
index 4b296dedc7..4b296dedc7 100755
--- a/src/ruby/tools/bin/protoc_grpc_ruby_plugin.rb
+++ b/src/ruby/tools/bin/grpc_tools_ruby_protoc_plugin.rb
diff --git a/templates/src/node/tools/package.json.template b/templates/src/node/tools/package.json.template
index 4f673c48d1..69ad71a3b8 100644
--- a/templates/src/node/tools/package.json.template
+++ b/templates/src/node/tools/package.json.template
@@ -18,8 +18,8 @@
}
],
"bin": {
- "grpc-tools-protoc": "./bin/protoc.js",
- "grpc-tools-plugin": "./bin/protoc_plugin.js"
+ "grpc_tools_node_protoc": "./bin/protoc.js",
+ "grpc_tools_node_protoc_plugin": "./bin/protoc_plugin.js"
},
"scripts": {
"install": "./node_modules/.bin/node-pre-gyp install"