diff options
| author | Alec Theriault <alec.theriault@gmail.com> | 2019-02-13 07:44:58 -0800 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-02-16 09:16:32 -0500 |
| commit | 3cb063c805ec841ca33b8371ef8aba9329221b6c (patch) | |
| tree | cc036e6f732cf1f72454d2950a5b4ff4b6cdd70c | |
| parent | 7752fa54909a10b565a80a5ca8b751e174b14282 (diff) | |
| download | haskell-3cb063c805ec841ca33b8371ef8aba9329221b6c.tar.gz | |
Remove `parallel` as a submodule
`parallel` is used in exactly one place in the GHC tree: the T2317 test.
It seems almost by accident that it is a submodule; libraries needed
only for tests should net be included as submodules (see `QuickCheck`,
`async`, `haskell98`, `regex-compat`, `utf8-string`, `vector` and more
for examples).
T2317 will now get run only when `parallel` is installed instead of
`parallel` being required for the testsuite to run.
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | ghc.mk | 4 | ||||
| -rw-r--r-- | hadrian/src/Base.hs | 2 | ||||
| -rw-r--r-- | hadrian/src/Packages.hs | 5 | ||||
| -rw-r--r-- | hadrian/src/Rules/SourceDist.hs | 1 | ||||
| -rw-r--r-- | hadrian/src/Settings/Default.hs | 1 | ||||
| m--------- | libraries/parallel | 0 | ||||
| -rw-r--r-- | packages | 1 |
8 files changed, 3 insertions, 15 deletions
diff --git a/.gitmodules b/.gitmodules index d2ab9ed668..5700a96a22 100644 --- a/.gitmodules +++ b/.gitmodules @@ -83,10 +83,6 @@ url = ../packages/unix.git ignore = untracked branch = 2.7 -[submodule "libraries/parallel"] - path = libraries/parallel - url = ../packages/parallel.git - ignore = untracked [submodule "libraries/stm"] path = libraries/stm url = ../packages/stm.git @@ -1206,9 +1206,6 @@ GIT_COMMIT_ID: sdist-ghc-prep-tree : VERSION GIT_COMMIT_ID -# Extra packages which shouldn't be in the source distribution: see #8801 -EXTRA_PACKAGES=parallel - .PHONY: sdist-ghc-prep-tree sdist-ghc-prep-tree : $(call removeTrees,$(SRC_DIST_GHC_ROOT)) @@ -1223,7 +1220,6 @@ sdist-ghc-prep-tree : $(call removeTrees,$(SRC_DIST_GHC_DIR)/libraries/stamp/) $(call removeTrees,$(SRC_DIST_GHC_DIR)/compiler/stage[123]) $(call removeFiles,$(SRC_DIST_GHC_DIR)/mk/build.mk) - for i in $(EXTRA_PACKAGES); do $(RM) $(RM_OPTS_REC) $(SRC_DIST_GHC_DIR)/libraries/$$i/; done cd $(SRC_DIST_GHC_DIR) && "$(FIND)" $(SRC_DIST_GHC_DIRS) \( -name .git -o -name "autom4te*" -o -name "*~" -o -name "\#*" -o -name ".\#*" -o -name "log" -o -name "*-SAVE" -o -name "*.orig" -o -name "*.rej" \) -print | "$(XARGS)" $(XARGS_OPTS) "$(RM)" $(RM_OPTS_REC) # Add files generated by alex and happy. diff --git a/hadrian/src/Base.hs b/hadrian/src/Base.hs index 277d6148ab..77eec0a48a 100644 --- a/hadrian/src/Base.hs +++ b/hadrian/src/Base.hs @@ -34,7 +34,7 @@ import Control.Monad.Reader import Data.List.Extra import Data.Maybe import Data.Semigroup -import Development.Shake hiding (parallel, unit, (*>), Normal) +import Development.Shake hiding (unit, (*>), Normal) import Development.Shake.Classes import Development.Shake.FilePath import Development.Shake.Util diff --git a/hadrian/src/Packages.hs b/hadrian/src/Packages.hs index f32661e534..02dc134387 100644 --- a/hadrian/src/Packages.hs +++ b/hadrian/src/Packages.hs @@ -6,7 +6,7 @@ module Packages ( filepath, genapply, genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCompact, ghcHeap, ghci, ghcPkg, ghcPrim, ghcSplit, haddock, haskeline, hsc2hs, hp2ps, hpc, hpcBin, integerGmp, integerSimple, iserv, libffi, - libiserv, mtl, parsec, parallel, pretty, primitive, process, rts, runGhc, + libiserv, mtl, parsec, pretty, primitive, process, rts, runGhc, stm, templateHaskell, terminfo, text, time, timeout, touchy, transformers, unlit, unix, win32, xhtml, ghcPackages, isGhcPackage, @@ -35,7 +35,7 @@ ghcPackages = , filepath, genapply, genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCompact , ghcHeap, ghci, ghcPkg, ghcPrim, haddock, haskeline, hsc2hs, hp2ps , hpc, hpcBin, integerGmp, integerSimple, iserv, libffi, libiserv, mtl - , parsec, parallel, pretty, process, rts, runGhc, stm, templateHaskell + , parsec, pretty, process, rts, runGhc, stm, templateHaskell , terminfo, text, time, touchy, transformers, unlit, unix, win32, xhtml , timeout ] @@ -82,7 +82,6 @@ libffi = top "libffi" libiserv = lib "libiserv" mtl = lib "mtl" parsec = lib "parsec" -parallel = lib "parallel" pretty = lib "pretty" primitive = lib "primitive" process = lib "process" diff --git a/hadrian/src/Rules/SourceDist.hs b/hadrian/src/Rules/SourceDist.hs index 8bec3f3b26..6e56c666b6 100644 --- a/hadrian/src/Rules/SourceDist.hs +++ b/hadrian/src/Rules/SourceDist.hs @@ -68,7 +68,6 @@ prepareTree dest = do , Test "libraries//ghc.mk" , Test "libraries//include/Hs*Config.h" , Test "libraries/dph" - , Test "libraries/parallel" , Test "libraries/primitive" , Test "libraries/random" , Test "libraries/stm" diff --git a/hadrian/src/Settings/Default.hs b/hadrian/src/Settings/Default.hs index 01fc01430b..cec1d6616a 100644 --- a/hadrian/src/Settings/Default.hs +++ b/hadrian/src/Settings/Default.hs @@ -135,7 +135,6 @@ testsuitePackages = do , hp2ps , hsc2hs , iserv - , parallel , runGhc , unlit ] ++ [ timeout | win ] diff --git a/libraries/parallel b/libraries/parallel deleted file mode 160000 -Subproject 4a04f41b7e2857ab8a09bcb8ed0b346516b0c81 @@ -65,6 +65,5 @@ libraries/unix - - ssh://g libraries/Win32 - - https://github.com/haskell/win32.git libraries/xhtml - - https://github.com/haskell/xhtml.git nofib nofib - - -libraries/parallel extra - ssh://git@github.com/haskell/parallel.git libraries/stm - - ssh://git@github.com/haskell/stm.git . - ghc.git - |