Make buildsystems_list() use updated auto-selection code.

[debhelper.git] / Debian / Debhelper / Dh_Buildsystems.pm

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index 49862675caccda2dd6d04c558d3b37625577f92c..8470eac05171f7d4e767f2703db6f202110fab1c 100644 (file)
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -14,6 +14,8 @@ use File::Spec;
 use base 'Exporter';
 our @EXPORT=qw(&buildsystems_init &buildsystems_do &load_buildsystem &load_all_buildsystems);
 
+use constant BUILD_STEPS => qw(configure build test install clean);
+
 # Historical order must be kept for backwards compatibility. New
 # build systems MUST be added to the END of the list.
 our @BUILDSYSTEMS = (
@@ -30,6 +32,7 @@ my $opt_buildsys;
 my $opt_sourcedir;
 my $opt_builddir;
 my $opt_list;
+my $opt_parallel;
 
 sub create_buildsystem_instance {
        my $system=shift;
@@ -47,9 +50,35 @@ sub create_buildsystem_instance {
        if (!exists $bsopts{sourcedir} && defined $opt_sourcedir) {
                $bsopts{sourcedir} = ($opt_sourcedir eq "") ? undef : $opt_sourcedir;
        }
+       if (!exists $bsopts{parallel}) {
+               $bsopts{parallel} = $opt_parallel;
+       }
        return $module->new(%bsopts);
 }
 
+# Autoselect a build system from the list of instances
+sub autoselect_buildsystem {
+       my $step=shift;
+       my $selected;
+       my $selected_level = 0;
+
+       for my $inst (@_) {
+               # Only derived (i.e. more specific) build system can be
+               # considered beyond the currently selected one.
+               next if defined $selected && !$inst->isa(ref $selected);
+
+               # If the build system says it is auto-buildable at the current
+               # step and it can provide more specific information about its
+               # status than its parent (if any), auto-select it.
+               my $level = $inst->check_auto_buildable($step);
+               if ($level > $selected_level) {
+                       $selected = $inst;
+                       $selected_level = $level;
+               }
+       }
+       return $selected;
+}
+
 # Similar to create_build system_instance(), but it attempts to autoselect
 # a build system if none was specified. In case autoselection fails, undef
 # is returned.
@@ -62,14 +91,12 @@ sub load_buildsystem {
        }
        else {
                # Try to determine build system automatically
+               my @buildsystems;
                for $system (@BUILDSYSTEMS) {
-                       my $inst = create_buildsystem_instance($system, @_);
-                       if ($inst->check_auto_buildable($step)) {
-                               return $inst;
-                       }
+                       push @buildsystems, create_buildsystem_instance($system, @_);
                }
+               return autoselect_buildsystem($step, @buildsystems);
        }
-       return;
 }
 
 sub load_all_buildsystems {
@@ -108,6 +135,8 @@ sub load_all_buildsystems {
 
 sub buildsystems_init {
        my %args=@_;
+       
+       my $max_parallel=-1; # unlimited
 
        # Available command line options
        my %options = (
@@ -122,31 +151,54 @@ sub buildsystems_init {
 
            "l" => \$opt_list,
            "list" => \$opt_list,
+
+           "max-parallel=i" => \$max_parallel,
        );
        $args{options}{$_} = $options{$_} foreach keys(%options);
        Debian::Debhelper::Dh_Lib::init(%args);
+       set_parallel($max_parallel);
+}
+
+sub set_parallel {
+       my $max=shift;
+
+       $opt_parallel=1;
+
+       if (exists $ENV{DEB_BUILD_OPTIONS}) {
+               # Parse parallel=n tag
+               foreach my $opt (split(/\s+/, $ENV{DEB_BUILD_OPTIONS})) {
+                       if ($opt =~ /^parallel=([-\d]+)$/) {
+                               my $n=$1;
+                               if ($n > 0 && ($max == -1 || $n < $max)) {
+                                       $opt_parallel = $n;
+                               }
+                               else {
+                                       $opt_parallel = $max;
+                               }
+                       }
+               }
+       }
 }
 
 sub buildsystems_list {
        my $step=shift;
 
+       my @buildsystems = load_all_buildsystems();
+       my $auto = autoselect_buildsystem($step, grep { ! $_->{thirdparty} } @buildsystems);
+       my $specified;
+
        # List build systems (including auto and specified status)
-       my ($auto, $specified);
-       for my $inst (load_all_buildsystems()) {
-               my $is_specified = defined $opt_buildsys && $opt_buildsys eq $inst->NAME();
+       for my $inst (@buildsystems) {
                if (! defined $specified && defined $opt_buildsys && $opt_buildsys eq $inst->NAME()) {
-                       $specified = $inst->NAME();
-               }
-               elsif (! defined $auto && ! $inst->{thirdparty} && $inst->check_auto_buildable($step)) {
-                       $auto = $inst->NAME();
+                       $specified = $inst;
                }
                printf("%-20s %s", $inst->NAME(), $inst->DESCRIPTION());
                print " [3rd party]" if $inst->{thirdparty};
                print "\n";
        }
        print "\n";
-       print "Auto-selected: $auto\n" if defined $auto;
-       print "Specified: $specified\n" if defined $specified;
+       print "Auto-selected: ", $auto->NAME(), "\n" if defined $auto;
+       print "Specified: ", $specified->NAME(), "\n" if defined $specified;
        print "No system auto-selected or specified\n"
                if ! defined $auto && ! defined $specified;
 }
@@ -159,7 +211,7 @@ sub buildsystems_do {
                $step =~ s/^dh_auto_//;
        }
 
-       if (grep(/^\Q$step\E$/, qw{configure build test install clean}) == 0) {
+       if (grep(/^\Q$step\E$/, BUILD_STEPS) == 0) {
                error("unrecognized build step: " . $step);
        }