From 876fb07fde3bebdc27efc91df67de5cd4b40aa52 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 24 Mar 2013 15:42:06 +0000 Subject: 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/mkconfig.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tool') diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index d8e9f0f3b7..514c8c81ad 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -116,7 +116,12 @@ File.foreach "config.status" do |line| 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 -- cgit v1.2.3