X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh;h=f68764daa1201e557eaf5bbba7a1282ec2c4891a;hb=9e45ddd5cc6d5be6a0a3fe2d2e22fec977b29441;hp=775e94921d90b64a39d89f391fcaf2a6f18b7aeb;hpb=17bf50c840dcbc9cece5b6a18ed0fe1574bf99a0;p=debhelper.git diff --git a/dh b/dh index 775e949..f68764d 100755 --- a/dh +++ b/dh @@ -35,18 +35,10 @@ in the sequence. The B<--until>, B<--before>, B<--after>, and B<--remaining> options can override this behavior. If debian/rules contains a target with a name like "override_I", -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.0.50 or above.) - -dh passes --parallel to dh_auto_* commands if it detects being run by the -C command, but a job server of the parent I -(presumably debian/rules) is not reachable. Nonetheless, it is highly -recommended to pass --parallel/-j option to dh explicitly to indicate that a -source package supports parallel building. See L for more information. +then when it would notmally run I, dh will instead call that +target. The override target can then run the command with additional options, +or run entirely different commands instead. See examples below. (Note that to +use this feature, you should Build-Depend on debhelper 7.0.50 or above.) =head1 OPTIONS @@ -85,18 +77,20 @@ Run commands in the sequence that come after I. Run all commands in the sequence that have yet to be run. +=item B<--no-act> + +Prints commands that would run for a given sequence, but does not run them. + =back All other options passed to dh are passed on to each command it runs. This can be used to set an option like "-v" or "-X" or "-N", as well as for more specialised options. -=head1 COMMAND SPECIFICATION - -I can be a full name of a debhelper command, or a substring. It'll first -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. +In the above options, I can be a full name of a debhelper command, or +a substring. It'll first 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. =cut @@ -183,6 +177,14 @@ default. This is how to use dh_pycentral instead. %: dh --with python-central $@ +Here is how to force use of perl's Module::Build build system, +which can be necessary if debhelper wrongly detects that the package +uses MakeMaker. + + #!/usr/bin/make -f + %: + dh --buildsystem=perl_build $@ + To patch your package using quilt, you can tell dh to use quilt's dh sequence addons like this: @@ -192,13 +194,22 @@ sequence addons like this: Here is an example of overriding where the dh_auto_* commands find the package's source, for a package where the source is located in a -subdirectory. It also forces use of perl's Module::Build build system, -which can be necessary if debhelper wrongly detects that the package -uses MakeMaker. +subdirectory. + + #!/usr/bin/make -f + %: + dh --sourcedirectory=src $@ + +Finally, here is a way to prevent dh from running several commands +that you don't want it to run, by defining empty override targets for each +command. #!/usr/bin/make -f %: - dh --sourcedirectory=src --buildsystem=perl_build $@ + dh $@ + + # Commands not to run: + override_dh_auto_test override_dh_compress override_dh_fixperms: =cut @@ -229,19 +240,14 @@ init(options => { }, "l" => \$dh{LIST}, "list" => \$dh{LIST}, - "j:i" => \$dh{PARALLEL}, - "parallel:i" => \$dh{PARALLEL}, }); inhibit_log(); -# If make was using a jobserver, but it is not available, clean out -# MAKEFLAGS so that further make invocations can start a new job -# server. +# If make is using a jobserver, but it is not available +# to this process, clean out MAKEFLAGS. This avoids +# ugly warnings when calling make. if (is_make_jobserver_unavailable()) { clean_jobserver_makeflags(); - # Implicitly enable parallel (no maximum) if a value was not previously - # specified. - $dh{PARALLEL} = 0 unless defined $dh{PARALLEL}; } # Definitions of sequences. @@ -450,12 +456,7 @@ while (@ARGV_orig) { shift @ARGV_orig; next; } - elsif ($opt =~ /^--?(no-act|remaining|(after|until|before|with|without|parallel)=)/) { - next; - } - elsif ($opt =~ /^(-j|--parallel)$/) { - # Argument to -j/--parallel is optional. - shift @ARGV_orig if @ARGV_orig > 0 && $ARGV_orig[0] =~ /^\d+$/; + elsif ($opt =~ /^--?(no-act|remaining|(after|until|before|with|without)=)/) { next; } push @options, $opt; @@ -536,39 +537,47 @@ sub run { # to prevent them from being acted on. push @options, map { "-N$_" } @exclude; - # Pass --parallel to dh_auto_* commands. - if (defined $dh{PARALLEL} && $dh{PARALLEL} != 1 - && $command =~ /^dh_auto_/) { - push @options, "--parallel" . ($dh{PARALLEL} > 1 ? "=$dh{PARALLEL}" : ""); - } - # Check for override targets in debian/rules and # run them instead of running the command directly. my $override_command; - if (rules_explicit_target("override_".$command)) { + my $has_explicit_target = rules_explicit_target("override_".$command); + if (defined $has_explicit_target) { $override_command=$command; - # This passes the options through to commands called - # inside the target. - $ENV{DH_INTERNAL_OPTIONS}=join("\x1e", @options); - $command="debian/rules"; - @options="override_".$override_command; + # Check if target isn't noop + if ($has_explicit_target) { + # This passes the options through to commands called + # inside the target. + $ENV{DH_INTERNAL_OPTIONS}=join("\x1e", @options); + $command="debian/rules"; + @options="override_".$override_command; + } + else { + $command = undef; + } } else { # Pass additional command options if any unshift @options, @{$command_opts{$command}} if exists $command_opts{$command}; } - # 3 space indent lines the command being run up under the - # sequence name after "dh ". - print " ".escape_shell($command, @options)."\n"; + if (defined $command) { + # 3 space indent lines the command being run up under the + # sequence name after "dh ". + print " ".escape_shell($command, @options)."\n"; + } + else { + print " ", "# Skipping ", $override_command, " - empty override", "\n"; + } if (! $dh{NO_ACT}) { - my $ret=system($command, @options); - if ($ret >> 8 != 0) { - exit $ret >> 8; - } - elsif ($ret) { - exit 1; + if (defined $command) { + my $ret=system($command, @options); + if ($ret >> 8 != 0) { + exit $ret >> 8; + } + elsif ($ret) { + exit 1; + } } if (defined $override_command) { @@ -593,12 +602,15 @@ my $rules_parsed; sub rules_explicit_target { # Checks if a specified target exists as an explicit target - # in debian/rules. + # in debian/rules. + # undef is returned if target does not exist, 0 if target is noop + # and 1 if target has dependencies or executes commands. my $target=shift; - - if (! $rules_parsed) { + + if (! $rules_parsed) { my $processing_targets = 0; my $not_a_target = 0; + my $current_target; open(MAKE, "LC_ALL=C make -Rrnpsf debian/rules debhelper-fail-me 2>/dev/null |"); while () { if ($processing_targets) { @@ -606,19 +618,34 @@ sub rules_explicit_target { $not_a_target = 1; } else { - if (!$not_a_target && /^([^#:]+)::?/) { - # Target is defined. - # NOTE: if it is a depenency - # of .PHONY it will be - # defined too but that's ok. - $targets{$1} = 1; + if (!$not_a_target && /^([^#:]+)::?\s*(.*)$/) { + # Target is defined. NOTE: if it is a depenency of + # .PHONY it will be defined too but that's ok. + # $2 contains target dependencies if any. + $current_target = $1; + $targets{$current_target} = ($2) ? 1 : 0; + } + else { + if (defined $current_target) { + if (/^#/) { + # Check if target has commands to execute + if (/^#\s*commands to execute/) { + $targets{$current_target} = 1; + } + } + else { + # Target parsed. + $current_target = undef; + } + } } # "Not a target:" is always followed by # a target name, so resetting this one # here is safe. $not_a_target = 0; } - } elsif (/^# Files$/) { + } + elsif (/^# Files$/) { $processing_targets = 1; } } @@ -626,7 +653,7 @@ sub rules_explicit_target { $rules_parsed = 1; } - return exists $targets{$target}; + return (exists $targets{$target}) ? $targets{$target} : undef; } }