ruby-changes:18141
From: nobu <ko1@a...>
Date: Fri, 10 Dec 2010 18:35:49 +0900 (JST)
Subject: [ruby-changes:18141] Ruby:r30162 (trunk): * tool/rbinstall.rb (install_recursive): always skip default ignored
nobu 2010-12-10 18:27:53 +0900 (Fri, 10 Dec 2010) New Revision: 30162 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30162 Log: * tool/rbinstall.rb (install_recursive): always skip default ignored files. if block is given, call it instead of calling install. * tool/rbinstall.rb (bin-comm): use install_recursive. Modified files: trunk/ChangeLog trunk/tool/rbinstall.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 30161) +++ ChangeLog (revision 30162) @@ -1,3 +1,10 @@ +Fri Dec 10 18:27:49 2010 Nobuyoshi Nakada <nobu@r...> + + * tool/rbinstall.rb (install_recursive): always skip default ignored + files. if block is given, call it instead of calling install. + + * tool/rbinstall.rb (bin-comm): use install_recursive. + Fri Dec 10 18:12:31 2010 Nobuyoshi Nakada <nobu@r...> * test/mkmf/base.rb (TestMkmf#config_value): extract macro value from Index: tool/rbinstall.rb =================================================================== --- tool/rbinstall.rb (revision 30161) +++ tool/rbinstall.rb (revision 30162) @@ -197,7 +197,8 @@ noinst = opts.delete(:no_install) glob = opts.delete(:glob) || "*" subpath = (srcdir.size+1)..-1 - prune = skip = FalseProc + prune = [] + skip = [] if noinst if Array === noinst prune = noinst.grep(/#{File::SEPARATOR}/o).map!{|f| f.chomp(File::SEPARATOR)} @@ -209,10 +210,10 @@ skip = [noinst] end end - skip |= %w"#*# *~ *.old *.bak *.orig *.rej *.diff *.patch *.core" - prune = path_matcher(prune) - skip = path_matcher(skip) end + skip |= %w"#*# *~ *.old *.bak *.orig *.rej *.diff *.patch *.core" + prune = path_matcher(prune) + skip = path_matcher(skip) File.directory?(srcdir) or return rescue return paths = [[srcdir, dest, true]] found = [] @@ -239,7 +240,11 @@ makedirs(d) else makedirs(File.dirname(d)) - install src, d, opts + if block_given? + yield src, d, opts + else + install src, d, opts + end end end end @@ -435,12 +440,7 @@ else trans = proc {|base| base} end - for src in Dir[File.join(srcdir, "bin/*")] - next unless File.file?(src) - s = src.downcase - next if %w(old bak orig rej diff patch core).include? File.extname(s) - next if /^\.\#|(~|core)$/i =~ File.basename(s) - + install_recursive(File.join(srcdir, "bin"), bindir) do |src, cmd| name = RbConfig.expand(trans[File.basename(src)]) shebang = '' @@ -457,7 +457,6 @@ shebang.sub!(/\r$/, '') body.gsub!(/\r$/, '') - cmd = File.join(bindir, name) cmd << ".#{$cmdtype}" if $cmdtype open_for_install(cmd, $script_mode) do case $cmdtype -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/