Simplified Ruby tools extension checking

hdszju · May 2, 2016 · edb8b76 · edb8b76
1 parent 8cb5f2f
commit edb8b76
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 61 deletions.
diff --git a/src/ruby/tools/bin/protoc.rb b/src/ruby/tools/bin/protoc.rb
@@ -30,14 +30,7 @@
 
 require 'rbconfig'
 
-require_relative '../os_check'
-
-protoc_name = case OS.os_name
-              when 'windows'
-                'protoc.exe'
-              else
-                'protoc'
-              end
+protoc_name = 'protoc' + RbConfig::CONFIG['EXEEXT']
 
 protoc_path = File.join(File.dirname(__FILE__),
                         RbConfig::CONFIG['host_cpu'] + '-' + OS.os_name,

diff --git a/src/ruby/tools/bin/protoc_grpc_ruby_plugin.rb b/src/ruby/tools/bin/protoc_grpc_ruby_plugin.rb
@@ -30,14 +30,7 @@
 
 require 'rbconfig'
 
-require_relative '../os_check'
-
-plugin_name = 'grpc_ruby_plugin' + case OS.os_name
-                                   when 'windows'
-                                     '.exe'
-                                   else
-                                     ''
-                                   end
+plugin_name = 'grpc_ruby_plugin' + RbConfig::CONFIG['EXEEXT']
 
 plugin_path = File.join(File.dirname(__FILE__),
                         RbConfig::CONFIG['host_cpu'] + '-' + OS.os_name,

diff --git a/src/ruby/tools/os_check.rb b/src/ruby/tools/os_check.rb