autobuild 1.12.3 → 1.13.0.pre1

data/lib/autobuild/packages/autotools.rb

@@ -39,7 +39,7 @@ def configurestamp; "#{builddir}/config.status" end
 
         def initialize(options)
             @using = Hash.new
-	    @configureflags = []
+            @configureflags = []
             @aclocal_flags    = Array.new
             @autoheader_flags = Array.new
             @autoconf_flags   = Array.new
@@ -70,29 +70,29 @@ def with_tests(target = 'test', &block)
             common_utility_handling(test_utility, target, &block)
         end
 
-	# Overrides the default behaviour w.r.t. autotools script generation
-	#
-	# Use it like that:
-	# * to force a generation step (skipping autodetection), do
-	#     pkg.use <program> => true
-	#   For instance, for aclocal
-	#     pkg.use :aclocal => true
-	#
-	# * to force a generation step, overriding the program defined on Autobuild
-	#     pkg.use <program> => true
-	#   For instance, for autoconf
-	#     pkg.use :autoconf => 'my_autoconf_program'
-	#
-	# * to disable a generation step, do
-	#     pkg.use <program> => false
-	#   For instance, for automake
-	#     pkg.use :automake => false
-	#
-	# * to restore autodetection, do
-	#     pkg.use <program> => nil
-	#   For instance, for automake
-	#     pkg.use :automake => nil
-	#
+        # Overrides the default behaviour w.r.t. autotools script generation
+        #
+        # Use it like that:
+        # * to force a generation step (skipping autodetection), do
+        #     pkg.use <program> => true
+        #   For instance, for aclocal
+        #     pkg.use :aclocal => true
+        #
+        # * to force a generation step, overriding the program defined on Autobuild
+        #     pkg.use <program> => true
+        #   For instance, for autoconf
+        #     pkg.use :autoconf => 'my_autoconf_program'
+        #
+        # * to disable a generation step, do
+        #     pkg.use <program> => false
+        #   For instance, for automake
+        #     pkg.use :automake => false
+        #
+        # * to restore autodetection, do
+        #     pkg.use <program> => nil
+        #   For instance, for automake
+        #     pkg.use :automake => nil
+        #
         def use(*programs)
             programs =
                 if programs.size == 1
@@ -152,6 +152,8 @@ def import(options = Hash.new)
             end
         end
 
+        class UnexpectedConfigStatusOutput < RuntimeError; end
+
         def prepare
             super
             autodetect_needed_stages
@@ -162,22 +164,22 @@ def prepare
                 FileUtils.rm_f fresh_checkout_mark
             end
 
-	    # Check if config.status has been generated with the
-	    # same options than the ones in configureflags
+            # Check if config.status has been generated with the
+            # same options than the ones in configureflags
             #
             # If it is not the case, remove it to force reconfiguration
-	    configureflags.flatten!
-	    if File.exist?(configurestamp)
-		output = run('prepare', configurestamp, '--version').
-                    grep(/with options/).first.chomp
-                if !output
-                    raise "invalid output of config.status --version, expected a line starting with `with options`"
+            if File.exist?(configurestamp)
+                output = run('prepare', configurestamp, '--version').
+                    grep(/with options/).first
+                if output && (match = /with options "(.*)"/.match(output))
+                    options = Shellwords.shellwords(match[1])
+                else
+                    raise UnexpectedConfigStatusOutput, "invalid output of config.status --version, expected a line with `with options \"OPTIONS\"`"
                 end
-                options = Shellwords.shellwords(output.scan(/with options "(.*)"$/).join(" "))
 
-		# Add the --prefix option to the configureflags array
-		testflags = ["--prefix=#{prefix}"] + Array[*configureflags]
-		old_opt = options.find do |o|
+                # Add the --prefix option to the configureflags array
+                testflags = ["--prefix=#{prefix}"] + configureflags.flatten
+                old_opt = options.find do |o|
                     if testflags.include?(o)
                         false
                     elsif o =~ /^-/
