mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
9b383bd6cf
string (e.g. ?x). * lib/tempfile.rb (Tempfile::make_tmpname): put dot between basename and pid. [ruby-talk:196272] * parse.y (do_block): remove -> style block. * parse.y (parser_yylex): remove tLAMBDA_ARG. * eval.c (rb_call0): binding for the return event hook should have consistent scope. [ruby-core:07928] * eval.c (proc_invoke): return behavior should depend whether it is surrounded by a lambda or a mere block. * eval.c (formal_assign): handles post splat arguments. * eval.c (rb_call0): ditto. * st.c (strhash): use FNV-1a hash. * parse.y (parser_yylex): removed experimental ';;' terminator. * eval.c (rb_node_arity): should be aware of post splat arguments. * eval.c (rb_proc_arity): ditto. * parse.y (f_args): syntax rule enhanced to support arguments after the splat. * parse.y (block_param): ditto for block parameters. * parse.y (f_post_arg): mandatory formal arguments after the splat argument. * parse.y (new_args_gen): generate nodes for mandatory formal arguments after the splat argument. * eval.c (rb_eval): dispatch mandatory formal arguments after the splat argument. * parse.y (args): allow more than one splat in the argument list. * parse.y (method_call): allow aref [] to accept all kind of method argument, including assocs, splat, and block argument. * eval.c (SETUP_ARGS0): prepare block argument as well. * lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931] * eval.c (error_line): print receivers true/false/nil specially. * eval.c (rb_proc_yield): handles parameters in yield semantics. * eval.c (nil_yield): gives LocalJumpError to denote no block error. * io.c (rb_io_getc): now takes one-character string. * string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo hashing algorithm. * string.c (rb_str_aref): str[0] now returns 1 character string, instead of a fixnum. [Ruby2] * parse.y (parser_yylex): ?c now returns 1 character string, instead of a fixnum. [Ruby2] * string.c (rb_str_aset): no longer support fixnum insertion. * eval.c (umethod_bind): should not update original class. [ruby-dev:28636] * eval.c (ev_const_get): should support constant access from within instance_eval(). [ruby-dev:28327] * time.c (time_timeval): should round for usec floating number. [ruby-core:07896] * time.c (time_add): ditto. * dir.c (sys_warning): should not call a vararg function rb_sys_warning() indirectly. [ruby-core:07886] * numeric.c (flo_divmod): the first element of Float#divmod should be an integer. [ruby-dev:28589] * test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder. * re.c (rb_reg_initialize): should not allow modifying literal regexps. frozen check moved from rb_reg_initialize_m as well. * re.c (rb_reg_initialize): should not modify untainted objects in safe levels higher than 3. * re.c (rb_memcmp): type change from char* to const void*. * dir.c (dir_close): should not close untainted dir stream. * dir.c (GetDIR): add tainted/frozen check for each dir operation. * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg): typo fixed. a patch from Florian Gross <florg at florg.net>. * eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from event_hooks. no guarantee for arbitrary hook deletion. [ruby-dev:28632] * util.c (ruby_strtod): differ addition to minimize error. [ruby-dev:28619] * util.c (ruby_strtod): should not raise ERANGE when the input string does not have any digits. [ruby-dev:28629] * eval.c (proc_invoke): should restore old ruby_frame->block. thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833] also fix [ruby-dev:28614] as well. * signal.c (trap): sig should be less then NSIG. Coverity found this bug. a patch from Kevin Tew <tewk at tewk.com>. [ruby-core:07823] * math.c (math_log2): add new method inspired by [ruby-talk:191237]. * math.c (math_log): add optional base argument to Math::log(). [ruby-talk:191308] * ext/syck/emitter.c (syck_scan_scalar): avoid accessing uninitialized array element. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07809] * array.c (rb_ary_fill): initialize local variables first. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810] * ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free type_tag. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07808] * ext/socket/socket.c (make_hostent_internal): accept ai_family check from Sam Roberts <sroberts at uniserve.com>. [ruby-core:07691] * util.c (ruby_strtod): should not cut off 18 digits for no reason. [ruby-core:07796] * array.c (rb_ary_fill): internalize local variable "beg" to pacify Coverity. [ruby-core:07770] * pack.c (pack_unpack): now supports CRLF newlines. a patch from <tommy at tmtm.org>. [ruby-dev:28601] * applied code clean-up patch from Stefan Huehner <stefan at huehner.org>. [ruby-core:07764] * lib/jcode.rb (String::tr_s): should have translated non squeezing character sequence (i.e. a character) as well. thanks to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090] * ext/socket/socket.c: document update patch from Sam Roberts <sroberts at uniserve.com>. [ruby-core:07701] * lib/mathn.rb (Integer): need not to remove gcd2. a patch from NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570] * parse.y (arg): too much NEW_LIST() * eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen. * eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1. [ruby-dev:28585] * parse.y (arg): use NODE_ARGSCAT for placeholder. * lib/getoptlong.rb (GetoptLong::get): RDoc update patch from mathew <meta at pobox.com>. [ruby-core:07738] * variable.c (rb_const_set): raise error when no target klass is supplied. [ruby-dev:28582] * prec.c (prec_prec_f): documentation patch from <gerardo.santana at gmail.com>. [ruby-core:07689] * bignum.c (rb_big_pow): second operand may be too big even if it's a Fixnum. [ruby-talk:187984] * README.EXT: update symbol description. [ruby-talk:188104] * COPYING: explicitly note GPLv2. [ruby-talk:187922] * parse.y: remove some obsolete syntax rules (unparenthesized method calls in argument list). * eval.c (rb_call0): insecure calling should be checked for non NODE_SCOPE method invocations too. * eval.c (rb_alias): should preserve the current safe level as well as method definition. * process.c (rb_f_sleep): remove RDoc description about SIGALRM which is not valid on the current implementation. [ruby-dev:28464] Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp> * eval.c (method_missing): should support argument splat in super. a bug in combination of super, splat and method_missing. [ruby-talk:185438] * configure.in: Solaris SunPro compiler -rapth patch from <kuwa at labs.fujitsu.com>. [ruby-dev:28443] * configure.in: remove enable_rpath=no for Solaris. [ruby-dev:28440] * ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby String object. * ruby.1: a clarification patch from David Lutterkort <dlutter at redhat.com>. [ruby-core:7508] * lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems directories. a patch from Eric Hodel <drbrain at segment7.net>. [ruby-core:07423] * eval.c (rb_clear_cache_by_class): clearing wrong cache. * ext/extmk.rb: use :remove_destination to install extension libraries to avoid SEGV. [ruby-dev:28417] * eval.c (rb_thread_fd_writable): should not re-schedule output from KILLED thread (must be error printing). * array.c (rb_ary_flatten_bang): allow specifying recursion level. [ruby-talk:182170] * array.c (rb_ary_flatten): ditto. * gc.c (add_heap): a heap_slots may overflow. a patch from Stefan Weil <weil at mail.berlios.de>. * eval.c (rb_call): use separate cache for fcall/vcall invocation. * eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local functions. * eval.c (rb_mod_local): a new method to specify newly added visibility "local". * eval.c (search_method): search for local methods which are visible only from the current class. * class.c (rb_class_local_methods): a method to list local methods. * object.c (Init_Object): add BasicObject class as a top level BlankSlate class. * ruby.h (SYM2ID): should not cast to signed long. [ruby-core:07414] * class.c (rb_include_module): allow module duplication. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
244 lines
5.7 KiB
Ruby
244 lines
5.7 KiB
Ruby
#!./miniruby
|
|
|
|
load "./rbconfig.rb"
|
|
include RbConfig
|
|
|
|
srcdir = File.dirname(__FILE__)
|
|
$:.unshift File.expand_path("lib", srcdir)
|
|
require 'fileutils'
|
|
require 'shellwords'
|
|
require 'optparse'
|
|
require 'optparse/shellwords'
|
|
require 'tempfile'
|
|
|
|
STDOUT.sync = true
|
|
File.umask(0)
|
|
|
|
def parse_args()
|
|
$mantype = 'doc'
|
|
$destdir = nil
|
|
$make = 'make'
|
|
$mflags = []
|
|
$install = []
|
|
opt = OptionParser.new
|
|
opt.on('-n') {$dryrun = true}
|
|
opt.on('--dest-dir=DIR') {|dir| $destdir = dir}
|
|
opt.on('--make=COMMAND') {|make| $make = make}
|
|
opt.on('--mantype=MAN') {|man| $mantype = man}
|
|
opt.on('--make-flags=FLAGS', '--mflags', Shellwords) do |*v|
|
|
if arg = v.first
|
|
arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
|
|
end
|
|
$mflags.concat(v)
|
|
end
|
|
opt.on('--install=TYPE', [:bin, :lib, :man]) {|ins| $install << ins}
|
|
opt.parse! rescue abort [$!.message, opt].join("\n")
|
|
|
|
$make, *rest = Shellwords.shellwords($make)
|
|
$mflags.unshift(*rest) unless rest.empty?
|
|
|
|
def $mflags.set?(flag)
|
|
grep(/\A-(?!-).*#{'%s' % flag}/i) { return true }
|
|
false
|
|
end
|
|
|
|
if $mflags.set?(?n)
|
|
$dryrun = true
|
|
else
|
|
$mflags << '-n' if $dryrun
|
|
end
|
|
|
|
$mflags << "DESTDIR=#{$destdir}"
|
|
|
|
$continue = $mflags.set?(?k)
|
|
end
|
|
|
|
parse_args()
|
|
|
|
include FileUtils::Verbose
|
|
include FileUtils::NoWrite if $dryrun
|
|
@fileutils_output = STDOUT
|
|
@fileutils_label = ''
|
|
|
|
def install?(type)
|
|
yield if $install.empty? or $install.include?(type)
|
|
end
|
|
|
|
def install(src, dest, options = {})
|
|
options[:preserve] = true
|
|
super
|
|
end
|
|
|
|
$made_dirs = {}
|
|
def makedirs(dirs)
|
|
dirs = fu_list(dirs)
|
|
dirs.reject! do |dir|
|
|
$made_dirs.fetch(dir) do
|
|
$made_dirs[dir] = true
|
|
File.directory?(dir)
|
|
end
|
|
end
|
|
super(dirs, :mode => 0755, :verbose => true) unless dirs.empty?
|
|
end
|
|
|
|
def with_destdir(dir)
|
|
return dir if !$destdir or $destdir.empty?
|
|
dir = dir.sub(/\A\w:/, '') if File::PATH_SEPARATOR == ';'
|
|
$destdir + dir
|
|
end
|
|
|
|
exeext = CONFIG["EXEEXT"]
|
|
|
|
ruby_install_name = CONFIG["ruby_install_name"]
|
|
rubyw_install_name = CONFIG["rubyw_install_name"]
|
|
|
|
version = CONFIG["ruby_version"]
|
|
bindir = with_destdir(CONFIG["bindir"])
|
|
libdir = with_destdir(CONFIG["libdir"])
|
|
rubylibdir = with_destdir(CONFIG["rubylibdir"])
|
|
archlibdir = with_destdir(CONFIG["archdir"])
|
|
sitelibdir = with_destdir(CONFIG["sitelibdir"])
|
|
sitearchlibdir = with_destdir(CONFIG["sitearchdir"])
|
|
mandir = with_destdir(File.join(CONFIG["mandir"], "man"))
|
|
configure_args = Shellwords.shellwords(CONFIG["configure_args"])
|
|
enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
|
|
dll = CONFIG["LIBRUBY_SO"]
|
|
lib = CONFIG["LIBRUBY"]
|
|
arc = CONFIG["LIBRUBY_A"]
|
|
|
|
makedirs [bindir, libdir, rubylibdir, archlibdir, sitelibdir, sitearchlibdir]
|
|
|
|
install?(:bin) do
|
|
ruby_bin = File.join(bindir, ruby_install_name)
|
|
|
|
install ruby_install_name+exeext, ruby_bin+exeext, :mode => 0755
|
|
if File.exist?(ruby_install_name+exeext+".manifest")
|
|
install ruby_install_name+exeext+".manifest", bindir, :mode => 0644
|
|
end
|
|
if rubyw_install_name and !rubyw_install_name.empty?
|
|
install rubyw_install_name+exeext, bindir, :mode => 0755
|
|
if File.exist?(rubyw_install_name+exeext+".manifest")
|
|
install rubyw_install_name+exeext+".manifest", bindir, :mode => 0644
|
|
end
|
|
end
|
|
if enable_shared and dll != lib
|
|
install dll, bindir, :mode => 0755
|
|
if File.exist?(dll+".manifest")
|
|
install dll+".manifest", bindir, :mode => 0644
|
|
end
|
|
end
|
|
install lib, libdir, :mode => 0755 unless lib == arc
|
|
install arc, libdir, :mode => 0644
|
|
install "config.h", archlibdir, :mode => 0644
|
|
install "rbconfig.rb", archlibdir, :mode => 0644
|
|
if CONFIG["ARCHFILE"]
|
|
for file in CONFIG["ARCHFILE"].split
|
|
install file, archlibdir, :mode => 0644
|
|
end
|
|
end
|
|
|
|
if dll == lib and dll != arc
|
|
for link in CONFIG["LIBRUBY_ALIASES"].split
|
|
ln_sf(dll, File.join(libdir, link))
|
|
end
|
|
end
|
|
end
|
|
|
|
Dir.chdir srcdir
|
|
|
|
install?(:lib) do
|
|
ruby_shebang = File.join(CONFIG["bindir"], ruby_install_name)
|
|
if File::ALT_SEPARATOR
|
|
ruby_bin_dosish = ruby_shebang.tr(File::SEPARATOR, File::ALT_SEPARATOR)
|
|
end
|
|
for src in Dir["bin/*"]
|
|
next unless File.file?(src)
|
|
next if /\/[.#]|(\.(old|bak|orig|rej|diff|patch|core)|~|\/core)$/i =~ src
|
|
|
|
name = ruby_install_name.sub(/ruby/, File.basename(src))
|
|
dest = File.join(bindir, name)
|
|
|
|
install src, dest, :mode => 0755
|
|
|
|
next if $dryrun
|
|
|
|
shebang = ''
|
|
body = ''
|
|
open(dest, "r+") { |f|
|
|
shebang = f.gets
|
|
body = f.read
|
|
|
|
if shebang.sub!(/^\#!.*?ruby\b/) {"#!" + ruby_shebang}
|
|
f.rewind
|
|
f.print shebang, body
|
|
f.truncate(f.pos)
|
|
end
|
|
}
|
|
|
|
if ruby_bin_dosish
|
|
batfile = File.join(CONFIG["bindir"], name + ".bat")
|
|
open(with_destdir(batfile), "w") { |b|
|
|
b.print <<EOH, shebang, body, <<EOF
|
|
@echo off
|
|
if not "%~d0" == "~d0" goto WinNT
|
|
#{ruby_bin_dosish} -x "#{batfile}" %1 %2 %3 %4 %5 %6 %7 %8 %9
|
|
goto endofruby
|
|
:WinNT
|
|
"%~dp0#{ruby_install_name}" -x "%~f0" %*
|
|
goto endofruby
|
|
EOH
|
|
__END__
|
|
:endofruby
|
|
EOF
|
|
}
|
|
end
|
|
end
|
|
|
|
for f in Dir["lib/**/*{.rb,help-message}"]
|
|
dir = File.dirname(f).sub!(/\Alib/, rubylibdir) || rubylibdir
|
|
makedirs dir
|
|
install f, dir, :mode => 0644
|
|
end
|
|
end
|
|
|
|
install?(:bin) do
|
|
for f in Dir["*.h"]
|
|
install f, archlibdir, :mode => 0644
|
|
end
|
|
|
|
if RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/
|
|
makedirs File.join(archlibdir, "win32")
|
|
install "win32/win32.h", File.join(archlibdir, "win32"), :mode => 0644
|
|
end
|
|
end
|
|
|
|
install?(:man) do
|
|
for mdoc in Dir["*.[1-9]"]
|
|
next unless File.file?(mdoc) and open(mdoc){|fh| fh.read(1) == '.'}
|
|
|
|
section = mdoc[-1,1]
|
|
|
|
destdir = mandir + section
|
|
destfile = File.join(destdir, mdoc.sub(/ruby/, ruby_install_name))
|
|
|
|
makedirs destdir
|
|
|
|
if $mantype == "doc"
|
|
install mdoc, destfile, :mode => 0644
|
|
else
|
|
require 'mdoc2man.rb'
|
|
|
|
w = Tempfile.open(mdoc)
|
|
|
|
open(mdoc) { |r|
|
|
Mdoc2Man.mdoc2man(r, w)
|
|
}
|
|
|
|
w.close
|
|
|
|
install w.path, destfile, :mode => 0644
|
|
end
|
|
end
|
|
end
|
|
|
|
# vi:set sw=2:
|