Use a submodule for the time package
authorIan Lynagh <ian@well-typed.com>
Sun, 2 Dec 2012 16:49:36 +0000 (16:49 +0000)
committerIan Lynagh <ian@well-typed.com>
Sun, 2 Dec 2012 16:58:21 +0000 (16:58 +0000)
This bring the time package into line with how we handle other
packages.

.gitignore
.gitmodules
boot
libraries/tarballs/time-1.4.0.1.tar.gz [deleted file]
libraries/time [new submodule]
packages

index 913e2d1..256d538 100644 (file)
@@ -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
index d73487a..5befbfc 100644 (file)
@@ -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 (executable)
--- 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 (file)
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 (submodule)
index 0000000..c98806f
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit c98806fe0c9cde7371452ec30fa2900d28d16b16
index a4b8087..74485df 100644 (file)
--- 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