nobu	2009-03-03 16:25:50 +0900 (Tue, 03 Mar 2009)

  New Revision: 22725

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22725

  Log:
    * ext/extmk.rb (extmake), lib/mkmf.rb (create_makefile): $objs and
      $srcs are always Array or nil now.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/extmk.rb
    branches/ruby_1_8/lib/mkmf.rb
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/ext/extmk.rb
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22724)
+++ ChangeLog	(revision 22725)
@@ -1,3 +1,8 @@
+Tue Mar  3 16:25:43 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/extmk.rb (extmake), lib/mkmf.rb (create_makefile): $objs and
+	  $srcs are always Array or nil now.
+
 Tue Mar  3 15:54:11 2009  NAKAMURA Usaku  <usa@r...>
 
 	* ext/dl/win32/lib/win32/{registry,resolv}.rb: use dl/import instead
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 22724)
+++ lib/mkmf.rb	(revision 22725)
@@ -1591,9 +1591,8 @@
   for i in $objs
     i.sub!(/\.o\z/, ".#{$OBJEXT}")
   end
-  $objs = $objs.join(" ")
 
-  target = nil if $objs == ""
+  target = nil if $objs.empty?
 
   if target and EXPORT_PREFIX
     if File.exist?(File.join(srcdir, target + '.def'))
@@ -1642,7 +1641,7 @@
 LOCAL_LIBS = #{$LOCAL_LIBS}
 LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
 SRCS = #{srcs.collect(&File.method(:basename)).join(' ')}
-OBJS = #{$objs}
+OBJS = #{$objs.join(" ")}
 TARGET = #{target}
 DLLIB = #{dllib}
 EXTSTATIC = #{$static || ""}
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 22724)
+++ ext/extmk.rb	(revision 22725)
@@ -105,8 +105,8 @@
     $mdir = target
     $srcdir = File.join($top_srcdir, "ext", $mdir)
     $preload = nil
-    $objs = ""
-    $srcs = ""
+    $objs = []
+    $srcs = []
     $compiled[target] = false
     makefile = "./Makefile"
     ok = File.exist?(makefile)
@@ -137,9 +137,8 @@
       }
       begin
 	$extconf_h = nil
-	$objs = []
 	ok &&= extract_makefile(makefile)
-        old_objs = $objs
+	old_objs = $objs
 	conf = ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb"].find {|f| File.exist?(f)}
 	if (($extconf_h && !File.exist?($extconf_h)) ||
 	    !(t = modified?(makefile, MTIMES)) ||
@@ -180,7 +179,7 @@
       args += ["static"] unless $clean
       $extlist.push [$static, $target, File.basename($target), $preload]
     end
-    FileUtils.rm_f($objs.split - old_objs)
+    FileUtils.rm_f($objs - old_objs)
     unless system($make, *args)
       $ignore or $continue or return false
     end
Index: ruby_1_8/ext/extmk.rb
===================================================================
--- ruby_1_8/ext/extmk.rb	(revision 22724)
+++ ruby_1_8/ext/extmk.rb	(revision 22725)
@@ -113,8 +113,8 @@
     $mdir = target
     $srcdir = File.join($top_srcdir, "ext", $mdir)
     $preload = nil
-    $objs = ""
-    $srcs = ""
+    $objs = []
+    $srcs = []
     $compiled[target] = false
     makefile = "./Makefile"
     ok = File.exist?(makefile)
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 22724)
+++ ruby_1_8/ChangeLog	(revision 22725)
@@ -1,3 +1,8 @@
+Tue Mar  3 16:25:43 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/extmk.rb (extmake), lib/mkmf.rb (create_makefile): $objs and
+	  $srcs are always Array or nil now.
+
 Sun Mar  1 19:41:25 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* util.c (ruby_dtoa): allocates one more byte to get rid of buffer
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 22724)
+++ ruby_1_8/version.h	(revision 22725)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-03-01"
+#define RUBY_RELEASE_DATE "2009-03-03"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090301
+#define RUBY_RELEASE_CODE 20090303
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DAY 3
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/lib/mkmf.rb
===================================================================
--- ruby_1_8/lib/mkmf.rb	(revision 22724)
+++ ruby_1_8/lib/mkmf.rb	(revision 22725)
@@ -1466,9 +1466,8 @@
   for i in $objs
     i.sub!(/\.o\z/, ".#{$OBJEXT}")
   end
-  $objs = $objs.join(" ")
 
-  target = nil if $objs == ""
+  target = nil if $objs.empty?
 
   if target and EXPORT_PREFIX
     if File.exist?(File.join(srcdir, target + '.def'))
@@ -1507,7 +1506,7 @@
 LOCAL_LIBS = #{$LOCAL_LIBS}
 LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
 SRCS = #{srcs.collect(&File.method(:basename)).join(' ')}
-OBJS = #{$objs}
+OBJS = #{$objs.join(" ")}
 TARGET = #{target}
 DLLIB = #{dllib}
 EXTSTATIC = #{$static || ""}

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