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

ruby-changes:45375

From: nobu <ko1@a...>
Date: Sat, 28 Jan 2017 14:23:45 +0900 (JST)
Subject: [ruby-changes:45375] nobu:r57448 (trunk): extmk.rb: remove direct build mode

nobu	2017-01-28 14:23:39 +0900 (Sat, 28 Jan 2017)

  New Revision: 57448

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

  Log:
    extmk.rb: remove direct build mode
    
    * ext/extmk.rb (parse_args): --command-output is now mandatory.
      remove direct build mode.

  Modified files:
    trunk/ext/extmk.rb
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 57447)
+++ ext/extmk.rb	(revision 57448)
@@ -375,6 +375,7 @@ def parse_args() https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L375
     $optparser.warn(e)
     abort $optparser.to_s
   end
+  $command_output or abort "--command-output option is mandatory"
 
   $destdir ||= ''
 
@@ -681,7 +682,7 @@ $makeflags.uniq! https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L682
 
 $mflags.unshift("topdir=#$topdir")
 ENV.delete("RUBYOPT")
-if $configure_only and $command_output
+if $configure_only
   exts.map! {|d| "#{ext_prefix}/#{d}/."}
   FileUtils.makedirs(File.dirname($command_output))
   atomic_write_open($command_output) do |mf|
@@ -781,7 +782,7 @@ if $configure_only and $command_output https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L782
     end
 
   end
-elsif $command_output
+else
   message = "making #{rubies.join(', ')}"
   message = "echo #{message}"
   $mflags.concat(rubies)
@@ -800,12 +801,6 @@ elsif $command_output https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L801
     end
     ff.chmod(0755)
   end
-elsif !$configure_only
-  message = "making #{rubies.join(', ')}"
-  puts message
-  $stdout.flush
-  $mflags.concat(rubies)
-  system($make, *$mflags) or exit($?.exitstatus)
 end
 # :startdoc:
 

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

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