mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-27 04:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbinstall.rb: add --exclude option for install-nodoc

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2019-01-17 23:23:14 +00:00
parent f550da512c
commit 92c6072ef4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common.mk
View File

@ -363,14 +363,14 @@ $(ruby_pc): $(srcdir)/template/ruby.pc.in config.status
install-all: docs pre-install-all do-install-all post-install-all
pre-install-all:: all pre-install-local pre-install-ext pre-install-doc
do-install-all: pre-install-all
$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all $(INSTALL_DOC_OPTS)
$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) $(INSTALL_DOC_OPTS)
post-install-all:: post-install-local post-install-ext post-install-doc
@$(NULLCMD)
install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
pre-install-nodoc:: pre-install-local pre-install-ext
do-install-nodoc: main pre-install-nodoc
$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS)
$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --exclude=doc
post-install-nodoc:: post-install-local post-install-ext
install-local: pre-install-local do-install-local post-install-local

10
tool/rbinstall.rb
View File

@ -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