diff options
-rwxr-xr-x | Rakefile | 2 | ||||
-rw-r--r-- | src/ruby/ext/grpc/extconf.rb | 3 | ||||
-rw-r--r-- | src/ruby/ext/grpc/rb_grpc.c | 2 | ||||
-rw-r--r-- | src/ruby/lib/grpc.rb | 3 | ||||
-rw-r--r-- | src/ruby/lib/grpc/generic/bidi_call.rb | 2 | ||||
-rw-r--r-- | src/ruby/lib/grpc/generic/rpc_desc.rb | 2 | ||||
-rw-r--r-- | src/ruby/lib/grpc/generic/rpc_server.rb | 2 | ||||
-rw-r--r-- | src/ruby/lib/grpc/grpc.rb (renamed from src/ruby/lib/grpc/loader.rb) | 4 |
8 files changed, 9 insertions, 11 deletions
@@ -16,7 +16,7 @@ Gem::PackageTask.new(spec) do |pkg| end # Add the extension compiler task -Rake::ExtensionTask.new('grpc', spec) do |ext| +Rake::ExtensionTask.new('grpc_c', spec) do |ext| ext.source_pattern = '**/*.{c,h}' ext.ext_dir = File.join('src', 'ruby', 'ext', 'grpc') ext.lib_dir = File.join('src', 'ruby', 'lib', 'grpc') diff --git a/src/ruby/ext/grpc/extconf.rb b/src/ruby/ext/grpc/extconf.rb index b7a6d71d25..52c512e015 100644 --- a/src/ruby/ext/grpc/extconf.rb +++ b/src/ruby/ext/grpc/extconf.rb @@ -114,8 +114,7 @@ when /mingw|mswin/ $LDFLAGS << ' -static ' end -subdir = RUBY_VERSION.sub(/\.\d$/,'') -output = File.join('grpc', 'grpc') +output = File.join('grpc', 'grpc_c') puts 'Generating Makefile for ' + output create_makefile(output) diff --git a/src/ruby/ext/grpc/rb_grpc.c b/src/ruby/ext/grpc/rb_grpc.c index 265ab58ecb..9514d54c17 100644 --- a/src/ruby/ext/grpc/rb_grpc.c +++ b/src/ruby/ext/grpc/rb_grpc.c @@ -297,7 +297,7 @@ VALUE sym_code = Qundef; VALUE sym_details = Qundef; VALUE sym_metadata = Qundef; -void Init_grpc() { +void Init_grpc_c() { grpc_init(); /* TODO: find alternative to ruby_vm_at_exit that is ok in Ruby 2.0 */ diff --git a/src/ruby/lib/grpc.rb b/src/ruby/lib/grpc.rb index 8512856259..1671ba3550 100644 --- a/src/ruby/lib/grpc.rb +++ b/src/ruby/lib/grpc.rb @@ -32,9 +32,8 @@ unless ENV['GRPC_DEFAULT_SSL_ROOTS_FILE_PATH'] ENV['GRPC_DEFAULT_SSL_ROOTS_FILE_PATH'] = ssl_roots_path end -require 'grpc/loader' - require 'grpc/errors' +require 'grpc/grpc' require 'grpc/logconfig' require 'grpc/notifier' require 'grpc/version' diff --git a/src/ruby/lib/grpc/generic/bidi_call.rb b/src/ruby/lib/grpc/generic/bidi_call.rb index b907393fd2..6b9b785693 100644 --- a/src/ruby/lib/grpc/generic/bidi_call.rb +++ b/src/ruby/lib/grpc/generic/bidi_call.rb @@ -28,7 +28,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. require 'forwardable' -require 'grpc/loader' +require 'grpc/grpc' # GRPC contains the General RPC module. module GRPC diff --git a/src/ruby/lib/grpc/generic/rpc_desc.rb b/src/ruby/lib/grpc/generic/rpc_desc.rb index 5dfb5c96fe..dd90d8d91d 100644 --- a/src/ruby/lib/grpc/generic/rpc_desc.rb +++ b/src/ruby/lib/grpc/generic/rpc_desc.rb @@ -27,7 +27,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -require 'grpc/loader' +require 'grpc/grpc' # GRPC contains the General RPC module. module GRPC diff --git a/src/ruby/lib/grpc/generic/rpc_server.rb b/src/ruby/lib/grpc/generic/rpc_server.rb index 22490567f9..410156ff03 100644 --- a/src/ruby/lib/grpc/generic/rpc_server.rb +++ b/src/ruby/lib/grpc/generic/rpc_server.rb @@ -27,7 +27,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -require 'grpc/loader' +require 'grpc/grpc' require 'grpc/generic/active_call' require 'grpc/generic/service' require 'thread' diff --git a/src/ruby/lib/grpc/loader.rb b/src/ruby/lib/grpc/grpc.rb index 9e04908d88..d8a4947494 100644 --- a/src/ruby/lib/grpc/loader.rb +++ b/src/ruby/lib/grpc/grpc.rb @@ -28,7 +28,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. begin - require "grpc/#{RUBY_VERSION.sub(/\.\d$/, '')}/grpc" + require "grpc/#{RUBY_VERSION.sub(/\.\d$/, '')}/grpc_c" rescue LoadError - require 'grpc/grpc' + require 'grpc/grpc_c' end |