Zap stable unfoldings in worker/wrapper

[ghc.git] / boot

diff --git a/boot b/boot
index 8977eaf..45f5bf0 100755 (executable)
--- a/boot
+++ b/boot
@@ -11,6 +11,9 @@ my %required_tag;
 my $validate;
 my $curdir;
 
+# See Trac #11530
+$ENV{GREP_OPTIONS} = '';
+
 $required_tag{"-"} = 1;
 $validate = 0;
 
@@ -53,6 +56,40 @@ sub sanity_check_tree {
     my $tag;
     my $dir;
 
+    if (-d ".git"  &&
+        system("git config remote.origin.url | grep github.com > /dev/null") == 0 &&
+        system("git config --get-regexp '^url.*github.com/.*/packages-.insteadOf' > /dev/null") != 0) {
+        # If we cloned from github, make sure the url rewrites are set.
+        # Otherwise 'git submodule update --init' prints confusing errors.
+        die <<EOF;
+It seems you cloned this repository from GitHub. But your git config files
+don't contain the url rewrites that are needed to make this work (GitHub
+doesn't support '/' in repository names, so we use a different naming scheme
+for the submodule repositories there).
+
+Please run the following commands first:
+
+  git config --global url."git://github.com/ghc/packages-".insteadOf     git://github.com/ghc/packages/
+  git config --global url."http://github.com/ghc/packages-".insteadOf    http://github.com/ghc/packages/
+  git config --global url."https://github.com/ghc/packages-".insteadOf   https://github.com/ghc/packages/
+  git config --global url."ssh://git\@github.com/ghc/packages-".insteadOf ssh://git\@github.com/ghc/packages/
+  git config --global url."git\@github.com:/ghc/packages-".insteadOf      git\@github.com:/ghc/packages/
+
+And then:
+
+  git submodule update --init
+  ./boot
+
+Or start over, and clone the GHC repository from the haskell server:
+
+  git clone --recursive git://git.haskell.org/ghc.git
+
+For more information, see:
+  * https://ghc.haskell.org/trac/ghc/wiki/Newcomers or
+  * https://ghc.haskell.org/trac/ghc/wiki/Building/GettingTheSources#CloningfromGitHub
+EOF
+    }
+
     # Check that we have all boot packages.
     open PACKAGES, "< packages";
     while (<PACKAGES>) {
@@ -72,7 +109,7 @@ sub sanity_check_tree {
                 # has a LICENSE file instead.
                 if (! -f "$dir/LICENSE") {
                     print STDERR "Error: $dir/LICENSE doesn't exist.\n";
-                    die "Maybe you haven't done './sync-all get'?";
+                    die "Maybe you haven't done 'git submodule update --init'?";
                 }
             }
         }
@@ -110,7 +147,10 @@ sub boot_pkgs {
 
     for $package (@library_dirs) {
         my $dir = &basename($package);
-        my @cabals = glob("$package/*.cabal");
+        my @cabals = glob("$package/*.cabal.in");
+        if ($#cabals < 0) {
+            @cabals = glob("$package/*.cabal");
+        }
         if ($#cabals > 0) {
             die "Too many .cabal file in $package\n";
         }
@@ -121,6 +161,7 @@ sub boot_pkgs {
             if (-f $cabal) {
                 $pkg = $cabal;
                 $pkg =~ s#.*/##;
+                $pkg =~ s/\.cabal.in$//;
                 $pkg =~ s/\.cabal$//;
                 $top = $package;
                 $top =~ s#[^/]+#..#g;
@@ -155,16 +196,25 @@ sub boot_pkgs {
 # autoreconf everything that needs it.
 sub autoreconf {
     my $dir;
+    my $fail;
 
     foreach $dir (".", glob("libraries/*/")) {
         if (-f "$dir/configure.ac") {
+            next if (my $pid = fork);
+            die "fork failed: $!" if (! defined $pid);
             print "Booting $dir\n";
             chdir $dir or die "can't change to $dir: $!";
-            system("autoreconf") == 0
-                or die "Running autoreconf failed with exitcode $?";
-            chdir $curdir or die "can't change to $curdir: $!";
+            exec("autoreconf");
+            exit 1;
         }
     }
+
+    # Wait for all child processes to finish.
+    while (wait() != -1) {
+        $fail = 1 if $?;
+    }
+
+    die "Running autoreconf failed" if $fail;
 }
 
 sub checkBuildMk {