Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper

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

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index 5c72ebd73f9c14824f0c1f64bc6e8449ed5b26f1..49862675caccda2dd6d04c558d3b37625577f92c 100644 (file)
--- 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+
@@ -15,14 +15,15 @@ use base 'Exporter';
 our @EXPORT=qw(&buildsystems_init &buildsystems_do &load_buildsystem &load_all_buildsystems);
 
 # 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;
@@ -37,7 +38,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) {
@@ -49,16 +50,20 @@ sub create_buildsystem_instance {
        return $module->new(%bsopts);
 }
 
+# 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);
+                       my $inst = create_buildsystem_instance($system, @_);
                        if ($inst->check_auto_buildable($step)) {
                                return $inst;
                        }
@@ -83,15 +88,15 @@ sub load_all_buildsystems {
                }
        }
 
-       # Push debhelper built-in buildsystems first
+       # Standard debhelper build systems first
        for my $name (@BUILDSYSTEMS) {
-               error("Debhelper built-in buildsystem '$name' could not be found/loaded")
+               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
+       # The rest are 3rd party build systems
        for my $name (keys %buildsystems) {
                my $inst = $buildsystems{$name};
                $inst->{thirdparty} = 1;
@@ -106,35 +111,28 @@ sub buildsystems_init {
 
        # 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,
        );
        $args{options}{$_} = $options{$_} foreach keys(%options);
-
-       # Pass options from the DH_AUTO_OPTIONS environment variable
-       if (defined $ENV{DH_AUTO_OPTIONS}) {
-               $args{extra_args} = $ENV{DH_AUTO_OPTIONS};
-       }
        Debian::Debhelper::Dh_Lib::init(%args);
 }
 
 sub buildsystems_list {
        my $step=shift;
 
-       # List buildsystems (including auto and specified status)
+       # List build systems (including auto and specified status)
        my ($auto, $specified);
-       my @buildsystems = load_all_buildsystems(undef);
-       for my $inst (@buildsystems) {
+       for my $inst (load_all_buildsystems()) {
                my $is_specified = defined $opt_buildsys && $opt_buildsys eq $inst->NAME();
                if (! defined $specified && defined $opt_buildsys && $opt_buildsys eq $inst->NAME()) {
                        $specified = $inst->NAME();
@@ -142,7 +140,7 @@ sub buildsystems_list {
                elsif (! defined $auto && ! $inst->{thirdparty} && $inst->check_auto_buildable($step)) {
                        $auto = $inst->NAME();
                }
-               printf("%s - %s", $inst->NAME(), $inst->DESCRIPTION());
+               printf("%-20s %s", $inst->NAME(), $inst->DESCRIPTION());
                print " [3rd party]" if $inst->{thirdparty};
                print "\n";
        }
@@ -170,7 +168,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 +177,4 @@ sub buildsystems_do {
        return 0;
 }
 
-1;
+1