layout

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

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index 2893c1a4c626dea352708e3c38cbb47f615cf6dd..22f80f9ebdacb39435e8a952ccd9d753199a2c03 100644 (file)
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -20,12 +20,14 @@ use constant BUILD_STEPS => qw(configure build test install clean);
 # build systems MUST be added to the END of the list.
 our @BUILDSYSTEMS = (
        "autoconf",
+       (! compat(7) ? "perl_build" : ()),
        "perl_makemaker",
        "makefile",
        "python_distutils",
-       "perl_build",
+       (compat(7) ? "perl_build" : ()),
        "cmake",
        "ant",
+       "qmake",
 );
 
 my $opt_buildsys;
@@ -56,6 +58,29 @@ sub create_buildsystem_instance {
        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;
+
+       foreach 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.
@@ -68,25 +93,11 @@ sub load_buildsystem {
        }
        else {
                # Try to determine build system automatically
-               my $selected;
-               my $selected_level = 0;
-               for $system (@BUILDSYSTEMS) {
-                       my $inst = create_buildsystem_instance($system, @_);
-
-                       # 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;
-                       }
+               my @buildsystems;
+               foreach $system (@BUILDSYSTEMS) {
+                       push @buildsystems, create_buildsystem_instance($system, @_);
                }
-               return $selected;
+               return autoselect_buildsystem($step, @buildsystems);
        }
 }
 
@@ -94,10 +105,10 @@ sub load_all_buildsystems {
        my $incs=shift || \@INC;
        my (%buildsystems, @buildsystems);
 
-       for my $inc (@$incs) {
+       foreach my $inc (@$incs) {
                my $path = File::Spec->catdir($inc, "Debian/Debhelper/Buildsystem");
                if (-d $path) {
-                       for my $module_path (glob "$path/*.pm") {
+                       foreach my $module_path (glob "$path/*.pm") {
                                my $name = basename($module_path);
                                $name =~ s/\.pm$//;
                                next if exists $buildsystems{$name};
@@ -107,7 +118,7 @@ sub load_all_buildsystems {
        }
 
        # Standard debhelper build systems first
-       for my $name (@BUILDSYSTEMS) {
+       foreach my $name (@BUILDSYSTEMS) {
                error("standard debhelper build system '$name' could not be found/loaded")
                    if not exists $buildsystems{$name};
                push @buildsystems, $buildsystems{$name};
@@ -115,7 +126,7 @@ sub load_all_buildsystems {
        }
 
        # The rest are 3rd party build systems
-       for my $name (keys %buildsystems) {
+       foreach my $name (keys %buildsystems) {
                my $inst = $buildsystems{$name};
                $inst->{thirdparty} = 1;
                push @buildsystems, $inst;
@@ -126,14 +137,14 @@ sub load_all_buildsystems {
 
 sub buildsystems_init {
        my %args=@_;
-       
-       my $max_parallel=-1; # unlimited
+
+       my $max_parallel=1;
 
        # Available command line options
        my %options = (
            "D=s" => \$opt_sourcedir,
            "sourcedirectory=s" => \$opt_sourcedir,
-       
+
            "B:s" => \$opt_builddir,
            "builddirectory:s" => \$opt_builddir,
 
@@ -143,6 +154,7 @@ sub buildsystems_init {
            "l" => \$opt_list,
            "list" => \$opt_list,
 
+           "parallel" => sub { $max_parallel = -1 },
            "max-parallel=i" => \$max_parallel,
        );
        $args{options}{$_} = $options{$_} foreach keys(%options);
@@ -156,14 +168,12 @@ sub set_parallel {
        $opt_parallel=1;
 
        if (exists $ENV{DEB_BUILD_OPTIONS}) {
-               # Parse parallel=n tag
+               # Get number of processes from parallel=n tag limiting it
+               # with $max if needed
                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 {
+                       if ($opt =~ /^parallel=(-?\d+)$/) {
+                               $opt_parallel = $1;
+                               if ($max > 0 && $opt_parallel > $max) {
                                        $opt_parallel = $max;
                                }
                        }
@@ -174,23 +184,22 @@ sub set_parallel {
 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();
+       foreach 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;
 }