X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=darcs-all;h=1ab395b06ffefa0141efd5af0e57d44a8059108e;hb=5ad61e1470db6dbc8279569c5ad1cc093f753ac0;hp=aecf6340b79e21f7fe27b05013df912825635789;hpb=345a81cac5ec23158160dcfa3a92cf132ee8e3d8;p=ghc-hetmet.git

diff --git a/darcs-all b/darcs-all
index aecf634..1ab395b 100644
--- 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://*) default_repo_root=`echo $defaultrepo | sed 's!/ghc$!!'`
+            default_lib_repo_root=$default_repo_root/packages;;
+  /*)       default_repo_root=$defaultrepo
+            default_lib_repo_root=$default_repo_root/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,7 +45,7 @@ function darcsall()
   done
 }
 
-function darcsget()
+darcsget()
 {
   case $* in
     *--partial*) ;;
@@ -52,7 +59,14 @@ function darcsget()
   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
@@ -63,7 +77,7 @@ function darcsget()
   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 +86,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