diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-07 03:06:58 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-07 03:06:58 +0000 |
commit | b032d111abc06e166b890f9f4d2a757af80116fd (patch) | |
tree | 7c636bec87ee1ba3cd3ce243f09be85fa1527870 /lib | |
parent | 9a0b64fda09dd86a5f314c7b6ec8d0f79c473250 (diff) |
mkmf.rb: library installation messages
* lib/mkmf.rb (configuration, dummy_makefile, create_makefile):
show library installation messages only when any files need to
be updated.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53448 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mkmf.rb | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index d8bc1b525d..9c1292b8ce 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1895,8 +1895,8 @@ SHELL = /bin/sh V = 0 Q1 = $(V:1=) Q = $(Q1:0=@) -ECHO1 = $(V:1=@#{CONFIG['NULLCMD']}) -ECHO = $(ECHO1:0=@echo) +ECHO1 = $(V:1=@ #{CONFIG['NULLCMD']}) +ECHO = $(ECHO1:0=@ echo) NULLCMD = #{CONFIG['NULLCMD']} #### Start of system configuration section. #### @@ -2040,6 +2040,7 @@ CLEANFILES = #{$cleanfiles.join(' ')} DISTCLEANFILES = #{$distcleanfiles.join(' ')} all install static install-so install-rb: Makefile + @$(NULLCMD) .PHONY: all install static install-so install-rb .PHONY: clean clean-so clean-static clean-rb @@ -2339,10 +2340,12 @@ static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{!$extmk ? " install-rb" : else mfile.puts "Makefile" end - mfile.print("install-rb: pre-install-rb install-rb-default\n") - mfile.print("install-rb-default: pre-install-rb-default\n") + mfile.print("install-rb: pre-install-rb do-install-rb install-rb-default\n") + mfile.print("install-rb-default: pre-install-rb-default do-install-rb-default\n") mfile.print("pre-install-rb: Makefile\n") mfile.print("pre-install-rb-default: Makefile\n") + mfile.print("do-install-rb:\n") + mfile.print("do-install-rb-default:\n") for sfx, i in [["-default", [["lib/**/*.rb", "$(RUBYLIBDIR)", "lib"]]], ["", $INSTALLFILES]] files = install_files(mfile, i, nil, srcprefix) or next for dir, *files in files @@ -2352,7 +2355,7 @@ static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{!$extmk ? " install-rb" : end for f in files dest = "#{dir}/#{File.basename(f)}" - mfile.print("install-rb#{sfx}: #{dest}\n") + mfile.print("do-install-rb#{sfx}: #{dest}\n") mfile.print("#{dest}: #{f} #{timestamp_file(dir, target_prefix)}\n") mfile.print("\t$(Q) $(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D)\n") if defined?($installed_list) and !$extout @@ -2368,7 +2371,13 @@ static: #{$extmk && !$static ? "all" : "$(STATIC_LIB)#{!$extmk ? " install-rb" : if files.empty? mfile.print("\t@$(NULLCMD)\n") else - mfile.print("\t$(ECHO) installing#{sfx.sub(/^-/, " ")} #{target} libraries\n") + q = "$(MAKE) -q do-install-rb#{sfx}" + if $nmake + mfile.print "!if \"$(Q)\" == \"@\"\n\t@#{q} || \\\n!endif\n\t" + else + mfile.print "\t$(Q:@=@#{q} || )" + end + mfile.print "$(ECHO:@=) installing#{sfx.sub(/^-/, " ")} #{target} libraries\n" end if $extout dirs.uniq! |