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

ruby-changes:46263

From: nobu <ko1@a...>
Date: Sun, 16 Apr 2017 23:55:04 +0900 (JST)
Subject: [ruby-changes:46263] nobu:r58371 (trunk): rbinstall.rb: ignore skipped exts

nobu	2017-04-16 23:54:59 +0900 (Sun, 16 Apr 2017)

  New Revision: 58371

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

  Log:
    rbinstall.rb: ignore skipped exts
    
    * tool/rbinstall.rb (default-gems): skip gemspec if corresponding
      Makefile does not exist.

  Modified files:
    trunk/tool/rbinstall.rb
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 58370)
+++ tool/rbinstall.rb	(revision 58371)
@@ -699,9 +699,14 @@ end https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L699
 install?(:ext, :arch, :gem, :'default-gems', :'default-gems-arch') do
   install_default_gem('ext', srcdir) do |path|
     # assume that gemspec and extconf.rb are placed in the same directory
-    IO.foreach(File.dirname(path[(srcdir.size+1)..-1]) + "/Makefile") do |l|
-      break true if /^TARGET\s*=/ =~ l
+    success = false
+    begin
+      IO.foreach(File.dirname(path[(srcdir.size+1)..-1]) + "/Makefile") do |l|
+        break success = true if /^TARGET\s*=/ =~ l
+      end
+    rescue Errno::ENOENT
     end
+    success
   end
 end
 

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

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