lib/autobuild/packages/gnumake.rb in autobuild-1.17.0 vs lib/autobuild/packages/gnumake.rb in autobuild-1.18.0

@@ -2,17 +2,17 @@
 
 module Autobuild
     def self.make_is_gnumake?(pkg, path = Autobuild.tool(:make))
         @make_is_gnumake ||= Hash.new
         @gnumake_version ||= Hash.new
-        if @make_is_gnumake.has_key?(path)
+        if @make_is_gnumake.key?(path)
             @make_is_gnumake[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]
+                @gnumake_version[path] = Gem::Version.new(result.first.scan(/[\d.]+/)[0])
             rescue Autobuild::SubcommandFailed
                 @make_is_gnumake[path] = false
             end
         end
     end
@@ -26,33 +26,39 @@
     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
+            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)
+
+                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
-                    job_server.get(reserved - 1) # We already have one token taken by autobuild itself
+                    # Account for the one token autobuild uses
+                    job_server.get(reserved - 1)
                     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")
+
+                jobserver_fds_arg = "#{job_server.rio.fileno},#{job_server.wio.fileno}"
+
+                if @gnumake_version[cmd_path] >= Gem::Version.new("4.2.0")
+                    yield("--jobserver-auth=#{jobserver_fds_arg}", "-j")
                 else
-                    yield("--jobserver-fds=#{job_server.rio.fileno},#{job_server.wio.fileno}", "-j")
+                    yield("--jobserver-fds=#{jobserver_fds_arg}", "-j")
                 end
             end
             yield("-j#{pkg.parallel_build_level}")
         else yield
         end
     ensure
-        if reserved
-            job_server.put(reserved)
-        end
+        job_server.put(reserved) if reserved
     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