ruby-changes:17808
From: nobu <ko1@a...>
Date: Wed, 17 Nov 2010 19:14:01 +0900 (JST)
Subject: [ruby-changes:17808] Ruby:r29819 (trunk): * lib/mkmf.rb (create_makefile): make extension libraries messages
nobu 2010-11-17 19:13:25 +0900 (Wed, 17 Nov 2010) New Revision: 29819 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29819 Log: * lib/mkmf.rb (create_makefile): make extension libraries messages brief. Modified files: trunk/ChangeLog trunk/ext/extmk.rb trunk/lib/mkmf.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 29818) +++ ChangeLog (revision 29819) @@ -1,5 +1,8 @@ -Wed Nov 17 18:38:35 2010 Nobuyoshi Nakada <nobu@r...> +Wed Nov 17 19:13:22 2010 Nobuyoshi Nakada <nobu@r...> + * lib/mkmf.rb (create_makefile): make extension libraries messages + brief. + * win32/Makefile.sub (MAKEDIRS): should not include silent flag. * common.mk (ext/ripper/ripper.c, ext/json/parser/parser.c): pass @@ -13,7 +16,7 @@ Wed Nov 17 16:04:23 2010 Yuki Sonoda (Yugui) <yugui@y...> * 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. Index: lib/mkmf.rb =================================================================== --- lib/mkmf.rb (revision 29818) +++ lib/mkmf.rb (revision 29819) @@ -1925,7 +1925,7 @@ 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 @@ 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 @@ 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 Index: ext/extmk.rb =================================================================== --- ext/extmk.rb (revision 29818) +++ ext/extmk.rb (revision 29819) @@ -62,7 +62,8 @@ 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/