autobuild 1.5.51 → 1.5.52.rc1

data/lib/autobuild/environment.rb

@@ -2,14 +2,44 @@ require 'set'
 module Autobuild
     @inherited_environment = Hash.new
     @environment = Hash.new
+    @env_source_files = Set.new
+
     class << self
-        attr_reader :inherited_environment
+        # List of the environment that should be set before calling a subcommand
+        #
+        # It is a map from environment variable name to the corresponding value.
+        # If the value is an array, it is joined using the path separator ':'
         attr_reader :environment
+
+        # In generated environment update shell files, indicates whether an
+        # environment variable should be overriden by the shell script, or
+        # simply updated
+        #
+        # If inherited_environment[varname] is true, the generated shell script
+        # will contain
+        #   
+        #   export VARNAME=new_value:new_value:$VARNAME
+        #
+        # otherwise
+        #
+        #   export VARNAME=new_value:new_value
+        attr_reader :inherited_environment
+
+        # List of files that should be sourced in the generated environment
+        # variable setting shell scripts
+        attr_reader :env_source_files
     end
 
-    def self.env_clear(name)
-        environment[name] = nil
-        inherited_environment[name] = nil
+    # Removes any settings related to the environment varialbe +name+, or for
+    # all environment variables if no name is given
+    def self.env_clear(name = nil)
+        if name
+            environment[name] = nil
+            inherited_environment[name] = nil
+        else
+            environment.clear
+            inherited_environment.clear
+        end
     end
 
     # Set a new environment variable
@@ -17,6 +47,7 @@ module Autobuild
         env_clear(name)
         env_add(name, *values)
     end
+
     # Adds a new value to an environment variable
     def self.env_add(name, *values)
         set = if environment.has_key?(name)
@@ -58,6 +89,39 @@ module Autobuild
         end
     end
 
+    # Require that generated environment variable scripts source the given shell
+    # script
+    def self.env_source_file(file)
+        @env_source_files << file
+    end
+
+    # Generates a shell script that sets the environment variable listed in
+    # Autobuild.environment, following the inheritance setting listed in
+    # Autobuild.inherited_environment.
+    #
+    # It also sources the files added by Autobuild.env_source_file
+    def self.export_env_sh(io)
+        variables = []
+        Autobuild.environment.each do |name, value|
+            variables << name
+            shell_line = "#{name}=#{value.join(":")}"
+            if Autoproj.env_inherit?(name)
+                if value.empty?
+                    next
+                else
+                    shell_line << ":$#{name}"
+                end
+            end
+            io.puts shell_line
+        end
+        variables.each do |var|
+            io.puts "export #{var}"
+        end
+        env_source_files.each do |path|
+            io.puts ". \"#{path}\""
+        end
+    end
+
     # DEPRECATED: use env_add_path instead
     def self.pathvar(path, varname)
         if File.directory?(path)
@@ -123,41 +187,51 @@ module Autobuild
     end
 
     # Updates the environment when a new prefix has been added
-    def self.update_environment(newprefix)
-        if File.directory?("#{newprefix}/bin")
-            env_add_path('PATH', "#{newprefix}/bin")
+    def self.update_environment(newprefix, includes = nil)
+        if !includes || includes.include?('PATH')
+            if File.directory?("#{newprefix}/bin")
+                env_add_path('PATH', "#{newprefix}/bin")
+            end
         end
 
-        pkg_config_search = ['lib/pkgconfig', 'lib/ARCH/pkgconfig', 'libARCHSIZE/pkgconfig']
-        each_env_search_path(newprefix, pkg_config_search) do |path|
-            env_add_path('PKG_CONFIG_PATH', path)
+        if !includes || includes.include?('PKG_CONFIG_PATH')
+            pkg_config_search = ['lib/pkgconfig', 'lib/ARCH/pkgconfig', 'libARCHSIZE/pkgconfig']
+            each_env_search_path(newprefix, pkg_config_search) do |path|
+                env_add_path('PKG_CONFIG_PATH', path)
+            end
         end
-        ld_library_search = ['lib', 'lib/ARCH', 'libARCHSIZE']
-        each_env_search_path(newprefix, ld_library_search) do |path|
-            if !Dir.glob(File.join(path, "lib*.so")).empty?
-                env_add_path('LD_LIBRARY_PATH', path)
+
+        if !includes || includes.include?('LD_LIBRARY_PATH')
+            ld_library_search = ['lib', 'lib/ARCH', 'libARCHSIZE']
+            each_env_search_path(newprefix, ld_library_search) do |path|
+                if !Dir.glob(File.join(path, "lib*.so")).empty?
+                    env_add_path('LD_LIBRARY_PATH', path)
+                end
             end
         end
 
         # Validate the new rubylib path
