@@ -7,9 +7,9 @@ sh boot-pkgs
# Check that we have all boot packages.
for dir in `grep "^[^# ][^ ]* *[^ ][^ ]* *[^ ][^ ]*$" packages | sed "s/ .*//"`
do
- if test ! -f $dir/LICENSE
+ if test ! -d $dir/_darcs
then
- echo "Error: $dir/LICENSE doesn't exist." >&2
+ echo "Error: $dir/_darcs doesn't exist." >&2
echo "Maybe you haven't done './darcs-all get'?" >&2
exit 1
fi
boot
@@ -389,23 +389,25 @@ then
LD="$hardtop/inplace/mingw/bin/ld.exe"
NM="$hardtop/inplace/mingw/bin/nm.exe"
if ! test -d inplace/mingw ||
- test inplace/mingw -ot mingw/binutils*.tar.gz ||
- test inplace/mingw -ot mingw/gcc-core*.tar.gz ||
- test inplace/mingw -ot mingw/libcrypt*.tar.bz2 ||
- test inplace/mingw -ot mingw/mingw-runtime*.tar.gz ||
- test inplace/mingw -ot mingw/perl*.tar.bz2 ||
- test inplace/mingw -ot mingw/w32api*.tar.gz
+ test inplace/mingw -ot ghc-tarballs/mingw/binutils*.tar.gz ||
+ test inplace/mingw -ot ghc-tarballs/mingw/gcc-core*.tar.gz ||
+ test inplace/mingw -ot ghc-tarballs/mingw/libcrypt*.tar.bz2 ||
+ test inplace/mingw -ot ghc-tarballs/mingw/mingw-runtime*.tar.gz ||
+ test inplace/mingw -ot ghc-tarballs/mingw/perl*.tar.bz2 ||
+ test inplace/mingw -ot ghc-tarballs/mingw/w32api*.tar.gz
then
AC_MSG_NOTICE([Making in-tree mingw tree])
rm -rf inplace/mingw
mkdir inplace
mkdir inplace/mingw
- ( cd inplace/mingw && tar -zxf ../../mingw/binutils*.tar.gz )
- ( cd inplace/mingw && tar -zxf ../../mingw/gcc-core*.tar.gz )
- ( cd inplace/mingw && tar -jxf ../../mingw/libcrypt*.tar.bz2 )
- ( cd inplace/mingw && tar -zxf ../../mingw/mingw-runtime*.tar.gz )
- ( cd inplace/mingw && tar -jxf ../../mingw/perl*.tar.bz2 )
- ( cd inplace/mingw && tar -zxf ../../mingw/w32api*.tar.gz )
+ cd inplace/mingw
+ tar -zxf ../../ghc-tarballs/mingw/binutils*.tar.gz
+ tar -zxf ../../ghc-tarballs/mingw/gcc-core*.tar.gz
+ tar -jxf ../../ghc-tarballs/mingw/libcrypt*.tar.bz2
+ tar -zxf ../../ghc-tarballs/mingw/mingw-runtime*.tar.gz
+ tar -jxf ../../ghc-tarballs/mingw/perl*.tar.bz2
+ tar -zxf ../../ghc-tarballs/mingw/w32api*.tar.gz
+ cd ../..
AC_MSG_NOTICE([In-tree mingw tree created])
fi
fi
configure.ac
@@ -112,20 +112,6 @@ sub warning {
}
}
-sub download {
- my ($from, $to) = @_;
-
- my @cmd = ("wget", $from, "-O", $to);
- message "== running @cmd";
- system @cmd;
- if ($? == -1) {
- die "Failed to execute wget: $!\n";
- }
- elsif ($? != 0) {
- die "wget failed: $?\n";
- }
-}
-
sub darcs {
message "== running darcs @_";
system ("darcs", @_) == 0
@@ -178,10 +164,6 @@ sub darcsall {
die "Bad line: $_";
}
}
-
- if ($_[0] eq "pull" || $_[0] eq "pul") {
- &sync_tarballs();
- }
}
sub darcsget {
@@ -233,63 +215,6 @@ sub darcsget {
die "Bad line: $_";
}
}
-
- &sync_tarballs();
-}
-
-sub sync_tarballs {
- my $localpath;
- my $localdirectory;
- my $localfilename;
- my $actualpath;
- my $actualfilename;
- my $remotepath;
- my $path;
- my @tarballs;
- my %localtarballs;
- my ($repo_base, $checked_out_tree) = getrepo();
-
- message "== Syncing tarballs";
-
- open IN, "< tarballs" or die "Can't open packages file";
- @tarballs = <IN>;
- close IN;
-
- foreach (@tarballs) {
- chomp;
- if (m@^([^# ]+)/([^#/ ]+) +([^ ]+)$@) {
- $localdirectory = $1;
- $localfilename = $2;
- $remotepath = $3;
- $localpath = "$localdirectory/$localfilename";
-
- $localtarballs{$localdirectory}{$localfilename} = 1;
-
- if (! -e $localpath) {
- if ($checked_out_tree) {
- $path = "$repo_base/$localpath";
- }
- else {
- $path = "$repo_base/$remotepath";
- }
- &download($path, $localpath);
- }
- }
- elsif (! /^(#.*)?$/) {
- die "Bad line: $_";
- }
- }
-
- foreach $localdirectory (keys %localtarballs) {
- FILE: foreach $actualpath (glob "$localdirectory/*.tar.gz $localdirectory/*.tar.bz2") {
- $actualfilename = $actualpath;
- $actualfilename =~ s#.*/##;
- if (! defined($localtarballs{$localdirectory}{$actualfilename})) {
- message "== Deleting $actualpath";
- unlink $actualpath;
- }
- }
- }
}
sub main {
darcs-all
@@ -106,7 +106,7 @@ endif
ifneq "$(BINDIST)" "YES"
$(libffi_STAMP_CONFIGURE):
"$(RM)" $(RM_OPTS) -r $(LIBFFI_DIR) libffi/build
- cd libffi && $(TAR) -zxf tarball/libffi*.tar.gz
+ cd libffi && $(TAR) -zxf ../ghc-tarballs/libffi/libffi*.tar.gz
mv libffi/libffi-* libffi/build
chmod +x libffi/ln
cd libffi/build && "$(PATCH)" -p1 < ../libffi.dllize-3.0.8.patch
libffi/ghc.mk
@@ -17,6 +17,7 @@
#
# Lines that start with a '#' are comments.
. ghc git
+ghc-tarballs ghc-tarballs darcs
utils/hsc2hs hsc2hs darcs
utils/haddock haddock2 darcs
libraries/array packages/array darcs
packages
libffi/tarball/README
tarballs
c1bcbb61be3a20417bb0a7734869471cc7777d48
Ian Lynagh
igloo@earth.li
http://github.com/ghc-hq/ghc/commit/f0fabbf8bc61414118029580b991693052202c18
f0fabbf8bc61414118029580b991693052202c18
2009-10-23T07:31:00-07:00
2009-10-23T07:31:00-07:00
Get the tarballs from a darcs repo, rather than with wget
6da549e40c7d967c692005eda68763f8726ffeda
Ian Lynagh
igloo@earth.li