projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
88e9830
)
Update boot scripts for git
author
Ian Lynagh
<igloo@earth.li>
Sun, 3 Apr 2011 12:04:16 +0000
(13:04 +0100)
committer
Ian Lynagh
<igloo@earth.li>
Sun, 3 Apr 2011 12:04:16 +0000
(13:04 +0100)
boot
patch
|
blob
|
history
boot-pkgs
patch
|
blob
|
history
diff --git
a/boot
b/boot
index
f47bdf6
..
ae57381
100755
(executable)
--- a/
boot
+++ b/
boot
@@
-43,13
+43,13
@@
while (<PACKAGES>) {
# If $tag is not "-" then it is an optional repository, so its
# absence isn't an error.
if (defined($required_tag{$tag})) {
# If $tag is not "-" then it is an optional repository, so its
# absence isn't an error.
if (defined($required_tag{$tag})) {
- # We would like to just check for an _darcs directory here,
- # but in an lndir tree we avoid making _darcs directories,
+ # We would like to just check for a .git directory here,
+ # but in an lndir tree we avoid making .git directories,
# so it doesn't exist. We therefore require that every repo
# has a LICENSE file instead.
if (! -f "$dir/LICENSE") {
print STDERR "Error: $dir/LICENSE doesn't exist.\n";
# so it doesn't exist. We therefore require that every repo
# has a LICENSE file instead.
if (! -f "$dir/LICENSE") {
print STDERR "Error: $dir/LICENSE doesn't exist.\n";
- die "Maybe you haven't done './darcs-all get'?";
+ die "Maybe you haven't done './sync-all get'?";
}
}
}
}
}
}
@@
-70,10
+70,3
@@
foreach $dir (".", glob("libraries/*/")) {
}
}
}
}
-# Alas, darcs doesn't handle file permissions, so fix a few of them.
-for my $file ("boot", "darcs-all", "validate") {
- if (-f $file) {
- chmod 0755, $file
- or die "Can't chmod 0755 $file: $!";
- }
-}
diff --git
a/boot-pkgs
b/boot-pkgs
index
b613828
..
6acea11
100644
(file)
--- a/
boot-pkgs
+++ b/
boot-pkgs
@@
-25,6
+25,9
@@
for $tarball (@tarballs) {
if (-d "libraries/$package/_darcs") {
print "Ignoring libraries/$package as it looks like a darcs checkout\n"
}
if (-d "libraries/$package/_darcs") {
print "Ignoring libraries/$package as it looks like a darcs checkout\n"
}
+ elsif (-d "libraries/$package/.git") {
+ print "Ignoring libraries/$package as it looks like a git checkout\n"
+ }
else {
if (! -d "libraries/stamp") {
mkdir "libraries/stamp";
else {
if (! -d "libraries/stamp") {
mkdir "libraries/stamp";