rscons 1.11.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1071a4e53bdabc660529e3ed77a04fd63478055
-  data.tar.gz: 772db7e7f90b80976d30f1523a296b2df2bec98b
+  metadata.gz: 6e16961355b842e34ba268c6aafc6e4a0cee8987
+  data.tar.gz: 9781c3c0b03f4261d2a565262087450ca3f2b9fa
 SHA512:
-  metadata.gz: 07ab3b0b3ad7f31684c0dd6d930e3228403aeba2083c20657ed5fc3b60521962156bdd31d787c5bdc2e2427fe120526bc4398d2f1535584b887eaa1efdd4d6b2
-  data.tar.gz: 5ee4e79134a58409a2855fc6e6da3b44e29e33f0d85a5a4827ed192ec1367d768cbce44641bae9cb452fed3f3207ec77cd82f1d6ed89cf122d67cbe6f11ca02e
+  metadata.gz: d0df2cb0f31ebb5e3f9002316322baa11cd050d238d9621e5a402a8b29259677ce31a4bf357763ebbd3ef97e3a1f25a7571290feea9a988296f7d18f698e3d91
+  data.tar.gz: 9a1af1c958361f39f5d22bb7c8974d2d2aaf498bb076906da8960ee45de8fec385540b25b146b7f21c457b1f10f3fdacfbf9907a93a073c02bd200d5db60a67b

data/lib/rscons/job_set.rb

@@ -47,24 +47,18 @@ module Rscons
     # @return [nil, Hash]
     #   The next job to run.
     def get_next_job_to_run(targets_still_building)
-      targets_skipped = Set.new
       @jobs.keys.each do |target|
         skip = false
         (@jobs[target][0][:sources] + (@build_dependencies[target] || []).to_a).each do |src|
           if @jobs.include?(src)
-            if targets_skipped.include?(src) or (src == target)
-              # We have encountered a circular dependency.
-              raise "Circular build dependency for #{src}"
-            end
-            # Skip this target because it depends on another target later in
-            # the job set.
-            targets_skipped << target
+            # Skip this target because it depends on another target not yet
+            # built.
             skip = true
             break
           end
           if targets_still_building.include?(src)
             # Skip this target because it depends on another target that is
-            # still being built.
+            # currently being built.
             skip = true
             break
           end
@@ -79,7 +73,12 @@ module Rscons
         return job
       end
 
-      nil
+      # If there is a job to run, and nothing is still building, but we did
+      # not find a job to run above, then there might be a circular dependency
+      # introduced by the user.
+      if (@jobs.size > 0) and targets_still_building.empty?
+        raise "Could not find a runnable job. Possible circular dependency for #{@jobs.keys.first}"
+      end
     end
 
     # Remove all jobs from the JobSet.

data/lib/rscons/version.rb

@@ -1,4 +1,4 @@
 module Rscons
   # gem version
-  VERSION = "1.11.0"
+  VERSION = "1.11.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rscons
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Josh Holtrop