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

ruby-changes:15663

From: nobu <ko1@a...>
Date: Sun, 2 May 2010 07:39:11 +0900 (JST)
Subject: [ruby-changes:15663] Ruby:r27580 (ruby_1_8, trunk): * lib/mkmf.rb (dir_config): should not modify argument arrays

nobu	2010-05-02 07:38:45 +0900 (Sun, 02 May 2010)

  New Revision: 27580

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

  Log:
    * lib/mkmf.rb (dir_config): should not modify argument arrays
      themselves.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 27579)
+++ ChangeLog	(revision 27580)
@@ -1,3 +1,8 @@
+Sun May  2 07:38:43 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (dir_config): should not modify argument arrays
+	  themselves.
+
 Sat May  1 22:53:57 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/tempfile.rb (Tempfile#size): stat by path name when it is
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 27579)
+++ lib/mkmf.rb	(revision 27580)
@@ -1340,7 +1340,7 @@
   ldir = with_config(target + "-lib", ldefault)
   $arg_config.last[1] ||= "${#{target}-dir}/lib"
 
-  idirs = idir ? Array === idir ? idir : idir.split(File::PATH_SEPARATOR) : []
+  idirs = idir ? Array === idir ? idir.dup : idir.split(File::PATH_SEPARATOR) : []
   if defaults
     idirs.concat(defaults.collect {|d| d + "/include"})
     idir = ([idir] + idirs).compact.join(File::PATH_SEPARATOR)
@@ -1353,7 +1353,7 @@
     end
   end
 
-  ldirs = ldir ? Array === ldir ? ldir : ldir.split(File::PATH_SEPARATOR) : []
+  ldirs = ldir ? Array === ldir ? ldir.dup : ldir.split(File::PATH_SEPARATOR) : []
   if defaults
     ldirs.concat(defaults.collect {|d| d + "/lib"})
     ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR)
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 27579)
+++ ruby_1_8/ChangeLog	(revision 27580)
@@ -1,3 +1,8 @@
+Sun May  2 07:38:43 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (dir_config): should not modify argument arrays
+	  themselves.
+
 Thu Apr 29 18:39:51 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/thwait.rb (ThreadsWait#join): refined rdoc again.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 27579)
+++ ruby_1_8/version.h	(revision 27580)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-04-30"
+#define RUBY_RELEASE_DATE "2010-05-02"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100430
+#define RUBY_RELEASE_CODE 20100502
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
-#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_MONTH 5
+#define RUBY_RELEASE_DAY 2
 
 #define NO_STRING_LITERAL_CONCATENATION 1
 #ifdef RUBY_EXTERN
Index: ruby_1_8/lib/mkmf.rb
===================================================================
--- ruby_1_8/lib/mkmf.rb	(revision 27579)
+++ ruby_1_8/lib/mkmf.rb	(revision 27580)
@@ -1304,7 +1304,7 @@
   ldir = with_config(target + "-lib", ldefault)
   $arg_config.last[1] ||= "${#{target}-dir}/lib"
 
-  idirs = idir ? Array === idir ? idir : idir.split(File::PATH_SEPARATOR) : []
+  idirs = idir ? Array === idir ? idir.dup : idir.split(File::PATH_SEPARATOR) : []
   if defaults
     idirs.concat(defaults.collect {|d| d + "/include"})
     idir = ([idir] + idirs).compact.join(File::PATH_SEPARATOR)
@@ -1317,7 +1317,7 @@
     end
   end
 
-  ldirs = ldir ? Array === ldir ? ldir : ldir.split(File::PATH_SEPARATOR) : []
+  ldirs = ldir ? Array === ldir ? ldir.dup : ldir.split(File::PATH_SEPARATOR) : []
   if defaults
     ldirs.concat(defaults.collect {|d| d + "/lib"})
     ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR)

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

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