X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh;h=2a91b92d7af29d34de874baf57a62753aad37451;hb=be6b0d8271778bde571985aa775b2f8f712716b5;hp=88dc9c4adbc5b5c69d18608e8acbb0374e928588;hpb=6c80d913e37857ae525d6ff7464cedcb01a67658;p=debhelper.git diff --git a/dh b/dh index 88dc9c4..2a91b92 100755 --- 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 @@ -50,8 +50,8 @@ you should Build-Depend on debhelper 7.2 or above.) Add the debhelper commands specified by the given addon to appropriate places in the sequence of commands that is run. This option can be repeated more than once, and is used when there is a third-party package that provides -debhelper commands. See "SEQUENCE ADDONS" below for documentation about what -such packages should do to be supported by --with. +debhelper commands. See the PROGRAMMING file for documentation about +the sequence addon interface. =item B<--until> I @@ -82,28 +82,6 @@ search for a command in the sequence exactly matching the name, to avoid any ambiguity. If there are multiple substring matches, the last one in the sequence will be used. -=head1 SEQUENCE ADDONS - -When B<--with> I is used, dh loads the perl module -Debian::Debhelper::Sequence::I. Two functions are provided to let -the module add its commands to sequences: - -=over 4 - -=item Debian::Debhelper::Dh_Lib::insert_before(existing_command, new_command) - -Insert I in sequences before I. - -=item Debian::Debhelper::Dh_Lib::insert_after(existing_command, new_command) - -Insert I in sequences after I. - -=item Debian::Debhelper::Dh_Lib::remove_command(existing_command) - -Remove I from the list of commands to run. - -=back - =cut sub command_pos { @@ -182,12 +160,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,8 +227,8 @@ $sequences{install} = [@{$sequences{build}}, qw{ dh_installudev dh_installwm dh_installxfonts + dh_bugfiles dh_lintian - dh_desktop dh_gconf dh_icons dh_perl @@ -311,8 +305,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 +353,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 +363,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 +420,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 +435,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 +456,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 () { - 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; @@ -499,7 +473,7 @@ sub rules_explicit_target { if (! $rules_parsed) { my $processing_targets = 0; my $not_a_target = 0; - open(MAKE, "make -Rrnpsf debian/rules debhelper-fail-me 2>/dev/null |"); + open(MAKE, "LC_ALL=C make -Rrnpsf debian/rules debhelper-fail-me 2>/dev/null |"); while () { if ($processing_targets) { if (/^# Not a target:/) {