[commit: ghc] master: Clean up remaining bits related to ghc-cabal (#658) (8dc4f73)

git at git.haskell.org git at git.haskell.org
Tue Oct 23 20:19:01 UTC 2018


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8dc4f73f169a6f7c2efb849df8d3493844ef413c/ghc

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

commit 8dc4f73f169a6f7c2efb849df8d3493844ef413c
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Aug 26 14:46:42 2018 +0100

    Clean up remaining bits related to ghc-cabal (#658)
    
    * Drop ghcCabal package
    * Merge GhcCabal and CabalFlags builders
    * Use more consistent naming
    * Resolve import cycle
    * Rename parseCabal to parseCabalFile
    * Remove outdated references to ghc-cabal from comments


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

8dc4f73f169a6f7c2efb849df8d3493844ef413c
 build.global-db.bat                             |  2 +-
 hadrian.cabal                                   |  6 +-
 src/Builder.hs                                  | 89 +++++++++++-----------
 src/Builder.hs-boot                             |  7 +-
 src/Environment.hs                              |  2 +-
 src/Expression.hs                               |  8 +-
 src/GHC.hs                                      | 25 +++----
 src/GHC/Packages.hs                             |  1 -
 src/Hadrian/Haskell/Cabal.hs                    | 10 +--
 src/Hadrian/Haskell/Cabal/CabalData.hs          | 24 ++++++
 src/Hadrian/Haskell/Cabal/PackageData.hs        |  2 +-
 src/Hadrian/Haskell/Cabal/Parse.hs              | 43 +++++------
 src/Hadrian/Haskell/Cabal/Parse.hs-boot         |  9 ---
 src/Hadrian/Haskell/Cabal/Type.hs               | 23 ------
 src/Hadrian/Oracles/TextFile.hs                 | 99 +++++--------------------
 src/Hadrian/Oracles/TextFile/Rules.hs           | 67 +++++++++++++++++
 src/Hadrian/Oracles/TextFile/Type.hs            | 41 ++++++++++
 src/Rules.hs                                    | 10 +--
 src/Rules/Configure.hs                          |  2 +
 src/Rules/Documentation.hs                      | 33 ++++-----
 src/Rules/Gmp.hs                                |  4 +-
 src/Rules/Program.hs                            | 19 ++---
 src/Rules/Register.hs                           |  2 +-
 src/Settings/Builders/{GhcCabal.hs => Cabal.hs} | 28 +++----
 src/Settings/Builders/GhcPkg.hs                 |  2 +-
 src/Settings/Default.hs                         |  4 +-
 src/Settings/Packages.hs                        | 30 ++++----
 27 files changed, 306 insertions(+), 286 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 8dc4f73f169a6f7c2efb849df8d3493844ef413c


More information about the ghc-commits mailing list