X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=boot;h=aa3b82d04a914b1b985022d64d0dbe8c2fa046f1;hb=27225b0c9f799a251c96242f502e8cfd6bf76d7c;hp=339f21dca28f0a1be825b7e4b0b44278e75cd29a;hpb=ccc1989726c3f4b94cf18f6a13aba2b5d339d077;p=ghc-hetmet.git diff --git a/boot b/boot index 339f21d..aa3b82d 100644 --- a/boot +++ b/boot @@ -4,10 +4,26 @@ use strict; 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: $?"; +my $tag; my $dir; my $curdir; @@ -20,21 +36,22 @@ while () { if (/^#/) { # Comment; do nothing } - elsif (/^([a-zA-Z0-9\/.-]+) *[^ ]+ *[^ ]+$/) { + elsif (/^([a-zA-Z0-9\/.-]+) +([^ ]+) +[^ ]+ +[^ ]+ +[^ ]+$/) { $dir = $1; + $tag = $2; - # We would like to just check for an _darcs directory here, but in - # an lndir tree we avoid making _darcs 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"; - die "Maybe you haven't done './darcs-all get'?"; - } - } - elsif (/^([a-zA-Z0-9\/.-]+) *[^ ]+ *[^ ]+ *[^ ]+$/) { - # These are lines which refer to optional repositories, so their + # If $tag is not "-" then it is an optional repository, so its # absence isn't an error. + if (defined($required_tag{$tag})) { + # We would like to just check for an _darcs directory here, + # but in an lndir tree we avoid making _darcs 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"; + die "Maybe you haven't done './darcs-all get'?"; + } + } } else { die "Bad line in packages file: $_";