archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 49689,49752,49753: [Backport #10953]

Browse source 
* common.mk: use ruby organization for rubyspec.

	* spec/default.mspec: remove specific version number.
	  7a909e925c

	* spec/default.mspec: use default configuration file name.
	  cc69f337b0


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@50069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2015-03-24 07:41:14 +00:00
parent 967f56114a
commit 10887fce42
4 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
Tue Mar 24 16:38:14 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* spec/default.mspec: use default configuration file name.
https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf
Tue Mar 24 16:38:14 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* spec/default.mspec: remove specific version number.
https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714
Tue Mar 24 16:38:14 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* common.mk: use ruby organization for rubyspec.
Wed Feb 25 17:30:10 2015 NAKAMURA Usaku <usa@ruby-lang.org> Wed Feb 25 17:30:10 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* class.c (clone_method): fixed missing assignment introduced by * class.c (clone_method): fixed missing assignment introduced by

2
common.mk
View file

@ -14,7 +14,7 @@ RUBYLIB = $(PATH_SEPARATOR)
RUBYOPT = - RUBYOPT = -
RUN_OPTS = --disable-gems RUN_OPTS = --disable-gems
SPEC_GIT_BASE = git://github.com/rubyspec SPEC_GIT_BASE = git://github.com/ruby
MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git

2
spec/default.mspec
View file

@ -1,4 +1,4 @@
load File.dirname(__FILE__) + '/rubyspec/ruby.1.9.mspec' load File.dirname(__FILE__) + '/rubyspec/default.mspec'
class MSpecScript class MSpecScript
builddir = Dir.pwd builddir = Dir.pwd
srcdir = ENV['SRCDIR'] srcdir = ENV['SRCDIR']

8
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2015-02-25" #define RUBY_RELEASE_DATE "2015-03-24"
#define RUBY_PATCHLEVEL 643 #define RUBY_PATCHLEVEL 644
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 3
#define RUBY_RELEASE_DAY 25 #define RUBY_RELEASE_DAY 24
#include "ruby/version.h" #include "ruby/version.h"