Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
9f6f8449
Commit
9f6f8449
authored
Sep 09, 2016
by
Duncan Coutts
Browse files
Correct the spelling of dependencies in multiple places
parent
34cc46ff
Changes
5
Hide whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Client/CmdRepl.hs
View file @
9f6f8449
...
...
@@ -86,7 +86,7 @@ replAction (configFlags, configExFlags, installFlags, haddockFlags)
ReplDefaultComponent
ReplSpecificComponent
userTargets
False
-- onlyDepen
c
encies, always False for repl
False
-- onlyDepen
d
encies, always False for repl
elaboratedPlan
--TODO: [required eventually] reject multiple targets, or at least
-- targets spanning multiple components. ie it's ok to have two
...
...
cabal-install/Distribution/Client/InstallPlan.hs
View file @
9f6f8449
...
...
@@ -311,7 +311,7 @@ lookup :: (IsUnit ipkg, IsUnit srcpkg)
->
Maybe
(
GenericPlanPackage
ipkg
srcpkg
)
lookup
plan
pkgid
=
Graph
.
lookup
pkgid
(
planIndex
plan
)
-- | Find all the direct depen
c
encies of the given package.
-- | Find all the direct depen
d
encies of the given package.
--
-- Note that the package must exist in the plan or it is an error.
--
...
...
@@ -323,7 +323,7 @@ directDeps plan pkgid =
Just
deps
->
deps
Nothing
->
internalError
"directDeps: package not in graph"
-- | Find all the direct reverse depen
c
encies of the given package.
-- | Find all the direct reverse depen
d
encies of the given package.
--
-- Note that the package must exist in the plan or it is an error.
--
...
...
@@ -342,7 +342,7 @@ revDirectDeps plan pkgid =
-- | Return all the packages in the 'InstallPlan' in reverse topological order.
-- That is, for each package, all depen
c
encies of the package appear first.
-- That is, for each package, all depen
d
encies of the package appear first.
--
-- Compared to 'executionOrder', this function returns all the installed and
-- source packages rather than just the source ones. Also, while both this
...
...
cabal-install/Distribution/Client/ProjectBuilding.hs
View file @
9f6f8449
...
...
@@ -194,7 +194,7 @@ data BuildStatusRebuild =
|
BuildStatusBuild
(
Maybe
(
Maybe
InstalledPackageInfo
))
BuildReason
data
BuildReason
=
-- | The depen
c
encies of this package have been (re)built so the build
-- | The depen
d
encies of this package have been (re)built so the build
-- phase needs to be rerun.
--
-- The optional registration info here tells us if we've registered the
...
...
@@ -325,10 +325,10 @@ rebuildTargetsDryRun verbosity distDirLayout@DistDirLayout{..} shared = \install
-- | A specialised traversal over the packages in an install plan.
--
-- The packages are visited in dependency order, starting with packages with no
-- depen
c
encies. The result for each package is accumulated into a 'Map' and
-- depen
d
encies. The result for each package is accumulated into a 'Map' and
-- returned as the final result. In addition, when visting a package, the
-- visiting function is passed the results for all the immediate package
-- depen
c
encies. This can be used to propagate information from depen
c
encies.
-- depen
d
encies. This can be used to propagate information from depen
d
encies.
--
foldMInstallPlanDepOrder
::
forall
m
ipkg
srcpkg
b
.
...
...
@@ -480,7 +480,7 @@ checkPackageFileMonitorChanged PackageFileMonitor{..}
MonitorUnchanged
()
_
-- The configChanged here includes the identity of the dependencies,
-- so depsBuildStatus is just needed for the changes in the content
-- of depen
c
encies.
-- of depen
d
encies.
|
any
buildStatusRequiresBuild
depsBuildStatus
->
do
regChanged
<-
checkFileMonitorChanged
pkgFileMonitorReg
srcdir
()
let
mreg
=
changedToMaybe
regChanged
...
...
cabal-install/Distribution/Client/ProjectOrchestration.hs
View file @
9f6f8449
...
...
@@ -273,7 +273,7 @@ selectTargets :: Verbosity -> PackageTarget
->
ElaboratedInstallPlan
->
IO
ElaboratedInstallPlan
selectTargets
verbosity
targetDefaultComponents
targetSpecificComponent
userBuildTargets
onlyDepen
c
encies
installPlan
=
do
userBuildTargets
onlyDepen
d
encies
installPlan
=
do
-- Match the user targets against the available targets. If no targets are
-- given this uses the package in the current directory, if any.
...
...
@@ -306,7 +306,7 @@ selectTargets verbosity targetDefaultComponents targetSpecificComponent
--
let
installPlan'
=
pruneInstallPlanToTargets
buildTargets'
installPlan
if
onlyDepen
c
encies
if
onlyDepen
d
encies
then
either
throwIO
return
$
pruneInstallPlanToDependencies
(
Map
.
keysSet
buildTargets'
)
installPlan'
...
...
cabal-install/Distribution/Solver/Modular/Preference.hs
View file @
9f6f8449
...
...
@@ -333,7 +333,7 @@ preferBaseGoalChoice = trav go
isBase
_
=
False
-- | Deal with setup dependencies after regular dependencies, so that we can
-- will link setup depen
c
encies against package dependencies when possible
-- will link setup depen
d
encies against package dependencies when possible
deferSetupChoices
::
Tree
a
->
Tree
a
deferSetupChoices
=
trav
go
where
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment