autobuild 1.17.0 → 1.21.0

data/lib/autobuild/packages/dummy.rb

@@ -7,27 +7,28 @@ class DummyPackage < Package
         def installstamp
             "#{srcdir}/#{STAMPFILE}"
         end
-        
+
         def initialize(*args)
             super
         end
 
-        def import(options = Hash.new)
-        end
+        def import(options = Hash.new); end
 
         def prepare
-            %w{import prepare build doc}.each do |phase|
+            %w[import prepare build doc].each do |phase|
                 task "#{name}-#{phase}"
                 t = Rake::Task["#{name}-#{phase}"]
-                def t.needed?; false end
+                def t.needed?
+                    false
+                end
             end
             task(installstamp)
             t = Rake::Task[installstamp]
-            def t.needed?; false end
+            def t.needed?
+                false
+            end
 
             super
         end
     end
 end
-    
-

data/lib/autobuild/packages/genom.rb

@@ -74,7 +74,7 @@ def get_requires
             end
         end
 
-        # Alias this package to the ones defined in the EXTRA_PKGCONFIG 
+        # Alias this package to the ones defined in the EXTRA_PKGCONFIG
         # flag in configure.ac.user
         def get_provides
             configure_ac_user = File.join(srcdir, 'configure.ac.user')

data/lib/autobuild/packages/gnumake.rb

@@ -1,19 +1,46 @@
 require 'rubygems/version'
 
 module Autobuild
-    def self.make_is_gnumake?(pkg, path = Autobuild.tool(:make))
+    def self.reset_gnumake_detection
+        @make_is_gnumake = Hash.new
+        @gnumake_version = Hash.new
+    end
+
+    def self.ensure_gnumake_detected(pkg, path = Autobuild.tool(:make))
         @make_is_gnumake ||= Hash.new
         @gnumake_version ||= Hash.new
-        if @make_is_gnumake.has_key?(path)
-            @make_is_gnumake[path]
+        return @make_is_gnumake[path] if @make_is_gnumake.key?(path)
+
+        begin
+            gnumake_version_string = pkg.run('prepare', path, '--version')
+        rescue Autobuild::SubcommandFailed
+            @make_is_gnumake[path] = false
+            return
+        end
+
+        gnumake_match = /^GNU Make[^\d]+(\d[\d.]+)/.match(gnumake_version_string.first)
+        unless gnumake_match
+            @make_is_gnumake[path] = false
+            return
+        end
+
+        @gnumake_version[path] = Gem::Version.new(gnumake_match[1])
+        @make_is_gnumake[path] = true
+    end
+
+    def self.make_is_gnumake?(pkg, path = Autobuild.tool(:make))
+        ensure_gnumake_detected(pkg, path)
+    end
+
+    class NotGNUMake < RuntimeError
+    end
+
+    def self.gnumake_version(pkg, path = Autobuild.tool(:make))
+        if ensure_gnumake_detected(pkg, path)
+            @gnumake_version.fetch(path)
         else
-            begin
-                result = pkg.run('prepare', path, '--version')
-                @make_is_gnumake[path] = (result.first =~ /GNU Make/)
-                @gnumake_version[path] = result.first.scan(/[\d.]+/)[0]
-            rescue Autobuild::SubcommandFailed
-                @make_is_gnumake[path] = false
-            end
+            raise NotGNUMake, "either #{path} is not a GNU Make or it does not have "\
+                              "the expected version string"
         end
     end
 
@@ -25,34 +52,50 @@ def self.make_has_gnumake_jobserver?(pkg, path = Autobuild.tool(:make))
         make_is_gnumake?(pkg, path)
     end
 
+    GNUMAKE_JOBSERVER_AUTH_VERSION = Gem::Version.new("4.2.0")
+
+    def self.gnumake_jobserver_option(job_server, pkg, path = Autobuild.tool(:make))
+        jobserver_fds_arg = "#{job_server.rio.fileno},#{job_server.wio.fileno}"
+
+        version = gnumake_version(pkg, path)
+        if version >= GNUMAKE_JOBSERVER_AUTH_VERSION
+            ["--jobserver-auth=#{jobserver_fds_arg}"]
+        else
+            ["--jobserver-fds=#{jobserver_fds_arg}", "-j"]
+        end
+    end
+
     def self.invoke_make_parallel(pkg, cmd_path = Autobuild.tool(:make))
         reserved = nil
-        if make_has_j_option?(pkg, cmd_path) && pkg.parallel_build_level != 1
-            if manager = Autobuild.parallel_task_manager
-                job_server = manager.job_server
-                if !make_has_gnumake_jobserver?(pkg, cmd_path) || (pkg.parallel_build_level != Autobuild.parallel_build_level)
-                    reserved = pkg.parallel_build_level
-                    job_server.get(reserved - 1) # We already have one token taken by autobuild itself
-                    yield("-j#{pkg.parallel_build_level}")
-                end
-                if Gem::Version.new(@gnumake_version[cmd_path]) >= Gem::Version.new("4.2.0")
-                    yield("--jobserver-auth=#{job_server.rio.fileno},#{job_server.wio.fileno}", "-j")
-                else
-                    yield("--jobserver-fds=#{job_server.rio.fileno},#{job_server.wio.fileno}", "-j")
-                end
+        return yield unless make_has_j_option?(pkg, cmd_path)
+
+        manager = Autobuild.parallel_task_manager
+        return yield("-j#{pkg.parallel_build_level}") unless manager
+
+        job_server = manager.job_server
+
+        specific_parallel_level = (
+            pkg.parallel_build_level != Autobuild.parallel_build_level
+        )
+        if !make_has_gnumake_jobserver?(pkg, cmd_path) || specific_parallel_level
+            reserved = pkg.parallel_build_level
+            # Account for the one token autobuild uses
+            begin
+                job_server.get(reserved - 1)
+                return yield("-j#{pkg.parallel_build_level}")
+            ensure
+                job_server.put(reserved - 1)
             end
-            yield("-j#{pkg.parallel_build_level}")
-        else yield
-        end
-    ensure
-        if reserved
-            job_server.put(reserved)
         end
+
+        options = gnumake_jobserver_option(job_server, pkg, cmd_path)
+        yield(*options)
     end
-    
+
     def self.make_subcommand(pkg, phase, *options, &block)
         invoke_make_parallel(pkg, Autobuild.tool(:make)) do |*make_parallel_options|
-            pkg.run(phase, Autobuild.tool(:make), *make_parallel_options, *options, &block)
+            pkg.run(phase, Autobuild.tool(:make),
+                *make_parallel_options, *options, &block)
         end
     end
 end

data/lib/autobuild/packages/import.rb

@@ -5,7 +5,7 @@ module Autobuild
     def self.import(spec, &proc)
         ImporterPackage.new(spec, &proc)
     end
-    
+
     class ImporterPackage < Package
         attr_reader :exclude
 
@@ -19,9 +19,7 @@ def prepare
 
             exclude = self.exclude.dup
             exclude << Regexp.new("^#{Regexp.quote(installstamp)}")
-            if doc_dir
-                exclude << Regexp.new("^#{Regexp.quote(doc_dir)}")
-            end
+            exclude << Regexp.new("^#{Regexp.quote(doc_dir)}") if doc_dir
 
             source_tree(srcdir) do |pkg|
                 pkg.exclude.concat exclude
@@ -32,5 +30,3 @@ def prepare
         end
     end
 end
-
-

data/lib/autobuild/packages/orogen.rb

@@ -41,7 +41,7 @@ class << self
             # This is still considered experimental. Use
             # Orogen.always_regenerate= to set it
             def always_regenerate?
-                !!@always_regenerate
+                @always_regenerate
             end
         end
 
@@ -63,14 +63,15 @@ def self.orocos_target
 
         class << self
             attr_accessor :default_type_export_policy
-            # The list of enabled transports as an array of strings (default: typelib, corba)
+            # 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 mqueue}
+        @transports = %w[corba typelib mqueue]
         @rtt_scripting = true
 
         attr_reader :orogen_options
@@ -121,12 +122,13 @@ def orogen_file
             if @orogen_file
                 @orogen_file
             else
-                return if !File.directory?(srcdir)
-                    
+                return unless File.directory?(srcdir)
+
                 Dir.glob(File.join(srcdir, '*.orogen')) do |path|
                     return File.basename(path)
                 end
-                raise ArgumentError, "cannot find an oroGen specification file in #{srcdir}"
+                raise ArgumentError,
+                    "cannot find an oroGen specification file in #{srcdir}"
             end
         end
 
@@ -141,7 +143,7 @@ def initialize(*args, &config)
 
         def prepare_for_forced_build
             super
-            FileUtils.rm_f genstamp 
+            FileUtils.rm_f genstamp
         end
 
         def update_environment
