Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/8fd3f3cebaccd270e10bc7b288a169ea9d0d5e29 >--------------------------------------------------------------- commit 8fd3f3cebaccd270e10bc7b288a169ea9d0d5e29 Author: Ian Lynagh <i...@well-typed.com> Date: Sun Dec 2 16:49:36 2012 +0000 Use a submodule for the time package This bring the time package into line with how we handle other packages. >--------------------------------------------------------------- .gitignore | 1 - .gitmodules | 3 ++ boot | 43 -------------------------------- libraries/tarballs/time-1.4.0.1.tar.gz | Bin 87466 -> 0 bytes libraries/time | 1 + packages | 1 + 6 files changed, 5 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 913e2d1..256d538 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 d73487a..5befbfc 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/ diff --git a/boot b/boot index 5d0973d..f1282fc 100755 --- a/boot +++ b/boot @@ -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 deleted file mode 100644 index 04181df..0000000 Binary files a/libraries/tarballs/time-1.4.0.1.tar.gz and /dev/null differ diff --git a/libraries/time b/libraries/time new file mode 160000 index 0000000..c98806f --- /dev/null +++ b/libraries/time @@ -0,0 +1 @@ +Subproject commit c98806fe0c9cde7371452ec30fa2900d28d16b16 diff --git a/packages b/packages index a4b8087..74485df 100644 --- a/packages +++ b/packages @@ -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 _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
