nobu	2008-06-19 21:43:57 +0900 (Thu, 19 Jun 2008)

  New Revision: 17433

  Modified files:
    branches/ruby_1_8/ext/extmk.rb
    trunk/ext/extmk.rb

  Log:
    * ext/extmk.rb (extmake): check if compile before showing message.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/extmk.rb?r1=17433&r2=17432&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/extmk.rb?r1=17433&r2=17432&diff_format=u

Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 17432)
+++ ext/extmk.rb	(revision 17433)
@@ -87,16 +87,7 @@
 def extmake(target)
   print "#{$message} #{target}\n"
   $stdout.flush
-  if $force_static or $static_ext[target]
-    $static = target
-  else
-    $static = false
-  end
 
-  unless $ignore
-    return true if $nodynamic and not $static
-  end
-
   FileUtils.mkpath target unless File.directory?(target)
   begin
     dir = Dir.pwd
@@ -439,7 +430,11 @@
 hdrdir = $hdrdir
 $hdrdir = ($top_srcdir = relative_from(srcdir, $topdir = "..")) + "/include"
 exts.each do |d|
-  extmake(d) or abort
+  $static = $force_static ? $static_ext[target] : false
+
+  if $ignore or !$nodynamic or $static
+    extmake(d) or abort
+  end
 end
 $top_srcdir = srcdir
 $topdir = "."
Index: ruby_1_8/ext/extmk.rb
===================================================================
--- ruby_1_8/ext/extmk.rb	(revision 17432)
+++ ruby_1_8/ext/extmk.rb	(revision 17433)
@@ -95,16 +95,7 @@
 def extmake(target)
   print "#{$message} #{target}\n"
   $stdout.flush
-  if $force_static or $static_ext[target]
-    $static = target
-  else
-    $static = false
-  end
 
-  unless $ignore
-    return true if $nodynamic and not $static
-  end
-
   FileUtils.mkpath target unless File.directory?(target)
   begin
     dir = Dir.pwd
@@ -448,7 +439,11 @@
 hdrdir = $hdrdir
 $hdrdir = $top_srcdir = relative_from(srcdir, $topdir = "..")
 exts.each do |d|
-  extmake(d) or abort
+  $static = $force_static ? $static_ext[target] : false
+
+  if $ignore or !$nodynamic or $static
+    extmake(d) or abort
+  end
 end
 $top_srcdir = srcdir
 $topdir = "."

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