public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* First figure out what symlinks need to be created, then create

Browse Source 
them.  This prevents unnecessary unlink operations to resolve
  collisions between directories.

svn path=/nixpkgs/trunk/; revision=22526
This commit is contained in:
Eelco Dolstra 2010-07-08 12:52:17 +00:00
parent eb2cb9afd4
commit a6fcf45726
1 changed files with 67 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
pkgs/build-support/buildenv/builder.pl
View File

@ -9,10 +9,6 @@ use File::Basename;
STDOUT->autoflush(1); STDOUT->autoflush(1);
my $out = $ENV{"out"}; my $out = $ENV{"out"};
mkdir "$out", 0755 || die "error creating $out";
my $symlinks = 0;
my @pathsToLink = split ' ', $ENV{"pathsToLink"}; my @pathsToLink = split ' ', $ENV{"pathsToLink"};
@ -27,95 +23,58 @@ sub isInPathsToLink {
} }
sub symLinkMkdir { # For each activated package, determine what symlinks to create.
my $src = shift;
my $dst = shift; my %symlinks;
my $dir = dirname $dst; $symlinks{""} = ""; # create root directory
mkpath $dir;
symlink($src, $dst) || sub findFiles;
die "error creating link `$dst': $!";
$symlinks++; sub findFilesInDir {
my ($relName, $target, $ignoreCollisions) = @_;
opendir DIR, "$target" or die "cannot open `$target': $!";
my @names = readdir DIR or die;
closedir DIR;
foreach my $name (@names) {
next if $name eq "." || $name eq "..";
findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions);
}
} }
sub findFiles {
# For each activated package, create symlinks. my ($relName, $target, $baseName, $ignoreCollisions) = @_;
sub createLinks {
my $relName = shift;
my $srcDir = shift;
my $dstDir = shift;
my $ignoreCollisions = shift;
my @srcFiles = glob("$srcDir/*");
foreach my $srcFile (@srcFiles) {
my $baseName = $srcFile;
$baseName =~ s/^.*\///g; # strip directory
my $dstFile = "$dstDir/$baseName";
my $relName2 = "$relName/$baseName";
# Urgh, hacky... # Urgh, hacky...
if ($srcFile =~ /\/propagated-build-inputs$/ || return if
$srcFile =~ /\/nix-support$/ || $relName eq "/propagated-build-inputs" ||
$srcFile =~ /\/perllocal.pod$/ || $relName eq "/nix-support" ||
$srcFile =~ /\/info\/dir$/ || $relName =~ /info\/dir/ ||
( $relName2 =~ /^\/share\/mime\// && !( $relName2 =~ /^\/share\/mime\/packages/ ) ) || ( $relName =~ /^\/share\/mime\// && !( $relName =~ /^\/share\/mime\/packages/ ) ) ||
$srcFile =~ /\/log$/) $baseName eq "perllocal.pod" ||
{ $baseName eq "log";
# Do nothing.
my $oldTarget = $symlinks{$relName};
if (!defined $oldTarget) {
$symlinks{$relName} = $target;
return;
} }
elsif (-d $srcFile) { unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) {
if (!isInPathsToLink($relName2)) {
# This path is not in the list of paths to link, but
# some of its children may be.
createLinks($relName2, $srcFile, $dstFile, $ignoreCollisions);
next;
}
lstat $dstFile;
if (-d _) {
createLinks($relName2, $srcFile, $dstFile, $ignoreCollisions);
}
elsif (-l _) {
my $target = readlink $dstFile or die;
if (!-d $target) {
die "collission between directory `$srcFile' and non-directory `$target'";
}
unlink $dstFile or die "error unlinking `$dstFile': $!";
mkpath $dstFile;
createLinks($relName2, $target, $dstFile, $ignoreCollisions);
createLinks($relName2, $srcFile, $dstFile, $ignoreCollisions);
}
else {
symLinkMkdir $srcFile, $dstFile;
}
}
elsif (-l $dstFile) {
my $oldTarget = readlink $dstFile;
my $oldTargetReal = abs_path $oldTarget;
my $newTarget = $srcFile;
my $newTargetReal = abs_path $newTarget;
unless ($newTargetReal eq $oldTargetReal) {
if ($ignoreCollisions) { if ($ignoreCollisions) {
warn "collision between `$newTarget' and `$oldTarget'\n"; warn "collision between `$target' and `$oldTarget'";
} return;
else { } else {
die "collision between `$newTarget' and `$oldTarget'"; die "collision between `$target' and `$oldTarget'";
}
} }
} }
else { findFilesInDir($relName, $oldTarget, $ignoreCollisions) unless $oldTarget eq "";
next unless isInPathsToLink($relName2); findFilesInDir($relName, $target, $ignoreCollisions);
symLinkMkdir $srcFile, $dstFile;
} $symlinks{$relName} = ""; # denotes directory
}
} }
@ -130,8 +89,7 @@ sub addPkg($;$) {
return if (defined $done{$pkgDir}); return if (defined $done{$pkgDir});
$done{$pkgDir} = 1; $done{$pkgDir} = 1;
# print "symlinking $pkgDir\n"; findFiles("", "$pkgDir", "", $ignoreCollisions);
createLinks("", "$pkgDir", "$out", $ignoreCollisions);
my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages"; my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages";
if (-e $propagatedFN) { if (-e $propagatedFN) {
@ -140,7 +98,6 @@ sub addPkg($;$) {
close PROP; close PROP;
my @propagated = split ' ', $propagated; my @propagated = split ' ', $propagated;
foreach my $p (@propagated) { foreach my $p (@propagated) {
print "$pkgDir propagates $p\n";
$postponed{$p} = 1 unless defined $done{$p}; $postponed{$p} = 1 unless defined $done{$p};
} }
} }
@ -167,17 +124,36 @@ while (scalar(keys %postponed) > 0) {
} }
} }
# Create the symlinks.
my $nrLinks = 0;
foreach my $relName (sort keys %symlinks) {
my $target = $symlinks{$relName};
my $abs = "$out/$relName";
next unless isInPathsToLink $relName;
if ($target eq "") {
#print "creating directory $relName\n";
mkpath $abs or die "cannot create directory `$abs': $!";
} else {
#print "creating symlink $relName to $target\n";
symlink $target, $abs ||
die "error creating link `$abs': $!";
$nrLinks++;
}
}
if (-x "$out/bin/update-mime-database" && -d "$out/share/mime/packages") { if (-x "$out/bin/update-mime-database" && -d "$out/share/mime/packages") {
system("$out/bin/update-mime-database -V $out/share/mime") == 0 system("$out/bin/update-mime-database -V $out/share/mime") == 0
or die "Can't update mime-database"; or die "Can't update mime-database";
} }
print STDERR "created $symlinks symlinks in user environment\n"; print STDERR "created $nrLinks symlinks in user environment\n";
my $manifest = $ENV{"manifest"}; my $manifest = $ENV{"manifest"};
if ($manifest ne "") { if ($manifest) {
symlink($manifest, "$out/manifest") or die "cannot create manifest"; symlink($manifest, "$out/manifest") or die "cannot create manifest";
} }