if (-d "libraries/$package/_darcs") {
print "Ignoring libraries/$package as it looks like a darcs checkout\n"
}
+ elsif (-d "libraries/$package/.git") {
+ print "Ignoring libraries/$package as it looks like a git checkout\n"
+ }
else {
+ if (! -d "libraries/stamp") {
+ mkdir "libraries/stamp";
+ }
$stamp = "libraries/stamp/$package";
if ((! -d "libraries/$package") || (! -f "$stamp")
|| ((-M "libraries/stamp/$package") > (-M $tarball))) {
&rmtree("libraries/$package")
or die "Can't remove libraries/$package: $!";
}
- mkdir "libraries/$package";
+ mkdir "libraries/$package"
+ or die "Can't create libraries/$package: $!";
system ("sh", "-c", "cd 'libraries/$package' && { cat ../../$tarball | gzip -d | tar xf - ; } && mv */* .") == 0
or die "Failed to unpack $package";
- open STAMP, "> $stamp";
- close STAMP;
+ open STAMP, "> $stamp"
+ or die "Failed to open stamp file: $!";
+ close STAMP
+ or die "Failed to close stamp file: $!";
}
}
}
$package =~ s/\/$//;
my $pkgs = "$package/ghc-packages";
if (-f $pkgs) {
- open PKGS, "< $pkgs";
+ open PKGS, "< $pkgs"
+ or die "Failed to open $pkgs: $!";
while (<PKGS>) {
chomp;
+ s/\r//g;
if (/.+/) {
push @library_dirs, "$package/$_";
}
if ($#cabals eq 0) {
my $cabal = $cabals[0];
my $pkg;
- my $stage;
my $top;
if (-f $cabal) {
$pkg = $cabal;
$pkg =~ s#.*/##;
$pkg =~ s/\.cabal$//;
- if (-f "$package/ghc-stage") {
- open STAGE, "< $package/ghc-stage";
- $stage = int(<STAGE>);
- close STAGE;
- }
- else {
- $stage = 1;
- }
$top = $package;
$top =~ s#[^/]+#..#g;
+ $dir = $package;
+ $dir =~ s#^libraries/##g;
print "Creating $package/ghc.mk\n";
- open GHCMK, "> $package/ghc.mk";
+ open GHCMK, "> $package/ghc.mk"
+ or die "Opening $package/ghc.mk failed: $!";
print GHCMK "${package}_PACKAGE = ${pkg}\n";
print GHCMK "${package}_dist-install_GROUP = libraries\n";
- print GHCMK "\$(eval \$(call build-package,${package},dist-install,${stage}))\n";
- close GHCMK;
+ print GHCMK "\$(eval \$(call build-package,${package},dist-install,\$(if \$(filter ${dir},\$(STAGE2_PACKAGES)),2,1)))\n";
+ close GHCMK
+ or die "Closing $package/ghc.mk failed: $!";
print "Creating $package/GNUmakefile\n";
- open GNUMAKEFILE, "> $package/GNUmakefile";
+ open GNUMAKEFILE, "> $package/GNUmakefile"
+ or die "Opening $package/GNUmakefile failed: $!";
print GNUMAKEFILE "dir = ${package}\n";
print GNUMAKEFILE "TOP = ${top}\n";
print GNUMAKEFILE "include \$(TOP)/mk/sub-makefile.mk\n";
print GNUMAKEFILE "FAST_MAKE_OPTS += stage=0\n";
- close GNUMAKEFILE;
+ close GNUMAKEFILE
+ or die "Closing $package/GNUmakefile failed: $!";
}
}
}