kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/mkmf.rb (create_makefile): make extension libraries messages

Browse source 
brief.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29819 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-11-17 10:13:25 +00:00
parent 023eab5201
commit 49959bfd62
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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.

3
ext/extmk.rb
View file

@ -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

6
lib/mkmf.rb
View file

@ -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