Commit 3cb063c8 authored by Alec Theriault's avatar Alec Theriault Committed by Marge Bot
Browse files

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.
parent 7752fa54
...@@ -83,10 +83,6 @@ ...@@ -83,10 +83,6 @@
url = ../packages/unix.git url = ../packages/unix.git
ignore = untracked ignore = untracked
branch = 2.7 branch = 2.7
[submodule "libraries/parallel"]
path = libraries/parallel
url = ../packages/parallel.git
ignore = untracked
[submodule "libraries/stm"] [submodule "libraries/stm"]
path = libraries/stm path = libraries/stm
url = ../packages/stm.git url = ../packages/stm.git
......
...@@ -1206,9 +1206,6 @@ GIT_COMMIT_ID: ...@@ -1206,9 +1206,6 @@ GIT_COMMIT_ID:
sdist-ghc-prep-tree : VERSION 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 .PHONY: sdist-ghc-prep-tree
sdist-ghc-prep-tree : sdist-ghc-prep-tree :
$(call removeTrees,$(SRC_DIST_GHC_ROOT)) $(call removeTrees,$(SRC_DIST_GHC_ROOT))
...@@ -1223,7 +1220,6 @@ sdist-ghc-prep-tree : ...@@ -1223,7 +1220,6 @@ sdist-ghc-prep-tree :
$(call removeTrees,$(SRC_DIST_GHC_DIR)/libraries/stamp/) $(call removeTrees,$(SRC_DIST_GHC_DIR)/libraries/stamp/)
$(call removeTrees,$(SRC_DIST_GHC_DIR)/compiler/stage[123]) $(call removeTrees,$(SRC_DIST_GHC_DIR)/compiler/stage[123])
$(call removeFiles,$(SRC_DIST_GHC_DIR)/mk/build.mk) $(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) 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. # Add files generated by alex and happy.
......
...@@ -34,7 +34,7 @@ import Control.Monad.Reader ...@@ -34,7 +34,7 @@ import Control.Monad.Reader
import Data.List.Extra import Data.List.Extra
import Data.Maybe import Data.Maybe
import Data.Semigroup import Data.Semigroup
import Development.Shake hiding (parallel, unit, (*>), Normal) import Development.Shake hiding (unit, (*>), Normal)
import Development.Shake.Classes import Development.Shake.Classes
import Development.Shake.FilePath import Development.Shake.FilePath
import Development.Shake.Util import Development.Shake.Util
......
...@@ -6,7 +6,7 @@ module Packages ( ...@@ -6,7 +6,7 @@ module Packages (
filepath, genapply, genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCompact, filepath, genapply, genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCompact,
ghcHeap, ghci, ghcPkg, ghcPrim, ghcSplit, haddock, haskeline, ghcHeap, ghci, ghcPkg, ghcPrim, ghcSplit, haddock, haskeline,
hsc2hs, hp2ps, hpc, hpcBin, integerGmp, integerSimple, iserv, libffi, 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, stm, templateHaskell, terminfo, text, time, timeout, touchy, transformers,
unlit, unix, win32, xhtml, ghcPackages, isGhcPackage, unlit, unix, win32, xhtml, ghcPackages, isGhcPackage,
...@@ -35,7 +35,7 @@ ghcPackages = ...@@ -35,7 +35,7 @@ ghcPackages =
, filepath, genapply, genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCompact , filepath, genapply, genprimopcode, ghc, ghcBoot, ghcBootTh, ghcCompact
, ghcHeap, ghci, ghcPkg, ghcPrim, haddock, haskeline, hsc2hs, hp2ps , ghcHeap, ghci, ghcPkg, ghcPrim, haddock, haskeline, hsc2hs, hp2ps
, hpc, hpcBin, integerGmp, integerSimple, iserv, libffi, libiserv, mtl , 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 , terminfo, text, time, touchy, transformers, unlit, unix, win32, xhtml
, timeout ] , timeout ]
...@@ -82,7 +82,6 @@ libffi = top "libffi" ...@@ -82,7 +82,6 @@ libffi = top "libffi"
libiserv = lib "libiserv" libiserv = lib "libiserv"
mtl = lib "mtl" mtl = lib "mtl"
parsec = lib "parsec" parsec = lib "parsec"
parallel = lib "parallel"
pretty = lib "pretty" pretty = lib "pretty"
primitive = lib "primitive" primitive = lib "primitive"
process = lib "process" process = lib "process"
......
...@@ -68,7 +68,6 @@ prepareTree dest = do ...@@ -68,7 +68,6 @@ prepareTree dest = do
, Test "libraries//ghc.mk" , Test "libraries//ghc.mk"
, Test "libraries//include/Hs*Config.h" , Test "libraries//include/Hs*Config.h"
, Test "libraries/dph" , Test "libraries/dph"
, Test "libraries/parallel"
, Test "libraries/primitive" , Test "libraries/primitive"
, Test "libraries/random" , Test "libraries/random"
, Test "libraries/stm" , Test "libraries/stm"
......
...@@ -135,7 +135,6 @@ testsuitePackages = do ...@@ -135,7 +135,6 @@ testsuitePackages = do
, hp2ps , hp2ps
, hsc2hs , hsc2hs
, iserv , iserv
, parallel
, runGhc , runGhc
, unlit ] ++ , unlit ] ++
[ timeout | win ] [ timeout | win ]
......
Subproject commit 4a04f41b7e2857ab8a09bcb8ed0b346516b0c817
...@@ -65,6 +65,5 @@ libraries/unix - - ssh://g ...@@ -65,6 +65,5 @@ libraries/unix - - ssh://g
libraries/Win32 - - https://github.com/haskell/win32.git libraries/Win32 - - https://github.com/haskell/win32.git
libraries/xhtml - - https://github.com/haskell/xhtml.git libraries/xhtml - - https://github.com/haskell/xhtml.git
nofib nofib - - nofib nofib - -
libraries/parallel extra - ssh://git@github.com/haskell/parallel.git
libraries/stm - - ssh://git@github.com/haskell/stm.git libraries/stm - - ssh://git@github.com/haskell/stm.git
. - ghc.git - . - ghc.git -
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment