adh: Don't bother running dh_shlibdebs, dh_makeshelibs, or dh_strip for the binary...

[debhelper.git] / dh

diff --git a/dh b/dh
index f77e5944c641c09f42a32fcd6675b1e4b256a72d..b86e36ad158736306579f703b10977791ce79ad1 100755 (executable)
--- a/dh
+++ b/dh
@@ -56,18 +56,22 @@ List all available addons.
 =item B<--until> I<cmd>
 
 Run commands in the sequence until and including I<cmd>, then stop.
+(Deprecated)
 
 =item B<--before> I<cmd>
 
 Run commands in the sequence before I<cmd>, then stop.
+(Deprecated)
 
 =item B<--after> I<cmd>
 
 Run commands in the sequence that come after I<cmd>.
+(Deprecated)
 
 =item B<--remaining>
 
 Run all commands in the sequence that have yet to be run.
+(Deprecated)
 
 =item B<--no-act>
 
@@ -258,7 +262,7 @@ B<build-indep>.
 
 Note that in the example above, dh will arrange for "debian/rules build"
 to call your build-indep and build-arch targets. You do not need to
-explicitly define the dependencies in the rules file when using dh with
+explicitly define those dependencies in the rules file when using dh with
 compatibility level v9. This example would be more complicated with
 earlier compatibility levels.
 
@@ -279,9 +283,6 @@ options can override this behavior.
 A sequence can also run dependent targets in debian/rules.  For
 example, the "binary" sequence runs the "install" target.
 
-B<dh> sets environment variables listed by B<dpkg-buildflags>, unless
-they are already set. It supports DEB_BUILD_OPTIONS=noopt too.
-
 B<dh> uses the B<DH_INTERNAL_OPTIONS> environment variable to pass information
 through to debhelper commands that are run inside override targets. The
 contents (and indeed, existence) of this environment variable, as the name
@@ -322,6 +323,7 @@ init(options => {
 );
 inhibit_log();
 set_buildflags();
+warn_deprecated();
 
 # If make is using a jobserver, but it is not available
 # to this process, clean out MAKEFLAGS. This avoids
@@ -373,9 +375,6 @@ my @bd = qw{
        dh_auto_build
        dh_auto_test
 };
-my @i_minimal = qw{
-       dh_testroot
-};
 my @i = qw{
        dh_testroot
        dh_prep
@@ -423,6 +422,9 @@ my @ba=qw{
        dh_makeshlibs
        dh_shlibdeps
 };
+if (! getpackages("arch")) {
+       @ba=();
+}
 my @b=qw{
        dh_installdeb
        dh_gencontrol
@@ -438,26 +440,10 @@ $sequences{'build-indep'} = [@bd];
 $sequences{'build-arch'} = [@bd];
 if (! compat(8)) {
        # From v9, sequences take standard rules targets into account.
-       if (rules_explicit_target('build-arch') ||
-           rules_explicit_target('build-indep')) {
-               # run sequences separately
-               $sequences{build} = [@bd_minimal, rules("build-arch"), rules("build-indep")];
-       }
-       else {
-               # run standard sequence (this is faster)
-               $sequences{build} = [@bd];
-       }
+       $sequences{build} = [@bd_minimal, rules("build-arch"), rules("build-indep")];
        $sequences{'install-indep'} = [rules("build-indep"), @i];
        $sequences{'install-arch'} = [rules("build-arch"), @i];
-       if (rules_explicit_target('install-arch') ||
-           rules_explicit_target('install-indep')) {
-               # run sequences separately
-               $sequences{'install'} = [rules("build"), @i_minimal, rules("install-arch"), rules("install-indep")];
-       }
-       else {
-               # run standard sequence (this is faster)
-               $sequences{'install'} = [rules("build"), @i, rules("install-arch"), rules("install-indep")];
-       }
+       $sequences{'install'} = [rules("build"), rules("install-arch"), rules("install-indep"), @i];
        $sequences{'binary-indep'} = [rules("install-indep"), @b];
        $sequences{'binary-arch'} = [rules("install-arch"), @ba, @b];
        $sequences{binary} = [rules("install"), rules("binary-arch"), rules("binary-indep")];
@@ -843,7 +829,7 @@ sub rules_explicit_target {
                                                if (defined $current_target) {
                                                        if (/^#/) {
                                                                # Check if target has commands to execute
-                                                               if (/^#\s*commands to execute/) {
+                                                               if (/^#\s*(commands|recipe) to execute/) {
                                                                        $targets{$current_target} = 1;
                                                                }
                                                        }
@@ -872,6 +858,14 @@ sub rules_explicit_target {
 
 }
 
+sub warn_deprecated {
+       foreach my $deprecated ('until', 'after', 'before', 'remaining') {
+               if (defined $dh{uc $deprecated}) {
+                       warning("The --$deprecated option is deprecated. Use override targets instead.");
+               }
+       }
+}
+
 =head1 SEE ALSO
 
 L<debhelper(7)>