mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
suppress warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
6f24054f6e
commit
57657a0b9b
3 changed files with 12 additions and 14 deletions
|
@ -38,7 +38,7 @@
|
|||
% cleanobjs << "$*.def" if deffile
|
||||
% rule_subst = CONFIG["RULE_SUBST"] || "%s"
|
||||
% transvpath = rule_subst.dup.sub!(/\{[^{}]+\}/, '$(TRANSVPATH)/') || "enc/trans/%s"
|
||||
% transvpath_prefix = (rule_subst.dup.sub!(/\{[^{}]+\}/, '{$(TRANSVPATH)}') || "") % ""
|
||||
% transvpath_prefix = rule_subst.dup.sub!(/\{[^{}]+\}/, '{$(TRANSVPATH)}') || ""
|
||||
% if File::ALT_SEPARATOR
|
||||
% pathrep = proc {|path| path.gsub('/', File::ALT_SEPARATOR).gsub(/\$\(([@<?*]\w?|\w+)\)/, "$(\\1:/=\\#{File::ALT_SEPARATOR})")}
|
||||
% else
|
||||
|
@ -99,7 +99,7 @@ $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.
|
|||
|
||||
<%=transvpath % "#{e}.c"%>: <%= transvpath % "#{e}.trans"%>
|
||||
% src = [*IO.read(File.join($srcdir, "trans", src)).scan(/^\s*require\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c+".rb"}]
|
||||
<%=transvpath % "#{e}.c"%>: <%= src.map {|e| transvpath % "#{e}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb
|
||||
<%=transvpath % "#{e}.c"%>: <%= src.map {|s| transvpath % "#{s}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb
|
||||
% end
|
||||
|
||||
% end
|
||||
|
@ -150,8 +150,8 @@ clean:
|
|||
$(Q)$(RM) enc/unicode/name2ctype.h
|
||||
-$(Q)$(RMDIR) enc/unicode<%=@ignore_error%>
|
||||
% end
|
||||
% workdirs.reverse_each do|dir|
|
||||
-$(Q)$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%>
|
||||
% workdirs.reverse_each do|d|
|
||||
-$(Q)$(RMDIR) <%=pathrep[d]%><%=@ignore_error%>
|
||||
% end
|
||||
|
||||
clean-srcs:
|
||||
|
|
17
ext/extmk.rb
17
ext/extmk.rb
|
@ -190,7 +190,6 @@ def extmake(target)
|
|||
# ignore
|
||||
ensure
|
||||
rm_f "conftest*"
|
||||
config = $0
|
||||
$0 = $PROGRAM_NAME
|
||||
end
|
||||
end
|
||||
|
@ -424,7 +423,7 @@ end unless $extstatic
|
|||
ext_prefix = "#{$top_srcdir}/ext"
|
||||
exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t}
|
||||
withes, withouts = %w[--with --without].collect {|w|
|
||||
if not (w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any?
|
||||
if !(w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any?
|
||||
nil
|
||||
elsif (w = w.grep(String)).empty?
|
||||
proc {true}
|
||||
|
@ -617,20 +616,20 @@ if $configure_only and $command_output
|
|||
end
|
||||
mf.puts
|
||||
targets = %w[all install static install-so install-rb clean distclean realclean]
|
||||
targets.each do |target|
|
||||
mf.puts "#{target}: $(extensions:/.=/#{target})"
|
||||
targets.each do |tgt|
|
||||
mf.puts "#{tgt}: $(extensions:/.=/#{tgt})"
|
||||
end
|
||||
mf.puts
|
||||
mf.puts "all: #{rubies.join(' ')}"
|
||||
mf.puts "#{rubies.join(' ')}: $(extensions:/.=/all)"
|
||||
rubies.each do |target|
|
||||
mf.puts "#{target}:\n\t$(Q)$(MAKE) $(MFLAGS) $@"
|
||||
rubies.each do |tgt|
|
||||
mf.puts "#{tgt}:\n\t$(Q)$(MAKE) $(MFLAGS) $@"
|
||||
end
|
||||
mf.puts
|
||||
exec = config_string("exec") {|s| s + " "}
|
||||
targets.each do |target|
|
||||
exec = config_string("exec") {|str| str + " "}
|
||||
targets.each do |tgt|
|
||||
exts.each do |d|
|
||||
mf.puts "#{d[0..-2]}#{target}:\n\t$(Q)cd $(@D) && #{exec}$(MAKE) $(MFLAGS) $(@F)"
|
||||
mf.puts "#{d[0..-2]}#{tgt}:\n\t$(Q)cd $(@D) && #{exec}$(MAKE) $(MFLAGS) $(@F)"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -6,7 +6,6 @@ def main
|
|||
mode = nil
|
||||
ids1src = nil
|
||||
ids2src = nil
|
||||
template = nil
|
||||
output = nil
|
||||
|
||||
parser = @parser = OptionParser.new
|
||||
|
|
Loading…
Reference in a new issue