-        new_rubylib = "#{newprefix}/lib"
-        if File.directory?(new_rubylib) && !File.directory?(File.join(new_rubylib, "ruby")) && !Dir["#{new_rubylib}/**/*.rb"].empty?
-            env_add_path('RUBYLIB', new_rubylib)
-        end
-
-        require 'rbconfig'
-        ruby_arch    = File.basename(Config::CONFIG['archdir'])
-        candidates = %w{rubylibdir archdir sitelibdir sitearchdir vendorlibdir vendorarchdir}.
-            map { |key| Config::CONFIG[key] }.
-            map { |path| path.gsub(/.*lib(?:32|64)?\/(\w*ruby\/)/, '\\1') }.
-            each do |subdir|
-                if File.directory?("#{newprefix}/lib/#{subdir}")
-                    env_add_path("RUBYLIB", "#{newprefix}/lib/#{subdir}")
-                end
+        if !includes || includes.include?('RUBYLIB')
+            new_rubylib = "#{newprefix}/lib"
+            if File.directory?(new_rubylib) && !File.directory?(File.join(new_rubylib, "ruby")) && !Dir["#{new_rubylib}/**/*.rb"].empty?
+                env_add_path('RUBYLIB', new_rubylib)
             end
+
+            require 'rbconfig'
+            ruby_arch    = File.basename(Config::CONFIG['archdir'])
+            candidates = %w{rubylibdir archdir sitelibdir sitearchdir vendorlibdir vendorarchdir}.
+                map { |key| Config::CONFIG[key] }.
+                map { |path| path.gsub(/.*lib(?:32|64)?\/(\w*ruby\/)/, '\\1') }.
+                each do |subdir|
+                    if File.directory?("#{newprefix}/lib/#{subdir}")
+                        env_add_path("RUBYLIB", "#{newprefix}/lib/#{subdir}")
+                    end
+                end
+        end
     end
 end
 
-Autobuild.update_environment '/'
-Autobuild.update_environment '/usr'
-Autobuild.update_environment '/usr/local'
+Autobuild.update_environment '/', ['PKG_CONFIG_PATH']
+Autobuild.update_environment '/usr', ['PKG_CONFIG_PATH']
+Autobuild.update_environment '/usr/local', ['PKG_CONFIG_PATH']
+

data/lib/autobuild/import/git.rb

@@ -71,9 +71,10 @@ module Autobuild
         # #repository is always used for read-only operations
         attr_accessor :push_to
 
-        # If set, git will be configured so that a "git push" pushes by default
-        # to the specified branch, instead of using #branch
-        attr_accessor :push_to_branch
+        # The remote branch to which we should push
+        #
+        # Defaults to #branch
+        attr_writer :remote_branch
 
         # The branch this importer is tracking
         #
@@ -85,10 +86,20 @@ module Autobuild
         # If not set, it defaults to #branch
         attr_writer :local_branch
 
+        # The branch that should be used on the local clone
+        #
+        # Defaults to #branch
         def local_branch
             @local_branch || branch
         end
 
+        # The remote branch to which we should push
+        #
+        # Defaults to #branch
+        def remote_branch
+            @remote_branch || branch
+        end
+
         # The tag we are pointing to. It is a tag name.
         #
         # If set, both branch and commit have to be nil.
@@ -144,9 +155,9 @@ module Autobuild
                 Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
                                "--replace-all", "remote.autobuild.fetch",  "+refs/heads/*:refs/remotes/autobuild/*")
 
-                if push_to_branch
+                if remote_branch && local_branch
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
-                               "--replace-all", "remote.autobuild.push",  "refs/heads/#{local_branch || branch}:refs/heads/#{push_to_branch}")
+                               "--replace-all", "remote.autobuild.push",  "refs/heads/#{local_branch}:refs/heads/#{remote_branch}")
                 else
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
                                "--replace-all", "remote.autobuild.push",  "refs/heads/*:refs/heads/*")
@@ -156,7 +167,7 @@ module Autobuild
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
                                    "--replace-all", "branch.#{local_branch}.remote",  "autobuild")
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
-                                   "--replace-all", "branch.#{local_branch}.merge", "refs/heads/#{branch}")
+                                   "--replace-all", "branch.#{local_branch}.merge", "refs/heads/#{local_branch}")
                 end
 
                 if commit
@@ -340,9 +351,9 @@ module Autobuild
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
                                    "--replace-all", "remote.autobuild.pushurl", push_to)
                 end
-                if push_to_branch
+                if local_branch && remote_branch
                     Subprocess.run(package, :import, Autobuild.tool('git'), 'config',
-                                   "--replace-all", "remote.autobuild.push", "refs/heads/#{local_branch || branch}:refs/heads/#{push_to_branch}")
+                                   "--replace-all", "remote.autobuild.push", "refs/heads/#{local_branch}:refs/heads/#{remote_branch}")
                 end
 
                 # If we are tracking a commit/tag, just check it out

data/lib/autobuild/packages/orogen.rb

@@ -65,9 +65,15 @@ module Autobuild
             attr_accessor :default_type_export_policy
             # The list of enabled transports as an array of strings (default: typelib, corba)
             attr_reader :transports
+
+            attr_reader :orogen_options
         end
