From dc0a16192546a40728852aa928ff9da15e96446d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= <dxld@darkboxed.org>
Date: Thu, 18 May 2017 02:40:21 +0200
Subject: [PATCH] Reorganize shared modules

---
 {Data => core/Data}/Binary/Generic.hs          | 0
 ghc-mod.cabal                                  | 6 +++---
 {System => shared/System}/Directory/ModTime.hs | 0
 Utils.hs => shared/Utils.hs                    | 0
 test/doctests.hs                               | 1 +
 5 files changed, 4 insertions(+), 3 deletions(-)
 rename {Data => core/Data}/Binary/Generic.hs (100%)
 rename {System => shared/System}/Directory/ModTime.hs (100%)
 rename Utils.hs => shared/Utils.hs (100%)

diff --git a/Data/Binary/Generic.hs b/core/Data/Binary/Generic.hs
similarity index 100%
rename from Data/Binary/Generic.hs
rename to core/Data/Binary/Generic.hs
diff --git a/ghc-mod.cabal b/ghc-mod.cabal
index 3835ff4..fbe6ef6 100644
--- a/ghc-mod.cabal
+++ b/ghc-mod.cabal
@@ -107,7 +107,7 @@ Library
   Default-Extensions:   ScopedTypeVariables, RecordWildCards, NamedFieldPuns,
                         ConstraintKinds, FlexibleContexts,
                         DataKinds, KindSignatures, TypeOperators, ViewPatterns
-  HS-Source-Dirs:       ., core
+  HS-Source-Dirs:       ., core, shared
   Exposed-Modules:
                         GhcMod
                         GhcModExe.Boot
@@ -221,7 +221,7 @@ Executable ghc-mod
                       , GHCMod.Options.ShellParse
   GHC-Options:          -Wall -fno-warn-deprecations -threaded
   Default-Extensions:   ConstraintKinds, FlexibleContexts
-  HS-Source-Dirs:       src
+  HS-Source-Dirs:       src, shared
   X-Internal:           True
   Build-Depends:
                       -- See Note [GHC Boot libraries]
@@ -251,7 +251,7 @@ Executable ghc-modi
   if os(windows)
       Cpp-Options:      -DWINDOWS
   Default-Extensions:   ConstraintKinds, FlexibleContexts
-  HS-Source-Dirs:       src, .
+  HS-Source-Dirs:       ., src, shared
   Build-Depends:
                       -- See Note [GHC Boot libraries]
                         base
diff --git a/System/Directory/ModTime.hs b/shared/System/Directory/ModTime.hs
similarity index 100%
rename from System/Directory/ModTime.hs
rename to shared/System/Directory/ModTime.hs
diff --git a/Utils.hs b/shared/Utils.hs
similarity index 100%
rename from Utils.hs
rename to shared/Utils.hs
diff --git a/test/doctests.hs b/test/doctests.hs
index 34c26af..a85e0ee 100644
--- a/test/doctests.hs
+++ b/test/doctests.hs
@@ -16,6 +16,7 @@ main = do
      , "-XScopedTypeVariables", "-XRecordWildCards", "-XNamedFieldPuns", "-XConstraintKinds", "-XFlexibleContexts", "-XDataKinds", "-XKindSignatures", "-XTypeOperators", "-XViewPatterns"
      , "-i" ++ distdir ++ "/build/autogen/"
      , "-icore/"
+     , "-ishared"
 --     , "-optP-include"
 --     , "-optP" ++ distdir ++ "/build/autogen/cabal_macros.h"
      , "GhcMod.hs"