From fa1f7befa95c930a68f4b7ace4a4e6e1dd221773 Mon Sep 17 00:00:00 2001 From: eban Date: Wed, 19 Jun 2002 05:54:24 +0000 Subject: [PATCH] * ext/extmk.rb, lib/mkmf.rb (xsystem): open the log file if xsystem is called. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2584 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/extmk.rb.in | 8 ++++++-- lib/mkmf.rb | 5 +++-- version.h | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index bbfb8c09c0..dc950a20b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 19 14:46:18 2002 WATANABE Hirofumi + + * ext/extmk.rb, lib/mkmf.rb (xsystem): open the log file if xsystem + is called. + Wed Jun 19 00:50:50 2002 Nobuyoshi Nakada * parse.y (yylex): ? followed by successive word charaters is diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index 8690e7a714..c5a929d4fe 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -80,18 +80,21 @@ end LINK = "@CC@ #{OUTFLAG}conftest -I#$topdir -I#$top_srcdir #{CFLAGS} @LDFLAGS@ %s %s %s conftest.c %s %s @LIBS@" CPP = "@CPP@ @CPPFLAGS@ -I#$topdir -I#$top_srcdir #{CFLAGS} %s %s %s conftest.c" -$log = open('extmk.log', 'w') - +$log = nil $orgerr = $stderr.dup $orgout = $stdout.dup + def xsystem command if $DEBUG puts command + $stdout.flush return system(command) end + $log ||= open(File.join($topdir, 'ext', 'extmk.log'), 'w') $stderr.reopen($log) $stdout.reopen($log) puts command + $stdout.flush r = system(command) $stderr.reopen($orgerr) $stdout.reopen($orgout) @@ -780,6 +783,7 @@ for d in Dir["#{ext_prefix}/**/*"] load "#{$top_srcdir}/ext/aix_mksym.rb" end end + $stdout.flush extmake(d) end diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 1f3910b0c6..7235294596 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -74,8 +74,6 @@ elsif RUBY_PLATFORM =~ /-nextstep|-rhapsody|-darwin/ CFLAGS.gsub!( /-arch\s\w*/, '' ) end -$log = open('mkmf.log', 'w') - if /mswin32/ =~ RUBY_PLATFORM OUTFLAG = '-Fe' elsif /bccwin32/ =~ RUBY_PLATFORM @@ -97,14 +95,17 @@ def rm_f(*files) end end +$log = nil $orgerr = $stderr.dup $orgout = $stdout.dup + def xsystem command Config.expand(command) if $DEBUG puts command return system(command) end + $log ||= open('mkmf.log', 'w') $stderr.reopen($log) $stdout.reopen($log) puts command diff --git a/version.h b/version.h index ec87324b7b..2bc2589380 100644 --- a/version.h +++ b/version.h @@ -1,4 +1,4 @@ #define RUBY_VERSION "1.7.2" -#define RUBY_RELEASE_DATE "2002-06-18" +#define RUBY_RELEASE_DATE "2002-06-19" #define RUBY_VERSION_CODE 172 -#define RUBY_RELEASE_CODE 20020618 +#define RUBY_RELEASE_CODE 20020619