Make darcs-all a perl script

This fixes a problem where patches altering the darcs-all script break
on Windows as the file is open. The script is now also slightly nicer,
on balance.

diff --git a/Makefile b/Makefile
index e70784d..e00a844 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ check-packages :
        @for d in `cat libraries/core-packages`; do \
          if test ! -d libraries/$$d; then \
             echo "Looks like you're missing libraries/$$d,"; \
        @for d in `cat libraries/core-packages`; do \
          if test ! -d libraries/$$d; then \
             echo "Looks like you're missing libraries/$$d,"; \

-            echo "maybe you haven't done 'sh darcs-all get'?"; \
+            echo "maybe you haven't done './darcs-all get'?"; \

             exit 1; \
          fi \
        done
             exit 1; \
          fi \
        done

diff --git a/README b/README
index 03642fb..25122a8 100644 (file)
--- a/README
+++ b/README
@@ -27,7 +27,7 @@ There are two ways to get a source tree:
       ghc-<version>-src-extralibs.tar.bz2
 
   You only need the first one, which contains GHC itself and
       ghc-<version>-src-extralibs.tar.bz2
 
   You only need the first one, which contains GHC itself and

-  the "core" libraries.  
+  the "core" libraries.

 
   The extralibs package contains a bunch of optional libraries.  If
   you want, you can unpack this over the top of your source tree, and
 
   The extralibs package contains a bunch of optional libraries.  If
   you want, you can unpack this over the top of your source tree, and

@@ -45,16 +45,17 @@ There are two ways to get a source tree:
 
     $ darcs get http://darcs.haskell.org/ghc/
 
 
     $ darcs get http://darcs.haskell.org/ghc/
 

-  Then run the darcs-all shell script in that repository 
+  Then run the darcs-all script in that repository

   to get the other repositories:
 
      $ cd ghc
   to get the other repositories:
 
      $ cd ghc

-     $ sh darcs-all get
+     $ chmod +x darcs-all
+     $ ./darcs-all get

 
   This grabs the "core" packages by default.  To get the full set of
   packages, instead say
 
 
   This grabs the "core" packages by default.  To get the full set of
   packages, instead say
 

-     $ sh darcs-all --extra get
+     $ ./darcs-all --extra get

 
   This also downloads the libraries that are normally bundled in the
   "extralibs" package (see above).
 
   This also downloads the libraries that are normally bundled in the
   "extralibs" package (see above).

@@ -71,7 +72,7 @@ below).
 
 You also need a few other tools installed: Happy [4], Alex [5], and
 Haddock [6] (for building library documentation), and a good DocBook
 
 You also need a few other tools installed: Happy [4], Alex [5], and
 Haddock [6] (for building library documentation), and a good DocBook

-XML toolchain if you want to build the compiler documentation. 
+XML toolchain if you want to build the compiler documentation.

 
 Quick start:  the following gives you a default build:
 
 
 Quick start:  the following gives you a default build:
 

@@ -107,5 +108,5 @@ Contributors
 ============
 
 Please see
 ============
 
 Please see

-  
+

    http://www.haskell.org/ghc/contributors.html
    http://www.haskell.org/ghc/contributors.html

diff --git a/boot b/boot
index d983d2f..dc7c9c0 100644 (file)
--- a/boot
+++ b/boot
@@ -7,7 +7,7 @@ do
     if test ! -d libraries/$d
     then
         echo "Looks like you're missing libraries/$d,"
     if test ! -d libraries/$d
     then
         echo "Looks like you're missing libraries/$d,"

-        echo "maybe you haven't done 'sh darcs-all get'?"
+        echo "maybe you haven't done './darcs-all get'?"

         exit 1
     fi
 done
         exit 1
     fi
 done

diff --git a/darcs-all b/darcs-all
index 65d6612..30173c2 100644 (file)
--- a/darcs-all
+++ b/darcs-all
@@ -1,135 +1,162 @@
-#!/bin/sh
+#!/usr/bin/perl -w

 
 

-set -e
+use strict;

 
 

-top_dirs="nofib testsuite"
+my @top_dirs = ("nofib", "testsuite");

 
 # Figure out where to get the other repositories from,
 # based on where this GHC repo came from.
 
 # 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 or SSH:
