Move everything into lib/ to clean up cabal file

jaspervdj · Oct 23, 2023 · 1684420 · 1684420
1 parent 75ced21
commit 1684420
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 33 deletions.
diff --git a/src/Profiteur/Core.hs → lib/Profiteur/Core.hs b/src/Profiteur/Core.hs → lib/Profiteur/Core.hs
diff --git a/src/Profiteur/DataFile/Internal.hs → lib/Profiteur/DataFile/Internal.hs b/src/Profiteur/DataFile/Internal.hs → lib/Profiteur/DataFile/Internal.hs
diff --git a/src/Main.hs → lib/Profiteur/Main.hs b/src/Main.hs → lib/Profiteur/Main.hs
@@ -1,6 +1,6 @@
 --------------------------------------------------------------------------------
 {-# LANGUAGE OverloadedStrings #-}
-module Main
+module Profiteur.Main
     ( main
     ) where
 

diff --git a/src/Profiteur/Parser.hs → lib/Profiteur/Parser.hs b/src/Profiteur/Parser.hs → lib/Profiteur/Parser.hs
diff --git a/src/embed/Profiteur/DataFile.hs → lib/embed/Profiteur/DataFile.hs b/src/embed/Profiteur/DataFile.hs → lib/embed/Profiteur/DataFile.hs
diff --git a/src/noembed/Profiteur/DataFile.hs → lib/noembed/Profiteur/DataFile.hs b/src/noembed/Profiteur/DataFile.hs → lib/noembed/Profiteur/DataFile.hs
diff --git a/profiteur.cabal b/profiteur.cabal
@@ -43,9 +43,10 @@ Source-repository head
 Library
   Default-language: Haskell2010
   Ghc-options:      -Wall
-  Hs-source-dirs:   src
+  Hs-source-dirs:   lib
   Exposed-Modules:
     Profiteur.Core
+    Profiteur.Main
     Profiteur.Parser
   Other-modules:
     Profiteur.DataFile
@@ -56,50 +57,24 @@ Library
     base                 >= 4.8  && < 5,
     bytestring           >= 0.9  && < 0.12,
     containers           >= 0.5  && < 0.7,
+    filepath             >= 1.4  && < 1.5,
     ghc-prof             >= 1.3  && < 1.5,
     js-jquery            >= 3.1  && < 3.4,
     scientific           >= 0.3  && < 0.4,
     text                 >= 0.11 && < 2.1,
     unordered-containers >= 0.2  && < 0.3,
-    vector               >= 0.10 && < 0.13
+    vector               >= 0.10 && < 0.14
   if flag(embed-data-files)
-    Hs-source-dirs: src/embed
+    Hs-source-dirs: lib/embed
     Build-depends:
       file-embed       >= 0.0.10 && < 0.0.12,
       template-haskell
   else
-    Hs-source-dirs: src/noembed
+    Hs-source-dirs: lib/noembed
 
 Executable profiteur
   Default-language: Haskell2010
   Ghc-options:      -Wall
   Hs-source-dirs:   src
   Main-is:          Main.hs
-
-  Other-modules:
-    Profiteur.Core
-    Profiteur.Parser
-    Profiteur.DataFile
-    Profiteur.DataFile.Internal
-    Paths_profiteur
-
-  Build-depends:
-    aeson                >= 0.6  && < 2.2,
-    base                 >= 4.8  && < 5,
-    bytestring           >= 0.9  && < 0.12,
-    containers           >= 0.5  && < 0.7,
-    filepath             >= 1.3  && < 1.5,
-    ghc-prof             >= 1.3  && < 1.5,
-    js-jquery            >= 3.1  && < 3.4,
-    scientific           >= 0.3  && < 0.4,
-    text                 >= 0.11 && < 2.1,
-    unordered-containers >= 0.2  && < 0.3,
-    vector               >= 0.10 && < 0.13
-
-  if flag(embed-data-files)
-    Hs-source-dirs: src/embed
-    Build-depends:
-      file-embed       >= 0.0.10 && < 0.0.12,
-      template-haskell
-  else
-    Hs-source-dirs: src/noembed
+  Build-depends:    base, profiteur