X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debian%2FDebhelper%2FDh_Buildsystems.pm;h=9c3fc0597c969b6639d8355c46a2ad21b266584d;hb=e8c799129672d5b7dbac58a06fadd175cffaa7ed;hp=a9a6b9141917e444514966397ef87ce2b2b7091e;hpb=ee5536e22dbe1a629beca2296c1b29ec5c771fde;p=debhelper.git

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index a9a6b91..9c3fc05 100644
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -14,21 +14,27 @@ 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 = (
-    "autoconf",
-    "perl_makemaker",
-    "makefile",
-    "python_distutils",
-    "perl_build",
-    "cmake",
+	"autoconf",
+	(! compat(7) ? "perl_build" : ()),
+	"perl_makemaker",
+	"makefile",
+	"python_distutils",
+	(compat(7) ? "perl_build" : ()),
+	"cmake",
+	"ant",
+	"qmake",
 );
 
 my $opt_buildsys;
 my $opt_sourcedir;
 my $opt_builddir;
 my $opt_list;
+my $opt_parallel;
 
 sub create_buildsystem_instance {
 	my $system=shift;
@@ -46,9 +52,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;
+
+	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.
@@ -61,24 +93,22 @@ sub load_buildsystem {
 	}
 	else {
 		# Try to determine build system automatically
-		for $system (@BUILDSYSTEMS) {
-			my $inst = create_buildsystem_instance($system, @_);
-			if ($inst->check_auto_buildable($step)) {
-				return $inst;
-			}
+		my @buildsystems;
+		foreach $system (@BUILDSYSTEMS) {
+			push @buildsystems, create_buildsystem_instance($system, @_);
 		}
+		return autoselect_buildsystem($step, @buildsystems);
 	}
-	return;
 }
 
 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};
@@ -88,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};
@@ -96,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;
@@ -108,11 +138,13 @@ sub load_all_buildsystems {
 sub buildsystems_init {
 	my %args=@_;
 
+	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,
 
@@ -121,31 +153,54 @@ 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);
 	Debian::Debhelper::Dh_Lib::init(%args);
+	Debian::Debhelper::Dh_Lib::set_buildflags();
+	set_parallel($max_parallel);
+}
+
+sub set_parallel {
+	my $max=shift;
+
+	$opt_parallel=1;
+
+	if (exists $ENV{DEB_BUILD_OPTIONS}) {
+		# 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+)$/) {
+				$opt_parallel = $1;
+				if ($max > 0 && $opt_parallel > $max) {
+					$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();
+	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;
 }
@@ -158,7 +213,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);
 	}