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

merge revision(s) 33566:

* tool/rbinstall.rb (install_recursive, bin-comm): split mere
	  string not path name.  [ruby-core:40462] [Bug #5492]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2012-01-03 04:48:34 +00:00
parent d838b0d043
commit 379a35b870
3 changed files with 8 additions and 3 deletions

View file

@ -1,3 +1,8 @@
Mon Jan 2 23:47:58 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* tool/rbinstall.rb (install_recursive, bin-comm): split mere
string not path name. [ruby-core:40462] [Bug #5492]
Mon Jan 2 23:41:57 2012 Tajima Akil <artonx@yahoo.co.jp>
* win32/Makefile.sub (CONFIG_H): have stdint.h if VC2010.

View file

@ -239,7 +239,7 @@ def install_recursive(srcdir, dest, options = {})
if dir
makedirs(d)
else
makedirs(File.dirname(d))
makedirs(d[/.*(?=\/)/m])
if block_given?
yield src, d, opts
else
@ -441,7 +441,7 @@ install?(:local, :comm, :bin, :'bin-comm') do
trans = proc {|base| base}
end
install_recursive(File.join(srcdir, "bin"), bindir) do |src, cmd|
cmd = File.join(File.dirname(cmd), RbConfig.expand(trans[File.basename(cmd)]))
cmd = cmd.sub(/[^\/]*\z/m) {|n| RbConfig.expand(trans[n])}
shebang = ''
body = ''

View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 15
#define RUBY_PATCHLEVEL 16
#define RUBY_RELEASE_DATE "2012-01-03"
#define RUBY_RELEASE_YEAR 2012