[commit: ghc] wip/prettyprinter: Port to prettyprinter proper (6f2ed20)

[git at git.haskell.org]

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

On branch  : wip/prettyprinter
Link       : http://ghc.haskell.org/trac/ghc/changeset/6f2ed20463366ff3235691e4a2c0106313e0c39f/ghc

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

commit 6f2ed20463366ff3235691e4a2c0106313e0c39f
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Sep 12 06:32:10 2017 -0400

    Port to prettyprinter proper


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

6f2ed20463366ff3235691e4a2c0106313e0c39f
 .gitmodules             | 3 +++
 ghc.mk                  | 7 +++++--
 libraries/prettyprinter | 1 +
 packages                | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 0ed88ab..9bf1d27 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -136,3 +136,6 @@
 [submodule "libraries/prettyprinter-core"]
 	path = libraries/prettyprinter-core
 	url = https://github.com/bollu/prettyprinter-core.git
+[submodule "libraries/prettyprinter"]
+	path = libraries/prettyprinter
+	url = git at github.com:quchen/prettyprinter.git
diff --git a/ghc.mk b/ghc.mk
index 8d44590..7b7304a 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -420,7 +420,10 @@ else # CLEANING
 # programs such as GHC and ghc-pkg, that we do not assume the stage0
 # compiler already has installed (or up-to-date enough).
 
-PACKAGES_STAGE0 = binary text transformers mtl parsec Cabal/Cabal hpc ghc-boot-th ghc-boot template-haskell ghci prettyprinter-core
+PACKAGES_STAGE0 = \
+    binary text transformers mtl parsec Cabal/Cabal hpc ghc-boot-th ghc-boot template-haskell ghci \
+    prettyprinter/prettyprinter
+
 ifeq "$(Windows_Host)" "NO"
 PACKAGES_STAGE0 += terminfo
 endif
@@ -459,7 +462,7 @@ PACKAGES_STAGE1 += ghc-boot-th
 PACKAGES_STAGE1 += ghc-boot
 PACKAGES_STAGE1 += template-haskell
 PACKAGES_STAGE1 += ghc-compact
-PACKAGES_STAGE1 += prettyprinter-core
+PACKAGES_STAGE1 += prettyprinter/prettyprinter
 
 ifeq "$(HADDOCK_DOCS)" "YES"
 PACKAGES_STAGE1 += xhtml
diff --git a/libraries/prettyprinter b/libraries/prettyprinter
new file mode 160000
index 0000000..973be20
--- /dev/null
+++ b/libraries/prettyprinter
@@ -0,0 +1 @@
+Subproject commit 973be208c28f0ec34c9cf7874bea9718996db776
diff --git a/packages b/packages
index 62a3373..b219e7f 100644
--- a/packages
+++ b/packages
@@ -41,7 +41,7 @@ ghc-tarballs                 windows     ghc-tarballs.git                -
 libffi-tarballs              -           -                               -
 utils/hsc2hs                 -           -                               -
 utils/haddock                -           -                               ssh://git@github.com/haskell/haddock.git
-libraries/prettyprinter-core -           -                               https://github.com/bollu/prettyprinter-core.git
+libraries/prettyprinter/prettyprinter -  -                               https://github.com/quchen/prettyprinter.git
 libraries/array              -           -                               -
 libraries/binary             -           -                               https://github.com/kolmodin/binary.git
 libraries/bytestring         -           -                               https://github.com/haskell/bytestring.git