kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* tool/rbinstall.rb (bin-comm): prepend prolog shell script if

Browse source 
necessary.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29704 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-11-05 22:30:13 +00:00
parent 41a25b855a
commit ec50e32dbd
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,4 +1,7 @@
Sat Nov 6 07:28:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
Sat Nov 6 07:30:07 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* tool/rbinstall.rb (bin-comm): prepend prolog shell script if
necessary.
* configure.in (LIBRUBY_RELATIVE): use rpath token expansion.

24
tool/rbinstall.rb
View file

@ -302,6 +302,7 @@ lib = CONFIG["LIBRUBY"]
arc = CONFIG["LIBRUBY_A"]
major = CONFIG["MAJOR"]
minor = CONFIG["MINOR"]
load_relative = configure_args.include?("--enable-load-relative")
install?(:local, :arch, :bin, :'bin-arch') do
prepare "binary commands", bindir
@ -381,6 +382,23 @@ install?(:doc, :capi) do
install_recursive "doc/capi", capidir, :mode => $data_mode
end
if load_relative
PROLOG_SCRIPT = <<EOS
#!/bin/sh\n# -*- ruby -*-
bindir=`#{CONFIG["CHDIR"]} "${0%/*}" 2>/dev/null; pwd`
EOS
if CONFIG["LIBRUBY_RELATIVE"] != 'yes' and libpathenv = CONFIG["LIBPATHENV"]
pathsep = File::PATH_SEPARATOR
PROLOG_SCRIPT << <<EOS
prefix="${bindir%/bin}"
export #{libpathenv}="$prefix/lib${#{libpathenv}#{pathsep}+#{pathsep}$#{libpathenv}}"
EOS
end
PROLOG_SCRIPT << %Q[exec "$bindir/#{ruby_install_name}" -x "$0" "$@"\n]
else
PROLOG_SCRIPT = nil
end
install?(:local, :comm, :bin, :'bin-comm') do
prepare "command scripts", bindir
@ -426,7 +444,11 @@ install?(:local, :comm, :bin, :'bin-comm') do
shebang = f.gets
body = f.read
end
shebang.sub!(/^\#!.*?ruby\b/) {"#!" + ruby_shebang}
if PROLOG_SCRIPT
shebang.sub!(/\A(\#!.*?ruby\b)?/) {PROLOG_SCRIPT + ($1 || "#!ruby\n")}
else
shebang.sub!(/\A\#!.*?ruby\b/) {"#!" + ruby_shebang}
end
shebang.sub!(/\r$/, '')
body.gsub!(/\r$/, '')