projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typos and add Outputable constraints to aid debugging.
[ghc-hetmet.git]
/
boot
diff --git
a/boot
b/boot
old mode 100644
(file)
new mode 100755
(executable)
index
6683ad5
..
ae57381
--- a/
boot
+++ b/
boot
@@
-4,6
+4,21
@@
use strict;
use Cwd;
use Cwd;
+my %required_tag;
+
+$required_tag{"-"} = 1;
+
+while ($#ARGV ne -1) {
+ my $arg = shift @ARGV;
+
+ if ($arg =~ /^--required-tag=(.*)/) {
+ $required_tag{$1} = 1;
+ }
+ else {
+ die "Bad arg: $arg";
+ }
+}
+
# Create libraries/*/{ghc.mk,GNUmakefile}
system("/usr/bin/perl", "-w", "boot-pkgs") == 0
or die "Running boot-pkgs failed: $?";
# Create libraries/*/{ghc.mk,GNUmakefile}
system("/usr/bin/perl", "-w", "boot-pkgs") == 0
or die "Running boot-pkgs failed: $?";
@@
-21,20
+36,20
@@
while (<PACKAGES>) {
if (/^#/) {
# Comment; do nothing
}
if (/^#/) {
# Comment; do nothing
}
- elsif (/^([a-zA-Z0-9\/.-]+) *([^ ]+) *[^ ]+ *[^ ]+$/) {
+ elsif (/^([a-zA-Z0-9\/.-]+) +([^ ]+) +[^ ]+ +[^ ]+ +[^ ]+$/) {
$dir = $1;
$tag = $2;
# If $tag is not "-" then it is an optional repository, so its
# absence isn't an error.
$dir = $1;
$tag = $2;
# If $tag is not "-" then it is an optional repository, so its
# absence isn't an error.
- if ($tag eq "-") {
- # We would like to just check for an _darcs directory here,
- # but in an lndir tree we avoid making _darcs directories,
+ if (defined($required_tag{$tag})) {
+ # We would like to just check for a .git directory here,
+ # but in an lndir tree we avoid making .git directories,
# so it doesn't exist. We therefore require that every repo
# has a LICENSE file instead.
if (! -f "$dir/LICENSE") {
print STDERR "Error: $dir/LICENSE doesn't exist.\n";
# so it doesn't exist. We therefore require that every repo
# has a LICENSE file instead.
if (! -f "$dir/LICENSE") {
print STDERR "Error: $dir/LICENSE doesn't exist.\n";
- die "Maybe you haven't done './darcs-all get'?";
+ die "Maybe you haven't done './sync-all get'?";
}
}
}
}
}
}
@@
-55,8
+70,3
@@
foreach $dir (".", glob("libraries/*/")) {
}
}
}
}
-# Alas, darcs doesn't handle file permissions, so fix a few of them.
-for my $file ("boot", "darcs-all", "validate") {
- chmod 0755, $file if -f $file
- or die "Can't chmod 0755 $file: $!";
-}