autobuild 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5db12f4baef9f5192a60e44c30b9db25301eeada8b07706dc29b07f8a3d72f9
-  data.tar.gz: '078bd5a842db6b28dcc83934074291860998f7688bb8186d7ca1c1b40510054f'
+  metadata.gz: 3b7ade4cfb6600c6240d0e6cbb23ed19340e7c3a43b7811aab49236e1d81b1f0
+  data.tar.gz: 72fade1f3c6de16fd4988c9d132452aed5a7684f4e1978872ea3e18933c8c0ac
 SHA512:
-  metadata.gz: 86b505fbc092682443ae1cf05403ad72ef2cba0cd5f0c42d9b1e70f352f37221a5304baf2a0b1391ccb9b2d8247580abbbe4ab7c503c1a480c7ded04d01e1314
-  data.tar.gz: a6110dd2e3f714a9213973f4eebbcee346357295e56970b798f413c692c59cfb49ac2b90399890827ffff101d1e564cce3ca715d36d260acbe290096633e18d8
+  metadata.gz: 3b63871e342d7a5b7bdf7bb0ab28c1aa6bb4e808f95a08ada2c9d56ba74c2ce95207883348b8e5727bfac65932d6c8f5cd2473f62bf2445ed6b4110d95331a17
+  data.tar.gz: 1a53537790164887e430742c5314e1f22685f2b50102874b33556f2153fa03e4d69f68cf95d89602c799bda420c878985c2f5600122077b84917221f8408ac89

data/lib/autobuild/import/archive.rb

@@ -395,7 +395,7 @@ def relocate(url, options = Hash.new)
         def update(package, options = Hash.new) # :nodoc:
             if options[:only_local]
                 package.warn "%s: the archive importer does not support local updates, skipping"
-                return
+                return false
             end
             needs_update = update_cache(package)
 
@@ -404,9 +404,9 @@ def update(package, options = Hash.new) # :nodoc:
             end
 
             if needs_update || archive_changed?(package)
-                checkout(package, allow_interactive: options[:allow_interactive])
-                true
+                return checkout(package, allow_interactive: options[:allow_interactive])
             end
+            false
         end
 
         def checkout_digest_stamp(package)
@@ -449,7 +449,7 @@ def checkout(package, options = Hash.new) # :nodoc:
                 if !response
                     package.message "not updating #{package.srcdir}"
                     package.progress_done
-                    return
+                    return false
                 else
                     package.message "deleting #{package.srcdir} to update to new archive"
                     FileUtils.rm_rf package.srcdir
@@ -498,6 +498,7 @@ def checkout(package, options = Hash.new) # :nodoc:
                 end
             end
             write_checkout_digest_stamp(package)
+            return true
 
         rescue SubcommandFailed
             if cachefile != url.path

data/lib/autobuild/packages/autotools.rb

@@ -19,8 +19,8 @@ def self.autotools(opts, &proc)
     # ==== Handles autotools-based packages
     #
     # == Used programs (see <tt>Autobuild.programs</tt>)
-    # Autotools will use the 'aclocal', 'autoheader', 'autoconf' and 'automake'
-    # programs defined on Autobuild.programs. autoheader is disabled by default,
+    # Autotools will use the 'aclocal', 'autoheader', 'autoconf', 'automake' and 'bear'
+    # programs defined on Autobuild.programs. autoheader and bear are disabled by default,
     # aclocal, autoconf and automake use are autodetected.
     #
     # To override this default behaviour on a per-package basis, use Autotools#use
@@ -32,8 +32,23 @@ class Autotools < Configurable
         attr_accessor   :autoheader_flags
         attr_accessor   :autoconf_flags
         attr_accessor   :automake_flags
+        attr_accessor   :bear_flags
 
         @builddir = 'build'
+        @@enable_bear_globally = false
+
+        def self.enable_bear_globally?
+            @@enable_bear_globally
+        end
+
+        def self.enable_bear_globally=(flag)
+            @@enable_bear_globally = flag
+        end
+
+        def using_bear?
+            return Autotools.enable_bear_globally? if using[:bear].nil?
+            using[:bear]
+        end
 
         def configurestamp; "#{builddir}/config.status" end
 
