X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_movefiles;h=03957a03ef99a335ef783d8de86bb9cc5dac7d90;hb=8a57ccd69b3f3ff7d3e407c2babc33d9a08d642e;hp=8eac3878168522a5edeb2e6e51f8d164a8fcc0bb;hpb=053f6f8b4e7431d32511aef209188a084e8c7e79;p=debhelper.git

diff --git a/dh_movefiles b/dh_movefiles
index 8eac387..03957a0 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -1,10 +1,81 @@
 #!/usr/bin/perl -w
-#
-# Move files out of debian/tmp, into subpackages.
+
+=head1 NAME
+
+dh_movefiles - move files out of debian/tmp into subpackages
+
+=cut
 
 use strict;
 use Debian::Debhelper::Dh_Lib;
-init();
+
+=head1 SYNOPSIS
+
+B<dh_movefiles> [S<I<debhelper options>>] [B<--sourcedir=>I<dir>] [B<-X>I<item>] S<I<file ...>>]
+
+=head1 DESCRIPTION
+
+dh_movefiles is a debhelper program that is responsible for moving files
+out of debian/tmp or some other directory and into other package build
+directories. This may be useful if your package has a Makefile that installs
+everything into debian/tmp, and you need to break that up into subpackages.
+
+Note: dh_install is a much better program, and you are recommended to use
+it instead of dh_movefiles.
+
+=head1 FILES
+
+=over 4
+
+=item debian/I<package>.files
+
+Lists the files to be moved into a package, separated by whitespace. The
+filenames listed should be relative to debian/tmp/. You can also list
+directory names, and the whole directory will be moved.
+
+=back
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<--sourcedir=>I<dir>
+
+Instead of moving files out of debian/tmp (the default), this option makes
+it move files out of some other directory. Since the entire contents of
+the sourcedir is moved, specifying something like --sourcedir=/ is very
+unsafe, so to prevent mistakes, the sourcedir must be a relative filename;
+it cannot begin with a `/'.
+
+=item B<-Xitem>, B<--exclude=item>
+
+Exclude files that contain "item" anywhere in their filename from
+being installed.
+
+=item I<file ...>
+
+Lists files to move. The filenames listed should be relative to
+debian/tmp/. You can also list directory names, and the whole directory will
+be moved. It is an error to list files here unless you use -p, -i, or -a to
+tell dh_movefiles which subpackage to put them in.
+
+=back
+
+=head1 NOTES
+
+Note that files are always moved out of debian/tmp by default (even if you
+have instructed debhelper to use a compatibility level higher than one,
+which does not otherwise use debian/tmp for anything at all). The idea
+behind this is that the package that is being built can be told to install
+into debian/tmp, and then files can be moved by dh_movefiles from that
+directory. Any files or directories that remain are ignored, and get
+deleted by dh_clean later.
+
+=cut
+
+init(options => {
+	"sourcedir=s" => \$dh{SOURCEDIR},	
+});
 
 my $ret=0;
 
@@ -36,7 +107,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	}
 
 	if (@tomove && $tmp eq $sourcedir) {
-		error("I was asked to move files from $sourcedir to $sourcedir. Perhaps you should set DH_COMAPT=2?");
+		error("I was asked to move files from $sourcedir to $sourcedir. Perhaps you should set DH_COMPAT=2?");
 	}
 
 	# Now we need to expand wildcards in @tomove.
@@ -63,14 +134,26 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		doit("rm","-f","debian/movelist");
 		foreach (@tomove) {
 			my $file=$_;
-			if (! -e $file && ! -l $file) {
+			if (! -e $file && ! -l $file && ! $dh{NO_ACT}) {
 				$ret=1;
-				warning("$file not found");
+				warning("$file not found (supposed to put it in $package)");
+			}
+			else {
+				$file=~s:^\Q$sourcedir\E/+::;
+				my $cmd="(cd $sourcedir >/dev/null ; find $file ! -type d ";
+				if ($dh{EXCLUDE_FIND}) {
+					$cmd.="-a ! \\( $dh{EXCLUDE_FIND} \\) ";
+				}
+				$cmd.="-print || true) >> debian/movelist";
+				complex_doit($cmd);
 			}
-			$file=~s:^\Q$sourcedir\E/+::;
-			complex_doit("(cd $sourcedir >/dev/null ; find $file ! -type d -print || true) >> debian/movelist");
 		}
-		complex_doit("(cd $sourcedir >/dev/null ; tar --create --remove-files --files-from=../movelist --file -) | (cd $tmp >/dev/null ;tar xpf -)");
+		my $pwd=`pwd`;
+		chomp $pwd;
+		complex_doit("(cd $sourcedir >/dev/null ; tar --create --files-from=$pwd/debian/movelist --file -) | (cd $tmp >/dev/null ;tar xpf -)");
+		# --remove-files is not used above because tar then doesn't
+		# preserve hard links
+		complex_doit("(cd $sourcedir >/dev/null ; tr '\\n' '\\0' < $pwd/debian/movelist | xargs -0  -i rm -f '{}')");
 		doit("rm","-f","debian/movelist");
 	}
 }
@@ -83,3 +166,15 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 # packages that arn't always sure exactly which files need
 # to be moved.
 exit $ret;
+
+=head1 SEE ALSO
+
+L<debhelper(7)>
+
+This program is a part of debhelper.
+
+=head1 AUTHOR
+
+Joey Hess <joeyh@debian.org>
+
+=cut