X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_install;h=c35c8924a67035af1e95991bd2ca86164838b292;hb=00048048303e84604ef52f66070b7b670877ce2a;hp=0d807d6fd917db86b87ae08cfc34b87353edba38;hpb=545fc81d5b8635506e75bdc22ed4e0d3484eb1a6;p=debhelper.git diff --git a/dh_install b/dh_install index 0d807d6..c35c892 100755 --- a/dh_install +++ b/dh_install @@ -12,7 +12,7 @@ use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS -B [B<-X>I] [B<--autodest>] [B<--list-missing>] [B<--sourcedir=>I] [S>] [S>] +B [B<-X>I] [B<--autodest>] [B<--sourcedir=>I] [S>] [S>] =head1 DESCRIPTION @@ -24,15 +24,6 @@ those particular tasks. dh_install, then, is useful for installing everything else, for which no particular intelligence is needed. It is a replacement for the old dh_movefiles command. -Files named debian/package.install list the files to install into each -package and the directory they should be installed to. The format is a set -of lines, where each line lists a file or files to install, and at the end -of the line tells the directory it should be installed in. The name of the -files (or directories) to install should be given relative to the current -directory, while the installation directory is given relative to the -package build directory. You may use wildcards in the names of the files to -install (in v3 mode and above). - This program may be used in one of two ways. If you just have a file or two that the upstream Makefile does not install for you, you can run dh_install on them to move them into place. On the other hand, maybe you have a large @@ -40,31 +31,29 @@ package that builds multiple binary packages. You can use the upstream Makefile to install it all into debian/tmp, and then use dh_install to copy directories and files from there into the proper package build directories. -=head1 OPTIONS +From debhelper compatibility level 7 on, dh_install will fall back to +looking in debian/tmp for files, if it doesn't find them in the current +directory (or whereever you've told it to look using --sourcedir). -=over 4 +=head1 FILES -=item B<-Xitem>, B<--exclude=item> +=over 4 -Exclude files that contain "item" anywhere in their filename from -being installed. +=item debian/I.install -=item B<--autodest> +List the files to install into each package and the directory they should be +installed to. The format is a set of lines, where each line lists a file or +files to install, and at the end of the line tells the directory it should be +installed in. The name of the files (or directories) to install should be given +relative to the current directory, while the installation directory is given +relative to the package build directory. You may use wildcards in the names of +the files to install (in v3 mode and above). -Guess as the destination directory to install things to. If this is -specified, you should not list destination directories in -debian/package.install files or on the command line. Instead, dh_install -will guess as follows: +=back -Strip off debian/tmp (or the sourcedir if one is given) from the front of -the filename, if it is present, and install into the dirname of the -filename. So if the filename is debian/tmp/usr/bin, then that directory -will be copied to debian/package/usr/. If the filename is -debian/tmp/etc/passwd, it will be copied to debian/package/etc/. +=head1 OPTIONS -Note that if you list only a filename on a line by itself in a -debian/package.install file, with no explicit destination, then dh_install -will automatically guess the destination even if this flag is not set. +=over 4 =item B<--list-missing> @@ -79,16 +68,42 @@ you don't miss installing newly added files in new upstream releases. Note that files that are excluded from being moved via the -X option are not warned about. +=item B<--fail-missing> + +This option is like --list-missing, except if a file was missed, it will +not only list the missing files, but also fail with a nonzero exit code. + +=item B<-Xitem>, B<--exclude=item> + +Exclude files that contain "item" anywhere in their filename from +being installed. + =item B<--sourcedir=dir> -Makes all source files be found under dir. If this is specified, it is -akin to all the source filenames having "dir/" prepended to them. +Look in the specified directory for files to be installed. + +Note that this is not the same as the --sourcedirectory option used +by the dh_auto_* commands. You rarely need to use this option, since +dh_install automatically looks for files in debian/tmp in debhelper +compatibility level 7 and above. -To make dh_install behave like the old dh_movefiles, move your -package.files file to package.install and call dh_install with -"--sourcedir=debian/tmp" appended to the command. This will -approximate dh_movefiles behaviour, except it will copy files instead -of moving them. +=item B<--autodest> + +Guess as the destination directory to install things to. If this is +specified, you should not list destination directories in +debian/package.install files or on the command line. Instead, dh_install +will guess as follows: + +Strip off debian/tmp (or the sourcedir if one is given) from the front of +the filename, if it is present, and install into the dirname of the +filename. So if the filename is debian/tmp/usr/bin, then that directory +will be copied to debian/package/usr/. If the filename is +debian/tmp/etc/passwd, it will be copied to debian/package/etc/. + +Note that if you list exactly one filename or wildcard-pattern on a line by +itself in a +debian/package.install file, with no explicit destination, then dh_install +will automatically guess the destination even if this flag is not set. =item I @@ -99,14 +114,24 @@ The files will be installed into the first package dh_install acts on. =cut -init(); +init(options => { + "autodest" => \$dh{AUTODEST}, + "list-missing" => \$dh{LIST_MISSING}, + "fail-missing" => \$dh{FAIL_MISSING}, + "sourcedir=s" => \$dh{SOURCEDIR}, +}); my @installed; my $srcdir = '.'; -$srcdir = $dh{SOURCEDIR}."/" if defined $dh{SOURCEDIR}; +$srcdir = $dh{SOURCEDIR} if defined $dh{SOURCEDIR}; + +foreach my $package (getpackages()) { + # Look at the install files for all packages to handle + # list-missing/fail-missing, but skip really installing for + # packages that are not being acted on. + my $skip_install=! grep { $_ eq $package } @{$dh{DOPACKAGES}}; -foreach my $package (@{$dh{DOPACKAGES}}) { my $tmp=tmpdir($package); my $file=pkgfile($package,"install"); @@ -132,19 +157,37 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if (! defined $dh{AUTODEST} && @$set > 1) { $dest=pop @$set; } - # glob now, relative to srcdir - foreach my $src (map { glob "$srcdir/$_" } @$set) { + + my @filelist; + foreach my $glob (@$set) { + my @found = glob "$srcdir/$glob"; + if (! compat(6)) { + # Fall back to looking in debian/tmp. + if (! @found || ! (-e $found[0] || -l $found[0])) { + @found = glob "debian/tmp/$glob"; + } + } + push @filelist, @found; + } + + if (! compat(4)) { # check added in v5 + if (! @filelist && ! $skip_install) { + error("$package missing files (@$set), aborting"); + } + } + + foreach my $src (@filelist) { next if excludefile($src); + + push @installed, $src; + next if $skip_install; if (! defined $dest) { # Guess at destination directory. $dest=$src; - my $strip=$srcdir; - if ($strip eq '.') { - $strip = "debian/tmp"; - } - $dest=~s/^(.*\/)?\Q$strip\E//; - $dest=dirname($dest); + $dest=~s/^(.*\/)?\Q$srcdir\E\///; + $dest=~s/^(.*\/)?debian\/tmp\///; + $dest=dirname("/".$dest); $tmpdest=1; } @@ -152,26 +195,16 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if (! -e "$tmp/$dest") { doit("install","-d","$tmp/$dest"); } - - # Keep track of what's installed. - if ($dh{LIST_MISSING}) { - # Kill any extra slashes. Makes the - # @installed stuff more robust. - $src=~y:/:/:s; - $src=~s:/+$::; - $src=~s:^(\./)*::; - push @installed, "\Q$src\E\/.*|\Q$src\E"; - } if (-d $src && $exclude) { - my ($dir_basename) = basename($src); - # Pity there's no cp --exclude .. + my $basename = basename($src); + my $dir = ($basename eq '.') ? $src : "$src/.."; my $pwd=`pwd`; chomp $pwd; - complex_doit("cd $src/.. && find $dir_basename $exclude \\( -type f -or -type l \\) -exec cp --parents -dp {} $pwd/$tmp/$dest/ \\;"); + complex_doit("cd '$dir' && find '$basename' $exclude \\( -type f -or -type l \\) -exec cp --parents -dp {} $pwd/$tmp/$dest/ \\;"); # cp is annoying so I need a separate pass # just for empty directories - complex_doit("cd $src/.. && find $dir_basename $exclude \\( -type d -and -empty \\) -exec cp --parents -a {} $pwd/$tmp/$dest/ \\;"); + complex_doit("cd '$dir' && find '$basename' $exclude \\( -type d -and -empty \\) -exec cp --parents -a {} $pwd/$tmp/$dest/ \\;"); } else { doit("cp", "-a", $src, "$tmp/$dest/"); @@ -184,23 +217,35 @@ foreach my $package (@{$dh{DOPACKAGES}}) { } } -if ($dh{LIST_MISSING}) { - +if ($dh{LIST_MISSING} || $dh{FAIL_MISSING}) { # . as srcdir makes no sense, so this is a special case. if ($srcdir eq '.') { $srcdir='debian/tmp'; } my @missing; - my $installed=join("|", @installed); - $installed=qr{^$installed$}; + my $installed=join("|", map { + # Kill any extra slashes, for robustness. + y:/:/:s; + s:/+$::; + s:^(\./)*::; + "\Q$_\E\/.*|\Q$_\E"; + } @installed); + $installed=qr{^($installed)$}; find(sub { -f || -l || return; $_="$File::Find::dir/$_"; - push @missing, $_ unless /$installed/ || excludefile($_); + if (! /$installed/ && ! excludefile($_)) { + my $file=$_; + $file=~s/^\Q$srcdir\E\///; + push @missing, $file; + } }, $srcdir); if (@missing) { - warning "$_ exists in debian/tmp but not installed to anywhere" foreach @missing; + warning "$_ exists in $srcdir but is not installed to anywhere" foreach @missing; + if ($dh{FAIL_MISSING}) { + error("missing files, aborting"); + } } } @@ -217,7 +262,7 @@ contain: While debian/libfoo.install contains: - usr/libfoo*.so.* + usr/lib/libfoo*.so.* If you want a libfoo-dev package too, debian/libfoo-dev.install might contain: @@ -225,7 +270,7 @@ If you want a libfoo-dev package too, debian/libfoo-dev.install might contain: usr/lib/libfoo*.so usr/share/man/man3 -=head1 LIMITIATIONS +=head1 LIMITATIONS dh_install cannot rename files or directories, it can only install them with the names they already have into wherever you want in the package