From 1daa0b113d853bfa57b776cc569939b61ca14292 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 13 Sep 2013 19:58:57 +0000
Subject: * lib/rubygems:  Update to RubyGems 2.1.3

  Fixed installing platform gems

  Restored concurrent requires

  Fixed installing gems with extensions with --install-dir

  Fixed `gem fetch -v` to install the latest version

  Fixed installing gems with "./" in their files entries

* test/rubygems/test_gem_package.rb:  Tests for the above.

* NEWS:  Updated for RubyGems 2.1.3


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42938 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rubygems/ext/builder.rb | 120 +-------------------------------------------
 1 file changed, 1 insertion(+), 119 deletions(-)

(limited to 'lib/rubygems/ext')

diff --git a/lib/rubygems/ext/builder.rb b/lib/rubygems/ext/builder.rb
index 8c05723573..79cae906ee 100644
--- a/lib/rubygems/ext/builder.rb
+++ b/lib/rubygems/ext/builder.rb
@@ -4,23 +4,8 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'rubygems/user_interaction'
-require 'thread'
-
 class Gem::Ext::Builder
 
-  include Gem::UserInteraction
-
-  ##
-  # The builder shells-out to run various commands after changing the
-  # directory.  This means multiple installations cannot be allowed to build
-  # extensions in parallel as they may change each other's directories leading
-  # to broken extensions or failed installations.
-
-  CHDIR_MUTEX = Mutex.new # :nodoc:
-
-  attr_accessor :build_args # :nodoc:
-
   def self.class_name
     name =~ /Ext::(.*)Builder/
     $1.downcase
@@ -33,7 +18,7 @@ class Gem::Ext::Builder
 
     # try to find make program from Ruby configure arguments first
     RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
-    make_program = ENV['MAKE'] || ENV['make'] || $1
+    make_program = $1 || ENV['MAKE'] || ENV['make']
     unless make_program then
       make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
     end
@@ -78,108 +63,5 @@ class Gem::Ext::Builder
     end
   end
 
-  ##
-  # Creates a new extension builder for +spec+ using the given +build_args+.
-  # The gem for +spec+ is unpacked in +gem_dir+.
-
-  def initialize spec, build_args
-    @spec       = spec
-    @build_args = build_args
-    @gem_dir    = spec.gem_dir
-
-    @ran_rake   = nil
-  end
-
-  ##
-  # Chooses the extension builder class for +extension+
-
-  def builder_for extension # :nodoc:
-    case extension
-    when /extconf/ then
-      Gem::Ext::ExtConfBuilder
-    when /configure/ then
-      Gem::Ext::ConfigureBuilder
-    when /rakefile/i, /mkrf_conf/i then
-      @ran_rake = true
-      Gem::Ext::RakeBuilder
-    when /CMakeLists.txt/ then
-      Gem::Ext::CmakeBuilder
-    else
-      extension_dir = File.join @gem_dir, File.dirname(extension)
-
-      message = "No builder for extension '#{extension}'"
-      build_error extension_dir, message
-    end
-  end
-
-  ##
-  # Logs the build +output+ in +build_dir+, then raises ExtensionBuildError.
-
-  def build_error build_dir, output, backtrace = nil # :nodoc:
-    gem_make_out = File.join build_dir, 'gem_make.out'
-
-    open gem_make_out, 'wb' do |io| io.puts output end
-
-    message = <<-EOF
-ERROR: Failed to build gem native extension.
-
-    #{output}
-
-Gem files will remain installed in #{@gem_dir} for inspection.
-Results logged to #{gem_make_out}
-EOF
-
-    raise Gem::Installer::ExtensionBuildError, message, backtrace
-  end
-
-  def build_extension extension, dest_path # :nodoc:
-    results = []
-
-    extension ||= '' # I wish I knew why this line existed
-    extension_dir = File.join @gem_dir, File.dirname(extension)
-
-    builder = builder_for extension
-
-    begin
-      FileUtils.mkdir_p dest_path
-
-      CHDIR_MUTEX.synchronize do
-        Dir.chdir extension_dir do
-          results = builder.build(extension, @gem_dir, dest_path,
-                                  results, @build_args)
-
-          say results.join("\n") if Gem.configuration.really_verbose
-        end
-      end
-    rescue
-      build_error extension_dir, results.join("\n"), $@
-    end
-  end
-
-  ##
-  # Builds extensions.  Valid types of extensions are extconf.rb files,
-  # configure scripts and rakefiles or mkrf_conf files.
-
-  def build_extensions
-    return if @spec.extensions.empty?
-
-    if @build_args.empty?
-      say "Building native extensions.  This could take a while..."
-    else
-      say "Building native extensions with: '#{@build_args.join ' '}'"
-      say "This could take a while..."
-    end
-
-    dest_path = File.join @gem_dir, @spec.require_paths.first
-
-    @ran_rake = false # only run rake once
-
-    @spec.extensions.each do |extension|
-      break if @ran_rake
-
-      build_extension extension, dest_path
-    end
-  end
-
 end
 
-- 
cgit v1.2.3