summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2012-12-02 16:49:36 +0000
committerIan Lynagh <ian@well-typed.com>2012-12-02 16:58:21 +0000
commit8fd3f3cebaccd270e10bc7b288a169ea9d0d5e29 (patch)
treebae7154162dc72a778f39e75ff1d7d4e02189ecf
parent691c8a8cef3b26a7f4734a6f7b69871a0ed726fd (diff)
downloadhaskell-8fd3f3cebaccd270e10bc7b288a169ea9d0d5e29.tar.gz
Use a submodule for the time package
This bring the time package into line with how we handle other packages.
-rw-r--r--.gitignore1
-rw-r--r--.gitmodules3
-rwxr-xr-xboot43
-rw-r--r--libraries/tarballs/time-1.4.0.1.tar.gzbin87466 -> 0 bytes
m---------libraries/time0
-rw-r--r--packages1
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/
diff --git a/boot b/boot
index 5d0973d1b9..f1282fce0d 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 04181df24b..0000000000
--- a/libraries/tarballs/time-1.4.0.1.tar.gz
+++ /dev/null
Binary files differ
diff --git a/libraries/time b/libraries/time
new file mode 160000
+Subproject c98806fe0c9cde7371452ec30fa2900d28d16b1
diff --git a/packages b/packages
index a4b808726c..74485df453 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