nobu	2015-02-01 13:46:55 +0900 (Sun, 01 Feb 2015)

  New Revision: 49465

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49465

  Log:
    rbinstall.rb: no batch installation
    
    * tool/rbinstall.rb (bin-comm): drop batch file installation.
      Windows 95 support has not been supported already.
      [Feature #10806]

  Modified files:
    trunk/ChangeLog
    trunk/tool/rbinstall.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49464)
+++ ChangeLog	(revision 49465)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Feb  1 13:46:52 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* tool/rbinstall.rb (bin-comm): drop batch file installation.
+	  Windows 95 support has not been supported already.
+	  [Feature #10806]
+
 Sat Jan 31 12:06:23 2015  Scott Francis  <scott.francis@s...>
 
 	* thread_pthread.c (reserve_stack): fix intermittent SIGBUS on
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 49464)
+++ tool/rbinstall.rb	(revision 49465)
@@ -44,7 +44,7 @@ def parse_args(argv = ARGV) https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L44
   $script_mode = nil
   $strip = false
   $cmdtype = (if File::ALT_SEPARATOR == '\\'
-                File.exist?("rubystub.exe") ? 'exe' : 'bat'
+                File.exist?("rubystub.exe") ? 'exe' : 'cmd'
               end)
   mflags = []
   opt = OptionParser.new
@@ -76,7 +76,7 @@ def parse_args(argv = ARGV) https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L76
   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('--cmd-type=TYPE', %w[cmd plain]) {|cmd| $cmdtype = (cmd unless cmd == 'plain')}
   opt.on('--[no-]strip') {|strip| $strip = strip}
 
   opt.order!(argv) do |v|
@@ -491,16 +491,6 @@ install?(:local, :comm, :bin, :'bin-comm https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L491
       case $cmdtype
       when "exe"
         stub + shebang + body
-      when "bat"
-        (prebatch + <<-"EOH".gsub(/^\s+/, '') << postbatch << shebang << body << "__END__\n:endofruby\n").gsub(/(?=\n)/, "\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
       when "cmd"
         prebatch + <<"/EOH" << postbatch << shebang << body
 @"%~dp0#{ruby_install_name}" -x "%~f0" %*

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/