X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_movefiles;h=e9439bded17c2241eb06b2542621f417c79fc2d9;hb=18a0da8092ea9f3dc48bca92b36f592af25a608d;hp=cc1af45eba1a2eb2f90a81b4144ed9326e50a84e;hpb=3aa6fbb20465d16cf23e1607b078ed3cedf95ebe;p=debhelper.git diff --git a/dh_movefiles b/dh_movefiles index cc1af45..e9439bd 100755 --- a/dh_movefiles +++ b/dh_movefiles @@ -11,23 +11,29 @@ use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS -B [S>] [B<--sourcedir=>I] [B<-X>I] S>] +B [S>] [B<--sourcedir=>I] [B<-X>I] S ...>] =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. +B is a debhelper program that is responsible for moving files +out of F or some other directory and into other package build +directories. This may be useful if your package has a F that installs +everything into F, and you need to break that up into subpackages. -Files named debian/package.files list the files to be moved, 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. If you -prefer, you can list the files to move on the command line and this will -apply to the first package dh_movefiles is told to act on. +Note: B is a much better program, and you are recommended to use +it instead of B. -Note: dh_install is a much better program that can do everything this one can, -and more. +=head1 FILES + +=over 4 + +=item debian/I.files + +Lists the files to be moved into a package, separated by whitespace. The +filenames listed should be relative to F. You can also list +directory names, and the whole directory will be moved. + +=back =head1 OPTIONS @@ -35,39 +41,41 @@ and more. =item B<--sourcedir=>I -Instead of moving files out of debian/tmp (the default), this option makes +Instead of moving files out of F (the default), this option makes it move files out of some other directory. Since the entire contents of -the sourcedir is moved, specifiying something like --sourcedir=/ is very +the sourcedir is moved, specifying something like B<--sourcedir=/> is very unsafe, so to prevent mistakes, the sourcedir must be a relative filename; -it cannot begin with a `/'. +it cannot begin with a `B'. =item B<-Xitem>, B<--exclude=item> -Exclude files that contain "item" anywhere in their filename from +Exclude files that contain B anywhere in their filename from being installed. -=item I +=item I ... 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. +F. You can also list directory names, and the whole directory will +be moved. It is an error to list files here unless you use B<-p>, B<-i>, or B<-a> to +tell B which subpackage to put them in. =back =head1 NOTES -Note that files are always moved out of debian/tmp by default (even if you +Note that files are always moved out of F 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 +into F, and then files can be moved by B from that directory. Any files or directories that remain are ignored, and get -deleted by dh_clean later. +deleted by B later. =cut -init(); +init(options => { + "sourcedir=s" => \$dh{SOURCEDIR}, +}); my $ret=0; @@ -104,7 +112,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # Now we need to expand wildcards in @tomove. # This is only necessary in pre-v3 land -- as of v3, the - # expension is automatically done by filearray(). + # expansion is automatically done by filearray(). if (@tomove && compat(2)) { my @filelist=(); foreach (@tomove) { @@ -130,27 +138,32 @@ foreach my $package (@{$dh{DOPACKAGES}}) { $ret=1; warning("$file not found (supposed to put it in $package)"); } - $file=~s:^\Q$sourcedir\E/+::; - my $cmd="(cd $sourcedir >/dev/null ; find $file ! -type d "; - if ($dh{EXCLUDE_FIND}) { - $cmd.="-a ! \\( $dh{EXCLUDE_FIND} \\) "; + 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); } - $cmd.="-print || true) >> debian/movelist"; - complex_doit($cmd); } my $pwd=`pwd`; chomp $pwd; - complex_doit("(cd $sourcedir >/dev/null ; tar --create --remove-files --files-from=$pwd/debian/movelist --file -) | (cd $tmp >/dev/null ;tar xpf -)"); + 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 rm -f)"); doit("rm","-f","debian/movelist"); } } -# If $ret is set, we wern't actually able to find some +# If $ret is set, we weren't actually able to find some # files that were specified to be moved, and we should # exit with the code in $ret. This program puts off # exiting with an error until all files have been tried # to be moved, because this makes it easier for some -# packages that arn't always sure exactly which files need +# packages that aren't always sure exactly which files need # to be moved. exit $ret;