diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-10 07:34:51 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-10 07:34:51 +0000 |
commit | 4d2421d58b1da845f9dbf09ce78555398106756f (patch) | |
tree | 4631a522bea64a669437db09b782bf88341b7e45 /instruby.rb | |
parent | 8e8a3a07b149e25aa743b68f180338fb10b32997 (diff) | |
download | ruby-4d2421d58b1da845f9dbf09ce78555398106756f.tar.gz |
* instruby.rb (install_recursive): add :glob option rather than
using FNM_DOTMACH.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'instruby.rb')
-rwxr-xr-x | instruby.rb | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/instruby.rb b/instruby.rb index 04add9346e..e910e15602 100755 --- a/instruby.rb +++ b/instruby.rb @@ -123,11 +123,12 @@ def makedirs(dirs) end def install_recursive(srcdir, dest, options = {}) - noinst = options.delete(:no_install) + noinst = options[:no_install] + glob = options[:glob] || "*" subpath = srcdir.size..-1 - Dir.glob("#{srcdir}/**/*", File::FNM_DOTMATCH) do |src| + Dir.glob("#{srcdir}/**/#{glob}") do |src| case base = File.basename(src) - when /\A\.{1,2}\z/, /\A\.\#/, /\A\#.*\#\z/, /~\z/, /\A\.svn\z/ + when /\A\#.*\#\z/, /~\z/ next end if noinst @@ -217,13 +218,13 @@ if $extout noinst = nil end install_recursive("#{extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst) - install_recursive("#{extout}/include/#{CONFIG['arch']}", archhdrdir) + install_recursive("#{extout}/include/#{CONFIG['arch']}", archhdrdir, :glob => "*.h") end install?(:ext, :comm, :'ext-comm') do puts "installing extension scripts" makedirs [rubylibdir, sitelibdir] install_recursive("#{extout}/common", rubylibdir) - install_recursive("#{extout}/include/ruby", rubyhdrdir + "/ruby") + install_recursive("#{extout}/include/ruby", rubyhdrdir + "/ruby", :glob => "*.h") end end @@ -315,7 +316,7 @@ install?(:local, :arch, :lib) do noinst << "win32.h" end noinst = nil if noinst.empty? - install_recursive("include", rubyhdrdir, :no_install => noinst) + install_recursive("include", rubyhdrdir, :no_install => noinst, :glob => "*.h") end install?(:local, :comm, :man) do |