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

[debhelper.git] / dh

diff --git a/dh b/dh
index e3a5943e959c36802e279789b7bcc52c8e986c24..f557a6330ef660fc343fa828990c13902b741f41 100755 (executable)
--- a/dh
+++ b/dh
@@ -39,7 +39,7 @@ then when it gets to that command in the sequence, dh will run that
 target from the rules file, rather than running the actual command. The
 override target can then run the command with additional options, or run
 entirely different commands instead. (Note that to use this feature,
-you should Build-Depend on debhelper 7.2 or above.)
+you should Build-Depend on debhelper 7.0.50 or above.)
 
 =head1 OPTIONS
 
@@ -182,12 +182,28 @@ after a particular debhelper command is run.
                dh_fixperms
                chmod 4755 debian/foo/usr/bin/foo
 
+If your package is a python package, dh will use dh_pysupport by
+default. This is how to use dh_pycentral instead.
+
+       #!/usr/bin/make -f
+       %:
+               dh --with python-central $@
+
 =cut
 
 # Stash this away before init modifies it.
 my @ARGV_orig=@ARGV;
 
-init();
+init(options => {
+       "until=s" => \$dh{UNTIL},
+       "after=s" => \$dh{AFTER},
+       "before=s" => \$dh{BEFORE},
+       "remaining" => \$dh{REMAINING},
+       "with=s" => sub {
+               my ($option,$value)=@_;
+               push @{$dh{WITH}},$value;
+       },
+});
 inhibit_log();
 
 # Definitions of sequences.
@@ -233,6 +249,7 @@ $sequences{install} = [@{$sequences{build}}, qw{
        dh_installudev
        dh_installwm
        dh_installxfonts
+       dh_bugfiles
        dh_lintian
        dh_desktop
        dh_gconf
@@ -311,8 +328,14 @@ if (! @ARGV) {
        error "specify a sequence to run";
 }
 my $sequence=shift;
-if (! exists $sequences{$sequence}) {
-       error "Unknown sequence $sequence (chose from: ".
+if ($sequence eq 'debian/rules' ||
+    $sequence =~ /^override_dh_/) {
+       # make -B causes the rules file to be run as a target
+       # and support completly empty override targets
+       exit 0
+}      
+elsif (! exists $sequences{$sequence}) {
+       error "Unknown sequence $sequence (choose from: ".
                join(" ", sort keys %sequences).")";
 }
 my @sequence=@{$sequences{$sequence}};
@@ -353,7 +376,7 @@ while (@ARGV_orig) {
 my %logged;
 my %startpoint;
 foreach my $package (@packages) {
-       my @log=loadlog($package);
+       my @log=load_log($package, \%logged);
        if ($dh{AFTER}) {
                # Run commands in the sequence that come after the
                # specified command.
@@ -363,7 +386,7 @@ foreach my $package (@packages) {
                # no commands remain to run after it, communicating to
                # future dh instances that the specified command should not
                # be run again.
-               writelog($package, $sequence[$startpoint{$package}-1]);
+               write_log($sequence[$startpoint{$package}-1], $package);
        }
        elsif ($dh{REMAINING}) {
                # Start at the beginning so all remaining commands will get
@@ -420,6 +443,10 @@ sub run {
        my @exclude=@{shift()};
        my @options=@_;
        
+       # If some packages are excluded, add flags
+       # to prevent them from being acted on.
+       push @options, map { "-N$_" } @exclude;
+
        # Check for override targets in debian/rules and
        # run them instead of running the command directly.
        my $override_command;
@@ -431,11 +458,6 @@ sub run {
                $command="debian/rules";
                @options="override_".$override_command;
        }
-       else {
-               # If some packages are excluded, add flags
-               # to prevent them from being acted on.
-               push @options, map { "-N$_" } @exclude;
-       }
 
        # 3 space indent lines the command being run up under the 
        # sequence name after "dh ".
@@ -457,36 +479,11 @@ sub run {
                        # been run by the rules file target.
                        my %packages=map { $_ => 1 } @packages;
                        map { delete $packages{$_} } @exclude;
-                       Debian::Debhelper::Dh_Lib::write_log($override_command, keys %packages);
+                       write_log($override_command, keys %packages);
                }
        }
 }
 
-sub loadlog {
-       my $package=shift;
-       my $ext=pkgext($package);
-       
-       my @log;
-       open(LOG, "<", "debian/${ext}debhelper.log") || return;
-       while (<LOG>) {
-               chomp;
-               push @log, $_;
-               $logged{$package}{$_}=1;
-       }
-       close LOG;
-       return @log;
-}
-               
-sub writelog {
-       my $package=shift;
-       my $cmd=shift;
-       my $ext=pkgext($package);
-       
-       open(LOG, ">>", "debian/${ext}debhelper.log") || error("failed to write to log");
-       print LOG $cmd."\n";
-       close LOG;
-}
-
 {
 my %targets;
 my $rules_parsed;
@@ -495,24 +492,27 @@ sub rules_explicit_target {
        # Checks if a specified target exists as an explicit target
        # in debian/rules. 
        my $target=shift;
-       my $processing_targets = 0;
-       my $not_a_target = 0;
        
        if (! $rules_parsed) {  
-               open(MAKE, "make -Rrnpsf debian/rules debhelper-fail-me 2>/dev/null |");
+               my $processing_targets = 0;
+               my $not_a_target = 0;
+               open(MAKE, "LC_ALL=C make -Rrnpsf debian/rules debhelper-fail-me 2>/dev/null |");
                while (<MAKE>) {
                        if ($processing_targets) {
                                if (/^# Not a target:/) {
                                        $not_a_target = 1;
-                               } else {
-                                       if (!$not_a_target && /^([^#:]+)::?/ && !exists $targets{$1}) {
+                               }
+                               else {
+                                       if (!$not_a_target && /^([^#:]+)::?/) {
                                                # Target is defined.
-                                               # NOTE: if it is a depenency of .PHONY it will be
+                                               # NOTE: if it is a depenency
+                                               # of .PHONY it will be
                                                # defined too but that's ok.
                                                $targets{$1} = 1;
                                        }
-                                       # "Not a target:" is always followed by a target name,
-                                       # so resetting this one here is safe.
+                                       # "Not a target:" is always followed by
+                                       # a target name, so resetting this one
+                                       # here is safe.
                                        $not_a_target = 0;
                                }
                        } elsif (/^# Files$/) {