ruby-changes:45471
From: nobu <ko1@a...>
Date: Mon, 6 Feb 2017 01:23:15 +0900 (JST)
Subject: [ruby-changes:45471] nobu:r57544 (trunk): tool/rbinstall.rb: add new tags
nobu 2017-02-06 01:23:12 +0900 (Mon, 06 Feb 2017) New Revision: 57544 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57544 Log: tool/rbinstall.rb: add new tags Modified files: trunk/tool/rbinstall.rb Index: tool/rbinstall.rb =================================================================== --- tool/rbinstall.rb (revision 57543) +++ tool/rbinstall.rb (revision 57544) @@ -354,7 +354,7 @@ install?(:local, :arch, :bin, :'bin-arch https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L354 end end -install?(:local, :arch, :lib) do +install?(:local, :arch, :lib, :'lib-arch') do prepare "base libraries", libdir install lib, libdir, :mode => $prog_mode, :strip => $strip unless lib == arc @@ -398,7 +398,7 @@ install?(:ext, :arch, :'ext-arch') do https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L398 end end end -install?(:ext, :arch, :hdr, :'arch-hdr') do +install?(:ext, :arch, :hdr, :'arch-hdr', :'hdr-arch') do prepare "extension headers", archhdrdir install_recursive("#{$extout}/include/#{CONFIG['arch']}", archhdrdir, :glob => "*.h", :mode => $data_mode) end @@ -408,7 +408,7 @@ install?(:ext, :comm, :'ext-comm') do https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L408 prepare "extension scripts", sitelibdir prepare "extension scripts", vendorlibdir end -install?(:ext, :comm, :hdr, :'comm-hdr') do +install?(:ext, :comm, :hdr, :'comm-hdr', :'hdr-comm') do hdrdir = rubyhdrdir + "/ruby" prepare "extension headers", hdrdir install_recursive("#{$extout}/include/ruby", hdrdir, :glob => "*.h", :mode => $data_mode) @@ -749,7 +749,14 @@ end https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L749 # :startdoc: -install?(:ext, :comm, :gem) do +install?(:ext, :comm, :gem, :'default-gem', :'default-gem-comm') do + install_default_gem('lib', srcdir) +end +install?(:ext, :arch, :gem, :'default-gem', :'default-gem-arch') do + install_default_gem('ext', srcdir) +end + +def install_default_gem(dir, srcdir) gem_dir = Gem.default_dir directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) prepare "default gems", gem_dir, directories @@ -758,7 +765,7 @@ install?(:ext, :comm, :gem) do https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L765 default_spec_dir = "#{spec_dir}/default" makedirs(default_spec_dir) - gems = Dir.glob(srcdir+"/{lib,ext}/**/*.gemspec").map {|src| + gems = Dir.glob("#{srcdir}/#{dir}/**/*.gemspec").map {|src| spec = Gem::Specification.load(src) || raise("invalid spec in #{src}") file_collector = RbInstall::Specs::FileCollector.new(src) files = file_collector.collect @@ -787,7 +794,7 @@ install?(:ext, :comm, :gem) do https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L794 end end -install?(:ext, :comm, :gem) do +install?(:ext, :comm, :gem, :'bundled-gem') do gem_dir = Gem.default_dir directories = Gem.ensure_gem_subdirectories(gem_dir, :mode => $dir_mode) prepare "bundle gems", gem_dir, directories -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/