Skip to content

Commit bd026d3

Browse files
authored
Remove JRuby on Windows workaround (ruby-git#511)
Signed-off-by: James Couball <jcouball@yahoo.com>
1 parent d1b1711 commit bd026d3

File tree

1 file changed

+0
-26
lines changed

1 file changed

+0
-26
lines changed

Rakefile

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -42,32 +42,6 @@ unless RUBY_PLATFORM == 'java'
4242
# default_tasks << :yardstick
4343
end
4444

45-
if RUBY_PLATFORM == 'java' && Gem.win_platform?
46-
# Reimplement the :build and :install task for JRuby on Windows
47-
# There is a bug in JRuby on Windows that makes the `build` task from `bundler/gem_tasks` fail.
48-
# Once https://github.com/jruby/jruby/issues/6516 is fixed, this block can be deleted.
49-
version = Git::VERSION
50-
pkg_name = 'git'
51-
gem_file = "pkg/#{pkg_name}-#{version}.gem"
52-
53-
Rake::Task[:build].clear
54-
task :build do
55-
FileUtils.mkdir 'pkg' unless File.exist? 'pkg'
56-
`gem build #{pkg_name}.gemspec --output "#{gem_file}" --quiet`
57-
raise 'Gem build failed' unless $CHILD_STATUS.success?
58-
puts "#{pkg_name} #{version} built to #{gem_file}."
59-
end
60-
61-
Rake::Task[:install].clear
62-
task :install => :build do
63-
`gem install #{gem_file} --quiet`
64-
raise 'Gem install failed' unless $CHILD_STATUS.success?
65-
puts "#{pkg_name} (#{version}) installed."
66-
end
67-
68-
CLOBBER << gem_file
69-
end
70-
7145
default_tasks << :build
7246

7347
task default: default_tasks

0 commit comments

Comments
 (0)