lib/autobuild/packages/cmake.rb in autobuild-1.4.3 vs lib/autobuild/packages/cmake.rb in autobuild-1.4.4

- old
+ new

@@ -62,11 +62,11 @@ # Declare that the given target can be used to generate documentation def with_doc(target = 'doc') doc_task do Dir.chdir(builddir) do Autobuild.progress "generating documentation for #{name}" - Subprocess.run(name, 'doc', Autobuild.tool(:make), "-j#{parallel_build_level}", target) + Subprocess.run(self, 'doc', Autobuild.tool(:make), "-j#{parallel_build_level}", target) yield if block_given? end end end @@ -151,23 +151,23 @@ Autobuild.progress "generating and configuring build system for #{name}" if full_reconfigures? FileUtils.rm_f configurestamp end - Subprocess.run(name, 'configure', *command) + Subprocess.run(self, 'configure', *command) super end end # Do the build in builddir def build Dir.chdir(builddir) do Autobuild.progress_with_value "building #{name}" if always_reconfigure || !File.file?('Makefile') - Subprocess.run(name, 'build', Autobuild.tool(:cmake), '.') + Subprocess.run(self, 'build', Autobuild.tool(:cmake), '.') end - Subprocess.run(name, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}") do |line| + Subprocess.run(self, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}") do |line| if line =~ /\[\s+(\d+)%\]/ Autobuild.progress_value Integer($1) end end end @@ -176,10 +176,10 @@ # Install the result in prefix def install Dir.chdir(builddir) do Autobuild.progress "installing #{name}" - Subprocess.run(name, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install') + Subprocess.run(self, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}", 'install') Autobuild.update_environment prefix end super end end