Skip to content

Commit

Permalink
Merge branch '2029-windows-support-for-ruby-27-on-v110x' into v1.10.x
Browse files Browse the repository at this point in the history
  • Loading branch information
flavorjones committed Jul 6, 2020
2 parents 9091602 + c39e1b0 commit f0c324c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .cross_rubies
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
2.7.0:i686-w64-mingw32
2.7.0:x86_64-w64-mingw32
2.6.0:i686-w64-mingw32
2.6.0:x86_64-w64-mingw32
2.5.0:i686-w64-mingw32
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ gem "minitest", "~>5.8", :group => [:development, :test]
gem "racc", "~>1.4.14", :group => [:development, :test]
gem "rake", "~>12.0", :group => [:development, :test]
gem "rake-compiler", "~>1.1.0", :group => [:development, :test]
gem "rake-compiler-dock", "~>0.7.0", :group => [:development, :test]
gem "rake-compiler-dock", "~>1.0", :group => [:development, :test]
gem "rexical", "~>1.0.5", :group => [:development, :test]
gem "rubocop", "~>0.73", :group => [:development, :test]
gem "simplecov", "~>0.16", :group => [:development, :test]
Expand Down
4 changes: 1 addition & 3 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ HOE = Hoe.spec 'nokogiri' do
["racc", "~> 1.4.14"],
["rake", "~> 12.0"],
["rake-compiler", "~> 1.1.0"],
["rake-compiler-dock", "~> 0.7.0"],
["rake-compiler-dock", "~> 1.0"],
["rexical", "~> 1.0.5"],
["rubocop", "~> 0.73"],
["simplecov", "~> 0.16"],
Expand Down Expand Up @@ -325,8 +325,6 @@ task :cross do

CROSS_RUBIES.each do |cross_ruby|
task "tmp/#{cross_ruby.platform}/nokogiri/#{cross_ruby.ver}/nokogiri.so" do |t|
# To reduce the gem file size strip mingw32 dlls before packaging
sh [cross_ruby.tool('strip'), '-S', t.name].shelljoin
verify_dll t.name, cross_ruby
end
end
Expand Down

0 comments on commit f0c324c

Please sign in to comment.