1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* instruby.rb: specify file mode to install. a patch from

Browse Source 
pegacorn  <subscriber.jp AT gmail.com> in [ruby-dev:33699].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15440 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2008-02-12 03:16:07 +00:00
parent f3ac3dc79c
commit ff15c72d69
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Feb 12 12:13:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* instruby.rb: specify file mode to install. a patch from
pegacorn <subscriber.jp AT gmail.com> in [ruby-dev:33699].
Tue Feb 12 11:38:57 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Tue Feb 12 11:38:57 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* numeric.c (rb_num_coerce_bin): add ID argument to specify * numeric.c (rb_num_coerce_bin): add ID argument to specify

19
instruby.rb
View File

@ -123,8 +123,9 @@ def makedirs(dirs)
end end
def install_recursive(srcdir, dest, options = {}) def install_recursive(srcdir, dest, options = {})
noinst = options[:no_install] opts = options.clone
glob = options[:glob] || "*" noinst = opts.delete(:no_install)
glob = opts.delete(:glob) || "*"
subpath = srcdir.size..-1 subpath = srcdir.size..-1
Dir.glob("#{srcdir}/**/#{glob}") do |src| Dir.glob("#{srcdir}/**/#{glob}") do |src|
case base = File.basename(src) case base = File.basename(src)
@ -143,7 +144,7 @@ def install_recursive(srcdir, dest, options = {})
makedirs(d) makedirs(d)
else else
makedirs(File.dirname(d)) makedirs(File.dirname(d))
install src, d install src, d, opts
end end
end end
end end
@ -224,15 +225,15 @@ if $extout
if noinst = CONFIG["no_install_files"] and noinst.empty? if noinst = CONFIG["no_install_files"] and noinst.empty?
noinst = nil noinst = nil
end end
install_recursive("#{extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst) install_recursive("#{extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst, :mode => 0755)
install_recursive("#{extout}/include/#{CONFIG['arch']}", archhdrdir, :glob => "*.h") install_recursive("#{extout}/include/#{CONFIG['arch']}", archhdrdir, :glob => "*.h", :mode => 0644)
end end
install?(:ext, :comm, :'ext-comm') do install?(:ext, :comm, :'ext-comm') do
puts "installing extension scripts" puts "installing extension scripts"
hdrdir = rubyhdrdir + "/ruby" hdrdir = rubyhdrdir + "/ruby"
makedirs [rubylibdir, sitelibdir, vendorlibdir, hdrdir] makedirs [rubylibdir, sitelibdir, vendorlibdir, hdrdir]
install_recursive("#{extout}/common", rubylibdir) install_recursive("#{extout}/common", rubylibdir, :mode => 0644)
install_recursive("#{extout}/include/ruby", hdrdir, :glob => "*.h") install_recursive("#{extout}/include/ruby", hdrdir, :glob => "*.h", :mode => 0644)
end end
end end
@ -243,7 +244,7 @@ install?(:rdoc) do
ridatadir = File.join(CONFIG['datadir'], 'ri/$(MAJOR).$(MINOR).$(TEENY)/system') ridatadir = File.join(CONFIG['datadir'], 'ri/$(MAJOR).$(MINOR).$(TEENY)/system')
Config.expand(ridatadir) Config.expand(ridatadir)
makedirs [ridatadir] makedirs [ridatadir]
install_recursive($rdocdir, ridatadir) install_recursive($rdocdir, ridatadir, :mode => 0644)
end end
end end
@ -324,7 +325,7 @@ install?(:local, :arch, :lib) do
noinst << "win32.h" noinst << "win32.h"
end end
noinst = nil if noinst.empty? noinst = nil if noinst.empty?
install_recursive("include", rubyhdrdir, :no_install => noinst, :glob => "*.h") install_recursive("include", rubyhdrdir, :no_install => noinst, :glob => "*.h", :mode => 0644)
end end
install?(:local, :comm, :man) do install?(:local, :comm, :man) do