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

exts.mk.tmpl: ruby names

Browse source 
* template/exts.mk.tmpl: extract configured ruby names.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57444 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-01-28 01:43:29 +00:00
parent e52d2e038e
commit 658fc3dd26
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/extmk.rb
View file

@ -741,7 +741,7 @@ if $configure_only and $command_output
mf.puts mf.puts
mf.puts "#{rubies.join(' ')}: $(extensions:/.=/#{$force_static ? 'static' : 'all'})" mf.puts "#{rubies.join(' ')}: $(extensions:/.=/#{$force_static ? 'static' : 'all'})"
submake = "$(Q)$(MAKE) $(MFLAGS) $(SUBMAKEOPTS)" submake = "$(Q)$(MAKE) $(MFLAGS) $(SUBMAKEOPTS)"
mf.puts "all static: #{rubies.join(' ')}\n" unless $configure_only == 'sub' mf.puts "all static: #{rubies.join(' ')}\n"
$extobjs.each do |tgt| $extobjs.each do |tgt|
mf.puts "#{tgt}: #{File.dirname(tgt)}/static" mf.puts "#{tgt}: #{File.dirname(tgt)}/static"
end end

15
template/exts.mk.tmpl
View file

@ -30,15 +30,17 @@ Dir.glob("ext/*/exts.mk") do |e|
macros[n] = m | v macros[n] = m | v
end end
end end
s.scan(%r"^(?:ext/\S+)/[^/\s:]+:[ \t]*\1/static$| r = s[/^all static: (.+)$/, 1]
deps << $&
rubies |= r.split if r
s.scan(%r"^(ext/\S+)/[^/\s:]+:[ \t]*\1/static$|
^(?: ^(?:
(ruby\w*#{Regexp.quote(exeext)}[^:]*)| (?:#{Regexp.new(r)})|
all|static|install(?:-(?:so|rb))?| all|static|install(?:-(?:so|rb))?|
(?:dist|real)?clean (?:dist|real)?clean
):.+$ ):.+$
"ox) do |r,| "x) do
deps << $& deps << $&
rubies |= r.split if r
end end
s.scan(%r"^note:\n((?:\t.+\n)+)") do |(n)| s.scan(%r"^note:\n((?:\t.+\n)+)") do |(n)|
note |= n.split(/^/) note |= n.split(/^/)
@ -92,8 +94,8 @@ SUBMAKEOPTS = DLDOBJS="$(EXTOBJS) $(EXTENCS)" EXTOBJS= \
EXTLDFLAGS="$(EXTLDFLAGS)" EXTINITS="$(EXTINITS)" \ EXTLDFLAGS="$(EXTLDFLAGS)" EXTINITS="$(EXTINITS)" \
UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)" SHOWFLAGS= UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)" SHOWFLAGS=
all: rubies all:
static: rubies static:
clean: clean:
-$(Q)$(RM) ext/extinit.<%= objext %> -$(Q)$(RM) ext/extinit.<%= objext %>
@ -102,7 +104,6 @@ distclean:
<%= deps.join("\n") %> <%= deps.join("\n") %>
rubies: <%= rubies.join(' ') %>
% rubies.each do |ruby| % rubies.each do |ruby|
<%= ruby %>: <%= ruby %>:
$(Q)$(MAKE) $(MFLAGS) $(SUBMAKEOPTS) $@ $(Q)$(MAKE) $(MFLAGS) $(SUBMAKEOPTS) $@