Skip to content

Commit f0c324c

Browse files
committed
Merge branch '2029-windows-support-for-ruby-27-on-v110x' into v1.10.x
2 parents 9091602 + c39e1b0 commit f0c324c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.cross_rubies

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
2.7.0:i686-w64-mingw32
2+
2.7.0:x86_64-w64-mingw32
13
2.6.0:i686-w64-mingw32
24
2.6.0:x86_64-w64-mingw32
35
2.5.0:i686-w64-mingw32

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ gem "minitest", "~>5.8", :group => [:development, :test]
1515
gem "racc", "~>1.4.14", :group => [:development, :test]
1616
gem "rake", "~>12.0", :group => [:development, :test]
1717
gem "rake-compiler", "~>1.1.0", :group => [:development, :test]
18-
gem "rake-compiler-dock", "~>0.7.0", :group => [:development, :test]
18+
gem "rake-compiler-dock", "~>1.0", :group => [:development, :test]
1919
gem "rexical", "~>1.0.5", :group => [:development, :test]
2020
gem "rubocop", "~>0.73", :group => [:development, :test]
2121
gem "simplecov", "~>0.16", :group => [:development, :test]

Rakefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ HOE = Hoe.spec 'nokogiri' do
149149
["racc", "~> 1.4.14"],
150150
["rake", "~> 12.0"],
151151
["rake-compiler", "~> 1.1.0"],
152-
["rake-compiler-dock", "~> 0.7.0"],
152+
["rake-compiler-dock", "~> 1.0"],
153153
["rexical", "~> 1.0.5"],
154154
["rubocop", "~> 0.73"],
155155
["simplecov", "~> 0.16"],
@@ -325,8 +325,6 @@ task :cross do
325325

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

0 commit comments

Comments
 (0)