@@ -189,19 +191,19 @@ def prepare
                         # explicitely given in configureflags
                         varname, value = o.split("=").first
                         if current_flag = testflags.find { |fl| fl =~ /^#{varname}=/ }
-                            current_flag != value
+                            current_flag != o
                         else false
                         end
                     end
                 end
-		new_opt = testflags.find { |o| !options.include?(o) }
-		if old_opt || new_opt
+                new_opt = testflags.find { |o| !options.include?(o) }
+                if old_opt || new_opt
                     if Autobuild.verbose
                         Autobuild.message "forcing reconfiguration of #{name} (#{old_opt} != #{new_opt})"
                     end
-		    FileUtils.rm_f configurestamp # to force reconfiguration
-		end
-	    end
+                    FileUtils.rm_f configurestamp # to force reconfiguration
+                end
+            end
 
             regen_target = create_regen_target
             file configurestamp => regen_target
@@ -232,68 +234,69 @@ def autodetect_needed_stages
             if using[:libtool].nil?
                 using[:libtool] = File.exist?(File.join(srcdir, 'ltmain.sh'))
             end
+
+            if using[:autogen].nil?
+                using[:autogen] = %w{autogen autogen.sh}.find { |f| File.exist?(File.join(srcdir, f)) }
+            end
         end
 
         # Adds a target to rebuild the autotools environment
         def create_regen_target(confsource = nil)
-	    conffile = "#{srcdir}/configure"
-	    if confsource
-		file conffile => confsource
-	    elsif confext = %w{.ac .in}.find { |ext| File.exist?("#{conffile}#{ext}") }
-		file conffile => "#{conffile}#{confext}"
-	    else
-		raise PackageException.new(self, 'prepare'), "neither configure.ac nor configure.in present in #{srcdir}"
-	    end
+            conffile = "#{srcdir}/configure"
+            if confsource
+                file conffile => confsource
+            elsif confext = %w{.ac .in}.find { |ext| File.exist?("#{conffile}#{ext}") }
+                file conffile => "#{conffile}#{confext}"
+            elsif using[:autoconf]
+                raise PackageException.new(self, 'prepare'), "neither configure.ac nor configure.in present in #{srcdir}"
+            end
 
             file conffile do
                 isolate_errors do
-                in_dir(srcdir) do
-                    if using[:autogen].nil?
-                        using[:autogen] = %w{autogen autogen.sh}.find { |f| File.exist?(File.join(srcdir, f)) }
-                    end
-
-                    autodetect_needed_stages
-
                     progress_start "generating autotools for %s", :done_message => 'generated autotools for %s' do
-                        if using[:libtool]
-                            run('configure', Autobuild.tool('libtoolize'), '--copy')
-                        end
-                        if using[:autogen]
-                            run('configure', File.expand_path(using[:autogen], srcdir))
-                        else
-                            [ :aclocal, :autoconf, :autoheader, :automake ].each do |tool|
-                                if tool_flag = using[tool]
-                                    tool_program = if tool_flag.respond_to?(:to_str)
-                                                       tool_flag.to_str
-                                                   else; Autobuild.tool(tool)
-                                                   end
-
-                                    run('configure', tool_program, *send("#{tool}_flags"))
-                                end
-                            end
-                        end
+                        regen
                     end
                 end
-                end
             end
 
             return conffile
         end
 
+        def regen
+            if using[:libtool]
+                run 'configure', Autobuild.tool('libtoolize'), '--copy',
+                    working_directory: srcdir
+            end
+            if using[:autogen]
+                run 'configure', File.expand_path(using[:autogen], srcdir),
+                    working_directory: srcdir
+            else
+                [ :aclocal, :autoconf, :autoheader, :automake ].each do |tool|
+                    if tool_flag = using[tool]
+                        tool_program = if tool_flag.respond_to?(:to_str)
+                                        tool_flag.to_str
+                                    else; Autobuild.tool(tool)
+                                    end
+
+                        run 'configure', tool_program, *send("#{tool}_flags"),
+                            working_directory: srcdir
+                    end
+                end
+            end
+        end
+
         # Configure the builddir directory before starting make
         def configure
             super do
-                in_dir(builddir) do
-                    command = [ "#{srcdir}/configure"]
-                    if force_config_status
-                        command << "--no-create"
-                    end
-                    command << "--prefix=#{prefix}"
-                    command += Array[*configureflags]
+                command = [ "#{srcdir}/configure"]
+                if force_config_status
+                    command << "--no-create"
+                end
+                command << "--prefix=#{prefix}"
+                command += configureflags.flatten
 
-                    progress_start "configuring autotools for %s", :done_message => 'configured autotools for %s' do
-                        run('configure', *command)
-                    end
+                progress_start "configuring autotools for %s", done_message: 'configured autotools for %s' do
+                    run('configure', *command, working_directory: builddir)
                 end
             end
         end
@@ -323,4 +326,3 @@ def install
         end
     end
 end
-

data/lib/autobuild/packages/cmake.rb

@@ -100,7 +100,7 @@ def cmake_cache; File.join(builddir, "CMakeCache.txt") end
         def configurestamp; cmake_cache end
 
         def initialize(options)
-	    @defines = Hash.new
+            @defines = Hash.new
             super
             @delete_obsolete_files_in_prefix = self.class.delete_obsolete_files_in_prefix?
         end

data/lib/autobuild/packages/dummy.rb

@@ -7,7 +7,7 @@ class DummyPackage < Package
         def installstamp
             "#{srcdir}/#{STAMPFILE}"
         end
-	
+        
         def initialize(*args)
             super
         end

data/lib/autobuild/packages/genom.rb

@@ -14,27 +14,27 @@ def initialize(*args, &config)
             @genomflags = []
             super
 
-	    use :autogen => 'autogen'
+            use :autogen => 'autogen'
         end
 
         def import(options = Hash.new)
-	    super
-	    get_provides
-	end
+            super
+            get_provides
+        end
 
         # Called before running the rake tasks and
         # after all imports have been made
         def prepare
-	    genomflags.flatten!
-	    get_requires
+            genomflags.flatten!
+            get_requires
 
             super
 
-	    file genomstamp => dependencies.map { |p| Package[p].installstamp }
+            file genomstamp => dependencies.map { |p| Package[p].installstamp }
         end
 
         # The file touched by genom on successful generation
-	def genomstamp; File.join(srcdir, '.genom', 'genom-stamp') end
+        def genomstamp; File.join(srcdir, '.genom', 'genom-stamp') end
 
         # Extract the cpp options from the genom options
         def cpp_options
@@ -43,7 +43,7 @@ def cpp_options
 
         # Extracts dependencies using the requires: field in the .gen file
         def get_requires
-	    apionly = genomflags.find { |f| f == '-a' }
+            apionly = genomflags.find { |f| f == '-a' }
             cpp = Autobuild.tool(:cpp)
             currentBuffer = nil
             Open3.popen3("#{cpp} #{cpp_options.join(" ")} #{srcdir}/#{name}.gen") do |cin, out, err|
@@ -77,8 +77,8 @@ def get_requires
         # Alias this package to the ones defined in the EXTRA_PKGCONFIG 
         # flag in configure.ac.user
         def get_provides
-	    configure_ac_user = File.join(srcdir, 'configure.ac.user')
-	    return unless File.readable?(configure_ac_user)
+            configure_ac_user = File.join(srcdir, 'configure.ac.user')
+            return unless File.readable?(configure_ac_user)
             File.open(configure_ac_user) do |f|
                 f.each_line { |line|
                     if line =~ /^\s*EXTRA_PKGCONFIG\s*=\s*"?([\w\-]+(?:\s+[\w\-]+)*)"?/
@@ -88,48 +88,48 @@ def get_provides
             end
         end
 
-	# Make the genom-stamp file depend on
-	#   * genom includes
-	#   * genom canvas
-	#   * the genom binary itself
-	def genom_dependencies
-	    # Get the genom pkg-config
-	    if Package['genom']
-		'genom'
-	    else
-		genom_pkg = PkgConfig.new('genom')
+        # Make the genom-stamp file depend on
+        #   * genom includes
+        #   * genom canvas
+        #   * the genom binary itself
+        def genom_dependencies
+            # Get the genom pkg-config
+            if Package['genom']
+                'genom'
+            else
+                genom_pkg = PkgConfig.new('genom')
 
-		includedir = File.join(genom_pkg.includedir, 'genom')
-		source_tree includedir
+                includedir = File.join(genom_pkg.includedir, 'genom')
+                source_tree includedir
 
-		canvasdir = File.join(genom_pkg.prefix, "share", "genom", genom_pkg.version);;
-		source_tree canvasdir
+                canvasdir = File.join(genom_pkg.prefix, "share", "genom", genom_pkg.version);;
+                source_tree canvasdir
 
-		binary = File.join(genom_pkg.exec_prefix, "bin", "genom")
-		file binary
+                binary = File.join(genom_pkg.exec_prefix, "bin", "genom")
+                file binary
 
-		[binary, includedir, canvasdir]
-	    end
-	end
+                [binary, includedir, canvasdir]
+            end
+        end
 
         def regen
             cmdline = [ 'genom', "#{name}.gen", *genomflags ]
 
-	    # Check that the module has been generated with the same flags
-	    genom_mk = "#{srcdir}/autoconf/genom.mk"
-	    if File.exist?(genom_mk)
-		contents = File.open(genom_mk).readlines
-		old_file = contents.find { |l| l =~ /^GENFILE/ }.gsub('GENFILE=', '').strip
-		old_flags = Shellwords.shellwords(
-			    contents.find { |l| l =~ /^GENFLAGS/ }.gsub('GENFLAGS=', ''))
+            # Check that the module has been generated with the same flags
+            genom_mk = "#{srcdir}/autoconf/genom.mk"
+            if File.exist?(genom_mk)
+                contents = File.open(genom_mk).readlines
+                old_file = contents.find { |l| l =~ /^GENFILE/ }.gsub('GENFILE=', '').strip
+                old_flags = Shellwords.shellwords(
+                            contents.find { |l| l =~ /^GENFLAGS/ }.gsub('GENFLAGS=', ''))
 
-		if old_file != "#{name}.gen" || !(old_flags - genomflags).empty? || !(genomflags - old_flags).empty?
-		    FileUtils.rm_f genomstamp
-		end
-	    end
+                if old_file != "#{name}.gen" || !(old_flags - genomflags).empty? || !(genomflags - old_flags).empty?
+                    FileUtils.rm_f genomstamp
+                end
+            end
 
             file buildstamp => genomstamp
-	    file genomstamp => genom_dependencies
+            file genomstamp => genom_dependencies
             file genomstamp => srcdir do
                 isolate_errors do
                     in_dir(srcdir) do
@@ -152,7 +152,7 @@ def regen
                 end
             end
 
-	    super("#{srcdir}/autoconf/configure.ac")
+            super("#{srcdir}/autoconf/configure.ac")
         end
     end
 end

data/lib/autobuild/packages/import.rb

@@ -7,10 +7,10 @@ def self.import(spec, &proc)
     end
     
     class ImporterPackage < Package
-	attr_reader :exclude
+        attr_reader :exclude
 
         def initialize(*args)
-	    @exclude = []
+            @exclude = []
             super
         end
 
@@ -18,15 +18,15 @@ def prepare
             super
 
             exclude = self.exclude.dup
-	    exclude << Regexp.new("^#{Regexp.quote(installstamp)}")
+            exclude << Regexp.new("^#{Regexp.quote(installstamp)}")
             if doc_dir
                 exclude << Regexp.new("^#{Regexp.quote(doc_dir)}")
             end
 
             source_tree(srcdir) do |pkg|
-		pkg.exclude.concat exclude
-		exclude.freeze
-	    end
+                pkg.exclude.concat exclude
+                exclude.freeze
+            end
 
             file installstamp => srcdir
         end

data/lib/autobuild/packages/orogen.rb

@@ -282,14 +282,14 @@ def regen
             end
         end
 
-	def generation_uptodate?
-	    if !File.file?(genstamp)
-		true
-	    elsif File.file?(File.join(builddir, 'Makefile'))
+        def generation_uptodate?
+            if !File.file?(genstamp)
+                true
+            elsif File.file?(File.join(builddir, 'Makefile'))
                 system("#{Autobuild.tool('make')} -C #{builddir} check-uptodate > /dev/null 2>&1")
-	    else
-	        true
-	    end
+            else
+                true
+            end
         end
     end
 end