usa	2013-03-28 18:15:03 +0900 (Thu, 28 Mar 2013)

  New Revision: 39979

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

  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_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/tool/mkconfig.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 39978)
+++ ruby_1_9_3/ChangeLog	(revision 39979)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Thu Mar 28 18:14:41 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.
+
 Thu Mar 28 18:13:38 2013  NARUSE, Yui  <naruse@r...>
 
 	* string.c (str_byte_substr): don't set coderange if it's not known.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 39978)
+++ ruby_1_9_3/version.h	(revision 39979)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 396
+#define RUBY_PATCHLEVEL 397
 
 #define RUBY_RELEASE_DATE "2013-03-28"
 #define RUBY_RELEASE_YEAR 2013
Index: ruby_1_9_3/tool/mkconfig.rb
===================================================================
--- ruby_1_9_3/tool/mkconfig.rb	(revision 39978)
+++ ruby_1_9_3/tool/mkconfig.rb	(revision 39979)
@@ -113,7 +113,12 @@ File.foreach "config.status" do |line| https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/tool/mkconfig.rb#L113
       end
     end
     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")
     elsif name == "libdir"
       v_runtime[:libdir] = val[/\$(\(exec_prefix\)|\{exec_prefix\})\/(.*)/, 2]

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


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