X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=darcs-all;h=bd8d7123ed8bf2002a0663cd20303a2ad6a5ba03;hb=497d3a963f679681db098588bcab00121687c8ed;hp=1cc2b243387bf187058258e19d5a39fbbdcbf1fd;hpb=06726aa7c0710100f0aaf81dfd3ac900b8ece3ee;p=ghc-hetmet.git

diff --git a/darcs-all b/darcs-all
index 1cc2b24..bd8d712 100644
--- a/darcs-all
+++ b/darcs-all
@@ -2,7 +2,7 @@
 
 use strict;
 
-my @top_dirs = ("nofib", "testsuite");
+my @top_dirs = ("nofib", "testsuite", "utils/hsc2hs");
 
 # Figure out where to get the other repositories from,
 # based on where this GHC repo came from.
@@ -10,6 +10,7 @@ my $defaultrepo = `cat _darcs/prefs/defaultrepo`;
 chomp $defaultrepo;
 my $defaultrepo_base;
 my $defaultrepo_lib;
+my $hsc2hs_repo_loc;
 
 if ($defaultrepo =~ /^...*:/) {
     # HTTP or SSH
@@ -18,16 +19,14 @@ if ($defaultrepo =~ /^...*:/) {
     $defaultrepo_base = $defaultrepo;
     $defaultrepo_base =~ s#/[^/]+/?$##;
     $defaultrepo_lib = "$defaultrepo_base/packages";
+    $hsc2hs_repo_loc = $defaultrepo_base;
 }
-elsif ($defaultrepo =~ /^\//) {
-    # 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):
+elsif ($defaultrepo =~ /^(\.\.)?\//) {
+    # Local filesystem, either absolute or relative path
+    # (assumes a checked-out tree):
     $defaultrepo_base = $defaultrepo;
     $defaultrepo_lib = "$defaultrepo/libraries";
+    $hsc2hs_repo_loc = "$defaultrepo_base/utils";
 }
 else {
     die "Couldn't work out defaultrepo";
@@ -78,11 +77,7 @@ sub darcsall {
         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");
-            }
+            darcs (@_, "--repodir", "libraries/$pkg");
         }
         else {
             die "that pattern can't fail!";
@@ -124,6 +119,10 @@ sub darcsget {
     darcsgetpackage($nofib,     $r_flags, $defaultrepo_base, "nofib");
     darcsgetpackage($testsuite, $r_flags, $defaultrepo_base, "testsuite");
 
+    chdir "utils";
+    darcsgetpackage(1         , $r_flags, $hsc2hs_repo_loc,  "hsc2hs");
+    chdir "..";
+
     chdir "libraries";
 
     my @packages;