autobuild 1.10.0.rc12 → 1.10.0.rc13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93d2b10bf766be5eff2ff289bee403db33bdf8bc
-  data.tar.gz: d7ec8fc8421d2bad68820e9d00b09d06f2361edd
+  metadata.gz: 62f1f8b5be427ce16c5f90acaa29148f6aec1898
+  data.tar.gz: 3b3e04ed491d7640d8cd66c65623ac50de886a1d
 SHA512:
-  metadata.gz: ab309ce13fbf4933bf84c657bf8b5153379353cbb1419be9ec972de7142d95ace0ebf0a10e81fec5bfa4314d8f80b8eeec6f73bcb025d9836cbb5f777b750cde
-  data.tar.gz: be06d3591c000d8d0c29c17332114da77b05f5c7e7291fa98682eea45383a05126021f9999eb4dc137c73c5b5872e3a7cf0f7c41a9e1ddd54b4e963fb2c4e582
+  metadata.gz: acc2cabb0c47592702162a230f039e3b2c7138d51ba8a5baa43e62bcb5c0ec8acdc6027a71a3dbad324d839a728bb0606f334556278b7a2c66bb16fc073a58a0
+  data.tar.gz: ef56847f897e5f2ba1df4635d731aef7e0590a87a0ece26fa667bd74d4ccd4315215672306a3e414cbb49a75ef3a2ebcf42f0209a4c759b8cc89cafda27a307c

data/lib/autobuild/configurable.rb

@@ -26,6 +26,7 @@ class Configurable < Package
 
         def initialize(spec = Hash.new)
             @source_tree_excludes = Array.new
+            @builddir = nil
             super
         end
 

data/lib/autobuild/environment.rb

@@ -90,8 +90,6 @@ class Environment
         # If the value is an array, it is joined using the operating system's
         # path separator (File::PATH_SEPARATOR)
         attr_reader :environment
-        attr_reader :source_after
-        attr_reader :source_before
 
         attr_reader :inherited_variables
 
@@ -115,6 +113,11 @@ def initialize
 
             @system_env = Hash.new
             @original_env = ORIGINAL_ENV.dup
+            
+            @default_pkgconfig_search_suffixes = nil
+            @arch_names = nil
+            @target_arch = nil
+            @arch_size = nil
         end
 
         # Declares that the given environment variable holds a path
@@ -285,7 +288,7 @@ def push(name, *values)
             end
         end
 
-        # Adds a new value to an environment variable
+        # Adds new value(s) at the end of an environment variable
         def add(name, *values)
             values = values.map { |v| expand(v) }
 
@@ -385,6 +388,13 @@ def set_path(name, *paths)
             add_path(name, *paths)
         end
 
+        # Add a path at the end of an environment variable
+        #
+        # Unlike "normal" variables, entries of path variables that cannot be
+        # found on disk are filtered out at usage points (either #resolve_env or
+        # at the time of envirnonment export)
+        #
+        # @see push_path
         def add_path(name, *paths)
             declare_path_variable(name)
             paths = paths.map { |p| expand(p) }
@@ -409,6 +419,13 @@ def remove_path(name, *paths)
             end
         end
 
+        # Add a path at the beginning of an environment variable
+        #
+        # Unlike "normal" variables, entries of path variables that cannot be
+        # found on disk are filtered out at usage points (either #resolve_env or
+        # at the time of envirnonment export)
+        #
+        # @see push_path
         def push_path(name, *values)
             declare_path_variable(name)
             if current = environment.delete(name)
@@ -432,6 +449,7 @@ def push_path(name, *values)
         def source_before(file = nil)
             if file
                 @source_before << file
+            else @source_before
             end
         end
 
@@ -447,6 +465,7 @@ def source_before(file = nil)
         def source_after(file = nil)
             if file
                 @source_after << file
+            else @source_after
             end
         end
 
@@ -456,7 +475,7 @@ def source_after(file = nil)
         #
         # It also sources the files added by source_file
         def export_env_sh(io)
-            @source_before.each do |path|
+            source_before.each do |path|
                 io.puts SHELL_SOURCE_SCRIPT % path
             end
 
@@ -487,7 +506,7 @@ def export_env_sh(io)
                     io.puts SHELL_EXPORT_COMMAND % [var]
                 end
             end
-            @source_after.each do |path|
+            source_after.each do |path|
                 io.puts SHELL_SOURCE_SCRIPT % [path]
             end
         end
@@ -562,9 +581,7 @@ def target_arch=(archname)
             @arch_size, @arch_names = nil
         end
 
-        def target_arch
-            @target_arch
-        end
+        attr_reader :target_arch
 
         def arch_names
             if @arch_names

data/lib/autobuild/import/git.rb

@@ -357,9 +357,9 @@ def delta_between_tags(package, from_tag, to_tag)
         # @return [Hash<String,String>] a mapping from a tag name to its commit
         #   ID
         def tags(package, options = Hash.new)
-            only_local = options.fetch(only_local: false)
-
-            run_git_bare(package, 'fetch', '--tags')
+            if !options.fetch(only_local: false)
+                run_git_bare(package, 'fetch', '--tags')
+            end
             tag_list = run_git_bare(package, 'show-ref', '--tags').map(&:strip)
             tags = Hash.new
             tag_list.each do |entry|
