diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | tool/mkconfig.rb | 7 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Mon Mar 25 00:41:23 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@gmail.com> * test/rubygems/test_gem_installer.rb (test_install_extension_flat): 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 @@ -1,10 +1,10 @@ #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" |