autobuild 1.18.1 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba0c35a9d6c2a15141684c9836ca9b5763b90dfdc46832a31d0f343a6837ef4d
-  data.tar.gz: 3d5b3c22bdd6b3c082e9ed209a656b637274bd2054c8e211260ff28f8d058cd9
+  metadata.gz: 2db3dc0a2d21505b88966e48b4019800e42f39e4a44cbd113a874a4aefad8dc8
+  data.tar.gz: 3f19bf595f8c258899f1cfd3636257e9c58bd0ca02680a1e205d12d645cb9354
 SHA512:
-  metadata.gz: 12cd8fb953e0ce63ba4679dce12ab0e8fb46678815c6baab0db97c44097fd74fe5c684f43a2e6f0de04630cf0ee6cb70a9a34fbe94b88e390a062de65cf335fc
-  data.tar.gz: aee8a423d0b011b6d17b70554a79527e67280a2004aa7b0709a4bce740d7ff3d6df4a5c2923f9f26e9d12971d8c2657cfda989952a7cfdfbda5e6516f0c82005
+  metadata.gz: ac1af6ad08365cda04b28c52e8283fdaf2b4f56ae0b320961fb8600c7126e242c7e83569d8ac8f6722b441efc5f10d18b90a576a76efee1dc53c9c442327562f
+  data.tar.gz: e716f6c428ea5c6384465697abd8124a9e6aa739ab78025129beec71dd4ec14630e81804f0109a6707575713e69d86fbcd2d16fea4031cff1953ae6ff702fcf9

data/lib/autobuild/import/git.rb

@@ -24,6 +24,11 @@ class << self
             # AUTOBUILD_GIT_CACHE_DIR and AUTOBUILD_CACHE_DIR environment
             # variables
             #
+            # Because of its role within the caching system in autobuild/autoproj,
+            # these defaults are not applied to git repositories that are using
+            # submodules. The autoproj cache builder does not generate repositories
+            # compatible with having submodules
+            #
             # @return [Array]
             # @see default_alternates=, Git#alternates
             def default_alternates
@@ -111,7 +116,6 @@ def self.at_least_version(*version)
         #   workflow, it is recommended to not use submodules but checkout all
         #   repositories separately instead.
         def initialize(repository, branch = nil, options = {})
-            @alternates = Git.default_alternates.dup
             @git_dir_cache = Array.new
             @local_branch = @remote_branch = nil
             @tag = @commit = nil
@@ -155,6 +159,13 @@ def initialize(repository, branch = nil, options = {})
 
             @single_branch = gitopts[:single_branch]
             @with_submodules = gitopts.delete(:with_submodules)
+            @alternates =
+                if @with_submodules
+                    []
+                else
+                    Git.default_alternates.dup
+                end
+
             @remote_name = 'autobuild'
             @push_to = nil
             relocate(repository, gitopts)

data/lib/autobuild/package.rb

@@ -207,28 +207,20 @@ def checked_out?
             File.directory?(srcdir)
         end
 
-        def prepare_invoked?
-            task("#{name}-prepare").already_invoked?
-        end
-
-        def prepared?
-            @prepared
-        end
-
         def import_invoked?
-            task("#{name}-import").already_invoked?
+            @import_invoked
         end
 
         def imported?
             @imported
         end
 
-        def build_invoked?
-            task("#{name}-build").already_invoked?
+        def install_invoked?
+            @install_invoked
         end
 
-        def built?
-            @built
+        def installed?
+            @installed
         end
 
         def to_s
@@ -459,12 +451,13 @@ def isolate_errors(options = Hash.new)
         def import(options = Hash.new)
             options = Hash[only_local: options] unless options.respond_to?(:to_hash)
 
+            @import_invoked = true
             if @importer
                 result = @importer.import(self, options)
-                @imported = true
             elsif update?
                 message "%s: no importer defined, doing nothing"
             end
+            @imported = true
 
             # Add the dependencies declared in spec
             depends_on(*@spec_dependencies) if @spec_dependencies
@@ -480,7 +473,10 @@ def prepare
             stamps = dependencies.map { |p| Package[p].installstamp }
 
             file installstamp => stamps do
-                isolate_errors { install }
+                isolate_errors do
+                    @install_invoked = true
+                    install
+                end
             end
             task "#{name}-build" => installstamp
 
@@ -563,7 +559,7 @@ def install
 
             Autobuild.touch_stamp(installstamp)
 
-            @built = true
+            @installed = true
         end
 
         def run(*args, &block)
@@ -580,6 +576,14 @@ def run(*args, &block)
 
         module TaskExtension
             attr_accessor :package
