kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 39507,39508: [Backport #7963]

Browse source 
* 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
This commit is contained in:
nagachika 2013-03-24 15:42:06 +00:00
parent 63b6616798
commit 876fb07fde
3 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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):

7
tool/mkconfig.rb
View file

@ -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

6
version.h
View file

@ -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"