-  http://* | *:*)
-    defaultrepo_base="`echo $defaultrepo | sed 's!/ghc$!!'`"
-    defaultrepo_lib="$defaultrepo_base"/packages;;
-  # Local filesystem (assumes a checked-out tree):
-  /*)
-    defaultrepo_base="$defaultrepo"
-    defaultrepo_lib="$defaultrepo"/libraries;;
-esac
-
-quiet=NO
-
-message()
-{
-  if [ "$quiet" = "NO" ]; then
-     echo "$@"
-  fi
+my $defaultrepo = `cat _darcs/prefs/defaultrepo`;
+chomp $defaultrepo;
+my $defaultrepo_base;
+my $defaultrepo_lib;
+
+if ($defaultrepo =~ /:/) {
+    # HTTP or SSH
+    $defaultrepo_base = $defaultrepo;
+    $defaultrepo_base =~ s#/ghc$##;
+    $defaultrepo_lib = "$defaultrepo_base/packages";

 }
 }

-
-darcsall()
-{
-  message "== running darcs $@ at the top level"
-  darcs "$@"
-  for dir in $top_dirs; do
-    if test -d $dir -a -d $dir/_darcs; then
-       message "== running darcs $@ in $dir"
-       darcs "$@" --repodir $dir
-    else
-       message "== $dir not present or not a repository; skipping"
-    fi
-  done
-  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
-    else
-       echo "warning: $pkg doesn't seem to exist, use 'darcs-all get' to get it"
-    fi
-  done
+elsif ($defaultrepo =~ /^\//) {
+    # Local filesystem (assumes a checked-out tree):
+    $defaultrepo_base = $defaultrepo;
+    $defaultrepo_lib = "$defaultrepo/libraries";

 }
 }

-
-darcsget()
-{
-  case $* in
-    *--complete*|*--partial*)
-      additional_flag="" ;;
-    *)
-      echo "warning: adding --partial, to override use --complete"
-      additional_flag="--partial" ;;
-  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
-
-  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=$defaultrepo_lib/$pkg
-       message "== running darcs get $additional_flag $@ $repo"
-       darcs get $additional_flag "$@" $repo
-    fi
-  done
+else {
+    die "Couldn't work out defaultrepo";

 }
 
 }
 

-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
-
-case $* in
-  *-q*) quiet=YES;;
-esac
+my $verbose = 1;
+my $ignore_failure = 0;

 
 # --extra says we grab the extra libs with 'get'.  It has no effect on
 # the other commands.
 
 # --extra says we grab the extra libs with 'get'.  It has no effect on
 # the other commands.

-extra=NO
+my $extra = 0;

 # --nofib/--testsuite tell get to also grab the respective repos.
 # They have no effect on the other commands.
 # --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
-  w|wh|wha|what|whats|whatsn|whatsne|whatsnew) set +e; darcsall "$@";;
-  *) darcsall "$@";;
-esac
+my $nofib = 0;
+my $testsuite = 0;
+
+while ($#_ ne -1) {
+    my $arg = shift;
+    if ($arg eq "-q") {
+        $verbose = 0;
+    }
+    elsif ($arg eq "--extra") {
+        $extra = 1;
+    }
+    elsif ($arg eq "--nofib") {
+        $nofib = 1;
+    }
+    elsif ($arg eq "--testsuite") {
+        $testsuite = 1;
+    }
+    else {
+        unshift @_, $arg;
+        last;
+    }
+}
+
+sub message {
+    if ($verbose) {
+        print "@_\n";
+    }
+}
+
+sub warning {
+    print "warning: @_\n";
+}
+
+sub darcs {
+    message "== running darcs @_";
+    system ("darcs", @_) == 0
+        or $ignore_failure
+        or die "darcs failed: $?";
+}
+
+sub darcsall {
+    darcs @_;
+    for my $dir (@top_dirs) {
+        if (-d $dir && -d "$dir/_darcs") {
+            darcs (@_, "--repodir", $dir);
+        }
+        else {
+            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");
+        }
+        else {
+            warning("$pkg doesn't exist, use 'darcs-all get' to get it");
+        }
+    }
+}
+
+sub darcsgetpackage {
+    my ($get_it, $r_flags, $repo_root, $package) = @_;
+
+    if ($get_it) {
+        if (-d $package) {
+            warning("$package already present; omitting");
+        }
+        else {
+            darcs (@$r_flags, "$repo_root/$package");
+        }
+    }
+}
+
+sub darcsget {
+    my $r_flags;
+    if (! grep /(?:--complete|--partial)/, @_) {
+        warning("adding --partial, to override use --complete");
+        $r_flags = [@_, "--partial"];
+    }
+    else {
+        $r_flags = \@_;
+    }
+
+    darcsgetpackage($nofib,     $r_flags, $defaultrepo_base, "nofib");
+    darcsgetpackage($testsuite, $r_flags, $defaultrepo_base, "testsuite");
+
+    chdir "libraries";
+
+    my @packages;
+    if ($extra) {
+        @packages = `cat core-packages extra-packages`;
+    }
+    else {
+        @packages = `cat core-packages`;
+    }
+
+    for my $pkg (@packages) {
+        chomp $pkg;
+        darcsgetpackage(1, $r_flags, $defaultrepo_lib, $pkg);
+    }
+}
+
+sub main {
+    if (! -d "_darcs" || ! -d "compiler") {
+        die "error: darcs-all must be run from the top level of the ghc tree."
+    }
+
+    if ($#_ eq -1) {
+        die "What do you want to do?";
+    }
+    my $command = $_[0];
+    if ($command eq "get") {
+        darcsget @_;
+    }
+    else {
+        if ($command =~ /^(?:w|wh|wha|what|whats|whatsn|whatsne|whatsnew)$/) {
+            # Hack around whatsnew failing if there are no changes
+            $ignore_failure = 1;
+        }
+        darcsall @_;
+    }
+}
+
+main(@ARGV);
+