projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Actually tar up Windows bindists
[ghc-hetmet.git]
/
darcs-all
diff --git
a/darcs-all
b/darcs-all
index
b1451b1
..
6c8b406
100644
(file)
--- a/
darcs-all
+++ b/
darcs-all
@@
-56,12
+56,10
@@
sub darcsall {
my $path;
my $tag;
my $path;
my $tag;
- darcs @_;
-
open IN, "< packages" or die "Can't open packages file";
while (<IN>) {
chomp;
open IN, "< packages" or die "Can't open packages file";
while (<IN>) {
chomp;
- if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+)/) {
+ if (/^([^# ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
$localpath = $1;
$tag = defined($2) ? $2 : "";
$localpath = $1;
$tag = defined($2) ? $2 : "";
@@
-75,7
+73,7
@@
sub darcsall {
message "== $localpath repo not present; skipping";
}
}
message "== $localpath repo not present; skipping";
}
}
- elsif (! /^$/) {
+ elsif (! /^(#.*)?$/) {
die "Bad line: $_";
}
}
die "Bad line: $_";
}
}
@@
-100,7
+98,7
@@
sub darcsget {
open IN, "< packages" or die "Can't open packages file";
while (<IN>) {
chomp;
open IN, "< packages" or die "Can't open packages file";
while (<IN>) {
chomp;
- if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+)/) {
+ if (/^([^ ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
$localpath = $1;
$tag = defined($2) ? $2 : "";
$remotepath = $3;
$localpath = $1;
$tag = defined($2) ? $2 : "";
$remotepath = $3;
@@
-121,7
+119,7
@@
sub darcsget {
}
}
}
}
}
}
- elsif (! /^$/) {
+ elsif (! /^(#.*)?$/) {
die "Bad line: $_";
}
}
die "Bad line: $_";
}
}
@@
-143,11
+141,10
@@
sub main {
elsif ($arg eq "-s") {
$verbose = 0;
}
elsif ($arg eq "-s") {
$verbose = 0;
}
- # --ci says we grab cabal-install repo, and the libraries it needs
- # with 'get'.
+ # --dph says we grab the dph libs with 'get'.
# It has no effect on the other commands.
# It has no effect on the other commands.
- elsif ($arg eq "--ci") {
- $tags{"ci"} = 1;
+ elsif ($arg eq "--dph") {
+ $tags{"dph"} = 1;
}
# --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.