mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* tool/rbinstall.rb: renamed to get rid of collision against
instruction.rb on command line completion of shell. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
9ae3b070c1
commit
9a46638fb3
3 changed files with 6 additions and 3 deletions
|
@ -1,4 +1,7 @@
|
|||
Tue Jun 30 16:55:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
Tue Jun 30 16:57:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* tool/rbinstall.rb: renamed to get rid of collision agains
|
||||
instruction.rb on command line completion of shell.
|
||||
|
||||
* tool/mkconfig.rb (RbConfig.expand): get rid of exceptions on
|
||||
frozen strings unless really changed.
|
||||
|
|
|
@ -103,7 +103,7 @@ SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \
|
|||
--make-flags="$(MAKEFLAGS)"
|
||||
EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \
|
||||
--make-flags="MINIRUBY='$(MINIRUBY)'" --
|
||||
INSTRUBY = $(MINIRUBY) $(srcdir)/tool/instruby.rb
|
||||
INSTRUBY = $(MINIRUBY) $(srcdir)/tool/rbinstall.rb
|
||||
INSTRUBY_ARGS = $(SCRIPT_ARGS) \
|
||||
--data-mode=$(INSTALL_DATA_MODE) \
|
||||
--prog-mode=$(INSTALL_PROG_MODE) \
|
||||
|
|
|
@ -221,7 +221,7 @@ def install_recursive(srcdir, dest, options = {})
|
|||
Dir.foreach(file) do |f|
|
||||
src = File.join(file, f)
|
||||
d = File.join(dest, dir = src[subpath])
|
||||
stat = File.lstat(src) rescue next
|
||||
stat = File.stat(src) rescue next
|
||||
if stat.directory?
|
||||
files << [src, d, true] if /\A\./ !~ f and !prune[dir]
|
||||
else
|
Loading…
Add table
Reference in a new issue