Skip to content

Commit 25ae263

Browse files
committed
Drop to support fat gem support.
ref. ruby/bigdecimal#149
1 parent 9397542 commit 25ae263

File tree

3 files changed

+2
-21
lines changed

3 files changed

+2
-21
lines changed

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ gemspec
55
group :development do
66
gem 'rake-compiler', ">= 0.4.1"
77
gem 'minitest', "~> 5.0"
8-
gem 'rake-compiler-dock', ">= 0.6.3", :platforms => :ruby
98
gem 'ruby-maven', :platforms => :jruby
109
end

Rakefile

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,7 @@ if RUBY_PLATFORM =~ /java/
2828
end
2929
else
3030
require 'rake/extensiontask'
31-
spec = Gem::Specification.load("psych.gemspec")
32-
Rake::ExtensionTask.new("psych", spec) do |ext|
33-
ext.lib_dir = File.join(*['lib', ENV['FAT_DIR']].compact)
34-
ext.cross_compile = true
35-
ext.cross_platform = %w[x86-mingw32 x64-mingw32]
36-
ext.cross_compiling do |s|
37-
s.files.concat ["lib/2.3/psych.so", "lib/2.4/psych.so", "lib/2.5/psych.so"]
38-
end
39-
end
40-
end
41-
42-
desc "Compile binaries for mingw platform using rake-compiler-dock"
43-
task 'build:mingw' do
44-
require 'rake_compiler_dock'
45-
RakeCompilerDock.sh "bundle && rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0"
31+
Rake::ExtensionTask.new("psych")
4632
end
4733

4834
task :default => [:compile, :test]

lib/psych.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@
1010
org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
1111
end
1212
else
13-
begin
14-
require "#{RUBY_VERSION[/\d+\.\d+/]}/psych.so"
15-
rescue LoadError
16-
require 'psych.so'
17-
end
13+
require 'psych.so'
1814
end
1915
require 'psych/nodes'
2016
require 'psych/streaming'

0 commit comments

Comments
 (0)