+
+            def disabled?
+                if @disabled.nil? && package
+                    package.disabled?
+                else
+                    super
+                end
+            end
         end
 
         def source_tree(*args, &block)
@@ -820,17 +824,13 @@ def disable_phases(*phases)
             phases.each do |phase|
                 task "#{name}-#{phase}"
                 t = Rake::Task["#{name}-#{phase}"]
-                t.disable!
+                t.disable
             end
         end
 
         # Make sure that this package will be ignored in the build
         def disable(phases = Autobuild.all_phases)
             @disabled = true
-            disable_phases(*phases)
-            task(installstamp)
-            t = Rake::Task[installstamp]
-            t.disable!
         end
 
         def utility(utility_name)

data/lib/autobuild/packages/python.rb

@@ -22,9 +22,8 @@ def initialize(options)
             super
         end
 
-        def prepare
-            super
-            @install_mode = File.file?(File.join(srcdir, 'setup.py'))
+        def install_mode?
+            File.file?(File.join(srcdir, 'setup.py'))
         end
 
         def prepare_for_forced_build
@@ -65,7 +64,7 @@ def python_path
 
         # Do the build in builddir
         def build
-            return unless @install_mode
+            return unless install_mode?
 
             command = generate_build_command
             command << '--force' if @forced
@@ -78,7 +77,7 @@ def build
 
         # Install the result in prefix
         def install
-            return unless @install_mode
+            return unless install_mode?
 
             command = generate_install_command
             command << '--force' if @forced
@@ -91,7 +90,7 @@ def install
 
         def update_environment
             super
-            path = @install_mode ? python_path : srcdir
+            path = install_mode? ? python_path : srcdir
             env_add_path 'PYTHONPATH', path
         end
     end

data/lib/autobuild/parallel.rb

@@ -188,12 +188,16 @@ def invoke_parallel(required_tasks)
                     break if !pending_task && available_workers.size == workers.size
                 end
 
-                if state.trivial_task?(pending_task)
-                    Worker.execute_task(pending_task)
+                bypass_task = pending_task.disabled? ||
+                              pending_task.already_invoked? ||
+                              !pending_task.needed?
+
+                if bypass_task
+                    pending_task.already_invoked = true
                     state.process_finished_task(pending_task)
                     next
-                elsif pending_task.already_invoked? || !pending_task.needed?
-                    pending_task.already_invoked = true
+                elsif state.trivial_task?(pending_task)
+                    Worker.execute_task(pending_task)
                     state.process_finished_task(pending_task)
                     next
                 end

data/lib/autobuild/rake_task_extension.rb

@@ -6,11 +6,16 @@ def already_invoked?
 
         attr_writer :already_invoked
 
-        def disable!
-            @already_invoked = true
-            singleton_class.class_eval do
-                define_method(:needed?) { false }
-            end
+        def disabled?
+            @disabled
+        end
+
+        def disabled!
+            disable
+        end
+
+        def disable
+            @disabled = true
         end
     end
 end

data/lib/autobuild/utility.rb

@@ -29,6 +29,10 @@ def initialize(name, package, install_on_error: false)
             @source_dir = nil
             @target_dir = nil
             @install_on_error = install_on_error
+
+            @invoked = false
+            @success = false
+            @installed = false
         end
 
         # Directory in which the utility will generate some files The
@@ -98,7 +102,10 @@ def task(&block)
         end
 
         def call_task_block
+            @invoked = true
+
             yield if block_given?
+            @success = true
 
             # Allow the user to install manually in the task
             # block
@@ -107,6 +114,7 @@ def call_task_block
             raise
         rescue ::Exception => e
             install if install_on_error? && !@installed && target_dir
+            @success = false
 
             if Autobuild.send("pass_#{name}_errors")
                 raise
@@ -167,6 +175,24 @@ def install
             @installed = true
         end
 
+        # True if the utility has been invoked
+        def invoked?
+            @invoked
+        end
+
+        # True if the utility has been successful
+        #
+        # Combine with {#invoked?} to determine whether 'false' means 'not run'
+        # or 'failed'
+        def success?
+            @success
+        end
+
+        # True if the utility's results have been installed
+        def installed?
+            @installed
+        end
+
         # Can be called in the block given to {task} to announce that the
         # utility is to be disabled for that package. This is mainly used
         # when a runtime check is necessary to know if a package can run

data/lib/autobuild/version.rb

@@ -1,3 +1,3 @@
 module Autobuild
-    VERSION = "1.18.1".freeze unless defined? Autobuild::VERSION
+    VERSION = "1.19.0".freeze unless defined? Autobuild::VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.18.1
+  version: 1.19.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel