Reorganize shared modules

DanielG · May 17, 2017 · 6404178 · 6404178
1 parent 4f7a675
commit 6404178
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/Data/Binary/Generic.hs → core/Data/Binary/Generic.hs b/Data/Binary/Generic.hs → core/Data/Binary/Generic.hs
diff --git 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
@@ -215,7 +215,7 @@ Executable ghc-mod
   Default-Language:     Haskell2010
   Main-Is:              GHCModWrapper.hs
   Other-Modules:        Paths_ghc_mod
-  HS-Source-Dirs:       src, .
+  HS-Source-Dirs:       ., src, shared
   GHC-Options:          -Wall
   Build-Depends:        base      < 5 && >= 4.0
                       , directory < 1.4
@@ -237,7 +237,7 @@ Executable ghc-mod-real
                       , 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]
@@ -268,7 +268,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 → shared/System/Directory/ModTime.hs b/System/Directory/ModTime.hs → shared/System/Directory/ModTime.hs
diff --git a/Utils.hs → shared/Utils.hs b/Utils.hs → shared/Utils.hs
diff --git 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"