Skip to content

Commit

Permalink
Do not check for duplicates in stdlib if it is not present.
Browse files Browse the repository at this point in the history
  • Loading branch information
donv committed Mar 25, 2015
1 parent 9b0a7aa commit 7840a34
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions assets/rakelib/ruboto.rake
Expand Up @@ -829,12 +829,15 @@ end

# FIXME(uwe): Issue # 705 https://github.com/ruboto/ruboto/issues/705
# FIXME(uwe): Use the files from the bundle instead of stdlib.
stdlib_files = `jar tf #{PROJECT_DIR}/libs/jruby-stdlib-*.jar`.lines.map(&:chomp)
Dir['**/*'].each do |f|
if stdlib_files.include? f
puts "Removing duplicate file #{f} in gem #{gem_lib}."
puts "Already present in the Ruby Standard Library."
FileUtils.rm f
stdlib_jar = "#{PROJECT_DIR}/libs/jruby-stdlib-*.jar"
if File.exists? stdlib_jar
stdlib_files = `jar tf #{stdlib_jar}`.lines.map(&:chomp)
Dir['**/*'].each do |f|
if stdlib_files.include? f
puts "Removing duplicate file #{f} in gem #{gem_lib}."
puts 'Already present in the Ruby Standard Library.'
FileUtils.rm f
end
end
end
# EMXIF
Expand Down

0 comments on commit 7840a34

Please sign in to comment.