Add Outputable.blankLine and use it

[ghc-hetmet.git] / boot

diff --git a/boot b/boot
index dc7c9c0..644c6d9 100644 (file)
--- a/boot
+++ b/boot
@@ -1,25 +1,39 @@
-#!/bin/sh
-
+#! /bin/sh
 set -e
 
-for d in `cat libraries/core-packages`
+# Create libraries/*/{ghc.mk,GNUmakefile}
+sh boot-pkgs
+
+# Check that we have all boot packages.
+for dir in `grep "^[^# ][^ ]*  *[^ ][^ ]*  *[^ ][^ ]*$" packages | sed "s/ .*//"`
 do
-    if test ! -d libraries/$d
+    # 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 test ! -f $dir/LICENSE
     then
-        echo "Looks like you're missing libraries/$d,"
-        echo "maybe you haven't done './darcs-all get'?"
+        echo "Error: $dir/LICENSE doesn't exist." >&2
+        echo "Maybe you haven't done './darcs-all get'?" >&2
         exit 1
     fi
 done
 
-autoreconf
-
-for lib in libraries/*; do
-    if test -e $lib/configure.ac
+# autoreconf everything that needs it.
+for dir in . libraries/*
+do
+    if test -f $dir/configure.ac
     then
-        cd $lib
-        autoreconf
-        cd ../..
+        echo "Booting $dir"
+        ( cd $dir && autoreconf )
     fi
 done
 
+# Alas, darcs doesn't handle file permissions, so fix a few of them.
+for f in boot darcs-all push-all validate
+do
+    if test -f $f
+    then
+        chmod +x $f
+    fi
+done