diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | boot | 43 | ||||
| -rw-r--r-- | libraries/tarballs/time-1.4.0.1.tar.gz | bin | 87466 -> 0 bytes | |||
| m--------- | libraries/time | 0 | ||||
| -rw-r--r-- | packages | 1 |
6 files changed, 4 insertions, 44 deletions
diff --git a/.gitignore b/.gitignore index 913e2d1332..256d538724 100644 --- a/.gitignore +++ b/.gitignore @@ -151,7 +151,6 @@ _darcs/ /libraries/plus.gif /libraries/synopsis.png /libraries/stamp/ -/libraries/time/ /mk/are-validating.mk /mk/build.mk /mk/config.h diff --git a/.gitmodules b/.gitmodules index d73487af17..5befbfc7f4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ [submodule "libraries/vector"] path = libraries/vector url = http://darcs.haskell.org/libraries/vector.git/ +[submodule "libraries/time"] + path = libraries/time + url = http://darcs.haskell.org/libraries/time.git/ @@ -85,51 +85,8 @@ sub sanity_check_tree { # Create libraries/*/{ghc.mk,GNUmakefile} sub boot_pkgs { my @library_dirs = (); - my @tarballs = glob("libraries/tarballs/*"); - my $tarball; my $package; - my $stamp; - - for $tarball (@tarballs) { - $package = $tarball; - $package =~ s#^libraries/tarballs/##; - $package =~ s/-[0-9.]*(-snapshot)?\.tar\.gz$//; - - # Sanity check, so we don't rmtree the wrong thing below - if (($package eq "") || ($package =~ m#[/.\\]#)) { - die "Bad package name: $package"; - } - - 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"; - } - $stamp = "libraries/stamp/$package"; - if ((! -d "libraries/$package") || (! -f "$stamp") - || ((-M "libraries/stamp/$package") > (-M $tarball))) { - print "Unpacking $package\n"; - if (-d "libraries/$package") { - &rmtree("libraries/$package") - or die "Can't remove libraries/$package: $!"; - } - mkdir "libraries/$package" - or die "Can't create libraries/$package: $!"; - system ("sh", "-c", "cd 'libraries/$package' && { cat ../../$tarball | gzip -d | tar xf - ; } && mv */* .") == 0 - or die "Failed to unpack $package"; - open STAMP, "> $stamp" - or die "Failed to open stamp file: $!"; - close STAMP - or die "Failed to close stamp file: $!"; - } - } - } for $package (glob "libraries/*/") { $package =~ s/\/$//; diff --git a/libraries/tarballs/time-1.4.0.1.tar.gz b/libraries/tarballs/time-1.4.0.1.tar.gz Binary files differdeleted file mode 100644 index 04181df24b..0000000000 --- a/libraries/tarballs/time-1.4.0.1.tar.gz +++ /dev/null diff --git a/libraries/time b/libraries/time new file mode 160000 +Subproject c98806fe0c9cde7371452ec30fa2900d28d16b1 @@ -70,6 +70,7 @@ libraries/pretty - - libraries/process - packages/process.git git libraries/template-haskell - packages/template-haskell.git git libraries/terminfo - - git +libraries/time - - git libraries/transformers - - git libraries/unix - packages/unix.git git libraries/Win32 - - git |