diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | instruby.rb | 5 |
2 files changed, 7 insertions, 4 deletions
@@ -1,7 +1,11 @@ -Sun Jun 10 12:07:41 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jun 10 12:56:46 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * include/ruby: moved public headers. + * instruby.rb (install_recursive): skip backup files. + + * instruby.rb (ext-comm): install only current platform headers. + Sun Jun 10 10:42:04 2007 Tanaka Akira <akr@fsij.org> * lib/securerandom.rb: renamed from lib/secrand.rb. diff --git a/instruby.rb b/instruby.rb index 52f81af4d5..d813d0fdd7 100755 --- a/instruby.rb +++ b/instruby.rb @@ -126,9 +126,8 @@ def install_recursive(srcdir, dest, options = {}) noinst = options.delete(:no_install) subpath = srcdir.size..-1 Dir.glob("#{srcdir}/**/*", File::FNM_DOTMATCH) do |src| - next if /\A\.{1,2}\z/ =~ (base = File.basename(src)) + next if /\A\.{1,2}\z|\A\.\#|\A\#.*\#\z|~\z/ =~ (base = File.basename(src)) if noinst - base = File.basename(src) if Array === noinst next if noinst.any? {|n| File.fnmatch?(n, base)} else @@ -221,7 +220,7 @@ if $extout puts "installing extension scripts" makedirs [rubylibdir, sitelibdir] install_recursive("#{extout}/common", rubylibdir) - install_recursive("#{extout}/include", rubyhdrdir) + install_recursive("#{extout}/include/ruby", rubyhdrdir + "/ruby") end end |