]> git.donarmstrong.com Git - debhelper.git/blobdiff - dh
dh: Disable option bundling to avoid mis-parsing bundled options such as "-Bpython...
[debhelper.git] / dh
diff --git a/dh b/dh
index dc588e21a8d5452f9b17ef1a8e0344b2ca17ae7d..2b60be5d4ffc701a45bb95ca01fff14f5fbffa2f 100755 (executable)
--- a/dh
+++ b/dh
@@ -35,7 +35,7 @@ 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<dh_command>",
-then when it would notmally run I<dh_command>, dh will instead call that
+then when it would normally run I<dh_command>, 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.)
@@ -87,12 +87,10 @@ 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<cmd> 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<cmd> 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
 
@@ -177,24 +175,48 @@ default. This is how to use dh_pycentral instead.
 
        #!/usr/bin/make -f
        %:
-               dh --with python-central $@
+               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:
        
        #!/usr/bin/make -f
        %:
-               dh --with quilt $@
+               dh $@ --with quilt
 
 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 --buildsystem=perl_build $@
+               dh $@ --sourcedirectory=src
+
+And here is an example of how to tell the dh_auto_* commands to build
+in a subdirectory, which will be removed on clean.
+
+       #!/usr/bin/make -f
+       %:
+               dh $@ --builddirectory=build
+
+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 $@
+       
+       # Commands not to run:
+       override_dh_auto_test override_dh_compress override_dh_fixperms:
 
 =cut
 
@@ -205,29 +227,31 @@ my @ARGV_orig=@ARGV;
 # (and comes first so python-central loads later and can disable it).
 unshift @ARGV, "--with=python-support";
                
-# Disable complaints about unknown options for both dh and the commands
-# it runs. This is done because dh accepts and passes on options that may
-# be specific to only some debhelper commands.
-$ENV{DH_IGNORE_UNKNOWN_OPTIONS}=1;
-
 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}},split(",", $value);
-       },
-       "without=s" => sub {
-               my ($option,$value)=@_;
-               @{$dh{WITH}} = grep { $_ ne $value } @{$dh{WITH}};
+               "until=s" => \$dh{UNTIL},
+               "after=s" => \$dh{AFTER},
+               "before=s" => \$dh{BEFORE},
+               "remaining" => \$dh{REMAINING},
+               "with=s" => sub {
+                       my ($option,$value)=@_;
+                       push @{$dh{WITH}},split(",", $value);
+               },
+               "without=s" => sub {
+                       my ($option,$value)=@_;
+                       @{$dh{WITH}} = grep { $_ ne $value } @{$dh{WITH}};
+               },
+               "l" => \$dh{LIST},
+               "list" => \$dh{LIST},
        },
-       "l" => \$dh{LIST},
-       "list" => \$dh{LIST},
-});
+       # Disable complaints about unknown options; they are passed on the
+       # debhelper commands.
+       ignore_unknown_options => 1,
+       # Bundling does not work well since there are unknown options.
+       bundling => 0,
+);
 inhibit_log();
 
+
 # If make is using a jobserver, but it is not available
 # to this process, clean out MAKEFLAGS. This avoids
 # ugly warnings when calling make.
@@ -444,7 +468,17 @@ while (@ARGV_orig) {
        elsif ($opt =~ /^--?(no-act|remaining|(after|until|before|with|without)=)/) {
                next;
        }
-       push @options, $opt;
+       elsif ($opt=~/^-/) {
+               push @options, "-O".$opt;
+       }
+       elsif (@options) {
+               if ($options[$#options]=~/^-O--/) {
+                       $options[$#options].="=".$opt;
+               }
+               else {
+                       $options[$#options].=$opt;
+               }
+       }
 }
 
 # Figure out at what point in the sequence to start for each package.
@@ -525,30 +559,44 @@ sub run {
        # 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) {
@@ -573,12 +621,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 (<MAKE>) {
                        if ($processing_targets) {
@@ -586,19 +637,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;
                        }
                }
@@ -606,7 +672,7 @@ sub rules_explicit_target {
                $rules_parsed = 1;
        }
 
-       return exists $targets{$target};
+       return $targets{$target};
 }
 
 }