[前][次][番号順一覧][スレッド一覧]

ruby-changes:54641

From: nobu <ko1@a...>
Date: Fri, 18 Jan 2019 08:23:21 +0900 (JST)
Subject: [ruby-changes:54641] nobu:r66856 (trunk): rbinstall.rb: add --exclude option for install-nodoc

nobu	2019-01-18 08:23:14 +0900 (Fri, 18 Jan 2019)

  New Revision: 66856

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66856

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

  Modified files:
    trunk/common.mk
    trunk/tool/rbinstall.rb
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 66855)
+++ tool/rbinstall.rb	(revision 66856)
@@ -40,6 +40,7 @@ def parse_args(argv = ARGV) https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L40
   $mflags = []
   $install = []
   $installed_list = nil
+  $exclude = []
   $dryrun = false
   $rdocdir = nil
   $htmldir = nil
@@ -67,6 +68,9 @@ def parse_args(argv = ARGV) https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L68
   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 https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L868
 @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| https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L876
   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
Index: common.mk
===================================================================
--- common.mk	(revision 66855)
+++ common.mk	(revision 66856)
@@ -363,14 +363,14 @@ $(ruby_pc): $(srcdir)/template/ruby.pc.i https://github.com/ruby/ruby/blob/trunk/common.mk#L363
 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]