X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=darcs-all;h=046e589f5d9e54b5861735ff9bc5e81848ff78d3;hp=72e1ed33541b6606a588d19fe035d75c17485443;hb=bca61eb59ad615793175e4d1a3de7a243b41de44;hpb=547952e269c1e1f4021046f1bf97da59be313cad

diff --git a/darcs-all b/darcs-all
index 72e1ed3..046e589 100644
--- a/darcs-all
+++ b/darcs-all
@@ -18,7 +18,12 @@ if ($defaultrepo =~ /:/) {
     $defaultrepo_lib = "$defaultrepo_base/packages";
 }
 elsif ($defaultrepo =~ /^\//) {
-    # Local filesystem (assumes a checked-out tree):
+    # Local filesystem, absolute path (assumes a checked-out tree):
+    $defaultrepo_base = $defaultrepo;
+    $defaultrepo_lib = "$defaultrepo/libraries";
+}
+elsif ($defaultrepo =~ /^..\//) {
+    # Local filesystem, relative path (assumes a checked-out tree):
     $defaultrepo_base = $defaultrepo;
     $defaultrepo_lib = "$defaultrepo/libraries";
 }
@@ -26,7 +31,7 @@ else {
     die "Couldn't work out defaultrepo";
 }
 
-my $verbose = 1;
+my $verbose = 2;
 my $ignore_failure = 0;
 
 # --extra says we grab the extra libs with 'get'.  It has no effect on
@@ -38,13 +43,15 @@ my $nofib = 0;
 my $testsuite = 0;
 
 sub message {
-    if ($verbose) {
+    if ($verbose >= 2) {
         print "@_\n";
     }
 }
 
 sub warning {
-    print "warning: @_\n";
+    if ($verbose >= 1) {
+        print "warning: @_\n";
+    }
 }
 
 sub darcs {
@@ -55,6 +62,7 @@ sub darcs {
 }
 
 sub darcsall {
+    my @packages;
     darcs @_;
     for my $dir (@top_dirs) {
         if (-d $dir && -d "$dir/_darcs") {
@@ -64,12 +72,25 @@ sub darcsall {
             message "== $dir not present or not a repository; skipping";
         }
     }
-    for my $pkg (`cat libraries/core-packages libraries/extra-packages`) {
-        chomp $pkg;
-        if (-d "libraries/$pkg") {
-            darcs (@_, "--repodir", "libraries/$pkg");
+    for my $path (<libraries/*/_darcs>) {
+        chomp $path;
+        if ($path =~ m#/(.*)/#) {
+            my $pkg = $1;
+            # bootstrapping.* are just copies of other repos; we don't
+            # update them directly.
+            if ($pkg !~ /bootstrapping/) {
+                darcs (@_, "--repodir", "libraries/$pkg");
+            }
         }
         else {
+            die "that pattern can't fail!";
+        }
+    }
+    @packages = `cat libraries/boot-packages`;
+    # @packages = `cat libraries/boot-packages libraries/extra-packages`;
+    for my $pkg (@packages) {
+        chomp $pkg;
+        if (! -d "libraries/$pkg") {
             warning("$pkg doesn't exist, use 'darcs-all get' to get it");
         }
     }
@@ -105,10 +126,10 @@ sub darcsget {
 
     my @packages;
     if ($extra) {
-        @packages = `cat core-packages extra-packages`;
+        @packages = `cat boot-packages extra-packages`;
     }
     else {
-        @packages = `cat core-packages`;
+        @packages = `cat boot-packages`;
     }
 
     for my $pkg (@packages) {
@@ -127,6 +148,9 @@ sub main {
         # We handle -q here as well as lower down as we need to skip over it
         # if it comes before the darcs command
         if ($arg eq "-q") {
+            $verbose = 1;
+        }
+        elsif ($arg eq "-s") {
             $verbose = 0;
         }
         elsif ($arg eq "--extra") {
@@ -141,7 +165,7 @@ sub main {
         else {
             unshift @_, $arg;
             if (grep /^-q$/, @_) {
-                $verbose = 0;
+                $verbose = 1;
             }
             last;
         }