summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/extmk.rb.in8
-rw-r--r--lib/mkmf.rb5
-rw-r--r--version.h4
4 files changed, 16 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index bbfb8c0..dc950a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 19 14:46:18 2002 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ext/extmk.rb, lib/mkmf.rb (xsystem): open the log file if xsystem
+ is called.
+
Wed Jun 19 00:50:50 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* parse.y (yylex): ? followed by successive word charaters is
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index 8690e7a..c5a929d 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 1f3910b..7235294 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 ec87324..2bc2589 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