lib/autobuild/packages/autotools.rb in autobuild-1.6.5 vs lib/autobuild/packages/autotools.rb in autobuild-1.7.0.rc1

- old
+ new

@@ -9,10 +9,14 @@ module Autobuild def self.autotools(opts, &proc) Autotools.new(opts, &proc) end + if Autobuild.macos? + Autobuild.programs['libtoolize'] = "glibtoolize" + end + # # ==== Handles autotools-based packages # # == Used programs (see <tt>Autobuild.programs</tt>) # Autotools will use the 'aclocal', 'autoheader', 'autoconf' and 'automake' @@ -30,19 +34,19 @@ def configurestamp; "#{builddir}/config.status" end def initialize(options) @using = Hash.new @configureflags = [] - + super end # Declare that the given target can be used to generate documentation def with_doc(target = 'doc') task "#{name}-doc" => configurestamp doc_task do - progress_start "generating documentation for %s" do + progress_start "generating documentation for %s", :done_message => 'generated_documentation for %s' do Subprocess.run(self, 'doc', Autobuild.tool(:make), "-j#{parallel_build_level}", target, :working_directory => builddir) end yield if block_given? end end @@ -218,11 +222,11 @@ using[:autogen] = %w{autogen autogen.sh}.find { |f| File.exists?(File.join(srcdir, f)) } end autodetect_needed_stages - progress_start "generating build system for %s" do + progress_start "generating autotools for %s", :done_message => 'generated autotools for %s' do if using[:libtool] Subprocess.run(self, 'configure', Autobuild.tool('libtoolize'), '--copy') end if using[:autogen] Subprocess.run(self, 'configure', File.expand_path(using[:autogen], srcdir)) @@ -255,21 +259,21 @@ command << "--no-create" end command << "--prefix=#{prefix}" command += Array[*configureflags] - progress_start "configuring build system for %s" do + progress_start "configuring autotools for %s", :done_message => 'configured autotools for %s' do Subprocess.run(self, 'configure', *command) end end end end # Do the build in builddir def build in_dir(builddir) do - progress_start "building %s [progress not available]" do + progress_start "building %s [progress not available]", :done_message => 'built %s' do if force_config_status Subprocess.run(self, 'build', './config.status') end Subprocess.run(self, 'build', Autobuild.tool(:make), "-j#{parallel_build_level}") end @@ -278,10 +282,10 @@ end # Install the result in prefix def install in_dir(builddir) do - progress_start "installing %s" do + progress_start "installing %s", :done_message => 'installed %s' do Subprocess.run(self, 'install', Autobuild.tool(:make), 'install') end end super