nagachika	2013-03-25 00:42:06 +0900 (Mon, 25 Mar 2013)

  New Revision: 39909

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

  Log:
    merge revision(s) 39507,39508: [Backport #7963]
    
    * tool/mkconfig.rb: reconstruct comma separated list values.  a
      command line to Windows batch file is splitted not only by spaces
      and equals sign but also by commas and semicolons.
      command line to Windows batch file is split not only by spaces
      and equal signs but also by commas and semicolons.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/tool/mkconfig.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39908)
+++ ruby_2_0_0/ChangeLog	(revision 39909)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Mar 25 00:41:23 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* tool/mkconfig.rb: reconstruct comma separated list values.  a
+	  command line to Windows batch file is split not only by spaces
+	  and equal signs but also by commas and semicolons.
+
 Wed Mar 20 23:21:14 2013  Hiroshi Shirosaki  <h.shirosaki@g...>
 
 	* test/rubygems/test_gem_installer.rb (test_install_extension_flat):
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39908)
+++ ruby_2_0_0/version.h	(revision 39909)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-03-20"
-#define RUBY_PATCHLEVEL 86
+#define RUBY_RELEASE_DATE "2013-03-25"
+#define RUBY_PATCHLEVEL 87
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 25
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/tool/mkconfig.rb
===================================================================
--- ruby_2_0_0/tool/mkconfig.rb	(revision 39908)
+++ ruby_2_0_0/tool/mkconfig.rb	(revision 39909)
@@ -116,7 +116,12 @@ File.foreach "config.status" do |line| https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/tool/mkconfig.rb#L116
     eq = win32 && vars[name] ? '<< "\n"' : '='
     vars[name] = val
     if name == "configure_args"
-      val.gsub!(/ +(?!-)/, "=") if win32
+      if win32
+        val.gsub!(/\G(--[-a-z0-9]+)((=\S+)|(?:\s+(?!-)\S+)+)?(\s*)/) {
+          _, opt, list, arg, sep = *$~
+          "#{opt}#{arg || list && list.sub(/^\s+/, '=').tr_s(' ', ',')}#{sep}"
+        }
+      end
       val.gsub!(/--with-out-ext/, "--without-ext")
     end
     val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39507-39508


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