Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
270e771d
Commit
270e771d
authored
Dec 05, 2013
by
Mikhail Glushenkov
Browse files
Whitespace, formatting.
parent
fb58429e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Cabal/Distribution/PackageDescription/Configuration.hs
View file @
270e771d
...
...
@@ -488,8 +488,9 @@ instance Monoid PDTagged where
--
finalizePackageDescription
::
FlagAssignment
-- ^ Explicitly specified flag assignments
->
(
Dependency
->
Bool
)
-- ^ Is a given depenency satisfiable from the set of available packages?
-- If this is unknown then use True.
->
(
Dependency
->
Bool
)
-- ^ Is a given depenency satisfiable from the set of
-- available packages? If this is unknown then use
-- True.
->
Platform
-- ^ The 'Arch' and 'OS'
->
CompilerId
-- ^ Compiler + Version
->
[
Dependency
]
-- ^ Additional constraints
...
...
@@ -498,7 +499,8 @@ finalizePackageDescription ::
(
PackageDescription
,
FlagAssignment
)
-- ^ Either missing dependencies or the resolved package
-- description along with the flag assignments chosen.
finalizePackageDescription
userflags
satisfyDep
(
Platform
arch
os
)
impl
constraints
finalizePackageDescription
userflags
satisfyDep
(
Platform
arch
os
)
impl
constraints
(
GenericPackageDescription
pkg
flags
mlib0
exes0
tests0
bms0
)
=
case
resolveFlags
of
Right
((
mlib
,
exes'
,
tests'
,
bms'
),
targetSet
,
flagVals
)
->
...
...
Cabal/Distribution/Simple/Configure.hs
View file @
270e771d
...
...
@@ -769,7 +769,7 @@ newPackageDepsBehaviour pkg =
combinedConstraints
::
[
Dependency
]
->
[(
PackageName
,
InstalledPackageId
)]
->
PackageIndex
->
Either
String
([
Dependency
],
Either
String
([
Dependency
],
Map
PackageName
InstalledPackageInfo
)
combinedConstraints
constraints
dependencies
installedPackages
=
do
...
...
Cabal/Distribution/Simple/Setup.hs
View file @
270e771d
...
...
@@ -310,15 +310,17 @@ data ConfigFlags = ConfigFlags {
configSplitObjs
::
Flag
Bool
,
-- ^Enable -split-objs with GHC
configStripExes
::
Flag
Bool
,
-- ^Enable executable stripping
configConstraints
::
[
Dependency
],
-- ^Additional constraints for
-- dependencies
configDependencies
::
[(
PackageName
,
InstalledPackageId
)],
-- ^The packages depended on
-- dependencies.
configDependencies
::
[(
PackageName
,
InstalledPackageId
)],
-- ^The packages depended on.
configConfigurationsFlags
::
FlagAssignment
,
configTests
::
Flag
Bool
,
-- ^Enable test suite compilation
configBenchmarks
::
Flag
Bool
,
-- ^Enable benchmark compilation
configLibCoverage
::
Flag
Bool
,
-- ^Enable test suite program coverage
configExactConfiguration
::
Flag
Bool
-- ^All direct dependencies and flags are provided on the command line by
-- the user via the '--dependency' and '--flags' options.
configTests
::
Flag
Bool
,
-- ^Enable test suite compilation
configBenchmarks
::
Flag
Bool
,
-- ^Enable benchmark compilation
configLibCoverage
::
Flag
Bool
,
-- ^Enable test suite program coverage.
configExactConfiguration
::
Flag
Bool
-- ^All direct dependencies and flags are provided on the command line by
-- the user via the '--dependency' and '--flags' options.
}
deriving
(
Read
,
Show
)
...
...
@@ -684,10 +686,10 @@ instance Monoid ConfigFlags where
configDependencies
=
mempty
,
configExtraIncludeDirs
=
mempty
,
configConfigurationsFlags
=
mempty
,
configTests
=
mempty
,
configLibCoverage
=
mempty
,
configExactConfiguration
=
mempty
,
configBenchmarks
=
mempty
configTests
=
mempty
,
configLibCoverage
=
mempty
,
configExactConfiguration
=
mempty
,
configBenchmarks
=
mempty
}
mappend
a
b
=
ConfigFlags
{
configPrograms
=
configPrograms
b
,
...
...
@@ -720,10 +722,10 @@ instance Monoid ConfigFlags where
configDependencies
=
combine
configDependencies
,
configExtraIncludeDirs
=
combine
configExtraIncludeDirs
,
configConfigurationsFlags
=
combine
configConfigurationsFlags
,
configTests
=
combine
configTests
,
configLibCoverage
=
combine
configLibCoverage
,
configExactConfiguration
=
combine
configExactConfiguration
,
configBenchmarks
=
combine
configBenchmarks
configTests
=
combine
configTests
,
configLibCoverage
=
combine
configLibCoverage
,
configExactConfiguration
=
combine
configExactConfiguration
,
configBenchmarks
=
combine
configBenchmarks
}
where
combine
field
=
field
a
`
mappend
`
field
b
...
...
cabal-install/Distribution/Client/Configure.hs
View file @
270e771d
...
...
@@ -218,9 +218,9 @@ configurePackage verbosity platform comp scriptOptions configFlags
|
deppkg
<-
deps
],
-- Use '--exact-configuration' if supported.
configExactConfiguration
=
toFlag
True
,
configVerbosity
=
toFlag
verbosity
,
configBenchmarks
=
toFlag
(
BenchStanzas
`
elem
`
stanzas
),
configTests
=
toFlag
(
TestStanzas
`
elem
`
stanzas
)
configVerbosity
=
toFlag
verbosity
,
configBenchmarks
=
toFlag
(
BenchStanzas
`
elem
`
stanzas
),
configTests
=
toFlag
(
TestStanzas
`
elem
`
stanzas
)
}
pkg
=
case
finalizePackageDescription
flags
...
...
cabal-install/Distribution/Client/Install.hs
View file @
270e771d
...
...
@@ -1097,8 +1097,8 @@ installReadyPackage platform comp configFlags
|
deppkg
<-
deps
],
-- Use '--exact-configuration' if supported.
configExactConfiguration
=
toFlag
True
,
configBenchmarks
=
toFlag
False
,
configTests
=
toFlag
(
TestStanzas
`
elem
`
stanzas
)
configBenchmarks
=
toFlag
False
,
configTests
=
toFlag
(
TestStanzas
`
elem
`
stanzas
)
}
source
pkg
pkgoverride
where
pkg
=
case
finalizePackageDescription
flags
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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