autobuild 1.10.0.rc5 → 1.10.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1c06167f06497b4020c6ffce89ee69dd72e4750
-  data.tar.gz: b718b386c30704197b1b9ae6a3b3fcb22460da2c
+  metadata.gz: 847879d0a9358e23c67213792adcf107c22ac905
+  data.tar.gz: faf239f772607f3a7d95ce23c7ace8f9c85a741c
 SHA512:
-  metadata.gz: 2580aff6b12ffb0ab7398ecf6cc2af1064f088dfc32cfe7bac301773a85c217064ae38bdc483baf8257eb43588e79e72bfd56915947d017ac1c16744267561cd
-  data.tar.gz: cfcbe1c31e7f417e94c9aaeb6a05152abf0788adb7d6a5abd4d4f06d5f16476b585c805d371101eaea855546a3e4a640f655a0f114d9e516672e1e914570254d
+  metadata.gz: d5d197ecf8a24f1409a0567ebfbf65ef89cbbf638922eb6fddd611c1fe1ab3f09a16446786c3474a7242e1e122940f05c6522225d3fadfb075d4ac446d0b0aeb
+  data.tar.gz: 1089a0b99f8daa3d05baf5f661db41b41d6bf5d9863f4c0c36ae6d6505eb84e00b9a2108ff30ef247ff87d30d69173f69398cd19b56e29158af17a4acddb1502

data/lib/autobuild.rb

@@ -4,8 +4,11 @@
     include Rake::DSL
 end
 
+require 'utilrb/logger'
+
 module Autobuild
     LIB_DIR = File.expand_path(File.dirname(__FILE__))
+    extend Logger::Root('Autobuild', Logger::INFO)
 end
 
 require 'net/smtp'

data/lib/autobuild/environment.rb

@@ -565,8 +565,8 @@ def update_environment(newprefix, includes = nil)
 
         # Returns the system-wide search path that is embedded in pkg-config
         def default_pkgconfig_search_suffixes
-            found_path_rx = /Scanning directory '(.*\/)((?:lib|lib64|share)\/.*)'$/
-            nonexistent_path_rx = /Cannot open directory '.*\/((?:lib|lib64|share)\/.*)' in package search path:.*/
+            found_path_rx = /Scanning directory (?:#\d+ )?'(.*\/)((?:lib|lib64|share)\/.*)'$/
+            nonexistent_path_rx = /Cannot open directory (?:#\d+ )?'.*\/((?:lib|lib64|share)\/.*)' in package search path:.*/
 
             if !@default_pkgconfig_search_suffixes
                 output = `LANG=C PKG_CONFIG_PATH= #{Autobuild.tool("pkg-config")} --debug 2>&1`.split("\n")

data/lib/autobuild/parallel.rb

@@ -223,12 +223,12 @@ def invoke_parallel(required_tasks)
 
             not_processed = tasks.find_all { |t| !t.already_invoked? }
             if !not_processed.empty?
-                cycle = resolve_cycle(not_processed)
+                cycle = resolve_cycle(tasks, not_processed, reverse_dependencies)
                 raise "cycle in task graph: #{cycle.map(&:name).sort.join(", ")}"
             end
         end
 
-        def resolve_cycle(tasks)
+        def resolve_cycle(all_tasks, tasks, reverse_dependencies)
             cycle = tasks.dup
             chain = []
             next_task = tasks.first
@@ -245,7 +245,23 @@ def resolve_cycle(tasks)
                     end
                 end
                 if !next_task
-                    raise "something fishy while resolving a cycle in #{cycle.map(&:name).join(", ")}. Some of these packages might have added new dependencies during the task resolution, which is forbidden"
+                    Autobuild.fatal "parallel processing stopped prematurely, but no cycle is present in the remaining tasks"
+                    Autobuild.fatal "remaining tasks: #{cycle.map(&:name).join(", ")}"
+                    Autobuild.fatal "known dependencies at initialization time that could block the processing of the remaining tasks"
+                    reverse_dependencies.each do |task, parents|
+                        if cycle.include?(task)
+                            parents.each do |p|
+                                Autobuild.fatal "  #{p}: #{task}"
+                            end
+                        end
+                    end
+                    Autobuild.fatal "known dependencies right now that could block the processing of the remaining tasks"
+                    all_tasks.each do |p|
+                        (cycle & p.prerequisite_tasks).each do |t|
+                            Autobuild.fatal "  #{p}: #{t}"
+                        end
+                    end
+                    raise "failed to resolve cycle in #{cycle.map(&:name).join(", ")}"
                 end
             end
             chain

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.10.0.rc5" unless defined? Autobuild::VERSION
+    VERSION = "1.10.0.rc6" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.10.0.rc5
+  version: 1.10.0.rc6
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake