Skip to content
Browse files

merge revision(s) 39835: [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@39852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 2aaa9ab commit 63b661679891bd4f5334864564cae12e3f6b0391 @nagachika nagachika committed Mar 20, 2013
Showing with 8 additions and 1 deletion.
  1. +6 −0 ChangeLog
  2. +1 −0 test/rubygems/test_gem_installer.rb
  3. +1 −1 version.h
View
6 ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 20 23:21:14 2013 Hiroshi Shirosaki <h.shirosaki@gmail.com>
+
+ * 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 Mar 20 23:17:33 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup):
View
1 test/rubygems/test_gem_installer.rb
@@ -1073,6 +1073,7 @@ def test_install_extension_flat
CONFIG['CC'] = '$(TOUCH) $@ ||'
CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
+ $ruby = '#{Gem.ruby}'
create_makefile("#{@spec.name}")
RUBY
View
2 version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-03-20"
-#define RUBY_PATCHLEVEL 85
+#define RUBY_PATCHLEVEL 86
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 3

0 comments on commit 63b6616

Please sign in to comment.
Something went wrong with that request. Please try again.