From a663b7bd401491712e9ce4a091a5237bdfcb1cab Mon Sep 17 00:00:00 2001 From: nagachika Date: Thu, 27 Jun 2013 04:16:58 +0000 Subject: merge revision(s) 41600: [Backport #8058] * test/rubygems/test_gem_installer.rb (test_install_extension_flat): use ruby in build directory in case ruby is not installed. [ruby-core:53265] [Bug #8058] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/rubygems/test_gem_installer.rb | 1 + version.h | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4d51d80f50..d301096a5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jun 27 13:16:40 2013 Hiroshi Shirosaki + + * test/rubygems/test_gem_installer.rb (test_install_extension_flat): + use ruby in build directory in case ruby is not installed. + [ruby-core:53265] [Bug #8058] + Wed Jun 26 23:05:34 2013 Hiroshi Shirosaki * test/ruby/test_io.rb (TestIO#test_write_32bit_boundary): skip if diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 0f9bfefd0e..4f233f9aab 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -1073,6 +1073,7 @@ gem 'other', version CONFIG['CC'] = '$(TOUCH) $@ ||' CONFIG['LDSHARED'] = '$(TOUCH) $@ ||' + $ruby = '#{Gem.ruby}' create_makefile("#{@spec.name}") RUBY diff --git a/version.h b/version.h index 99c414a29f..cc4c437158 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-06-27" -#define RUBY_PATCHLEVEL 245 +#define RUBY_PATCHLEVEL 246 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 6 -- cgit v1.2.3