X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=boot;h=66bff3eb8f98a08eb81460b21110540fcfbe3a18;hp=f47bdf649134f1c2fea3e73f77f72c0c42618872;hb=4564ccb752ff2dd28176ff1b567b8475fdb8b403;hpb=1be165c939bbfa7bb287eae3ef1a989ef6086355

diff --git a/boot b/boot
old mode 100644
new mode 100755
index f47bdf6..66bff3e
--- a/boot
+++ b/boot
@@ -5,8 +5,10 @@ use strict;
 use Cwd;
 
 my %required_tag;
+my $validate;
 
 $required_tag{"-"} = 1;
+$validate = 0;
 
 while ($#ARGV ne -1) {
     my $arg = shift @ARGV;
@@ -14,11 +16,32 @@ while ($#ARGV ne -1) {
     if ($arg =~ /^--required-tag=(.*)/) {
         $required_tag{$1} = 1;
     }
+    elsif ($arg =~ /^--validate$/) {
+        $validate = 1;
+    }
     else {
         die "Bad arg: $arg";
     }
 }
 
+{
+    local $/ = undef;
+    open FILE, "packages" or die "Couldn't open file: $!";
+    binmode FILE;
+    my $string = <FILE>;
+    close FILE;
+
+    if ($string =~ /\r/) {
+        print STDERR <<EOF;
+Found ^M in packages.
+Perhaps you need to run
+    git config --global core.autocrlf false
+and re-check out the tree?
+EOF
+        exit 1;
+    }
+}
+
 # Create libraries/*/{ghc.mk,GNUmakefile}
 system("/usr/bin/perl", "-w", "boot-pkgs") == 0
     or die "Running boot-pkgs failed: $?";
@@ -43,13 +66,13 @@ while (<PACKAGES>) {
         # 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,
+            # 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";
-                die "Maybe you haven't done './darcs-all get'?";
+                die "Maybe you haven't done './sync-all get'?";
             }
         }
     }
@@ -70,10 +93,19 @@ foreach $dir (".", glob("libraries/*/")) {
     }
 }
 
-# Alas, darcs doesn't handle file permissions, so fix a few of them.
-for my $file ("boot", "darcs-all", "validate") {
-    if (-f $file) {
-        chmod 0755, $file
-            or die "Can't chmod 0755 $file: $!";
-    }
+if ($validate eq 0 && ! -f "mk/build.mk") {
+    print <<EOF;
+
+WARNING: You don't have a mk/build.mk file.
+
+By default a standard GHC build will be done, which uses optimisation
+and builds the profiling libraries. This will take a long time, so may
+not be what you want if you are developing GHC or the libraries, rather
+than simply building it to use it.
+
+For information on creating a mk/build.mk file, please see:
+    http://hackage.haskell.org/trac/ghc/wiki/Building/Using#Buildconfiguration
+
+EOF
 }
+