Fixed uninitialised FunBind fun_tick field

[ghc-hetmet.git] / darcs-all

diff --git a/darcs-all b/darcs-all
index aecf634..69e0ff9 100644 (file)
--- a/darcs-all
+++ b/darcs-all
@@ -4,19 +4,26 @@ set -e
 
 top_dirs="nofib testsuite"
 
-default_repo_root="http://darcs.haskell.org/"
-default_lib_repo_root=$default_repo_root/packages
+# Figure out where to get the other repositories from,
+# based on where this GHC repo came from.
+defaultrepo=`cat _darcs/prefs/defaultrepo`
+case $defaultrepo in
+  http://* | *@*:*)
+    defaultrepo_lib=`echo $defaultrepo | sed 's!/ghc$!!'`/packages;;
+  /*)
+    defaultrepo_lib=$defaultrepo/libraries;;
+esac
 
 quiet=NO
 
-function message()
+message()
 {
   if [ "$quiet" = "NO" ]; then
      echo $*
   fi
 }
 
-function darcsall()
+darcsall()
 {
   message "== running darcs $* at the top level"
   darcs $*
@@ -28,7 +35,7 @@ function darcsall()
        message "== $dir not present or not a repository; skipping"
     fi
   done
-  for pkg in `cat libraries/default-packages`; do
+  for pkg in `cat libraries/core-packages libraries/extra-packages`; do
     if test -d libraries/$pkg; then
        message "== running darcs $* in libraries/$pkg"
        darcs $* --repodir libraries/$pkg
@@ -38,32 +45,36 @@ function darcsall()
   done
 }
 
-function darcsget()
+darcsget()
 {
   case $* in
-    *--partial*) ;;
-    *) echo "warning: adding --partial, to override use --complete"
-  esac
-
-  repo_root=`cat _darcs/prefs/defaultrepo`
-  case $repo_root in
-    /*) lib_repos=$repo_root/libraries;;
-    *)  lib_repos=$default_lib_repo_root;;
+    *--complete*|*--partial*)
+      additional_flag="" ;;
+    *)
+      echo "warning: adding --partial, to override use --complete"
+      additional_flag="--partial" ;;
   esac
 
   cd libraries
-  for pkg in `cat default-packages`; do
+
+  if test "$extra" = "YES"; then
+      packages=`cat core-packages extra-packages`
+  else
+      packages=`cat core-packages`
+  fi
+
+  for pkg in $packages; do
     if test -d $pkg; then
        echo "warning: $pkg already present; omitting"
     else
-       repo=$lib_repos/$pkg
-       message "== running darcs get --partial $* $repo"
-       darcs get --partial $* $repo
+       repo=$defaultrepo_lib/$pkg
+       message "== running darcs get $additional_flag $* $repo"
+       darcs get $additional_flag $* $repo
     fi
   done
 }
 
-if test ! -d _darcs; then
+if test ! -d _darcs -o ! -d compiler; then
   echo "error: darcs-all must be run from the top level of the ghc tree."
   exit 1;
 fi
@@ -72,6 +83,13 @@ case $* in
   *-q*) quiet=YES;;
 esac
 
+# --extra says we grab the extra libs with 'get'.  It has no effect on
+# the other commands.
+extra=NO;
+case $1 in
+  --extra) shift; extra=YES;
+esac
+
 case $1 in
   get)  shift; darcsget $*;;
   # Hack around whatsnew failing if there are no changes