lib/autobuild/packages/cmake.rb in autobuild-1.9.6 vs lib/autobuild/packages/cmake.rb in autobuild-1.10.0.b1

@@ -224,24 +224,24 @@
             end
             doxyfile = File.join(builddir, "Doxyfile")
             File.open(doxyfile, 'w') do |io|
                 io.write(doxyfile_data)
             end
-            Subprocess.run(self, 'doc', Autobuild.tool(:doxygen), doxyfile)
+            run('doc', Autobuild.tool(:doxygen), doxyfile)
         end
 
         def common_utility_handling(utility, target, start_msg, done_msg)
             utility.task do
                 progress_start start_msg, :done_message => done_msg do
                     if internal_doxygen_mode?
                         run_doxygen
                     else
-                        Subprocess.run(self, utility.name,
-                                       Autobuild.tool(:make),
-                                       "-j#{parallel_build_level}",
-                                       target,
-                                       :working_directory => builddir)
+                        run(utility.name,
+                            Autobuild.tool(:make),
+                            "-j#{parallel_build_level}",
+                            target,
+                            working_directory: builddir)
                     end
                     yield if block_given?
                 end
             end
         end
@@ -327,11 +327,11 @@
                     cache_line = cache.each_line.find do |line|
                         line =~ /^#{name}:/
                     end
 
                     value = value.to_s
-                    old_value = cache_line.partition("=").last.chomp if cache_line
+                    old_value = cache_line.split("=")[1].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}'"
                         end
                         if old_value
@@ -379,11 +379,11 @@
                     
                     progress_start "configuring CMake for %s", :done_message => "configured CMake for %s" do
                         if full_reconfigures?
                             FileUtils.rm_f cmake_cache
                         end
-                        Subprocess.run(self, 'configure', *command)
+                        run('configure', *command)
                     end
                 end
             end
         end
 
@@ -410,11 +410,11 @@
         def build
             current_message = String.new
             in_dir(builddir) do
                 progress_start "building %s" do
                     if always_reconfigure || !File.file?('Makefile')
-                        Subprocess.run(self, 'build', Autobuild.tool(:cmake), '.')
+                        run('build', Autobuild.tool(:cmake), '.')
                     end
 
                     warning_count = 0
                     Autobuild.make_subcommand(self, 'build') do |line|
                         needs_display = false
@@ -456,10 +456,10 @@
 
         # Install the result in prefix
         def install
             in_dir(builddir) do
                 progress_start "installing %s", :done_message => 'installed %s' do
-                    Subprocess.run(self, 'install', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install')
+                    run('install', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install')
                 end
             end
             super
         end
     end