diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-22 03:39:38 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-22 03:39:38 +0000 |
| commit | b8f4796ac51d057712138e39bd2209e7b613e1d7 (patch) | |
| tree | b6eca0cd897644369f8cb7019497b03e479e86ed | |
| parent | fb72edcedfef116e499795586951389392f68d02 (diff) | |
merge revision(s) 49689,49752,49753: [Backport #10953]
* common.mk: use ruby organization for rubyspec.
* spec/default.mspec: remove specific version number.
https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714
* spec/default.mspec: use default configuration file name.
https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | spec/default.mspec | 2 | ||||
| -rw-r--r-- | version.h | 6 |
4 files changed, 19 insertions, 5 deletions
@@ -1,3 +1,17 @@ +Sun Mar 22 12:39:17 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + + * spec/default.mspec: use default configuration file name. + https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf + +Sun Mar 22 12:39:17 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + + * spec/default.mspec: remove specific version number. + https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714 + +Sun Mar 22 12:39:17 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + + * common.mk: use ruby organization for rubyspec. + Thu Feb 26 15:48:41 2015 NAKAMURA Usaku <usa@ruby-lang.org> * ext/win32/Win32API.rb (initialize): accept both a string and an array @@ -17,7 +17,7 @@ RUBYLIB = $(PATH_SEPARATOR) RUBYOPT = - RUN_OPTS = --disable-gems -SPEC_GIT_BASE = git://github.com/nurse +SPEC_GIT_BASE = git://github.com/ruby MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git diff --git a/spec/default.mspec b/spec/default.mspec index 0506f1d86a..47f5dd12e5 100644 --- a/spec/default.mspec +++ b/spec/default.mspec @@ -1,4 +1,4 @@ -load File.dirname(__FILE__) + '/rubyspec/ruby.2.2.mspec' +load File.dirname(__FILE__) + '/rubyspec/default.mspec' class MSpecScript builddir = Dir.pwd srcdir = ENV['SRCDIR'] @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.2.2" -#define RUBY_RELEASE_DATE "2015-03-03" -#define RUBY_PATCHLEVEL 86 +#define RUBY_RELEASE_DATE "2015-03-22" +#define RUBY_PATCHLEVEL 87 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 22 #include "ruby/version.h" |