Add "tool-depends" field to BuildInfo and parse it (with caveat)

haskell#3708 says that an entry without an explicit exe component is shorthand for all exe components, but this complicates parsing so I'm punting for now: an explicit component name is required.
Ericson2314 · Nov 14, 2016 · 721f422 · 721f422
1 parent 56ef995
commit 721f422
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/Cabal/Distribution/PackageDescription/Parse.hs b/Cabal/Distribution/PackageDescription/Parse.hs
@@ -411,6 +411,9 @@ binfoFieldDescrs =
  , commaListField  "build-tools"
            disp               parse
            buildTools         (\xs  binfo -> binfo{buildTools=xs})
+ , commaListField  "tool-depends"
+           disp               parse
+           toolDepends        (\xs  binfo -> binfo{toolDepends=xs})
  , commaListFieldWithSep vcat "build-depends"
            disp                   parse
            targetBuildDepends (\xs binfo -> binfo{targetBuildDepends=xs})

diff --git a/Cabal/Distribution/PackageDescription/Parsec/FieldDescr.hs b/Cabal/Distribution/PackageDescription/Parsec/FieldDescr.hs
@@ -417,6 +417,9 @@ binfoFieldDescrs =
  , commaListField  "build-tools"
            disp               parsec
            buildTools         (\xs  binfo -> binfo{buildTools=xs})
+ , commaListField  "tool-depends"
+           disp               parsec
+           toolDepends        (\xs  binfo -> binfo{toolDepends=xs})
  , commaListFieldWithSep vcat "build-depends"
        disp               parsec
        targetBuildDepends (\xs binfo -> binfo{targetBuildDepends=xs})

diff --git a/Cabal/Distribution/Types/BuildInfo.hs b/Cabal/Distribution/Types/BuildInfo.hs
@@ -30,6 +30,7 @@ import Language.Haskell.Extension
 data BuildInfo = BuildInfo {
         buildable         :: Bool,      -- ^ component is buildable here
         buildTools        :: [LegacyExeDependency], -- ^ tools needed to build this bit
+        toolDepends       :: [ExeDependency], -- ^ haskell tools needed to build this bit
         cppOptions        :: [String],  -- ^ options for pre-processing Haskell code
         ccOptions         :: [String],  -- ^ options for C compiler
         ldOptions         :: [String],  -- ^ options for linker
@@ -71,6 +72,7 @@ instance Monoid BuildInfo where
   mempty = BuildInfo {
     buildable           = True,
     buildTools          = [],
+    toolDepends         = [],
     cppOptions          = [],
     ccOptions           = [],
     ldOptions           = [],
@@ -106,6 +108,7 @@ instance Semigroup BuildInfo where
   a <> b = BuildInfo {
     buildable           = buildable a && buildable b,
     buildTools          = combine    buildTools,
+    toolDepends         = combine    toolDepends,
     cppOptions          = combine    cppOptions,
     ccOptions           = combine    ccOptions,
     ldOptions           = combine    ldOptions,