From 9550714057bf9f2b1455bbdcd53fe6623ef48524 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 23 Jan 2017 02:50:23 +0000 Subject: Parallel ext configuration * ext/configure-ext.mk: configure each directories underneath ext in parallel. * template/exts.mk.tmpl: then collect the results. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- template/configure-ext.mk.tmpl | 27 ++++++++++++ template/exts.mk.tmpl | 98 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+) create mode 100644 template/configure-ext.mk.tmpl create mode 100644 template/exts.mk.tmpl (limited to 'template') diff --git a/template/configure-ext.mk.tmpl b/template/configure-ext.mk.tmpl new file mode 100644 index 0000000000..974a257e2e --- /dev/null +++ b/template/configure-ext.mk.tmpl @@ -0,0 +1,27 @@ +V = 0 +Q1 = $(V:1=) +Q = $(Q1:0=@) +ECHO1 = $(V:1=@:) +ECHO = $(ECHO1:0=@echo) + +<% +srcdir = miniruby = nil +opt = OptionParser.new do |o| + o.on('--srcdir=SRCDIR') {|v| srcdir = v} + o.on('--miniruby=MINIRUBY') {|v| miniruby = v} + o.order!(ARGV) +end +srcdir ||= File.dirname(File.dirname(__FILE__)) +exts = Dir.glob("#{srcdir}/ext/*/").map(&File.method(:basename)) +%> +all: +% exts.each do |dir| +all: ext/<%=dir%>/exts.mk +ext/<%=dir%>/exts.mk: FORCE + $(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=ext/<%=dir%>/exts.mk \ + $(SCRIPT_ARGS) --extension=<%=dir%> --extstatic $(EXTSTATIC) \ + --gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \ + -- subconfigure +% end + +.PHONY: FORCE diff --git a/template/exts.mk.tmpl b/template/exts.mk.tmpl new file mode 100644 index 0000000000..6fadf79108 --- /dev/null +++ b/template/exts.mk.tmpl @@ -0,0 +1,98 @@ +# -*- makefile -*- +V = 0 +Q1 = $(V:1=) +Q = $(Q1:0=@) +ECHO1 = $(V:1=@:) +ECHO = $(ECHO1:0=@echo) +<% +require './rbconfig' +macros = {} +deps = [] +note = [] +Dir.glob("ext/*/exts.mk") do |e| + s = File.read(e) + s.scan(/^(extensions|EXT[A-Z]+)[ \t]*=[ \t]*((?>(?>[^\\\n]|\\.)*\\\n)*(?>[^\\\n]|\\.)*)$/) do |n, v| + v.gsub!(/\\\n[ \t]*/, ' ') + next if v.empty? + v = v.split + m = macros[n] ||= [] + case n + when "LIBS" + m.concat(v) + else + macros[n] = m | v + end + end + s.scan(%r"^(ext/\S+)/[^/\s:]+:[ \t]*\1/static$|^(?:ruby|install(?:-(?:so|rb))?|static|(?:dist|real)?clean):.+$") do + deps << $& + end + s.scan(%r"^note:\n((?:\t.+\n)+)") do |(n)| + note |= n.split(/^/) + end +end +deps.uniq! +if objs = macros["EXTOBJS"] and objs.any? {|e|e.start_with?("ext/extinit.")} + objs.delete_if {|e|e.start_with?("dmyext.")} +end +macros.default = [].freeze +class Array + def fold(h, w = 70) + return "" if empty? + w -= h + ret = [s = String.new] + each do |e| + if s.size + e.size + 1 > w + ret << (s = String.new) + end + s << " " << e + end + ret.join(" \\\n" + "\t" * (h / 8) + " " * (h % 8)) + end +end +@erbout = _erbout +def self.column + w = 0 + @erbout[/^.*\z/].scan(/\t|([^\t]+)/) {|s,| w += (s ? s.size : 8 - w % 8)} + w +end +targets = %w[all static install install-so install-rb clean distclean realclean] +objext = RbConfig::CONFIG["OBJEXT"] +%> + +extensions =<%= macros["extensions"].fold(column) %> +gems = +EXTOBJS =<%= macros["EXTOBJS"].fold(column) %> +EXTLIBS =<%= macros["EXTLIBS"].fold(column) %> +EXTSO =<%= macros["EXTSO"].fold(column) %> +EXTLDFLAGS =<%= macros["EXTLDFLAGS"].fold(column) %> +EXTINITS =<%= macros["EXTINITS"].fold(column) %> +SUBMAKEOPTS = DLDOBJS="$(EXTOBJS) $(EXTENCS)" EXTOBJS= \ + EXTSOLIBS="$(EXTLIBS)" LIBRUBY_SO_UPDATE=$(LIBRUBY_EXTS) \ + EXTLDFLAGS="$(EXTLDFLAGS)" EXTINITS="$(EXTINITS)" \ + UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)" SHOWFLAGS= + +all static: ruby + +clean: + -$(Q)$(RM) ext/extinit.<%= objext %> +distclean: + -$(Q)$(RM) ext/extinit.c + +<%= deps.join("\n") %> +ruby: + $(Q)$(MAKE) $(MFLAGS) $(SUBMAKEOPTS) $@ +libencs: + $(Q)$(MAKE) -f enc.mk V=$(V) $@ +ext/extinit.<%=objext%>: + $(Q)$(MAKE) $(MFLAGS) V=$(V) EXTINITS="$(EXTINITS)" $@ + +% targets.product(macros["extensions"].map {|e|e.chomp("/.")}) do |t, e| +<%=e%>/<%=t%>: + $(Q)$(MAKE) -C $(@D) $(MFLAGS) V=$(V) $(@F) +% end + +extso: + @echo EXTSO=$(EXTSO) + +note: +<%= note.join("") %> -- cgit v1.2.3