aboutsummaryrefslogtreecommitdiffstats
path: root/tool
diff options
context:
space:
mode:
Diffstat (limited to 'tool')
-rwxr-xr-xtool/rbinstall.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 4100fe17bf..b1ae31b601 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -40,6 +40,7 @@ def parse_args(argv = ARGV)
$mflags = []
$install = []
$installed_list = nil
+ $exclude = []
$dryrun = false
$rdocdir = nil
$htmldir = nil
@@ -67,6 +68,9 @@ def parse_args(argv = ARGV)
opt.on('-i', '--install=TYPE', $install_procs.keys) do |ins|
$install << ins
end
+ opt.on('-x', '--exclude=TYPE', $install_procs.keys) do |exc|
+ $exclude << exc
+ end
opt.on('--data-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode|
$data_mode = mode
end
@@ -864,8 +868,7 @@ include FileUtils::NoWrite if $dryrun
@fileutils_output = STDOUT
@fileutils_label = ''
-all = $install.delete(:all)
-$install << :local << :ext if $install.empty?
+$install << :all if $install.empty?
installs = $install.map do |inst|
if !(procs = $install_procs[inst]) || procs.empty?
next warn("unknown install target - #{inst}")
@@ -873,8 +876,7 @@ installs = $install.map do |inst|
procs
end
installs.flatten!
-installs.uniq!
-installs |= $install_procs[:all] if all
+installs -= $exclude.map {|exc| $install_procs[exc]}.flatten
installs.each do |block|
dir = Dir.pwd
begin