X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=darcs-all;h=8b2a68a6bed09b7c95e6922fd40d1afa53cc4407;hp=c711c77c4b4f3ac893c384030a5b716bcf879044;hb=9fd4d1e84e5a305e227db2ec78a46d1762907493;hpb=abd6576d1b73060cf9d02122e926c10b3b36ae73

diff --git a/darcs-all b/darcs-all
index c711c77..8b2a68a 100644
--- a/darcs-all
+++ b/darcs-all
@@ -4,19 +4,28 @@ 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_base="`echo $defaultrepo | sed 's!/ghc$!!'`"
+    defaultrepo_lib="$defaultrepo_base"/packages;;
+  /*)
+    defaultrepo_base="$defaultrepo"
+    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,42 +37,66 @@ 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
-	echo "== running darcs $* in libraries/$pkg"
+	message "== running darcs $* in libraries/$pkg"
 	darcs $* --repodir libraries/$pkg
     else
-	echo "warning: $dir doesn't seem to exist, use 'darcs-all get' to get it"
+	echo "warning: $pkg doesn't seem to exist, use 'darcs-all get' to get it"
     fi
   done
 }
 
-function darcsget()
+darcsget()
 {
   case $* in
-    *--partial*) ;;
-    *) echo "warning: adding --partial, to override use --complete"
+    *--complete*|*--partial*)
+      additional_flag="" ;;
+    *)
+      echo "warning: adding --partial, to override use --complete"
+      additional_flag="--partial" ;;
   esac
 
-  repo_root=`cat _darcs/prefs/defaultrepo`
-  case $repo_root in
-    /*) lib_repos=$repo_root/libraries;;
-    *)  lib_repos=$default_lib_repo_root;;
-  esac
+  if test "$nofib" = "YES"; then
+    if test -d nofib; then
+      echo "warning: nofib already present; omitting"
+    else
+      repo="$defaultrepo_base"/nofib
+      message "== running darcs get $additional_flag $* $repo"
+      darcs get $additional_flag $* $repo
+    fi
+  fi
+
+  if test "$testsuite" = "YES"; then
+    if test -d testsuite; then
+      echo "warning: testsuite already present; omitting"
+    else
+      repo="$defaultrepo_base"/testsuite
+      message "== running darcs get $additional_flag $* $repo"
+      darcs get $additional_flag $* $repo
+    fi
+  fi
 
   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 -o ! -d ghc; 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 +105,26 @@ 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
+# --nofib/--testsuite tell get to also grab the respective repos.
+# They have no effect on the other commands.
+nofib=NO
+testsuite=NO
+
+args_done=NO
+
+while [ "$args_done" == NO ]
+do
+    case $1 in
+      --extra) shift; extra=YES;;
+      --nofib) shift; nofib=YES;;
+      --testsuite) shift; testsuite=YES;;
+      *) args_done=YES;;
+    esac
+done
+
 case $1 in
   get)  shift; darcsget $*;;
   # Hack around whatsnew failing if there are no changes