ruby-changes:12228
From: nobu <ko1@a...>
Date: Tue, 30 Jun 2009 16:57:28 +0900 (JST)
Subject: [ruby-changes:12228] Ruby:r23914 (trunk): * tool/rbinstall.rb: renamed to get rid of collision against
nobu 2009-06-30 16:57:11 +0900 (Tue, 30 Jun 2009) New Revision: 23914 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23914 Log: * tool/rbinstall.rb: renamed to get rid of collision against instruction.rb on command line completion of shell. Added files: trunk/tool/rbinstall.rb Removed files: trunk/tool/instruby.rb Modified files: trunk/ChangeLog trunk/common.mk Index: ChangeLog =================================================================== --- ChangeLog (revision 23913) +++ ChangeLog (revision 23914) @@ -1,5 +1,8 @@ -Tue Jun 30 16:55:32 2009 Nobuyoshi Nakada <nobu@r...> +Tue Jun 30 16:57:07 2009 Nobuyoshi Nakada <nobu@r...> + * 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. Index: common.mk =================================================================== --- common.mk (revision 23913) +++ common.mk (revision 23914) @@ -103,7 +103,7 @@ --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) \ Index: tool/instruby.rb =================================================================== --- tool/instruby.rb (revision 23913) +++ tool/instruby.rb (revision 23914) @@ -1,550 +0,0 @@ -#!./miniruby - -load "./rbconfig.rb" -include RbConfig -$".unshift File.expand_path("./rbconfig.rb") - -srcdir = File.expand_path('../..', __FILE__) -unless defined?(CROSS_COMPILING) and CROSS_COMPILING - $:.replace([srcdir+"/lib", Dir.pwd]) -end -require 'fileutils' -require 'shellwords' -require 'optparse' -require 'optparse/shellwords' -require 'tempfile' - -STDOUT.sync = true -File.umask(0) - -def parse_args(argv = ARGV) - $mantype = 'doc' - $destdir = nil - $extout = nil - $make = 'make' - $mflags = [] - $install = [] - $installed_list = nil - $dryrun = false - $rdocdir = nil - $data_mode = 0644 - $prog_mode = 0755 - $dir_mode = nil - $script_mode = nil - $strip = false - $cmdtype = ('bat' if File::ALT_SEPARATOR == '\\') - mflags = [] - opt = OptionParser.new - opt.on('-n') {$dryrun = true} - opt.on('--dest-dir=DIR') {|dir| $destdir = dir} - opt.on('--extout=DIR') {|dir| $extout = (dir unless dir.empty?)} - 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('-i', '--install=TYPE', - [:local, :bin, :"bin-arch", :"bin-comm", :lib, :man, :ext, :"ext-arch", :"ext-comm", :rdoc, :capi]) do |ins| - $install << ins - end - opt.on('--data-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode| - $data_mode = mode - end - opt.on('--prog-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode| - $prog_mode = mode - end - opt.on('--dir-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode| - $dir_mode = mode - end - opt.on('--script-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode| - $script_mode = mode - end - opt.on('--installed-list [FILENAME]') {|name| $installed_list = name} - opt.on('--rdoc-output [DIR]') {|dir| $rdocdir = dir} - opt.on('--cmd-type=TYPE', %w[bat cmd plain]) {|cmd| $cmdtype = (cmd unless cmd == 'plain')} - opt.on('--[no-]strip') {|strip| $strip = strip} - - opt.order!(argv) do |v| - case v - when /\AINSTALL[-_]([-\w]+)=(.*)/ - argv.unshift("--#{$1.tr('_', '-')}=#{$2}") - when /\A\w[-\w+]*=\z/ - mflags << v - when /\A\w[-\w+]*\z/ - $install << v.intern - else - raise OptionParser::InvalidArgument, v - end - end rescue abort [$!.message, opt].join("\n") - - $make, *rest = Shellwords.shellwords($make) - $mflags.unshift(*rest) unless rest.empty? - $mflags.unshift(*mflags) - - def $mflags.set?(flag) - grep(/\A-(?!-).*#{flag.chr}/i) { return true } - false - end - def $mflags.defined?(var) - grep(/\A#{var}=(.*)/) {return block_given? ? yield($1) : $1} - false - end - - if $mflags.set?(?n) - $dryrun = true - else - $mflags << '-n' if $dryrun - end - - $destdir ||= $mflags.defined?("DESTDIR") - if $extout ||= $mflags.defined?("EXTOUT") - RbConfig.expand($extout) - end - - $continue = $mflags.set?(?k) - - if $installed_list ||= $mflags.defined?('INSTALLED_LIST') - RbConfig.expand($installed_list, RbConfig::CONFIG) - $installed_list = open($installed_list, "ab") - $installed_list.sync = true - end - - $rdocdir ||= $mflags.defined?('RDOCOUT') - - $dir_mode ||= $prog_mode | 0700 - $script_mode ||= $prog_mode -end - -parse_args() - -include FileUtils -include FileUtils::NoWrite if $dryrun -@fileutils_output = STDOUT -@fileutils_label = '' - -$install_procs = Hash.new {[]} -def install?(*types, &block) - $install_procs[:all] <<= block - types.each do |type| - $install_procs[type] <<= block - end -end - -def strip_file(file) - if !defined?($strip_command) and (cmd = CONFIG["STRIP"]) - case cmd - when "", "true", ":" then return - else $strip_command = Shellwords.shellwords(cmd) - end - elsif !$strip_command - return - end - system(*($strip_command + [file])) -end - -def install(src, dest, options = {}) - options = options.clone - strip = options.delete(:strip) - options[:preserve] = true - d = with_destdir(dest) - super(src, d, options) - if strip - d = File.join(d, File.basename(src)) if $made_dirs[dest] - strip_file(d) - end - if $installed_list - dest = File.join(dest, File.basename(src)) if $made_dirs[dest] - $installed_list.puts dest - end -end - -def ln_sf(src, dest) - super(src, with_destdir(dest)) - $installed_list.puts dest if $installed_list -end - -$made_dirs = {} -def makedirs(dirs) - dirs = fu_list(dirs) - dirs.collect! do |dir| - realdir = with_destdir(dir) - realdir unless $made_dirs.fetch(dir) do - $made_dirs[dir] = true - $installed_list.puts(File.join(dir, "")) if $installed_list - File.directory?(realdir) - end - end.compact! - super(dirs, :mode => $dir_mode) unless dirs.empty? -end - -FalseProc = proc {false} -def path_matcher(pat) - if pat and !pat.empty? - proc {|f| pat.any? {|n| File.fnmatch?(n, f)}} - else - FalseProc - end -end - -def install_recursive(srcdir, dest, options = {}) - opts = options.clone - noinst = opts.delete(:no_install) - glob = opts.delete(:glob) || "*" - subpath = (srcdir.size+1)..-1 - prune = skip = FalseProc - if noinst - if Array === noinst - prune = noinst.grep(/#{File::SEPARATOR}/o).map!{|f| f.chomp(File::SEPARATOR)} - skip = noinst.grep(/\A[^#{File::SEPARATOR}]*\z/o) - else - if noinst.index(File::SEPARATOR) - prune = [noinst] - else - skip = [noinst] - end - end - skip |= %w"#*# *~ *.old *.bak *.orig *.rej *.diff *.patch *.core" - prune = path_matcher(prune) - skip = path_matcher(skip) - end - File.directory?(srcdir) or return rescue return - paths = [[srcdir, dest, true]] - found = [] - while file = paths.shift - found << file - file, d, dir = *file - if dir - files = [] - Dir.foreach(file) do |f| - src = File.join(file, f) - d = File.join(dest, dir = src[subpath]) - stat = File.lstat(src) rescue next - if stat.directory? - files << [src, d, true] if /\A\./ !~ f and !prune[dir] - else - files << [src, d, false] if File.fnmatch?(glob, f) and !skip[f] - end - end - paths.insert(0, *files) - end - end - for src, d, dir in found - if dir - makedirs(d) - else - makedirs(File.dirname(d)) - install src, d, opts - end - end -end - -def open_for_install(path, mode) - data = open(realpath = with_destdir(path), "rb") {|f| f.read} rescue nil - newdata = yield - unless $dryrun - unless newdata == data - open(realpath, "wb", mode) {|f| f.write newdata} - end - File.chmod(mode, realpath) - end - $installed_list.puts path if $installed_list -end - -def with_destdir(dir) - return dir if !$destdir or $destdir.empty? - dir = dir.sub(/\A\w:/, '') if File::PATH_SEPARATOR == ';' - $destdir + dir -end - -def prepare(mesg, basedir, subdirs=nil) - case - when !subdirs - dirs = basedir - when subdirs.size == 0 - subdirs = nil - when subdirs.size == 1 - dirs = [basedir = File.join(basedir, subdirs)] - subdirs = nil - else - dirs = [basedir, *subdirs.collect {|dir| File.join(basedir, dir)}] - end - printf("installing %-18s %s%s\n", "#{mesg}:", basedir, - (subdirs ? " (#{subdirs.join(', ')})" : "")) - makedirs(dirs) -end - -exeext = CONFIG["EXEEXT"] - -ruby_install_name = CONFIG["ruby_install_name"] -rubyw_install_name = CONFIG["rubyw_install_name"] -goruby_install_name = "go" + ruby_install_name - -version = CONFIG["ruby_version"] -bindir = CONFIG["bindir"] -libdir = CONFIG["libdir"] -archhdrdir = rubyhdrdir = CONFIG["rubyhdrdir"] -archhdrdir += "/" + CONFIG["arch"] -rubylibdir = CONFIG["rubylibdir"] -archlibdir = CONFIG["archdir"] -sitelibdir = CONFIG["sitelibdir"] -sitearchlibdir = CONFIG["sitearchdir"] -vendorlibdir = CONFIG["vendorlibdir"] -vendorarchlibdir = CONFIG["vendorarchdir"] -mandir = CONFIG["mandir"] -capidir = CONFIG["docdir"] -configure_args = Shellwords.shellwords(CONFIG["configure_args"]) -enable_shared = CONFIG["ENABLE_SHARED"] == 'yes' -dll = CONFIG["LIBRUBY_SO"] -lib = CONFIG["LIBRUBY"] -arc = CONFIG["LIBRUBY_A"] - -install?(:local, :arch, :bin, :'bin-arch') do - prepare "binary commands", bindir - - install ruby_install_name+exeext, bindir, :mode => $prog_mode, :strip => $strip - if rubyw_install_name and !rubyw_install_name.empty? - install rubyw_install_name+exeext, bindir, :mode => $prog_mode, :strip => $strip - end - if File.exist? goruby_install_name+exeext - install goruby_install_name+exeext, bindir, :mode => $prog_mode, :strip => $strip - end - if enable_shared and dll != lib - install dll, bindir, :mode => $prog_mode, :strip => $strip - end -end - -install?(:local, :arch, :lib) do - prepare "base libraries", libdir - - install lib, libdir, :mode => $prog_mode, :strip => $strip unless lib == arc - install arc, libdir, :mode => $data_mode - if dll == lib and dll != arc - for link in CONFIG["LIBRUBY_ALIASES"].split - ln_sf(dll, File.join(libdir, link)) - end - end - - prepare "arch files", archlibdir - install "rbconfig.rb", archlibdir, :mode => $data_mode - if CONFIG["ARCHFILE"] - for file in CONFIG["ARCHFILE"].split - install file, archlibdir, :mode => $data_mode - end - end -end - -if $extout - extout = "#$extout" - install?(:ext, :arch, :'ext-arch') do - prepare "extension objects", archlibdir - noinst = %w[-*] | (CONFIG["no_install_files"] || "").split - install_recursive("#{extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst, :mode => $prog_mode, :strip => $strip) - prepare "extension objects", sitearchlibdir - prepare "extension objects", vendorarchlibdir - end - install?(:ext, :arch, :'ext-arch') do - prepare "extension headers", archhdrdir - install_recursive("#{extout}/include/#{CONFIG['arch']}", archhdrdir, :glob => "*.h", :mode => $data_mode) - end - install?(:ext, :comm, :'ext-comm') do - prepare "extension scripts", rubylibdir - install_recursive("#{extout}/common", rubylibdir, :mode => $data_mode) - prepare "extension scripts", sitelibdir - prepare "extension scripts", vendorlibdir - end - install?(:ext, :comm, :'ext-comm') do - hdrdir = rubyhdrdir + "/ruby" - prepare "extension headers", hdrdir - install_recursive("#{extout}/include/ruby", hdrdir, :glob => "*.h", :mode => $data_mode) - end -end - -install?(:doc, :rdoc) do - if $rdocdir - ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version'], "system") - prepare "rdoc", ridatadir - install_recursive($rdocdir, ridatadir, :mode => $data_mode) - end -end -install?(:doc, :capi) do - prepare "capi-docs", capidir - install_recursive "doc/capi", capidir, :mode => $data_mode -end - -install?(:local, :comm, :bin, :'bin-comm') do - prepare "command scripts", bindir - - ruby_shebang = File.join(bindir, ruby_install_name) - if File::ALT_SEPARATOR - ruby_bin = ruby_shebang.tr(File::SEPARATOR, File::ALT_SEPARATOR) - end - if trans = CONFIG["program_transform_name"] - exp = [] - trans.gsub!(/\$\$/, '$') - trans.scan(%r[\G[\s;]*(/(?:\\.|[^/])*/)?([sy])(\W)((?:\\.|(?!\3).)*)\3((?:\\.|(?!\3).)*)\3([gi]*)]) do - |addr, cmd, sep, pat, rep, opt| - addr &&= Regexp.new(addr[/\A\/(.*)\/\z/, 1]) - case cmd - when 's' - next if pat == '^' and rep.empty? - exp << [addr, (opt.include?('g') ? :gsub! : :sub!), - Regexp.new(pat, opt.include?('i')), rep.gsub(/&/){'\&'}] - when 'y' - exp << [addr, :tr!, Regexp.quote(pat), rep] - end - end - trans = proc do |base| - exp.each {|addr, opt, pat, rep| base.__send__(opt, pat, rep) if !addr or addr =~ base} - base - end - elsif /ruby/ =~ ruby_install_name - trans = proc {|base| ruby_install_name.sub(/ruby/, base)} - else - trans = proc {|base| base} - end - for src in Dir[File.join(srcdir, "bin/*")] - next unless File.file?(src) - next if /\/[.#]|(\.(old|bak|orig|rej|diff|patch|core)|~|\/core)$/i =~ src - - name = trans[File.basename(src)] - - shebang = '' - body = '' - open(src, "rb") do |f| - shebang = f.gets - body = f.read - end - shebang.sub!(/^\#!.*?ruby\b/) {"#!" + ruby_shebang} - shebang.sub!(/\r$/, '') - body.gsub!(/\r$/, '') - - cmd = File.join(bindir, name) - cmd << ".#{$cmdtype}" if $cmdtype - open_for_install(cmd, $script_mode) do - case $cmdtype - when "bat" - "#{<<EOH}#{shebang}#{body}#{<<EOF}".gsub(/$/, "\r") -@echo off -@if not "%~d0" == "~d0" goto WinNT -#{ruby_bin} -x "#{cmd}" %1 %2 %3 %4 %5 %6 %7 %8 %9 -@goto endofruby -:WinNT -"%~dp0#{ruby_install_name}" -x "%~f0" %* -@goto endofruby -EOH -__END__ -:endofruby -EOF - when "cmd" - "#{<<"/EOH"}#{shebang}#{body}" -@"%~dp0#{ruby_install_name}" -x "%~f0" %* -@exit /b %ERRORLEVEL% -/EOH - else - shebang + body - end - end - end -end - -install?(:local, :comm, :lib) do - prepare "library scripts", rubylibdir - noinst = %w[README* *.txt *.rdoc] - install_recursive(File.join(srcdir, "lib"), rubylibdir, :no_install => noinst, :mode => $data_mode) -end - -install?(:local, :arch, :lib) do - prepare "common headers", rubyhdrdir - - noinst = [] - unless RUBY_PLATFORM =~ /mswin|mingw|bccwin/ - noinst << "win32.h" - end - noinst = nil if noinst.empty? - install_recursive(File.join(srcdir, "include"), rubyhdrdir, :no_install => noinst, :glob => "*.h", :mode => $data_mode) -end - -install?(:local, :comm, :man) do - mdocs = Dir["#{srcdir}/man/*.[1-9]"] - prepare "manpages", mandir, ([] | mdocs.collect {|mdoc| mdoc[/\d+$/]}).sort.collect {|sec| "man#{sec}"} - - mandir = File.join(mandir, "man") - has_goruby = File.exist?(goruby_install_name+exeext) - require File.join(srcdir, "tool/mdoc2man.rb") if $mantype != "doc" - mdocs.each do |mdoc| - next unless File.file?(mdoc) and open(mdoc){|fh| fh.read(1) == '.'} - base = File.basename(mdoc) - if base == "goruby.1" - next unless has_goruby - end - - destdir = mandir + (section = mdoc[/\d+$/]) - destname = ruby_install_name.sub(/ruby/, base.chomp(".#{section}")) - destfile = File.join(destdir, "#{destname}.#{section}") - - if $mantype == "doc" - install mdoc, destfile, :mode => $data_mode - else - w = nil - Tempfile.open(base) do |f| - w = f - open(mdoc) {|r| Mdoc2Man.mdoc2man(r, w)} - end - install w.path, destfile, :mode => $data_mode - w.close! - end - end -end - -install?(:ext, :comm, :gem) do - directories = [] - IO.foreach(File.join(srcdir, "lib/rubygems.rb")) do |line| - if /^\s*DIRECTORIES\s*=\s*%w\[(.*?)\]/ =~ line - directories = $1.split - break - end - end - gpath = CONFIG["sitelibdir"].sub(%r'/site_ruby/(?=[^/]+)', '/gems/') - prepare "default gems", gpath, directories - - destdir = File.join(gpath, directories.grep(/^spec/)[0]) - default_gems = [ - ['rake', 'rake.rb'], - ['rdoc', 'rdoc.rb'], - ['minitest', 'minitest/unit.rb'], - ] - default_gems.each do |name, lib| - lib = File.join(srcdir, "lib", lib) - version = open(lib) {|f| f.find {|s| /^\s*\w*VERSION\s*=(?!=)/ =~ s}} or next - version = version.split(%r"=\s*", 2)[1].strip - open_for_install(File.join(destdir, "#{name}.gemspec"), $data_mode) do |f| - <<-GEMSPEC -Gem::Specification.new do |s| - s.name = #{name.dump} - s.version = #{version} - s.summary = "This #{name} is bundled with Ruby" -end - GEMSPEC - end - end -end - -$install << :local << :ext if $install.empty? -$install.each do |inst| - if !(procs = $install_procs[inst]) || procs.empty? - next warn("unknown install target - #{inst}") - end - procs.each do |block| - dir = Dir.pwd - begin - block.call - ensure - Dir.chdir(dir) - end - end -end - -# vi:set sw=2: Index: tool/rbinstall.rb =================================================================== --- tool/rbinstall.rb (revision 0) +++ tool/rbinstall.rb (revision 23914) @@ -0,0 +1,550 @@ +#!./miniruby + +load "./rbconfig.rb" +include RbConfig +$".unshift File.expand_path("./rbconfig.rb") + +srcdir = File.expand_path('../..', __FILE__) +unless defined?(CROSS_COMPILING) and CROSS_COMPILING + $:.replace([srcdir+"/lib", Dir.pwd]) +end +require 'fileutils' +require 'shellwords' +require 'optparse' +require 'optparse/shellwords' +require 'tempfile' + +STDOUT.sync = true +File.umask(0) + +def parse_args(argv = ARGV) + $mantype = 'doc' + $destdir = nil + $extout = nil + $make = 'make' + $mflags = [] + $install = [] + $installed_list = nil + $dryrun = false + $rdocdir = nil + $data_mode = 0644 + $prog_mode = 0755 + $dir_mode = nil + $script_mode = nil + $strip = false + $cmdtype = ('bat' if File::ALT_SEPARATOR == '\\') + mflags = [] + opt = OptionParser.new + opt.on('-n') {$dryrun = true} + opt.on('--dest-dir=DIR') {|dir| $destdir = dir} + opt.on('--extout=DIR') {|dir| $extout = (dir unless dir.empty?)} + 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('-i', '--install=TYPE', + [:local, :bin, :"bin-arch", :"bin-comm", :lib, :man, :ext, :"ext-arch", :"ext-comm", :rdoc, :capi]) do |ins| + $install << ins + end + opt.on('--data-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode| + $data_mode = mode + end + opt.on('--prog-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode| + $prog_mode = mode + end + opt.on('--dir-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode| + $dir_mode = mode + end + opt.on('--script-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode| + $script_mode = mode + end + opt.on('--installed-list [FILENAME]') {|name| $installed_list = name} + opt.on('--rdoc-output [DIR]') {|dir| $rdocdir = dir} + opt.on('--cmd-type=TYPE', %w[bat cmd plain]) {|cmd| $cmdtype = (cmd unless cmd == 'plain')} + opt.on('--[no-]strip') {|strip| $strip = strip} + + opt.order!(argv) do |v| + case v + when /\AINSTALL[-_]([-\w]+)=(.*)/ + argv.unshift("--#{$1.tr('_', '-')}=#{$2}") + when /\A\w[-\w+]*=\z/ + mflags << v + when /\A\w[-\w+]*\z/ + $install << v.intern + else + raise OptionParser::InvalidArgument, v + end + end rescue abort [$!.message, opt].join("\n") + + $make, *rest = Shellwords.shellwords($make) + $mflags.unshift(*rest) unless rest.empty? + $mflags.unshift(*mflags) + + def $mflags.set?(flag) + grep(/\A-(?!-).*#{flag.chr}/i) { return true } + false + end + def $mflags.defined?(var) + grep(/\A#{var}=(.*)/) {return block_given? ? yield($1) : $1} + false + end + + if $mflags.set?(?n) + $dryrun = true + else + $mflags << '-n' if $dryrun + end + + $destdir ||= $mflags.defined?("DESTDIR") + if $extout ||= $mflags.defined?("EXTOUT") + RbConfig.expand($extout) + end + + $continue = $mflags.set?(?k) + + if $installed_list ||= $mflags.defined?('INSTALLED_LIST') + RbConfig.expand($installed_list, RbConfig::CONFIG) + $installed_list = open($installed_list, "ab") + $installed_list.sync = true + end + + $rdocdir ||= $mflags.defined?('RDOCOUT') + + $dir_mode ||= $prog_mode | 0700 + $script_mode ||= $prog_mode +end + +parse_args() + +include FileUtils +include FileUtils::NoWrite if $dryrun +@fileutils_output = STDOUT +@fileutils_label = '' + +$install_procs = Hash.new {[]} +def install?(*types, &block) + $install_procs[:all] <<= block + types.each do |type| + $install_procs[type] <<= block + end +end + +def strip_file(file) + if !defined?($strip_command) and (cmd = CONFIG["STRIP"]) + case cmd + when "", "true", ":" then return + else $strip_command = Shellwords.shellwords(cmd) + end + elsif !$strip_command + return + end + system(*($strip_command + [file])) +end + +def install(src, dest, options = {}) + options = options.clone + strip = options.delete(:strip) + options[:preserve] = true + d = with_destdir(dest) + super(src, d, options) + if strip + d = File.join(d, File.basename(src)) if $made_dirs[dest] + strip_file(d) + end + if $installed_list + dest = File.join(dest, File.basename(src)) if $made_dirs[dest] + $installed_list.puts dest + end +end + +def ln_sf(src, dest) + super(src, with_destdir(dest)) + $installed_list.puts dest if $installed_list +end + +$made_dirs = {} +def makedirs(dirs) + dirs = fu_list(dirs) + dirs.collect! do |dir| + realdir = with_destdir(dir) + realdir unless $made_dirs.fetch(dir) do + $made_dirs[dir] = true + $installed_list.puts(File.join(dir, "")) if $installed_list + File.directory?(realdir) + end + end.compact! + super(dirs, :mode => $dir_mode) unless dirs.empty? +end + +FalseProc = proc {false} +def path_matcher(pat) + if pat and !pat.empty? + proc {|f| pat.any? {|n| File.fnmatch?(n, f)}} + else + FalseProc + end +end + +def install_recursive(srcdir, dest, options = {}) + opts = options.clone + noinst = opts.delete(:no_install) + glob = opts.delete(:glob) || "*" + subpath = (srcdir.size+1)..-1 + prune = skip = FalseProc + if noinst + if Array === noinst + prune = noinst.grep(/#{File::SEPARATOR}/o).map!{|f| f.chomp(File::SEPARATOR)} + skip = noinst.grep(/\A[^#{File::SEPARATOR}]*\z/o) + else + if noinst.index(File::SEPARATOR) + prune = [noinst] + else + skip = [noinst] + end + end + skip |= %w"#*# *~ *.old *.bak *.orig *.rej *.diff *.patch *.core" + prune = path_matcher(prune) + skip = path_matcher(skip) + end + File.directory?(srcdir) or return rescue return + paths = [[srcdir, dest, true]] + found = [] + while file = paths.shift + found << file + file, d, dir = *file + if dir + files = [] + Dir.foreach(file) do |f| + src = File.join(file, f) + d = File.join(dest, dir = src[subpath]) + stat = File.stat(src) rescue next + if stat.directory? + files << [src, d, true] if /\A\./ !~ f and !prune[dir] + else + files << [src, d, false] if File.fnmatch?(glob, f) and !skip[f] + end + end + paths.insert(0, *files) + end + end + for src, d, dir in found + if dir + makedirs(d) + else + makedirs(File.dirname(d)) + install src, d, opts + end + end +end + +def open_for_install(path, mode) + data = open(realpath = with_destdir(path), "rb") {|f| f.read} rescue nil + newdata = yield + unless $dryrun + unless newdata == data + open(realpath, "wb", mode) {|f| f.write newdata} + end + File.chmod(mode, realpath) + end + $installed_list.puts path if $installed_list +end + +def with_destdir(dir) + return dir if !$destdir or $destdir.empty? + dir = dir.sub(/\A\w:/, '') if File::PATH_SEPARATOR == ';' + $destdir + dir +end + +def prepare(mesg, basedir, subdirs=nil) + case + when !subdirs + dirs = basedir + when subdirs.size == 0 + subdirs = nil + when subdirs.size == 1 + dirs = [basedir = File.join(basedir, subdirs)] + subdirs = nil + else + dirs = [basedir, *subdirs.collect {|dir| File.join(basedir, dir)}] + end + printf("installing %-18s %s%s\n", "#{mesg}:", basedir, + (subdirs ? " (#{subdirs.join(', ')})" : "")) + makedirs(dirs) +end + +exeext = CONFIG["EXEEXT"] + +ruby_install_name = CONFIG["ruby_install_name"] +rubyw_install_name = CONFIG["rubyw_install_name"] +goruby_install_name = "go" + ruby_install_name + +version = CONFIG["ruby_version"] +bindir = CONFIG["bindir"] +libdir = CONFIG["libdir"] +archhdrdir = rubyhdrdir = CONFIG["rubyhdrdir"] +archhdrdir += "/" + CONFIG["arch"] +rubylibdir = CONFIG["rubylibdir"] +archlibdir = CONFIG["archdir"] +sitelibdir = CONFIG["sitelibdir"] +sitearchlibdir = CONFIG["sitearchdir"] +vendorlibdir = CONFIG["vendorlibdir"] +vendorarchlibdir = CONFIG["vendorarchdir"] +mandir = CONFIG["mandir"] +capidir = CONFIG["docdir"] +configure_args = Shellwords.shellwords(CONFIG["configure_args"]) +enable_shared = CONFIG["ENABLE_SHARED"] == 'yes' +dll = CONFIG["LIBRUBY_SO"] +lib = CONFIG["LIBRUBY"] +arc = CONFIG["LIBRUBY_A"] + +install?(:local, :arch, :bin, :'bin-arch') do + prepare "binary commands", bindir + + install ruby_install_name+exeext, bindir, :mode => $prog_mode, :strip => $strip + if rubyw_install_name and !rubyw_install_name.empty? + install rubyw_install_name+exeext, bindir, :mode => $prog_mode, :strip => $strip + end + if File.exist? goruby_install_name+exeext + install goruby_install_name+exeext, bindir, :mode => $prog_mode, :strip => $strip + end + if enable_shared and dll != lib + install dll, bindir, :mode => $prog_mode, :strip => $strip + end +end + +install?(:local, :arch, :lib) do + prepare "base libraries", libdir + + install lib, libdir, :mode => $prog_mode, :strip => $strip unless lib == arc + install arc, libdir, :mode => $data_mode + if dll == lib and dll != arc + for link in CONFIG["LIBRUBY_ALIASES"].split + ln_sf(dll, File.join(libdir, link)) + end + end + + prepare "arch files", archlibdir + install "rbconfig.rb", archlibdir, :mode => $data_mode + if CONFIG["ARCHFILE"] + for file in CONFIG["ARCHFILE"].split + install file, archlibdir, :mode => $data_mode + end + end +end + +if $extout + extout = "#$extout" + install?(:ext, :arch, :'ext-arch') do + prepare "extension objects", archlibdir + noinst = %w[-*] | (CONFIG["no_install_files"] || "").split + install_recursive("#{extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst, :mode => $prog_mode, :strip => $strip) + prepare "extension objects", sitearchlibdir + prepare "extension objects", vendorarchlibdir + end + install?(:ext, :arch, :'ext-arch') do + prepare "extension headers", archhdrdir + install_recursive("#{extout}/include/#{CONFIG['arch']}", archhdrdir, :glob => "*.h", :mode => $data_mode) + end + install?(:ext, :comm, :'ext-comm') do + prepare "extension scripts", rubylibdir + install_recursive("#{extout}/common", rubylibdir, :mode => $data_mode) + prepare "extension scripts", sitelibdir + prepare "extension scripts", vendorlibdir + end + install?(:ext, :comm, :'ext-comm') do + hdrdir = rubyhdrdir + "/ruby" + prepare "extension headers", hdrdir + install_recursive("#{extout}/include/ruby", hdrdir, :glob => "*.h", :mode => $data_mode) + end +end + +install?(:doc, :rdoc) do + if $rdocdir + ridatadir = File.join(CONFIG['ridir'], CONFIG['ruby_version'], "system") + prepare "rdoc", ridatadir + install_recursive($rdocdir, ridatadir, :mode => $data_mode) + end +end +install?(:doc, :capi) do + prepare "capi-docs", capidir + install_recursive "doc/capi", capidir, :mode => $data_mode +end + +install?(:local, :comm, :bin, :'bin-comm') do + prepare "command scripts", bindir + + ruby_shebang = File.join(bindir, ruby_install_name) + if File::ALT_SEPARATOR + ruby_bin = ruby_shebang.tr(File::SEPARATOR, File::ALT_SEPARATOR) + end + if trans = CONFIG["program_transform_name"] + exp = [] + trans.gsub!(/\$\$/, '$') + trans.scan(%r[\G[\s;]*(/(?:\\.|[^/])*/)?([sy])(\W)((?:\\.|(?!\3).)*)\3((?:\\.|(?!\3).)*)\3([gi]*)]) do + |addr, cmd, sep, pat, rep, opt| + addr &&= Regexp.new(addr[/\A\/(.*)\/\z/, 1]) + case cmd + when 's' + next if pat == '^' and rep.empty? + exp << [addr, (opt.include?('g') ? :gsub! : :sub!), + Regexp.new(pat, opt.include?('i')), rep.gsub(/&/){'\&'}] + when 'y' + exp << [addr, :tr!, Regexp.quote(pat), rep] + end + end + trans = proc do |base| + exp.each {|addr, opt, pat, rep| base.__send__(opt, pat, rep) if !addr or addr =~ base} + base + end + elsif /ruby/ =~ ruby_install_name + trans = proc {|base| ruby_install_name.sub(/ruby/, base)} + else + trans = proc {|base| base} + end + for src in Dir[File.join(srcdir, "bin/*")] + next unless File.file?(src) + next if /\/[.#]|(\.(old|bak|orig|rej|diff|patch|core)|~|\/core)$/i =~ src + + name = trans[File.basename(src)] + + shebang = '' + body = '' + open(src, "rb") do |f| + shebang = f.gets + body = f.read + end + shebang.sub!(/^\#!.*?ruby\b/) {"#!" + ruby_shebang} + shebang.sub!(/\r$/, '') + body.gsub!(/\r$/, '') + + cmd = File.join(bindir, name) + cmd << ".#{$cmdtype}" if $cmdtype + open_for_install(cmd, $script_mode) do + case $cmdtype + when "bat" + "#{<<EOH}#{shebang}#{body}#{<<EOF}".gsub(/$/, "\r") +@echo off +@if not "%~d0" == "~d0" goto WinNT +#{ruby_bin} -x "#{cmd}" %1 %2 %3 %4 %5 %6 %7 %8 %9 +@goto endofruby +:WinNT +"%~dp0#{ruby_install_name}" -x "%~f0" %* +@goto endofruby +EOH +__END__ +:endofruby +EOF + when "cmd" + "#{<<"/EOH"}#{shebang}#{body}" +@"%~dp0#{ruby_install_name}" -x "%~f0" %* +@exit /b %ERRORLEVEL% +/EOH + else + shebang + body + end + end + end +end + +install?(:local, :comm, :lib) do + prepare "library scripts", rubylibdir + noinst = %w[README* *.txt *.rdoc] + install_recursive(File.join(srcdir, "lib"), rubylibdir, :no_install => noinst, :mode => $data_mode) +end + +install?(:local, :arch, :lib) do + prepare "common headers", rubyhdrdir + + noinst = [] + unless RUBY_PLATFORM =~ /mswin|mingw|bccwin/ + noinst << "win32.h" + end + noinst = nil if noinst.empty? + install_recursive(File.join(srcdir, "include"), rubyhdrdir, :no_install => noinst, :glob => "*.h", :mode => $data_mode) +end + +install?(:local, :comm, :man) do + mdocs = Dir["#{srcdir}/man/*.[1-9]"] + prepare "manpages", mandir, ([] | mdocs.collect {|mdoc| mdoc[/\d+$/]}).sort.collect {|sec| "man#{sec}"} + + mandir = File.join(mandir, "man") + has_goruby = File.exist?(goruby_install_name+exeext) + require File.join(srcdir, "tool/mdoc2man.rb") if $mantype != "doc" + mdocs.each do |mdoc| + next unless File.file?(mdoc) and open(mdoc){|fh| fh.read(1) == '.'} + base = File.basename(mdoc) + if base == "goruby.1" + next unless has_goruby + end + + destdir = mandir + (section = mdoc[/\d+$/]) + destname = ruby_install_name.sub(/ruby/, base.chomp(".#{section}")) + destfile = File.join(destdir, "#{destname}.#{section}") + + if $mantype == "doc" + install mdoc, destfile, :mode => $data_mode + else + w = nil + Tempfile.open(base) do |f| + w = f + open(mdoc) {|r| Mdoc2Man.mdoc2man(r, w)} + end + install w.path, destfile, :mode => $data_mode + w.close! + end + end +end + +install?(:ext, :comm, :gem) do + directories = [] + IO.foreach(File.join(srcdir, "lib/rubygems.rb")) do |line| + if /^\s*DIRECTORIES\s*=\s*%w\[(.*?)\]/ =~ line + directories = $1.split + break + end + end + gpath = CONFIG["sitelibdir"].sub(%r'/site_ruby/(?=[^/]+)', '/gems/') + prepare "default gems", gpath, directories + + destdir = File.join(gpath, directories.grep(/^spec/)[0]) + default_gems = [ + ['rake', 'rake.rb'], + ['rdoc', 'rdoc.rb'], + ['minitest', 'minitest/unit.rb'], + ] + default_gems.each do |name, lib| + lib = File.join(srcdir, "lib", lib) + version = open(lib) {|f| f.find {|s| /^\s*\w*VERSION\s*=(?!=)/ =~ s}} or next + version = version.split(%r"=\s*", 2)[1].strip + open_for_install(File.join(destdir, "#{name}.gemspec"), $data_mode) do |f| + <<-GEMSPEC +Gem::Specification.new do |s| + s.name = #{name.dump} + s.version = #{version} + s.summary = "This #{name} is bundled with Ruby" +end + GEMSPEC + end + end +end + +$install << :local << :ext if $install.empty? +$install.each do |inst| + if !(procs = $install_procs[inst]) || procs.empty? + next warn("unknown install target - #{inst}") + end + procs.each do |block| + dir = Dir.pwd + begin + block.call + ensure + Dir.chdir(dir) + end + end +end + +# vi:set sw=2: Property changes on: tool/rbinstall.rb ___________________________________________________________________ Name: svn:eol-style + LF Name: svn:executable + * Name: svn:keywords + Author Date Id Revision -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/