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 df810208e22222c2315bebbc720f1cda8be57b0d..49862675caccda2dd6d04c558d3b37625577f92c 100644 (file)
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -1,4 +1,4 @@
-# A module for loading and managing debhelper build system class.
+# 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
@@ -17,19 +17,19 @@ 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;
 my $opt_sourcedir;
 my $opt_builddir;
 my $opt_list;
-my $opt_help_buildsys;
 
 sub create_buildsystem_instance {
        my $system=shift;
@@ -88,9 +88,9 @@ sub load_all_buildsystems {
                }
        }
 
-       # Push debhelper built-in build systems first
+       # Standard debhelper build systems first
        for my $name (@BUILDSYSTEMS) {
-               error("debhelper built-in build system '$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};
@@ -122,8 +122,6 @@ sub buildsystems_init {
 
            "l" => \$opt_list,
            "list" => \$opt_list,
-
-           "help-buildsystem" => \$opt_help_buildsys,
        );
        $args{options}{$_} = $options{$_} foreach keys(%options);
        Debian::Debhelper::Dh_Lib::init(%args);
@@ -134,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();
@@ -143,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";
        }
@@ -154,50 +151,6 @@ sub buildsystems_list {
                if ! defined $auto && ! defined $specified;
 }
 
-sub help_buildsystem {
-       my $step=shift;
-
-       # Print build system help page to standard output
-
-       my $inst = load_buildsystem($opt_buildsys, $step);
-       if ($inst) {
-               my $pmfile = ref $inst;
-               $pmfile =~ s#::#/#g;
-               $pmfile = $INC{"$pmfile.pm"};
-
-               # Display help with perldoc if it is installed and output is
-               # a tty
-               my $perldoc;
-               if (-t STDOUT) {
-                       eval "use Pod::Perldoc";
-                       $perldoc = "Pod::Perldoc" if (!$@);
-               }
-               if ($perldoc) {
-                       $perldoc = new Pod::Perldoc();
-                       $perldoc->{args} = [ '-oman',
-                                            '-w', 'section=7" "--name=dh_auto_'.lc($inst->NAME()),
-                                            '-w', 'center=Dh_auto build system documentation',
-                                            '-w', 'release=',
-                                            '-F', $pmfile ];
-                       $perldoc->process();
-               }
-               else {
-                       # No perldoc on the system. Use Pod::Usage to emit simple text
-                       eval "use Pod::Usage";
-                       pod2usage( -message => "Help page for the ".$inst->NAME()." build system\n" .
-                                              '<' . '-'x74 . '>',
-                                  -input => $pmfile, -exitval => 'NOEXIT',
-                                  -verbose => 2, -noperldoc => 1 );
-                       print '<', '-'x74, '>', "\n";
-               }
-               return 0;
-       }
-       else {
-               print STDERR "No system auto-selected or specified. Try using --buildsystem option\n";
-               return 1;
-       }
-}
-
 sub buildsystems_do {
        my $step=shift;
 
@@ -215,10 +168,6 @@ sub buildsystems_do {
                exit 0;
        }
 
-       if ($opt_help_buildsys) {
-               exit help_buildsystem($step);
-       }
-
        my $buildsystem = load_buildsystem($opt_buildsys, $step);
        if (defined $buildsystem) {
                $buildsystem->pre_building_step($step);
@@ -228,4 +177,4 @@ sub buildsystems_do {
        return 0;
 }
 
-1;
+1