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 d37c593d48e4ed0fe08d0178dc980a4512b78080..49862675caccda2dd6d04c558d3b37625577f92c 100644 (file)
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -17,12 +17,13 @@ our @EXPORT=qw(&buildsystems_init &buildsystems_do &load_buildsystem &load_all_b
 # 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",
+       "perl_makemaker",
+       "makefile",
+       "python_distutils",
+       "perl_build",
+       "cmake",
+       "ant",
 );
 
 my $opt_buildsys;
@@ -87,7 +88,7 @@ sub load_all_buildsystems {
                }
        }
 
-       # Push standard debhelper build systems first
+       # Standard debhelper build systems first
        for my $name (@BUILDSYSTEMS) {
                error("standard debhelper build system '$name' could not be found/loaded")
                    if not exists $buildsystems{$name};
@@ -131,8 +132,7 @@ sub buildsystems_list {
 
        # List build systems (including auto and specified status)
        my ($auto, $specified);
-       my @buildsystems = load_all_buildsystems();
-       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();
@@ -140,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";
        }
@@ -177,4 +177,4 @@ sub buildsystems_do {
        return 0;
 }
 
-1;
+1