summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2014-03-22 15:26:34 +0100
committerHerbert Valerio Riedel <hvr@gnu.org>2014-06-25 10:19:22 +0200
commitdb19c665ec5055c2193b2174519866045aeff09a (patch)
tree4339fb1a0277aabb8fc63a80a160118969e46b3b
parentec550e8f951e50fb91c89389e2e77a3358079c3a (diff)
downloadhaskell-db19c665ec5055c2193b2174519866045aeff09a.tar.gz
Convert loose sub-repos into proper submodules (re #8545)
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>
-rw-r--r--.gitignore21
-rw-r--r--.gitmodules54
m---------libffi-tarballs0
m---------libraries/array0
m---------libraries/deepseq0
m---------libraries/directory0
m---------libraries/dph0
m---------libraries/filepath0
m---------libraries/haskell20100
m---------libraries/haskell980
m---------libraries/hoopl0
m---------libraries/hpc0
m---------libraries/old-locale0
m---------libraries/old-time0
m---------libraries/parallel0
m---------libraries/process0
m---------libraries/stm0
m---------libraries/unix0
m---------nofib0
-rw-r--r--packages36
m---------utils/hsc2hs0
21 files changed, 72 insertions, 39 deletions
diff --git a/.gitignore b/.gitignore
index a25197d979..99bf3a6bab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/.gitmodules b/.gitmodules
index 99893a4ab9..b5e7122f70 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -54,6 +54,60 @@
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
+Subproject a0088d1da0e171849ddb47a46c869856037a01d
diff --git a/libraries/array b/libraries/array
new file mode 160000
+Subproject 26ff04744117b0ad8233a1a2b5635fa1277b88d
diff --git a/libraries/deepseq b/libraries/deepseq
new file mode 160000
+Subproject 3a9c431e4c89ca506aae8e80867cfcde8c09972
diff --git a/libraries/directory b/libraries/directory
new file mode 160000
+Subproject 0c64d5420e54bb871f0407a4ec3155c6be60075
diff --git a/libraries/dph b/libraries/dph
new file mode 160000
+Subproject 3ebad521cd1e3b5573d97b483305ca465a9cba6
diff --git a/libraries/filepath b/libraries/filepath
new file mode 160000
+Subproject 486373cb6bc3de8bf7f0b8532558c5fff32df20
diff --git a/libraries/haskell2010 b/libraries/haskell2010
new file mode 160000
+Subproject c0c87ad53e377aa00f4897bc729c261459b6048
diff --git a/libraries/haskell98 b/libraries/haskell98
new file mode 160000
+Subproject cc6bbbf2bf4eaea57062043cbb6e7c5d6c2f42a
diff --git a/libraries/hoopl b/libraries/hoopl
new file mode 160000
+Subproject a2e34db038b737365c4126f69b1a32eae84dae6
diff --git a/libraries/hpc b/libraries/hpc
new file mode 160000
+Subproject d6ac0c532f12d30af778eeb285da9031bb06fdd
diff --git a/libraries/old-locale b/libraries/old-locale
new file mode 160000
+Subproject 7e7f6722895af36ca4e2f60f2fdfdc056b70db0
diff --git a/libraries/old-time b/libraries/old-time
new file mode 160000
+Subproject 89017411036b24875393e4fd6ca8ef92fc181ad
diff --git a/libraries/parallel b/libraries/parallel
new file mode 160000
+Subproject 03da43303ed05ace65cb24cee1dbc1766c69423
diff --git a/libraries/process b/libraries/process
new file mode 160000
+Subproject b39e340bb1fa887842e99db9824906858515cdf
diff --git a/libraries/stm b/libraries/stm
new file mode 160000
+Subproject 52c3028aff127fd957cdaf1ec7605fc533a5996
diff --git a/libraries/unix b/libraries/unix
new file mode 160000
+Subproject cdc3ae7b087ac7451298a5b87fe2548fb74c2fd
diff --git a/nofib b/nofib
new file mode 160000
+Subproject d98f7038d1111e515db9cc27d5d3bbe237e6e14
diff --git a/packages b/packages
index 1416cd8f9d..f52fc734be 100644
--- a/packages
+++ b/packages
@@ -48,37 +48,37 @@
# 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
+Subproject 4a0f67704d89712f8493a0c7eccffa9243d6ef0