mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/extmk.rb (extmake): Invoke Logging::log_close in a ensure
clause. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
1d339ff212
commit
ee2b218293
2 changed files with 6 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Wed Apr 3 20:27:37 2013 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
|
* ext/extmk.rb (extmake): Invoke Logging::log_close in a ensure
|
||||||
|
clause.
|
||||||
|
|
||||||
Wed Apr 3 18:53:58 2013 Tanaka Akira <akr@fsij.org>
|
Wed Apr 3 18:53:58 2013 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* ext/extmk.rb (extmake): Use Logging.open to switch stdout and
|
* ext/extmk.rb (extmake): Use Logging.open to switch stdout and
|
||||||
|
|
|
@ -230,10 +230,8 @@ def extmake(target)
|
||||||
Logging::message(mess) if Logging.log_opened?
|
Logging::message(mess) if Logging.log_opened?
|
||||||
print(mess)
|
print(mess)
|
||||||
$stdout.flush
|
$stdout.flush
|
||||||
Logging::log_close
|
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
Logging::log_close
|
|
||||||
args = sysquote($mflags)
|
args = sysquote($mflags)
|
||||||
unless $destdir.to_s.empty? or $mflags.defined?("DESTDIR")
|
unless $destdir.to_s.empty? or $mflags.defined?("DESTDIR")
|
||||||
args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))]
|
args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))]
|
||||||
|
@ -265,6 +263,7 @@ def extmake(target)
|
||||||
$extpath |= $LIBPATH
|
$extpath |= $LIBPATH
|
||||||
end
|
end
|
||||||
ensure
|
ensure
|
||||||
|
Logging::log_close
|
||||||
unless $ignore
|
unless $ignore
|
||||||
RbConfig.module_eval {
|
RbConfig.module_eval {
|
||||||
remove_const(:CONFIG)
|
remove_const(:CONFIG)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue