autobuild 1.22.0 → 1.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bf4fb952c18b27c30e09e50c005f4e07e475c4d0c21c2cac3c81e4e62dc41a0
-  data.tar.gz: dbc32874e7cdf92e6dff9b18718a8922c6d602abe45701ee4dda17fccd04e684
+  metadata.gz: cb4af40b45b8a0e1185e81a0cf63a4cf75728d1360290b0dfb3bb194bd409361
+  data.tar.gz: 1e2a3d4f44a08126ca0ca39fe00e15c31430da623f83852827159cabd880b2e2
 SHA512:
-  metadata.gz: 0d9408d8aa15779a19ceaae45feafb53cea942aef147becce39835abebf873717c0f9d4d9ed04f7a47052e31120b4c80ec1b480c002ceb4d40458bd0881f1bde
-  data.tar.gz: 8e84128190fcd911790ff20803d1965f955762affa1979bee79188dcff64a8799c4f4267d86985842008103a835004d7921794717c141e65fc97f6c8d46c638d
+  metadata.gz: 6b363c75454df74373af48e1fa994a1a92471f076184bbffa85867f6f6c346d61aac1469621c56f331646695c817c445bb1b1198aee063d79ad95a9da25437d5
+  data.tar.gz: 84751817159e35967dcaf0b7d32e13b46e9c660ec6c649b8eac0cce97a33003f50fef2a05502cbd667025143b763cc69688f0a96805b9f2764848cbc4c15785b

data/lib/autobuild/environment.rb

@@ -29,37 +29,44 @@ module Autobuild
 
     SHELL_VAR_EXPANSION =
         if windows? then "%%%s%%".freeze
-        else "$%s".freeze
+        else
+            "$%s".freeze
         end
     SHELL_SET_COMMAND =
         if windows? then "set %s=%s".freeze
-        else "%s=\"%s\"".freeze
+        else
+            "%s=\"%s\"".freeze
         end
     SHELL_CONDITIONAL_SET_COMMAND =
         if windows? then "set %s=%s".freeze
-        else "if test -z \"$%1$s\"; then\n  %1$s=\"%3$s\"\n"\
+        else
+            "if test -z \"$%1$s\"; then\n  %1$s=\"%3$s\"\n"\
             "else\n  %1$s=\"%2$s\"\nfi".freeze
         end
     SHELL_UNSET_COMMAND = "unset %s".freeze
     SHELL_EXPORT_COMMAND =
         if windows? then "set %s".freeze
-        else "export %s".freeze
+        else
+            "export %s".freeze
         end
     SHELL_SOURCE_SCRIPT =
         if windows? then "%s".freeze
-        else '. "%s"'.freeze
+        else
+            '. "%s"'.freeze
         end
 
     LIBRARY_PATH =
         if macos? then 'DYLD_LIBRARY_PATH'.freeze
         elsif windows? then 'PATH'.freeze
-        else 'LD_LIBRARY_PATH'.freeze
+        else
+            'LD_LIBRARY_PATH'.freeze
         end
 
     LIBRARY_SUFFIX =
         if macos? then 'dylib'
         elsif windows? then 'dll'
-        else 'so'
+        else
+            'so'
         end
 
     ORIGINAL_ENV = Hash.new
@@ -211,7 +218,8 @@ module Autobuild
             if @inherit
                 if name
                     @inherited_variables.include?(name)
-                else true
+                else
+                    true
                 end
             end
         end
@@ -245,7 +253,8 @@ module Autobuild
             flag =
                 if !names.last.respond_to?(:to_str)
                     names.pop
-                else true
+                else
+                    true
                 end
 
             if flag
@@ -342,7 +351,8 @@ module Autobuild
                         inherited_environment[name] || []
                     elsif inheritance_mode == :keep && inherit?(name)
                         ["$#{name}"]
-                    else []
+                    else
+                        []
                     end
 
                 value = []
@@ -439,7 +449,8 @@ module Autobuild
             if file
                 @source_before << { file: file, shell: shell }
                 source_before(shell: shell) # for backwards compatibility
-            else @source_before.select { |pair| pair[:shell] == shell }
+            else
+                @source_before.select { |pair| pair[:shell] == shell }
                                .map { |item| item[:file] }
             end
         end
@@ -457,7 +468,8 @@ module Autobuild
             if file
                 @source_after << { file: file, shell: shell }
                 source_after(shell: shell) # for backwards compatibility
-            else @source_after.select { |pair| pair[:shell] == shell }
+            else
+                @source_after.select { |pair| pair[:shell] == shell }
                               .map { |item| item[:file] }
             end
         end
@@ -542,7 +554,8 @@ module Autobuild
                     with_inheritance = with_inheritance.map do |value|
                         if value == variable_expansion
                             base_env[name]
-                        else value
+                        else
+                            value
                         end
                     end
                     result[name] = with_inheritance.join(File::PATH_SEPARATOR)
@@ -604,7 +617,8 @@ module Autobuild
             @arch_size ||=
                 if RbConfig::CONFIG['host_cpu'] =~ /64/
                     64
-                else 32
+                else
+                    32
                 end
             @arch_size
         end
@@ -633,17 +647,83 @@ module Autobuild
             add_prefix(newprefix, includes)
         end
 
+        def default_cmake_search_globs(prefix, *file_globs)
+            lib_globs = %w[lib]
+
+            case arch_size
+            when 32
+                lib_globs << "lib32"
+                lib_globs << "libx32"
+            when 64
+                lib_globs << "lib64"
+            end
+
+            unless arch_names.empty?
+                arch_names.each do |arch_name|
+                    lib_globs << File.join("lib", arch_name)
+                end
+            end
+
+            lib_share_glob = "{#{lib_globs.join(',')},share}"
+            file_glob = "{#{file_globs.join(',')}}"
+
+            # Reference: https://cmake.org/cmake/help/latest/command/find_package.html
+            #
+            # <prefix>/                                                       (W)
+            # <prefix>/(cmake|CMake)/                                         (W)
+            # <prefix>/<name>*/                                               (W)
+            # <prefix>/<name>*/(cmake|CMake)/                                 (W)
+            # <prefix>/(lib/<arch>|lib*|share)/cmake/<name>*/                 (U)
+            # <prefix>/(lib/<arch>|lib*|share)/<name>*/                       (U)
+            # <prefix>/(lib/<arch>|lib*|share)/<name>*/(cmake|CMake)/         (U)
+            # <prefix>/<name>*/(lib/<arch>|lib*|share)/cmake/<name>*/         (W/U)
+            # <prefix>/<name>*/(lib/<arch>|lib*|share)/<name>*/               (W/U)
+            # <prefix>/<name>*/(lib/<arch>|lib*|share)/<name>*/(cmake|CMake)/ (W/U)
+            [
+                File.join(prefix, file_glob),
+                File.join(prefix, "{cmake,CMake}", file_glob),
+                File.join(prefix, "*", file_glob),
+                File.join(prefix, "*", "{cmake/CMake}", file_glob),
+                File.join(prefix, lib_share_glob, "cmake", "*", file_glob),
+                File.join(prefix, lib_share_glob, "*", file_glob),
+                File.join(prefix, lib_share_glob, "*", "{cmake,CMake}", file_glob),
+                File.join(prefix, "*", lib_share_glob, "cmake", "*", file_glob),
+                File.join(prefix, "*", lib_share_glob, "*", file_glob),
+                File.join(prefix, "*", lib_share_glob, "*", "{cmake,CMake}", file_glob)
+            ]
+        end
+
+        def has_cmake_files?(prefix, *file_globs)
+            default_cmake_search_globs(prefix, *file_globs).each do |glob_path|
+                return true unless Dir[glob_path].empty?
+            end
+            false
+        end
+
         PKGCONFIG_PATH_RX = %r{.*/((?:lib|lib64|share)/.*)}.freeze
 
+        def pkgconfig_tool_path
+            @pkgconfig_tool_path ||= Autobuild.tool_in_path("pkg-config", env: self)
+        rescue ArgumentError
+            nil
+        end
+
         # Returns the system-wide search path that is embedded in pkg-config
         def default_pkgconfig_search_suffixes
+            return [] unless pkgconfig_tool_path
+
             @default_pkgconfig_search_suffixes ||=
-                `LANG=C #{Autobuild.tool("pkg-config")} --variable pc_path pkg-config`
+                `LANG=C #{pkgconfig_tool_path} --variable pc_path pkg-config`
                     .strip
                     .split(":")
                     .grep(PKGCONFIG_PATH_RX)
                     .map { |l| l.gsub(PKGCONFIG_PATH_RX, '\1') }
                     .to_set
+                    .add("/lib/pkgconfig")
+            # /lib/pkgconfig is added for packages that always install their
+            # libraries in /lib/ instead of the system mandated directory
+            # (/lib/x86_64-linux-gnu/ for 64bit x86 ubuntu multiarch,
+            # /lib64/ for some other 64bit systems)
         end
 
         # Updates the environment when a new prefix has been added
@@ -670,6 +750,16 @@ module Autobuild
                 end
             end
 
+            cmake_pairs = []
+            cmake_pairs << ["CMAKE_PREFIX_PATH", ["*-config.cmake", "*Config.cmake"]]
+            cmake_pairs << ["CMAKE_MODULE_PATH", ["Find*.cmake"]]
+            cmake_pairs.each do |cmake_var, cmake_file_globs|
+                if !includes || includes.include?(cmake_var)
+                    has_cmake = has_cmake_files?(newprefix, *cmake_file_globs)
+                    add_path(cmake_var, newprefix) if has_cmake
+                end
+            end
+
             # Validate the new rubylib path
             if !includes || includes.include?('RUBYLIB')
                 new_rubylib = "#{newprefix}/lib"

data/lib/autobuild/exceptions.rb

@@ -33,7 +33,8 @@ module Autobuild
             target_name =
                 if target.respond_to?(:name)
                     target.name
-                else target.to_str
+                else
+                    target.to_str
                 end
 
             if target && phase

data/lib/autobuild/import/archive.rb

@@ -529,7 +529,8 @@ module Autobuild
 
             if mode == Zip
                 main_dir = if @options[:no_subdirectory] then package.srcdir
-                           else base_dir
+                           else
+                               base_dir
                            end
 
                 FileUtils.mkdir_p base_dir

data/lib/autobuild/import/git.rb

@@ -40,7 +40,8 @@ module Autobuild
                     @default_alternates = cache_dirs.map do |path|
                         File.join(File.expand_path(path), '%s')
                     end
-                else Array.new
+                else
+                    Array.new
                 end
             end
         end
@@ -300,8 +301,10 @@ module Autobuild
         #
         # @param [Package] package
         def try_resolve_remote_head_from_local(package)
-            ls_local_string = run_git(package, 'symbolic-ref',
-                                      "refs/remotes/#{@remote_name}/HEAD").first.strip
+            ls_local_string = run_git_bare(
+                package, 'symbolic-ref',
+                "refs/remotes/#{@remote_name}/HEAD"
+            ).first.strip
             local_remote_head = ls_local_string.match("refs/remotes/#{@remote_name}/(.*)")
             local_remote_head ? local_remote_head[1] : nil
         rescue Autobuild::SubcommandFailed # rubocop:disable Lint/SuppressedException
@@ -539,8 +542,11 @@ module Autobuild
         # @api private
         #
         # Set a remote up in the repositorie's configuration
-        def setup_remote(package, remote_name, repository, push_to = repository)
-            resolve_all_branches(package, only_local: true) unless has_all_branches?
+        def setup_remote(
+            package, remote_name, repository, push_to = repository,
+            only_local: true
+        )
+            resolve_all_branches(package, only_local: only_local) unless has_all_branches?
 
             run_git_bare(package, 'config', '--replace-all',
                          "remote.#{remote_name}.url", repository)
@@ -576,9 +582,9 @@ module Autobuild
         # @api private
         #
         # Updates the git repository's configuration for the target remote
-        def update_remotes_configuration(package)
+        def update_remotes_configuration(package, only_local: true)
             each_configured_remote do |*args|
-                setup_remote(package, *args)
+                setup_remote(package, *args, only_local: only_local)
             end
 
             if local_branch
@@ -759,7 +765,8 @@ module Autobuild
         rescue SubcommandFailed => e
             if e.status == 1
                 false
-            else raise
+            else
+                raise
             end
         end
 
@@ -770,7 +777,8 @@ module Autobuild
         rescue SubcommandFailed => e
             if e.status == 1
                 false
-            else raise
+            else
+                raise
             end
         end
 
@@ -1015,7 +1023,8 @@ module Autobuild
                     File.readlines(alternates_path)
                         .map(&:strip)
                         .find_all { |l| !l.empty? }
-                else Array.new
+                else
+                    Array.new
                 end
 
             alternates = each_alternate_path(package).map do |path|

data/lib/autobuild/import/svn.rb

@@ -202,7 +202,8 @@ module Autobuild
                     # Try svn upgrade and info again
                     run_svn(package, 'upgrade', retry: false)
                     svninfo = run_svn(package, 'info')
-                else raise
+                else
+                    raise
                 end
             end
 

data/lib/autobuild/importer.rb

@@ -357,7 +357,8 @@ module Autobuild
                 message = Autobuild.color('interrupted', :red)
                 if last_error
                     raise last_error
-                else raise
+                else
+                    raise
                 end
             rescue ::Exception => e
                 message = Autobuild.color('update failed', :red)
@@ -410,7 +411,8 @@ module Autobuild
                     execute_post_hooks(package)
                 rescue Interrupt
                     if last_error then raise last_error
-                    else raise
+                    else
+                        raise
                     end
                 rescue ::Exception => e
                     last_error = e

data/lib/autobuild/package.rb

@@ -119,7 +119,8 @@ module Autobuild
         def update?
             if @update.nil?
                 Autobuild.do_update
-            else @update
+            else
+                @update
             end
         end
 
@@ -287,6 +288,11 @@ module Autobuild
             add_env_op EnvOp.new(:add_prefix, prefix, [includes])
         end
 
+        # Add a file to be sourced at the end of the generated env file
+        def env_source_after(file, shell: "sh")
+            add_env_op EnvOp.new(:source_after, file, shell: shell)
+        end
+
         # Hook called by autoproj to set up the default environment for this
         # package
         #
@@ -327,7 +333,11 @@ module Autobuild
                         set[env_op.name] = [self, env_op.values]
                     end
                 end
-                env.send(env_op.type, env_op.name, *env_op.values)
+                if env_op.type == :source_after
+                    env.send(env_op.type, env_op.name, **env_op.values)
+                else
+                    env.send(env_op.type, env_op.name, *env_op.values)
+                end
                 ops << env_op
             end
             ops
@@ -492,7 +502,8 @@ module Autobuild
                     suffix << token.gsub(/%s/, name)
                 elsif suffix.empty?
                     prefix << token
-                else suffix << token
+                else
+                    suffix << token
                 end
             end
             if suffix.empty?

data/lib/autobuild/packages/autotools.rb

@@ -146,7 +146,7 @@ module Autobuild
             FileUtils.rm_f configurestamp
         end
 
-        def import(options = Hash.new)
+        def import(**options)
             # We force a regen after the first checkout. The issue is that
             # autotools is less robust than it should, and very often it is
             # better to generate the build system for the system on which we
@@ -206,7 +206,8 @@ module Autobuild
                         varname, = o.split("=").first
                         if (current_flag = testflags.find { |fl| fl =~ /^#{varname}=/ })
                             current_flag != o
-                        else false
+                        else
+                            false
                         end
                     end
                 end

data/lib/autobuild/packages/cmake.rb

@@ -440,7 +440,8 @@ module Autobuild
         def show_make_messages?
             if !@show_make_messages.nil?
                 @show_make_messages
-            else CMake.show_make_messages?
+            else
+                CMake.show_make_messages?
             end
         end
 

data/lib/autobuild/packages/python.rb

@@ -27,12 +27,14 @@ module Autobuild
 
         def prepare_for_forced_build
             super
-            FileUtils.rm_f configurestamp
             @forced = true
         end
 
         def generate_build_command
-            command = ['python', 'setup.py', 'build']
+            command = %w[python setup.py]
+            command << "egg_info"
+            command << "--egg-base=#{builddir}"
+            command << "build"
             command << "--build-base=#{builddir}"
             command += buildflags.flatten
             command
@@ -42,25 +44,35 @@ module Autobuild
             command = generate_build_command
             command << 'install'
             command << "--prefix=#{prefix}"
+            command << "--record=#{builddir}/install.log"
+            command << "--single-version-externally-managed"
             command += installflags.flatten
             command
         end
 
-        def python_path
+        def self.user_site(prefix)
+            return File.join(prefix, @user_site) if @user_site
+
             begin
-                _, output, _, ret = Open3.popen3({ 'PYTHONUSERBASE' => prefix },
-                                                 'python -m site --user-site')
+                env = Autobuild.env.resolved_env.merge({ 'PYTHONUSERBASE' => "/" })
+                _, output, _, ret = Open3.popen3(env, 'python -m site --user-site')
             rescue Exception => e
                 raise "Unable to set PYTHONPATH: #{e.message}"
             end
 
             if ret.value.success?
-                output.read.chomp
+                @user_site = Pathname.new(output.read.chomp)
+                                     .relative_path_from(Pathname.new("/"))
+                File.join(prefix, @user_site)
             else
                 raise 'Unable to set PYTHONPATH: user site directory disabled?'
             end
         end
 
+        def python_path
+            self.class.user_site(prefix)
+        end
+
         # Do the build in builddir
         def build
             return unless install_mode?

data/lib/autobuild/parallel.rb

@@ -88,7 +88,8 @@ module Autobuild
                 if task.respond_to?(:package)
                     started_packages[task.package] ||= -started_packages.size
                     queue[task] = started_packages[task.package]
-                else queue[task] = base_priority
+                else
+                    queue[task] = base_priority
                 end
             end
 

data/lib/autobuild/progress_display.rb

@@ -246,7 +246,8 @@ module Autobuild
                             groups.last[1] = (current_group.first..group_end_index)
                             groups << [prefix, [idx, other_idx]]
                             grouping = true
-                        else break
+                        else
+                            break
                         end
                     end
                 end

data/lib/autobuild/reporting.rb

@@ -130,7 +130,8 @@ module Autobuild
         # :exit if debug is false, or :raise if it is true
         def self.default_report_on_package_failures
             if Autobuild.debug then :raise
-            else :exit
+            else
+                :exit
             end
         end
 
@@ -163,7 +164,8 @@ module Autobuild
                 raise interrupted_by if interrupted_by
 
                 e = if errors.size == 1 then errors.first
-                    else CompositeException.new(errors)
+                    else
+                        CompositeException.new(errors)
                     end
                 raise e
             elsif %i[report_silent report].include?(on_package_failures)

data/lib/autobuild/subcommand.rb

@@ -251,7 +251,8 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
         end
         logdir = if target.respond_to?(:logdir)
                      target.logdir
-                 else Autobuild.logdir
+                 else
+                     Autobuild.logdir
                  end
 
         if target.respond_to?(:working_directory)
@@ -271,7 +272,8 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
 
         open_flag = if Autobuild.keep_oldlogs then 'a'
                     elsif Autobuild.registered_logfile?(logname) then 'a'
-                    else 'w'
+                    else
+                        'w'
                     end
         open_flag << ":BINARY"
 
@@ -461,7 +463,8 @@ module Autobuild::Subprocess # rubocop:disable Style/ClassAndModuleChildren
         error = Autobuild::SubcommandFailed.new(target, command.join(" "),
                                                 logname, e.status, subcommand_output)
         error.retry = if e.retry?.nil? then options[:retry]
-                      else e.retry?
+                      else
+                          e.retry?
                       end
         error.phase = phase
         raise error, e.message

data/lib/autobuild/test_utility.rb

@@ -24,7 +24,8 @@ module Autobuild
         def coverage_enabled?
             if @coverage_enabled.nil?
                 TestUtility.coverage_enabled?
-            else @coverage_enabled
+            else
+                @coverage_enabled
             end
         end
 
@@ -53,7 +54,8 @@ module Autobuild
             if @coverage_source_dir
                 relative = if package.respond_to?(:builddir)
                                package.builddir
-                           else package.srcdir
+                           else
+                               package.srcdir
                            end
                 File.expand_path(@coverage_source_dir, relative)
             end

data/lib/autobuild/version.rb

@@ -1,3 +1,3 @@
 module Autobuild
-    VERSION = "1.22.0".freeze unless defined? Autobuild::VERSION
+    VERSION = "1.23.1".freeze unless defined? Autobuild::VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autobuild
 version: !ruby/object:Gem::Version
-  version: 1.22.0
+  version: 1.23.1
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -277,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Library to handle build systems and import mechanisms