X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debian%2FDebhelper%2FDh_Buildsystems.pm;h=f6c123c5800bad09a7e1990e701e6bc041ccd898;hb=8ceb2df1b9e3368e765076b23ee0ecd4a2532a46;hp=eade500253b54406c29af4a640211ff770a4054e;hpb=26631f8cd7c72f5e546d3ccff7d24224fb44961f;p=debhelper.git

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index eade500..f6c123c 100644
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -1,5 +1,5 @@
-# A module for loading and managing debhelper buildsystem plugins.
-# This module is intended to be used by all dh_auto_* helper commands.
+# A module for loading and managing debhelper build system classes.
+# This module is intended to be used by all dh_auto_* programs.
 #
 # Copyright: © 2009 Modestas Vainius
 # License: GPL-2+
@@ -14,21 +14,25 @@ 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
-# buildsystems MUST be added to the END of the list.
+# build systems MUST be added to the END of the list.
 our @BUILDSYSTEMS = (
-    "autoconf",
-    "perl_makemaker",
-    "makefile",
-    "python_distutils",
-    "perl_build",
-    "cmake",
+	"autoconf",
+	"perl_makemaker",
+	"makefile",
+	"python_distutils",
+	"perl_build",
+	"cmake",
+	"ant",
 );
 
 my $opt_buildsys;
 my $opt_sourcedir;
 my $opt_builddir;
 my $opt_list;
+my $opt_parallel;
 
 sub create_buildsystem_instance {
 	my $system=shift;
@@ -37,7 +41,7 @@ sub create_buildsystem_instance {
 
 	eval "use $module";
 	if ($@) {
-		error("unable to load buildsystem class '$system': $@");
+		error("unable to load build system class '$system': $@");
 	}
 
 	if (!exists $bsopts{builddir} && defined $opt_builddir) {
@@ -46,35 +50,63 @@ 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.
 sub load_buildsystem {
-	my ($step, $system)=@_;
+	my $system=shift;
+	my $step=shift;
 	if (defined $system) {
-		my $inst = create_buildsystem_instance($system);
+		my $inst = create_buildsystem_instance($system, @_);
 		return $inst;
 	}
 	else {
 		# Try to determine build system automatically
-		for $system (@BUILDSYSTEMS) {
-			my $inst = create_buildsystem_instance($system, build_step=>$step);
-			if ($inst->is_buildable()) {
-				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};
@@ -83,16 +115,16 @@ sub load_all_buildsystems {
 		}
 	}
 
-	# Push debhelper built-in buildsystems first
-	for my $name (@BUILDSYSTEMS) {
-		error("Debhelper built-in buildsystem '$name' could not be found/loaded")
+	# Standard debhelper build systems first
+	foreach my $name (@BUILDSYSTEMS) {
+		error("standard debhelper build system '$name' could not be found/loaded")
 		    if not exists $buildsystems{$name};
 		push @buildsystems, $buildsystems{$name};
 		delete $buildsystems{$name};
 	}
 
-	# The rest are 3rd party buildsystems
-	for my $name (keys %buildsystems) {
+	# The rest are 3rd party build systems
+	foreach my $name (keys %buildsystems) {
 		my $inst = $buildsystems{$name};
 		$inst->{thirdparty} = 1;
 		push @buildsystems, $inst;
@@ -103,52 +135,70 @@ sub load_all_buildsystems {
 
 sub buildsystems_init {
 	my %args=@_;
+	
+	my $max_parallel=-1; # unlimited
 
 	# Available command line options
 	my %options = (
-	    "d" => undef, # cancel default D_FLAG option spec
-	    "d=s" => \$opt_sourcedir,
+	    "D=s" => \$opt_sourcedir,
 	    "sourcedirectory=s" => \$opt_sourcedir,
 	
-	    "b:s" => \$opt_builddir,
+	    "B:s" => \$opt_builddir,
 	    "builddirectory:s" => \$opt_builddir,
 
-	    "c=s" => \$opt_buildsys,
+	    "S=s" => \$opt_buildsys,
 	    "buildsystem=s" => \$opt_buildsys,
 
 	    "l" => \$opt_list,
-	    "--list" => \$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);
+}
 
-	# Pass options from the DH_AUTO_OPTIONS environment variable
-	if (defined $ENV{DH_AUTO_OPTIONS}) {
-		$args{extra_args} = $ENV{DH_AUTO_OPTIONS};
+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;
+				}
+			}
+		}
 	}
-	Debian::Debhelper::Dh_Lib::init(%args);
 }
 
 sub buildsystems_list {
 	my $step=shift;
 
-	# List buildsystems (including auto and specified status)
-	my ($auto, $specified);
-	my @buildsystems = load_all_buildsystems(undef, build_step => undef);
-	for my $inst (@buildsystems) {
-		my $is_specified = defined $opt_buildsys && $opt_buildsys eq $inst->NAME();
+	my @buildsystems = load_all_buildsystems();
+	my $auto = autoselect_buildsystem($step, grep { ! $_->{thirdparty} } @buildsystems);
+	my $specified;
+
+	# List build systems (including auto and specified status)
+	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("%s - %s", $inst->NAME(), $inst->DESCRIPTION());
+		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;
 }
@@ -161,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);
 	}
 
@@ -170,7 +220,7 @@ sub buildsystems_do {
 		exit 0;
 	}
 
-	my $buildsystem = load_buildsystem($step, $opt_buildsys);
+	my $buildsystem = load_buildsystem($opt_buildsys, $step);
 	if (defined $buildsystem) {
 		$buildsystem->pre_building_step($step);
 		$buildsystem->$step(@_, @{$dh{U_PARAMS}});
@@ -179,4 +229,4 @@ sub buildsystems_do {
 	return 0;
 }
 
-1;
+1