@@ -44,6 +59,7 @@ def initialize(options)
             @autoheader_flags = Array.new
             @autoconf_flags   = Array.new
             @automake_flags   = Array.new
+            @bear_flags       = ['-a']
 
             super
         end
@@ -209,6 +225,15 @@ def prepare
             file configurestamp => regen_target
         end
 
+        def tool_program(tool)
+            tool_flag = using[tool.to_sym]
+            if tool_flag.respond_to?(:to_str)
+                tool_flag.to_str
+            else
+                Autobuild.tool(tool)
+            end
+        end
+
         # If set to true, configure will be called with --no-create and
         # ./config.status will be started each time before "make"
         #
@@ -272,15 +297,9 @@ def regen
                     working_directory: srcdir
             else
                 [ :aclocal, :autoconf, :autoheader, :automake ].each do |tool|
-                    if tool_flag = using[tool]
-                        tool_program = if tool_flag.respond_to?(:to_str)
-                                        tool_flag.to_str
-                                    else; Autobuild.tool(tool)
-                                    end
-
-                        run 'configure', tool_program, *send("#{tool}_flags"),
-                            working_directory: srcdir
-                    end
+                    next unless using[tool]
+                    run 'configure', tool_program(tool), *send("#{tool}_flags"),
+                        working_directory: srcdir
                 end
             end
         end
@@ -308,7 +327,18 @@ def build
                     if force_config_status
                         run('build', './config.status')
                     end
-                    run('build', Autobuild.tool(:make), "-j#{parallel_build_level}")
+
+                    build_options = []
+                    if using_bear?
+                        build_tool = tool_program(:bear)
+                        build_options = bear_flags
+                        build_options << Autobuild.tool(:make)
+                    else
+                        build_tool = Autobuild.tool(:make)
+                    end
+                    build_options << "-j#{parallel_build_level}"
+
+                    run('build', build_tool, *build_options)
                 end
             end
             Autobuild.touch_stamp(buildstamp)

data/lib/autobuild/packages/gnumake.rb

@@ -1,12 +1,16 @@
+require 'rubygems/version'
+
 module Autobuild
     def self.make_is_gnumake?(pkg, path = Autobuild.tool(:make))
         @make_is_gnumake ||= Hash.new
+        @gnumake_version ||= Hash.new
         if @make_is_gnumake.has_key?(path)
             @make_is_gnumake[path]
         else
             begin
                 result = pkg.run('prepare', path, '--version')
                 @make_is_gnumake[path] = (result.first =~ /GNU Make/)
+                @gnumake_version[path] = result.first.scan(/[\d.]+/)[0]
             rescue Autobuild::SubcommandFailed
                 @make_is_gnumake[path] = false
             end
@@ -31,7 +35,11 @@ def self.invoke_make_parallel(pkg, cmd_path = Autobuild.tool(:make))
                     job_server.get(reserved - 1) # We already have one token taken by autobuild itself
                     yield("-j#{pkg.parallel_build_level}")
                 end
-                yield("--jobserver-fds=#{job_server.rio.fileno},#{job_server.wio.fileno}", "-j")
+                if Gem::Version.new(@gnumake_version[cmd_path]) >= Gem::Version.new("4.2.0")
+                    yield("--jobserver-auth=#{job_server.rio.fileno},#{job_server.wio.fileno}", "-j")
+                else
+                    yield("--jobserver-fds=#{job_server.rio.fileno},#{job_server.wio.fileno}", "-j")
+                end
             end
             yield("-j#{pkg.parallel_build_level}")
         else yield

data/lib/autobuild/version.rb

@@ -1,3 +1,3 @@
 module Autobuild
-    VERSION = "1.15.0" unless defined? Autobuild::VERSION
+    VERSION = "1.16.0" unless defined? Autobuild::VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake