aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-17 10:13:25 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-17 10:13:25 +0000
commit49959bfd629304db8971be5581d124fc7d1ce42d (patch)
treec7bfeafcd7eeae6b9da7ad9390ada8c5acab6600
parent023eab52018a87a63a465aa73d25a58162115663 (diff)
downloadruby-49959bfd629304db8971be5581d124fc7d1ce42d.tar.gz
* lib/mkmf.rb (create_makefile): make extension libraries messages
brief. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rwxr-xr-xext/extmk.rb3
-rw-r--r--lib/mkmf.rb6
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d3d48d912..658203d762 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Wed Nov 17 18:38:35 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Wed Nov 17 19:13:22 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (create_makefile): make extension libraries messages
+ brief.
* win32/Makefile.sub (MAKEDIRS): should not include silent flag.
@@ -13,7 +16,7 @@ Wed Nov 17 16:09:52 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
Wed Nov 17 16:04:23 2010 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* test/ruby/envutil.rb (Test::Unit::Assersions#assert_warn):
- new assersion to assert that a particular warning message is
+ new assersion to assert that a particular warning message is
displayed.
forwardport from branches/ruby_1_9_2@29795.
diff --git a/ext/extmk.rb b/ext/extmk.rb
index c2b215425c..d0b0b7f863 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -62,7 +62,8 @@ def extract_makefile(makefile, keep = true)
unless installrb.empty?
config = CONFIG.dup
install_dirs(target_prefix).each {|var, val| config[var] = val}
- FileUtils.rm_f(installrb.values.collect {|f| RbConfig.expand(f, config)}, :verbose => true)
+ FileUtils.rm_f(installrb.values.collect {|f| RbConfig.expand(f, config)},
+ :verbose => $makeflags.defined?("Q") != "@")
end
end
return false
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index ef354df4b0..6a49c280f3 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1925,7 +1925,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
dest = "#{dir}/#{File.basename(f)}"
mfile.print("install-rb#{sfx}: #{dest} #{dir}\n")
mfile.print("#{dest}: #{f}\n")
- mfile.print("\t$(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n")
+ mfile.print("\t$(Q) $(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n")
if defined?($installed_list) and !$extout
mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n")
end
@@ -1935,6 +1935,8 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
end
end
end
+ mfile.print "pre-install-rb#{sfx}:\n"
+ mfile.print("\t$(ECHO) installing#{sfx.sub(/^-/, " ")} #{target} libraries\n")
if $extout
dirs.uniq!
unless dirs.empty?
@@ -1946,7 +1948,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
end
end
dirs.unshift(sodir) if target and !dirs.include?(sodir)
- dirs.each {|d| mfile.print "#{d}:\n\t$(MAKEDIRS) $@\n"}
+ dirs.each {|d| mfile.print "#{d}:\n\t$(Q) $(MAKEDIRS) $@\n"}
mfile.print <<-SITEINSTALL