[commit: packages/Cabal] ghc-head: Rename 'extra-html-files' to 'extra-doc-files'. (4502e90)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/Cabal

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=4502e9014c0c7453f62503fc8e4560728a91f1ba

>---------------------------------------------------------------

commit 4502e9014c0c7453f62503fc8e4560728a91f1ba
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Wed Aug 21 10:18:25 2013 +0200

    Rename 'extra-html-files' to 'extra-doc-files'.


>---------------------------------------------------------------

4502e9014c0c7453f62503fc8e4560728a91f1ba
 Cabal/Distribution/PackageDescription.hs       |    4 ++--
 Cabal/Distribution/PackageDescription/Check.hs |   10 +++++-----
 Cabal/Distribution/PackageDescription/Parse.hs |    4 ++--
 Cabal/Distribution/Simple/Haddock.hs           |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cabal/Distribution/PackageDescription.hs b/Cabal/Distribution/PackageDescription.hs
index 8abce0f..585506b 100644
--- a/Cabal/Distribution/PackageDescription.hs
+++ b/Cabal/Distribution/PackageDescription.hs
@@ -195,7 +195,7 @@ data PackageDescription
         dataDir        :: FilePath,
         extraSrcFiles  :: [FilePath],
         extraTmpFiles  :: [FilePath],
-        extraHtmlFiles :: [FilePath]
+        extraDocFiles  :: [FilePath]
     }
     deriving (Show, Read, Eq, Typeable, Data)
 
@@ -259,7 +259,7 @@ emptyPackageDescription
                       dataDir      = "",
                       extraSrcFiles = [],
                       extraTmpFiles = [],
-                      extraHtmlFiles = []
+                      extraDocFiles = []
                      }
 
 -- | The type of build system used by this package.
diff --git a/Cabal/Distribution/PackageDescription/Check.hs b/Cabal/Distribution/PackageDescription/Check.hs
index 067d0fe..48d2a18 100644
--- a/Cabal/Distribution/PackageDescription/Check.hs
+++ b/Cabal/Distribution/PackageDescription/Check.hs
@@ -852,11 +852,11 @@ checkPaths pkg =
       _            -> False
     -- paths that must be relative
     relPaths =
-         [ (path, "extra-src-files")  | path <- extraSrcFiles  pkg ]
-      ++ [ (path, "extra-tmp-files")  | path <- extraTmpFiles  pkg ]
-      ++ [ (path, "extra-html-files") | path <- extraHtmlFiles pkg ]
-      ++ [ (path, "data-files")       | path <- dataFiles      pkg ]
-      ++ [ (path, "data-dir")         | path <- [dataDir       pkg]]
+         [ (path, "extra-src-files") | path <- extraSrcFiles pkg ]
+      ++ [ (path, "extra-tmp-files") | path <- extraTmpFiles pkg ]
+      ++ [ (path, "extra-doc-files") | path <- extraDocFiles pkg ]
+      ++ [ (path, "data-files")      | path <- dataFiles     pkg ]
+      ++ [ (path, "data-dir")        | path <- [dataDir      pkg]]
       ++ concat
          [    [ (path, "c-sources")        | path <- cSources        bi ]
            ++ [ (path, "install-includes") | path <- installIncludes bi ]
diff --git a/Cabal/Distribution/PackageDescription/Parse.hs b/Cabal/Distribution/PackageDescription/Parse.hs
index 2d1c153..facb42e 100644
--- a/Cabal/Distribution/PackageDescription/Parse.hs
+++ b/Cabal/Distribution/PackageDescription/Parse.hs
@@ -174,9 +174,9 @@ pkgDescrFieldDescrs =
  , listField "extra-tmp-files"
            showFilePath       parseFilePathQ
            extraTmpFiles          (\val pkg -> pkg{extraTmpFiles=val})
- , listField "extra-html-files"
+ , listField "extra-doc-files"
            showFilePath    parseFilePathQ
-           extraHtmlFiles         (\val pkg -> pkg{extraHtmlFiles=val})
+           extraDocFiles          (\val pkg -> pkg{extraDocFiles=val})
  ]
 
 -- | Store any fields beginning with "x-" in the customFields field of
diff --git a/Cabal/Distribution/Simple/Haddock.hs b/Cabal/Distribution/Simple/Haddock.hs
index 2cc30e3..86cd174 100644
--- a/Cabal/Distribution/Simple/Haddock.hs
+++ b/Cabal/Distribution/Simple/Haddock.hs
@@ -237,7 +237,7 @@ haddock pkg_descr lbi suffixes flags = do
         CTest  _ -> when (flag haddockTestSuites)  $ doExe comp
         CBench _ -> when (flag haddockBenchmarks)  $ doExe comp
 
-    forM_ (extraHtmlFiles pkg_descr) $ \ fpath -> do
+    forM_ (extraDocFiles pkg_descr) $ \ fpath -> do
       files <- matchFileGlob fpath
       forM_ files $ copyFileTo verbosity (unDir $ argOutputDir commonArgs)
   where