Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/f73d60bee5154777eb2515c0df806ddc928f874f >--------------------------------------------------------------- commit f73d60bee5154777eb2515c0df806ddc928f874f Author: Ian Lynagh <i...@well-typed.com> Date: Sun Nov 25 18:27:40 2012 +0000 Use submodules for repositories with upstreams >--------------------------------------------------------------- .gitignore | 12 ------------ .gitmodules | 36 ++++++++++++++++++++++++++++++++++++ libraries/Cabal | 1 + libraries/Win32 | 1 + libraries/binary | 1 + libraries/bytestring | 1 + libraries/containers | 1 + libraries/haskeline | 1 + libraries/pretty | 1 + libraries/primitive | 1 + libraries/terminfo | 1 + libraries/transformers | 1 + libraries/vector | 1 + libraries/xhtml | 1 + sync-all | 18 ++++++++++++++++++ 15 files changed, 66 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index baf85fa..913e2d1 100644 --- a/.gitignore +++ b/.gitignore @@ -43,20 +43,14 @@ _darcs/ # sub-repositories /ghc-tarballs/ -/libraries/Cabal/ -/libraries/Win32/ /libraries/array/ /libraries/base/ -/libraries/binary/ -/libraries/bytestring/ -/libraries/containers/ /libraries/deepseq/ /libraries/directory/ /libraries/dph/ /libraries/extensible-exceptions/ /libraries/filepath/ /libraries/ghc-prim/ -/libraries/haskeline/ /libraries/haskell2010/ /libraries/haskell98/ /libraries/hoopl/ @@ -67,18 +61,12 @@ _darcs/ /libraries/old-locale/ /libraries/old-time/ /libraries/parallel/ -/libraries/pretty/ -/libraries/primitive/ /libraries/process/ /libraries/random/ /libraries/stm/ /libraries/template-haskell/ -/libraries/terminfo/ -/libraries/transformers /libraries/unix/ /libraries/utf8-string/ -/libraries/vector/ -/libraries/xhtml/ /nofib/ /testsuite/ /utils/haddock/ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..d73487a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,36 @@ +[submodule "libraries/binary"] + path = libraries/binary + url = http://darcs.haskell.org/libraries/binary.git/ +[submodule "libraries/bytestring"] + path = libraries/bytestring + url = http://darcs.haskell.org/libraries/bytestring.git/ +[submodule "libraries/Cabal"] + path = libraries/Cabal + url = http://darcs.haskell.org/libraries/Cabal.git/ +[submodule "libraries/containers"] + path = libraries/containers + url = http://darcs.haskell.org/libraries/containers.git/ +[submodule "libraries/haskeline"] + path = libraries/haskeline + url = http://darcs.haskell.org/libraries/haskeline.git/ +[submodule "libraries/pretty"] + path = libraries/pretty + url = http://darcs.haskell.org/libraries/pretty.git/ +[submodule "libraries/terminfo"] + path = libraries/terminfo + url = http://darcs.haskell.org/libraries/terminfo.git/ +[submodule "libraries/transformers"] + path = libraries/transformers + url = http://darcs.haskell.org/libraries/transformers.git/ +[submodule "libraries/xhtml"] + path = libraries/xhtml + url = http://darcs.haskell.org/libraries/xhtml.git/ +[submodule "libraries/Win32"] + path = libraries/Win32 + url = http://darcs.haskell.org/libraries/Win32.git/ +[submodule "libraries/primitive"] + path = libraries/primitive + url = http://darcs.haskell.org/libraries/primitive.git/ +[submodule "libraries/vector"] + path = libraries/vector + url = http://darcs.haskell.org/libraries/vector.git/ diff --git a/libraries/Cabal b/libraries/Cabal new file mode 160000 index 0000000..532e349 --- /dev/null +++ b/libraries/Cabal @@ -0,0 +1 @@ +Subproject commit 532e349ec6ee33fc3477137b44f108d3658d0528 diff --git a/libraries/Win32 b/libraries/Win32 new file mode 160000 index 0000000..21335a3 --- /dev/null +++ b/libraries/Win32 @@ -0,0 +1 @@ +Subproject commit 21335a30161c099da79ae9619c9782e5e32e4644 diff --git a/libraries/binary b/libraries/binary new file mode 160000 index 0000000..2d31cea --- /dev/null +++ b/libraries/binary @@ -0,0 +1 @@ +Subproject commit 2d31cea238d0d08885c457475fc354dbf2b88976 diff --git a/libraries/bytestring b/libraries/bytestring new file mode 160000 index 0000000..6bd69fe --- /dev/null +++ b/libraries/bytestring @@ -0,0 +1 @@ +Subproject commit 6bd69fe27af33e878e38f4c579983f6a23120a87 diff --git a/libraries/containers b/libraries/containers new file mode 160000 index 0000000..a9b7224 --- /dev/null +++ b/libraries/containers @@ -0,0 +1 @@ +Subproject commit a9b7224068ae60f73baacd5f76d2c27624d90120 diff --git a/libraries/haskeline b/libraries/haskeline new file mode 160000 index 0000000..9ad0092 --- /dev/null +++ b/libraries/haskeline @@ -0,0 +1 @@ +Subproject commit 9ad00926f832f4e5f5d38c8fe84bfc85f4e8f728 diff --git a/libraries/pretty b/libraries/pretty new file mode 160000 index 0000000..ab7e8d9 --- /dev/null +++ b/libraries/pretty @@ -0,0 +1 @@ +Subproject commit ab7e8d91470bb94c9e184dffbec89d0aae116f9b diff --git a/libraries/primitive b/libraries/primitive new file mode 160000 index 0000000..75c3379 --- /dev/null +++ b/libraries/primitive @@ -0,0 +1 @@ +Subproject commit 75c3379b6d76e914cc3c7ffd290b6b1cad7ea3e6 diff --git a/libraries/terminfo b/libraries/terminfo new file mode 160000 index 0000000..579d2c3 --- /dev/null +++ b/libraries/terminfo @@ -0,0 +1 @@ +Subproject commit 579d2c324e69856ff8d1ea8b5036e30c920e1973 diff --git a/libraries/transformers b/libraries/transformers new file mode 160000 index 0000000..a59fb93 --- /dev/null +++ b/libraries/transformers @@ -0,0 +1 @@ +Subproject commit a59fb93860f84ccd44178dcbbb82cfea7e02cd07 diff --git a/libraries/vector b/libraries/vector new file mode 160000 index 0000000..c4c5a74 --- /dev/null +++ b/libraries/vector @@ -0,0 +1 @@ +Subproject commit c4c5a740ec977a4300449bc85f4707ec641be923 diff --git a/libraries/xhtml b/libraries/xhtml new file mode 160000 index 0000000..fb9e0bb --- /dev/null +++ b/libraries/xhtml @@ -0,0 +1 @@ +Subproject commit fb9e0bbb69e15873682a9f25d39652099a3ccac1 diff --git a/sync-all b/sync-all index fd60446..4f7e767 100755 --- a/sync-all +++ b/sync-all @@ -117,6 +117,16 @@ sub parsePackages { } } +sub tryReadFile { + my $filename = shift; + my @lines; + + open (FH, $filename) or return ""; + @lines = <FH>; + close FH; + return join('', @lines); +} + sub message { if ($verbose >= 2) { print "@_\n"; @@ -751,6 +761,14 @@ sub main { } scmall ($command, @_); + + if ($command eq "get" or $command eq "pull") { + my $gitConfig = &tryReadFile(".git/config"); + if ($gitConfig !~ /submodule/) { + &scm(".", "git", "submodule", "init"); + } + &scm(".", "git", "submodule", "update"); + } } } _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
