Convert loose sub-repos into proper submodules (re #8545)
authorHerbert Valerio Riedel <hvr@gnu.org>
Sat, 22 Mar 2014 14:26:34 +0000 (15:26 +0100)
committerHerbert Valerio Riedel <hvr@gnu.org>
Wed, 25 Jun 2014 08:19:22 +0000 (10:19 +0200)
Specifically, the following sub-repos/modules are converted:

 - libffi-tarballs
 - libraries/array
 - libraries/deepseq
 - libraries/directory
 - libraries/dph
 - libraries/filepath
 - libraries/haskell2010
 - libraries/haskell98
 - libraries/hoopl
 - libraries/hpc
 - libraries/old-locale
 - libraries/old-time
 - libraries/parallel
 - libraries/process
 - libraries/stm
 - libraries/unix
 - nofib
 - utils/hsc2hs

N.B. ghc-tarballs is not converted as it will probably be handled
     differently in the future.

Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
21 files changed:
.gitignore
.gitmodules
libffi-tarballs [new submodule]
libraries/array [new submodule]
libraries/deepseq [new submodule]
libraries/directory [new submodule]
libraries/dph [new submodule]
libraries/filepath [new submodule]
libraries/haskell2010 [new submodule]
libraries/haskell98 [new submodule]
libraries/hoopl [new submodule]
libraries/hpc [new submodule]
libraries/old-locale [new submodule]
libraries/old-time [new submodule]
libraries/parallel [new submodule]
libraries/process [new submodule]
libraries/stm [new submodule]
libraries/unix [new submodule]
nofib [new submodule]
packages
utils/hsc2hs [new submodule]

index a25197d..99bf3a6 100644 (file)
@@ -46,27 +46,6 @@ _darcs/
 # sub-repositories
 
 /ghc-tarballs/
-/libffi-tarballs/
-/libraries/array/
-/libraries/deepseq/
-/libraries/directory/
-/libraries/dph/
-/libraries/extensible-exceptions/
-/libraries/filepath/
-/libraries/haskell2010/
-/libraries/haskell98/
-/libraries/hoopl/
-/libraries/hpc/
-/libraries/mtl/
-/libraries/old-locale/
-/libraries/old-time/
-/libraries/parallel/
-/libraries/process/
-/libraries/stm/
-/libraries/unix/
-/libraries/utf8-string/
-/nofib/
-/utils/hsc2hs/
 
 # -----------------------------------------------------------------------------
 # Cabal dist directories
index 99893a4..b5e7122 100644 (file)
        path = libraries/random
        url = ../packages/random.git
        ignore = untracked
+[submodule "libraries/array"]
+       path = libraries/array
+       url = ../packages/array.git
+[submodule "libraries/deepseq"]
+       path = libraries/deepseq
+       url = ../packages/deepseq.git
+[submodule "libraries/directory"]
+       path = libraries/directory
+       url = ../packages/directory.git
+[submodule "libraries/filepath"]
+       path = libraries/filepath
+       url = ../packages/filepath.git
+[submodule "libraries/haskell98"]
+       path = libraries/haskell98
+       url = ../packages/haskell98.git
+[submodule "libraries/haskell2010"]
+       path = libraries/haskell2010
+       url = ../packages/haskell2010.git
+[submodule "libraries/hoopl"]
+       path = libraries/hoopl
+       url = ../packages/hoopl.git
+[submodule "libraries/hpc"]
+       path = libraries/hpc
+       url = ../packages/hpc.git
+[submodule "libraries/old-locale"]
+       path = libraries/old-locale
+       url = ../packages/old-locale.git
+[submodule "libraries/old-time"]
+       path = libraries/old-time
+       url = ../packages/old-time.git
+[submodule "libraries/process"]
+       path = libraries/process
+       url = ../packages/process.git
+[submodule "libraries/unix"]
+       path = libraries/unix
+       url = ../packages/unix.git
+[submodule "libraries/parallel"]
+       path = libraries/parallel
+       url = ../packages/parallel.git
+[submodule "libraries/stm"]
+       path = libraries/stm
+       url = ../packages/stm.git
+[submodule "libraries/dph"]
+       path = libraries/dph
+       url = ../packages/dph.git
 [submodule "utils/haddock"]
        path = utils/haddock
        url = ../haddock.git
+[submodule "nofib"]
+       path = nofib
+       url = ../nofib.git
+[submodule "utils/hsc2hs"]
+       path = utils/hsc2hs
+       url = ../hsc2hs.git
+[submodule "libffi-tarballs"]
+       path = libffi-tarballs
+       url = ../libffi-tarballs.git
diff --git a/libffi-tarballs b/libffi-tarballs
new file mode 160000 (submodule)
index 0000000..a0088d1
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit a0088d1da0e171849ddb47a46c869856037a01d1
diff --git a/libraries/array b/libraries/array
new file mode 160000 (submodule)
index 0000000..26ff047
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 26ff04744117b0ad8233a1a2b5635fa1277b88d9
diff --git a/libraries/deepseq b/libraries/deepseq
new file mode 160000 (submodule)
index 0000000..3a9c431
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 3a9c431e4c89ca506aae8e80867cfcde8c099724
diff --git a/libraries/directory b/libraries/directory
new file mode 160000 (submodule)
index 0000000..0c64d54
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 0c64d5420e54bb871f0407a4ec3155c6be600756
diff --git a/libraries/dph b/libraries/dph
new file mode 160000 (submodule)
index 0000000..3ebad52
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 3ebad521cd1e3b5573d97b483305ca465a9cba69
diff --git a/libraries/filepath b/libraries/filepath
new file mode 160000 (submodule)
index 0000000..486373c
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 486373cb6bc3de8bf7f0b8532558c5fff32df20a
diff --git a/libraries/haskell2010 b/libraries/haskell2010
new file mode 160000 (submodule)
index 0000000..c0c87ad
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit c0c87ad53e377aa00f4897bc729c261459b6048a
diff --git a/libraries/haskell98 b/libraries/haskell98
new file mode 160000 (submodule)
index 0000000..cc6bbbf
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit cc6bbbf2bf4eaea57062043cbb6e7c5d6c2f42a9
diff --git a/libraries/hoopl b/libraries/hoopl
new file mode 160000 (submodule)
index 0000000..a2e34db
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit a2e34db038b737365c4126f69b1a32eae84dae6b
diff --git a/libraries/hpc b/libraries/hpc
new file mode 160000 (submodule)
index 0000000..d6ac0c5
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit d6ac0c532f12d30af778eeb285da9031bb06fddb
diff --git a/libraries/old-locale b/libraries/old-locale
new file mode 160000 (submodule)
index 0000000..7e7f672
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 7e7f6722895af36ca4e2f60f2fdfdc056b70db0b
diff --git a/libraries/old-time b/libraries/old-time
new file mode 160000 (submodule)
index 0000000..8901741
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 89017411036b24875393e4fd6ca8ef92fc181ad2
diff --git a/libraries/parallel b/libraries/parallel
new file mode 160000 (submodule)
index 0000000..03da433
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 03da43303ed05ace65cb24cee1dbc1766c694233
diff --git a/libraries/process b/libraries/process
new file mode 160000 (submodule)
index 0000000..b39e340
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit b39e340bb1fa887842e99db9824906858515cdf7
diff --git a/libraries/stm b/libraries/stm
new file mode 160000 (submodule)
index 0000000..52c3028
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 52c3028aff127fd957cdaf1ec7605fc533a59961
diff --git a/libraries/unix b/libraries/unix
new file mode 160000 (submodule)
index 0000000..cdc3ae7
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit cdc3ae7b087ac7451298a5b87fe2548fb74c2fdc
diff --git a/nofib b/nofib
new file mode 160000 (submodule)
index 0000000..d98f703
--- /dev/null
+++ b/nofib
@@ -0,0 +1 @@
+Subproject commit d98f7038d1111e515db9cc27d5d3bbe237e6e14f
index 1416cd8..f52fc73 100644 (file)
--- a/packages
+++ b/packages
 # localpath                  tag         remotepath                      upstreamurl
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ghc-tarballs                 windows     ghc-tarballs.git                -
-libffi-tarballs              -           libffi-tarballs.git             -
-utils/hsc2hs                 -           hsc2hs.git                      -
+libffi-tarballs              -           -                               -
+utils/hsc2hs                 -           -                               -
 utils/haddock                -           -                               ssh://git@github.com/haskell/haddock.git
-libraries/array              -           packages/array.git              -
+libraries/array              -           -                               -
 libraries/binary             -           -                               https://github.com/kolmodin/binary.git
 libraries/bytestring         -           -                               https://github.com/haskell/bytestring.git
 libraries/Cabal              -           -                               https://github.com/haskell/cabal.git
 libraries/containers         -           -                               https://github.com/haskell/containers.git
-libraries/deepseq            -           packages/deepseq.git            -
-libraries/directory          -           packages/directory.git          -
-libraries/filepath           -           packages/filepath.git           -
+libraries/deepseq            -           -                               -
+libraries/directory          -           -                               -
+libraries/filepath           -           -                               -
 libraries/haskeline          -           -                               https://github.com/judah/haskeline.git
-libraries/haskell98          -           packages/haskell98.git          -
-libraries/haskell2010        -           packages/haskell2010.git        -
-libraries/hoopl              -           packages/hoopl.git              -
-libraries/hpc                -           packages/hpc.git                -
-libraries/old-locale         -           packages/old-locale.git         -
-libraries/old-time           -           packages/old-time.git           -
+libraries/haskell98          -           -                               -
+libraries/haskell2010        -           -                               -
+libraries/hoopl              -           -                               -
+libraries/hpc                -           -                               -
+libraries/old-locale         -           -                               -
+libraries/old-time           -           -                               -
 libraries/pretty             -           -                               https://github.com/haskell/pretty.git
-libraries/process            -           packages/process.git            -
+libraries/process            -           -                               -
 libraries/terminfo           -           -                               https://github.com/judah/terminfo.git
 libraries/time               -           -                               http://git.haskell.org/darcs-mirrors/time.git
 libraries/transformers       -           -                               http://git.haskell.org/darcs-mirrors/transformers.git
-libraries/unix               -           packages/unix.git               -
+libraries/unix               -           -                               -
 libraries/Win32              -           -                               https://github.com/haskell/win32.git
 libraries/xhtml              -           -                               https://github.com/haskell/xhtml.git
-nofib                        nofib       nofib.git                       -
-libraries/parallel           extra       packages/parallel.git           -
-libraries/stm                extra       packages/stm.git                -
+nofib                        nofib       -                               -
+libraries/parallel           extra       -                               -
+libraries/stm                extra       -                               -
 libraries/random             dph         -                               https://github.com/haskell/random.git
 libraries/primitive          dph         -                               https://github.com/haskell/primitive.git
 libraries/vector             dph         -                               https://github.com/haskell/vector.git
-libraries/dph                dph         packages/dph.git                -
+libraries/dph                dph         -                               -
 .                            -           ghc.git                         -
diff --git a/utils/hsc2hs b/utils/hsc2hs
new file mode 160000 (submodule)
index 0000000..4a0f677
--- /dev/null
@@ -0,0 +1 @@
+Subproject commit 4a0f67704d89712f8493a0c7eccffa9243d6ef09