+        @orogen_options = []
         @default_type_export_policy = :used
         @transports = %w{corba typelib}
+        @rtt_scripting = true
+
+        attr_reader :orogen_options
 
         # Path to the orogen tool
         def self.orogen_bin(full_path = false)
@@ -146,6 +152,7 @@ module Autobuild
 
             @orocos_target = nil
             @orogen_file ||= "#{File.basename(name)}.orogen"
+            @orogen_options = []
         end
 
         def prepare_for_forced_build
@@ -217,12 +224,30 @@ module Autobuild
             end
         end
 
+        def add_cmd_to_cmdline(cmd, cmdline)
+            base = nil
+
+            if cmd =~ /^([\w-]+)/
+                cmd_filter = $1
+            else
+                raise ArgumentError, "cannot parse the provided command #{cmd}"
+            end
+
+            cmdline.delete_if { |str| str =~ /^#{cmd_filter}/ }
+            if cmd_filter =~ /^--no-(.*)/
+                cmd_filter = $1
+                cmdline.delete_if { |str| str =~ /^--#{cmd_filter}/ }
+            end
+            cmdline << cmd
+        end
+
         def regen
             cmdline = []
             cmdline << '--corba' if corba
 
             ext_states = extended_states
             if !ext_states.nil?
+                cmdline.delete_if { |str| str =~ /extended-states/ }
                 if ext_states
                     cmdline << '--extended-states'
                 else
@@ -239,8 +264,20 @@ module Autobuild
                     cmdline << "--transports=#{Orogen.transports.sort.uniq.join(",")}"
                 end
             end
+
+            # Now, add raw options
+            #
+            # The raw options take precedence
+            Orogen.orogen_options.each do |cmd|
+                add_cmd_to_cmdline(cmd, cmdline)
+            end
+            orogen_options.each do |cmd|
+                add_cmd_to_cmdline(cmd, cmdline)
+            end
+
             cmdline = cmdline.sort
             cmdline << orogen_file
+            puts cmdline.inspect
 
             needs_regen = Autobuild::Orogen.always_regenerate?
 

data/lib/autobuild/subcommand.rb

@@ -97,6 +97,13 @@ module Autobuild
             else
                 @processor_count = processor_ids.size
             end
+        else
+            result = Open3.popen3("sysctl", "-n", "hw.cpu") do |_, io, _|
+                io.read
+            end
+            if !result.empty?
+                @processor_count = Integer(result.chomp.strip)
+            end
         end
 
         # The format of the cpuinfo file is ... let's say not very standardized.
@@ -168,12 +175,13 @@ module Autobuild::Subprocess
             if Autobuild.keep_oldlogs
                 logfile.puts
             end
-            logfile.puts "#{Time.now}: running"
-            logfile.puts "    #{command.join(" ")}"
 	    logfile.puts "with environment:"
             ENV.keys.sort.each do |key|
                 logfile.puts "  '#{key}'='#{ENV[key]}'"
             end
+            logfile.puts
+            logfile.puts "#{Time.now}: running"
+            logfile.puts "    #{command.join(" ")}"
 	    logfile.flush
             logfile.sync = true
 
@@ -276,7 +284,8 @@ module Autobuild::Subprocess
         Autobuild.add_stat(target, phase, duration)
         FileUtils.mkdir_p(Autobuild.logdir)
         File.open(File.join(Autobuild.logdir, "stats.log"), 'a') do |io|
-            io.puts "#{target_name} #{phase} #{duration}"
+            formatted_time = "#{start_time.strftime('%F %H:%M:%S')}.#{'%.03i' % [start_time.tv_usec / 1000]}"
+            io.puts "#{formatted_time} #{target_name} #{phase} #{duration}"
         end
         if target.respond_to?(:add_stat)
             target.add_stat(phase, duration)

data/lib/autobuild/version.rb

@@ -1,5 +1,5 @@
 module Autobuild
-    VERSION = "1.5.51" unless defined? Autobuild::VERSION
+    VERSION = "1.5.52.rc1" unless defined? Autobuild::VERSION
 end
 
 

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: autobuild
 version: !ruby/object:Gem::Version 
-  hash: 101
-  prerelease: 
+  hash: 15424455
+  prerelease: 7
   segments: 
   - 1
   - 5
-  - 51
-  version: 1.5.51
+  - 52
+  - rc
+  - 1
+  version: 1.5.52.rc1
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 Z
+date: 2011-10-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -85,14 +87,13 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 27
         segments: 
         - 2
-        - 8
-        - 0
-        version: 2.8.0
+        - 12
+        version: "2.12"
   type: :development
   version_requirements: *id005
 description: |-
@@ -164,6 +165,7 @@ files:
 - test/test_import_tar.rb
 - test/test_subcommand.rb
 - test/tools.rb
+- .gemtest
 homepage: 
 licenses: []
 
@@ -185,16 +187,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: autobuild
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Rake-based utility to build and install multiple packages with dependencies