Reorganize shared modules

2017-05-18 02:40:21 +02:00 · 2017-05-18 02:40:21 +02:00 · dc0a161925
parent 3572b720d1
commit dc0a161925
5 changed files with 4 additions and 3 deletions
--- a/core/Data/Binary/Generic.hs
+++ b/core/Data/Binary/Generic.hs
--- 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
--- a/shared/System/Directory/ModTime.hs
+++ b/shared/System/Directory/ModTime.hs
--- a/shared/Utils.hs
+++ b/shared/Utils.hs
--- 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"