@@ -736,7 +736,7 @@ def commit_present_in?(package, rev, reference)
                 merge_base = run_git_bare(package, 'merge-base', commit, reference).first
                 merge_base == commit
                 
-            rescue Exception => e
+            rescue Exception
                 raise PackageException.new(package, 'import'), "failed to find the merge-base between #{rev} and #{reference}. Are you sure these commits exist ?"
             end
         end

data/lib/autobuild/package.rb

@@ -118,7 +118,8 @@ def update?
         def updated?; !!@updated end
 
 	def initialize(spec = Hash.new)
-            @srcdir = @importdir = @logdir = nil
+            @srcdir = @importdir = @logdir = @prefix = nil
+            @updated = false
             @update = nil
             @failed = nil
 	    @dependencies   = Array.new
@@ -244,6 +245,8 @@ def update_environment
 
         class IncompatibleEnvironment < ConfigException; end
 
+        # @api private
+        #
         # Apply this package's environment to the given {Environment} object
         #
         # It does *not* apply the dependencies' environment. Call
@@ -255,17 +258,17 @@ class IncompatibleEnvironment < ConfigException; end
         #   package sets a variable as to avoid unexpected conflicts.
         # @return [Array<EnvOp>] list of environment-modifying operations
         #   applied so far
-        def apply_env(env, set = Set.new, ops = Array.new)
+        def apply_env(env, set = Hash.new, ops = Array.new)
             self.env.each do |env_op|
                 next if ops.last == env_op
                 if env_op.type == :set
                     if last = set[env_op.name]
                         last_pkg, last_values = *last
                         if last_values != env_op.values
-                            raise IncompatibleEnvironment, "trying to reset #{name} to #{values} which conflicts with #{last_pkg.name} already setting it to #{last_values}"
+                            raise IncompatibleEnvironment, "trying to reset #{env_op.name} to #{env_op.values} which conflicts with #{last_pkg.name} already setting it to #{last_values}"
                         end
                     else
-                        set[name] = [self, values]
+                        set[env_op.name] = [self, env_op.values]
                     end
                 end
                 env.send(env_op.type, env_op.name, *env_op.values)
@@ -274,9 +277,11 @@ def apply_env(env, set = Set.new, ops = Array.new)
             ops
         end
 
+        # @api private
+        #
         # Updates an {Environment} object with the environment of the package's
         # dependencies
-        def resolve_dependency_env(env, set = Set.new, ops = Array.new)
+        def resolve_dependency_env(env, set, ops)
             all_dependencies.each do |pkg_name|
                 pkg = Autobuild::Package[pkg_name]
                 ops = pkg.apply_env(env, set, ops)

data/lib/autobuild/packages/autotools.rb

@@ -167,7 +167,6 @@ def prepare
             #
             # If it is not the case, remove it to force reconfiguration
 	    configureflags.flatten!
-	    force_reconfigure = false
 	    if File.exist?(configurestamp)
 		output = IO.popen("#{configurestamp} --version").readlines.grep(/with options/).first.chomp
 		raise "invalid output of config.status --version" unless output =~ /with options "(.*)"$/

data/lib/autobuild/packages/cmake.rb

@@ -31,6 +31,7 @@ def full_reconfigures?
             attr_reader :prefix_path
             attr_reader :module_path
         end
+        @builddir = nil
         @prefix_path = []
         @module_path = []
         @full_reconfigures = true
@@ -336,7 +337,7 @@ def prepare
                     end
 
                     value = value.to_s
-                    old_value = cache_line.split("=")[1].chomp if cache_line
+                    old_value = cache_line.partition("=").last.chomp if cache_line
                     if !old_value || !equivalent_option_value?(old_value, value)
                         if Autobuild.debug
                             message "%s: option '#{name}' changed value: '#{old_value}' => '#{value}'"

data/lib/autobuild/packages/orogen.rb

@@ -94,7 +94,7 @@ def self.orogen_root
             if @orogen_root
                 @orogen_root
             elsif orogen_bin = self.orogen_bin(true)
-                @orogen_root = File.expand_path('../lib', File.dirname(@orogen_bin))
+                @orogen_root = File.expand_path('../lib', File.dirname(orogen_bin))
             end
         end
 
@@ -248,8 +248,6 @@ def guess_ruby_name
         end
 
         def add_cmd_to_cmdline(cmd, cmdline)
-            base = nil
-
             if cmd =~ /^([\w-]+)/
                 cmd_filter = $1
             else

data/lib/autobuild/parallel.rb

@@ -248,10 +248,10 @@ def resolve_cycle(all_tasks, tasks, reverse_dependencies)
                     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)
+                    reverse_dependencies.each do |parent_task, parents|
+                        if cycle.include?(parent_task)
                             parents.each do |p|
-                                Autobuild.fatal "  #{p}: #{task}"
+                                Autobuild.fatal "  #{p}: #{parent_task}"
                             end
                         end
                     end

data/lib/autobuild/utility.rb

@@ -13,6 +13,7 @@ class Utility
 
         def initialize(name, package)
             @name = name
+            @task = nil
             @package = package
             @available = true
             @enabled   = true

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.10.0.rc12" unless defined? Autobuild::VERSION
+    VERSION = "1.10.0.rc13" 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.rc12
+  version: 1.10.0.rc13
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake