summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-01 04:46:55 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-01 04:46:55 +0000
commit38a37ed8f2f9c988096e77dc01d0be78c1aa4320 (patch)
tree0c9524a455b3b505a59ce42e9302569aab313b6b /tool
parent23aad65d1f7970675211b9945271e32b98474997 (diff)
rbinstall.rb: no batch installation
* tool/rbinstall.rb (bin-comm): drop batch file installation. Windows 95 support has not been supported already. [Feature #10806] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49465 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-xtool/rbinstall.rb14
1 files changed, 2 insertions, 12 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index e488ec8..f3570e6 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -44,7 +44,7 @@ def parse_args(argv = ARGV)
$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)
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') do
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" %*