@@ -158,9 +160,7 @@ def orogen_version
             if !@orogen_version && (root = orogen_root)
                 version_file = File.join(root, 'lib', 'orogen', 'version.rb')
                 version_line = File.readlines(version_file).grep(/VERSION\s*=\s*"/).first
-                if version_line =~ /.*=\s+"(.+)"$/
-                    @orogen_version = $1
-                end
+                @orogen_version = $1 if version_line =~ /.*=\s+"(.+)"$/
             end
             @orogen_version
         end
@@ -168,9 +168,7 @@ def orogen_version
         def orogen_root
             if orogen_tool_path
                 root = File.expand_path(File.join('..', '..'), orogen_tool_path)
-                if File.directory?(File.join(root, 'lib', 'orogen'))
-                    root
-                end
+                root if File.directory?(File.join(root, 'lib', 'orogen'))
             end
         end
 
@@ -187,7 +185,9 @@ def prepare
             super
         end
 
-        def genstamp; File.join(srcdir, '.orogen', 'orogen-stamp') end
+        def genstamp
+            File.join(srcdir, '.orogen', 'orogen-stamp')
+        end
 
         def add_cmd_to_cmdline(cmd, cmdline)
             if cmd =~ /^([\w-]+)$/
@@ -210,31 +210,30 @@ def regen
             cmdline << '--corba' if corba
 
             ext_states = extended_states
-            if !ext_states.nil?
+            unless ext_states.nil?
                 cmdline.delete_if { |str| str =~ /extended-states/ }
-                if ext_states
-                    cmdline << '--extended-states'
-                else
-                    cmdline << '--no-extended-states'
-                end
+                cmdline <<
+                    if ext_states
+                        '--extended-states'
+                    else
+                        '--no-extended-states'
+                    end
             end
 
-            @orogen_tool_path = find_in_path 'orogen'
-            if !orogen_tool_path
+            unless (@orogen_tool_path = find_in_path('orogen'))
                 raise ArgumentError, "cannot find 'orogen' in #{resolved_env['PATH']}"
             end
 
-            version = orogen_version
-            if !version
+            unless (version = orogen_version)
                 raise ArgumentError, "cannot determine the orogen version"
             end
 
-            if (version >= "1.0")
+            if version >= "1.0" # rubocop:disable Style/IfUnlessModifier
                 cmdline << "--parallel-build=#{parallel_build_level}"
             end
-            if (version >= "1.1")
+            if version >= "1.1"
                 cmdline << "--type-export-policy=#{Orogen.default_type_export_policy}"
-                cmdline << "--transports=#{Orogen.transports.sort.uniq.join(",")}"
+                cmdline << "--transports=#{Orogen.transports.sort.uniq.join(',')}"
             end
 
             # Now, add raw options
@@ -269,9 +268,11 @@ def regen
             needs_regen ||= !generation_uptodate?
 
             if needs_regen
-                progress_start "generating oroGen %s", :done_message => 'generated oroGen %s' do
+                progress_start "generating oroGen %s",
+                               done_message: 'generated oroGen %s' do
                     in_dir(srcdir) do
-                        run 'orogen', Autobuild.tool('ruby'), '-S', orogen_tool_path, *cmdline
+                        run 'orogen', Autobuild.tool('ruby'), '-S',
+                            orogen_tool_path, *cmdline
                         File.open(genstamp, 'w') do |io|
                             io.print cmdline.join("\n")
                         end
@@ -287,11 +288,11 @@ def generation_uptodate?
             if !File.file?(genstamp)
                 true
             elsif File.file?(File.join(builddir, 'Makefile'))
-                system("#{Autobuild.tool('make')} -C #{builddir} check-uptodate > /dev/null 2>&1")
+                make = Autobuild.tool('make')
+                system("#{make} -C #{builddir} check-uptodate > /dev/null 2>&1")
             else
                 true
             end
         end
     end
 end
-

data/lib/autobuild/packages/pkgconfig.rb

@@ -16,9 +16,10 @@ def installstamp
             return std_stamp if File.file?(std_stamp)
 
             pcfile = File.join(pkgconfig.prefix, "lib", "pkgconfig", "#{name}.pc")
-            if !File.file?(pcfile)
+            unless File.file?(pcfile)
                 raise "cannot find the .pc file for #{name}, tried #{pcfile}"
             end
+
             pcfile
         end
     end
@@ -26,4 +27,3 @@ def self.installed_pkgconfig(name, &block)
         InstalledPkgConfig.new(name, &block)
     end
 end
- 

data/lib/autobuild/packages/python.rb

@@ -22,9 +22,8 @@ def initialize(options)
             super
         end
 
-        def prepare
-            super
-            @install_mode = File.file?(File.join(srcdir, 'setup.py'))
+        def install_mode?
+            File.file?(File.join(srcdir, 'setup.py'))
         end
 
         def prepare_for_forced_build
@@ -56,13 +55,17 @@ def python_path
                 raise "Unable to set PYTHONPATH: #{e.message}"
             end
 
-            return output.read.chomp if ret.value.success?
-            raise 'Unable to set PYTHONPATH: user site directory disabled?'
+            if ret.value.success?
+                output.read.chomp
+            else
+                raise 'Unable to set PYTHONPATH: user site directory disabled?'
+            end
         end
 
         # Do the build in builddir
         def build
-            return unless @install_mode
+            return unless install_mode?
+
             command = generate_build_command
             command << '--force' if @forced
             progress_start 'building %s [progress not available]',
@@ -74,7 +77,8 @@ def build
 
         # Install the result in prefix
         def install
-            return unless @install_mode
+            return unless install_mode?
+
             command = generate_install_command
             command << '--force' if @forced
             progress_start 'installing %s',
@@ -86,7 +90,7 @@ def install
 
         def update_environment
             super
-            path = @install_mode ? python_path : srcdir
+            path = install_mode? ? python_path : srcdir
             env_add_path 'PYTHONPATH', path
         end
     end

data/lib/autobuild/packages/ruby.rb

@@ -22,7 +22,7 @@ class Ruby < ImporterPackage
         def initialize(*args)
             self.rake_setup_task = "default"
             self.rake_doc_task   = "redocs"
-            self.rake_clean_task   = "clean"
+            self.rake_clean_task = "clean"
             self.rake_test_task  = "test"
             self.rake_test_options = []
 
@@ -36,19 +36,23 @@ def initialize(*args)
 
         def with_doc
             doc_task do
-                progress_start "generating documentation for %s", :done_message => 'generated documentation for %s' do
+                progress_start "generating documentation for %s",
+                               done_message: 'generated documentation for %s' do
                     run 'doc',
-                        Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('rake'), rake_doc_task,
-                        :working_directory => srcdir
+                        Autobuild.tool_in_path('ruby'), '-S',
+                            Autobuild.tool('rake'), rake_doc_task,
+                        working_directory: srcdir
                 end
             end
         end
 
         def with_tests
             test_utility.task do
-                progress_start "running tests for %s", :done_message => 'tests passed for %s' do
+                progress_start "running tests for %s",
+                               done_message: 'tests passed for %s' do
                     run 'test',
-                        Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('rake'), rake_test_task, *rake_test_options,
+                        Autobuild.tool_in_path('ruby'), '-S',
+                            Autobuild.tool('rake'), rake_test_task, *rake_test_options,
                         working_directory: srcdir
                 end
             end
@@ -57,13 +61,15 @@ def with_tests
         def invoke_rake(setup_task = rake_setup_task)
             if setup_task && File.file?(File.join(srcdir, 'Rakefile'))
                 run 'post-install',
-                    Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('rake'), setup_task,
-                    :working_directory => srcdir
+                    Autobuild.tool_in_path('ruby'), '-S',
+                        Autobuild.tool('rake'), setup_task,
+                    working_directory: srcdir
             end
         end
 
         def install
-            progress_start "setting up Ruby package %s", :done_message => 'set up Ruby package %s' do
+            progress_start "setting up Ruby package %s",
+                           done_message: 'set up Ruby package %s' do
                 invoke_rake
             end
             super
@@ -71,10 +77,11 @@ def install
 
         def prepare_for_forced_build # :nodoc:
             super
-            %w{ext tmp}.each do |extdir|
+            %w[ext tmp].each do |extdir|
                 if File.directory?(extdir)
                     Find.find(extdir) do |file|
                         next if file !~ /\<Makefile\>|\<CMakeCache.txt\>$/
+
                         FileUtils.rm_rf file
                     end
                 end
@@ -86,10 +93,11 @@ def prepare_for_rebuild # :nodoc:
             if rake_clean_task && File.file?(File.join(srcdir, 'Rakefile'))
                 begin
                     run 'clean',
-                        Autobuild.tool_in_path('ruby'), '-S', Autobuild.tool('rake'), rake_clean_task,
-                        :working_directory => srcdir
+                        Autobuild.tool_in_path('ruby'), '-S',
+                            Autobuild.tool('rake'), rake_clean_task,
+                        working_directory: srcdir
                 rescue Autobuild::SubcommandFailed => e
-                    warn "%s: cleaning failed. If this package does not need a clean target,"
+                    warn "%s: clean failed. If this package does not need a clean target,"
                     warn "%s: set pkg.rake_clean_task = nil in the package definition."
                     warn "%s: see #{e.logfile} for more details"
                 end
@@ -99,9 +107,7 @@ def prepare_for_rebuild # :nodoc:
         def update_environment
             env_add_prefix srcdir
             libdir = File.join(srcdir, 'lib')
-            if File.directory?(libdir)
-                env_add_path 'RUBYLIB', libdir
-            end
+            env_add_path 'RUBYLIB', libdir if File.directory?(libdir)
         end
     end
 
@@ -109,4 +115,3 @@ def self.ruby(spec, &proc)
         Ruby.new(spec, &proc)
     end
 end
-