rscons 1.9.3 → 1.10.0

data/lib/rscons/job_set.rb

@@ -0,0 +1,93 @@
+require "set"
+
+module Rscons
+  # Class to keep track of a set of jobs that need to be performed.
+  class JobSet
+
+    # Create a JobSet
+    #
+    # @param build_dependencies [Hash]
+    #   Hash mapping targets to a set of build dependencies. A job will not be
+    #   returned as ready to run if any of its dependencies are still building.
+    def initialize(build_dependencies)
+      @jobs = {}
+      @build_dependencies = build_dependencies
+    end
+
+    # Add a job to the JobSet.
+    #
+    # @param options [Hash]
+    #   Options.
+    # @option options [Symbol, String] :target
+    #   Build target name.
+    # @option options [Builder] :builder
+    #   The {Builder} to use to build the target.
+    # @option options [Array<String>] :sources
+    #   Source file name(s).
+    # @option options [Hash] :vars
+    #   Construction variable overrides.
+    def add_job(options)
+      # We allow multiple jobs to be registered per target for cases like:
+      #   env.Directory("dest")
+      #   env.Install("dest", "bin")
+      #   env.Install("dest", "share")
+      @jobs[options[:target]] ||= []
+      @jobs[options[:target]] << options
+    end
+
+    # Get the next job that is ready to run from the JobSet.
+    #
+    # This method will remove the job from the JobSet.
+    #
+    # @param targets_still_building [Array<String>]
+    #   Targets that are not finished building. This is used to avoid returning
+    #   a job as available to run if it depends on one of the targets that are
+    #   still building as a source.
+    #
+    # @return [nil, Hash]
+    #   The next job to run.
+    def get_next_job_to_run(targets_still_building)
+      @jobs.keys.each do |target|
+        skip = false
+        (@jobs[target][0][:sources] + (@build_dependencies[target] || []).to_a).each do |src|
+          if @jobs.include?(src)
+            # Skip this target because it depends on another target later in
+            # the job set.
+            skip = true
+            break
+          end
+          if targets_still_building.include?(src)
+            # Skip this target because it depends on another target that is
+            # still being built.
+            skip = true
+            break
+          end
+        end
+        next if skip
+        job = @jobs[target][0]
+        if @jobs[target].size > 1
+          @jobs[target].slice!(0)
+        else
+          @jobs.delete(target)
+        end
+        return job
+      end
+
+      nil
+    end
+
+    # Remove all jobs from the JobSet.
+    def clear!
+      @jobs.clear
+    end
+
+    # Get the JobSet size.
+    #
+    # @return [Integer]
+    #   JobSet size.
+    def size
+      @jobs.size
+    end
+
+  end
+end

data/lib/rscons/threaded_command.rb

@@ -0,0 +1,63 @@
+module Rscons
+  # If a builder returns an instance of this class from its #run method, then
+  # Rscons will execute the command specified in a thread and allow other
+  # builders to continue executing in parallel.
+  class ThreadedCommand
+
+    # @return [Array<String>]
+    #   The command to execute.
+    attr_reader :command
+
+    # @return [Object]
+    #   Arbitrary object to store builder-specific info. This object value will
+    #   be passed back into the builder's #finalize method.
+    attr_reader :builder_info
+
+    # @return [String]
+    #   Short description of the command. This will be printed to standard
+    #   output if the Environment's echo mode is :short.
+    attr_reader :short_description
+
+    # @return [Hash]
+    #   Environment Hash to pass to Kernel#system.
+    attr_reader :system_env
+
+    # @return [Hash]
+    #   Options Hash to pass to Kernel#system.
+    attr_reader :system_options
+
+    # @return [Hash]
+    #   Field for Rscons to store the build operation while this threaded
+    #   command is executing.
+    attr_accessor :build_operation
+
+    # @return [Thread]
+    #   The thread waiting on this command to terminate.
+    attr_accessor :thread
+
+    # Create a ThreadedCommand object.
+    #
+    # @param command [Array<String>]
+    #   The command to execute.
+    # @param options [Hash]
+    #   Optional parameters.
+    # @option options [Object] :builder_info
+    #   Arbitrary object to store builder-specific info. This object value will
+    #   be passed back into the builder's #finalize method.
+    # @option options [String] :short_description
+    #   Short description of the command. This will be printed to standard
+    #   output if the Environment's echo mode is :short.
+    # @option options [Hash] :system_env
+    #   Environment Hash to pass to Kernel#system.
+    # @option options [Hash] :system_options
+    #   Options Hash to pass to Kernel#system.
+    def initialize(command, options = {})
+      @command = command
+      @builder_info = options[:builder_info]
+      @short_description = options[:short_description]
+      @system_env = options[:system_env]
+      @system_options = options[:system_options]
+    end
+
+  end
+end

data/lib/rscons/version.rb

@@ -1,4 +1,4 @@
 module Rscons
   # gem version
-  VERSION = "1.9.3"
+  VERSION = "1.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rscons
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.10.0
 platform: ruby
 authors:
 - Josh Holtrop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2017-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -130,10 +130,14 @@ files:
 - lib/rscons/builders/object.rb
 - lib/rscons/builders/preprocess.rb
 - lib/rscons/builders/program.rb
+- lib/rscons/builders/shared_library.rb
+- lib/rscons/builders/shared_object.rb
 - lib/rscons/builders/simple_builder.rb
 - lib/rscons/cache.rb
 - lib/rscons/cli.rb
 - lib/rscons/environment.rb
+- lib/rscons/job_set.rb
+- lib/rscons/threaded_command.rb
 - lib/rscons/varset.rb
 - lib/rscons/version.rb
 - rscons.gemspec
@@ -157,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Software construction library inspired by SCons and implemented in Ruby