[commit: ghc] ghc-8.0: Switch from -this-package-key to -this-unit-id. (9cebc24)

Tue Jan 19 10:05:49 UTC 2016

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

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/9cebc2457aff5b9ad59ccecacc8df7e1155add7a/ghc

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

commit 9cebc2457aff5b9ad59ccecacc8df7e1155add7a
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Mon Jan 18 17:32:27 2016 +0100

    Switch from -this-package-key to -this-unit-id.

    A small cosmetic change, but we have to do a bit of work to
    actually support it:

        - Cabal submodule update, so that Cabal passes us
          -this-unit-id when we ask for it.  This includes
          a Cabal renaming to be consistent with Unit ID, which
          makes ghc-pkg a bit more scrutable.

        - Build system is updated to use -this-unit-id rather than
          -this-package-key, to avoid deprecation warnings.  Needs
          a version test so I resurrected the old test we had
          (sorry rwbarton!)

        - I've *undeprecated* -package-name, so that we are in the same
          state as GHC 7.10, since the "correct" flag will have only
          entered circulation in GHC 8.0.

        - I removed -package-key.  Since we didn't deprecate -package-id
          I think this should not cause any problems for users; they
          can just change their code to use -package-id.

        - The package database is indexed by UNIT IDs, not component IDs.
          I updated the naming here.

        - I dropped the signatures field from ExposedModule; nothing
          was using it, and instantiatedWith from the package database
          field.

        - ghc-pkg was updated to use unit ID nomenclature, I removed
          the -package-key flags but I decided not to add any new flags
          for now.

    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>

    Test Plan: validate

    Reviewers: austin, hvr, bgamari

    Reviewed By: bgamari

    Subscribers: 23Skidoo, thomie, erikd

    Differential Revision: https://phabricator.haskell.org/D1780

    (cherry picked from commit 240ddd7c39536776e955e881d709bbb039b48513)

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

9cebc2457aff5b9ad59ccecacc8df7e1155add7a
 compiler/ghc.cabal.in                              | 15 ++--
 compiler/main/DynFlags.hs                          | 45 ++++++----
 compiler/main/HscTypes.hs                          |  4 +-
 compiler/main/PackageConfig.hs                     | 18 +---
 compiler/main/Packages.hs                          | 11 +--
 configure.ac                                       |  5 ++
 docs/users_guide/8.0.1-notes.rst                   |  8 ++
 docs/users_guide/packages.rst                      | 17 ++--
 libraries/Cabal                                    |  2 +-
 libraries/base/base.cabal                          |  2 +-
 libraries/ghc-boot/GHC/PackageDb.hs                | 83 +++++++------------
 libraries/ghc-prim/ghc-prim.cabal                  |  2 +-
 libraries/integer-gmp/integer-gmp.cabal            |  2 +-
 libraries/integer-simple/integer-simple.cabal      |  4 +-
 libraries/template-haskell/template-haskell.cabal  |  9 +-
 mk/config.mk.in                                    |  4 +-
 rts/ghc.mk                                         |  6 +-
 rules/distdir-way-opts.mk                          | 12 +--
 testsuite/tests/module/base01/Makefile             |  4 +-
 testsuite/tests/rename/prog006/Makefile            |  2 +-
 testsuite/tests/rename/should_compile/T3103/test.T |  2 +-
 utils/ghc-cabal/Main.hs                            | 14 ++--
 utils/ghc-pkg/Main.hs                              | 95 ++++++++++------------
 utils/mkUserGuidePart/Options/Packages.hs          |  4 +-
 24 files changed, 183 insertions(+), 187 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 9cebc2457aff5b9ad59ccecacc8df7e1155add7a