Structural reorganizations:

* Export all modules. * Make executable builds depend on library in cabal file. * Moved library files to src/ directory.
jgm · Aug 19, 2015 · e508602 · e508602
1 parent 454e8bb
commit e508602
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 26 deletions.
diff --git a/gitit.cabal b/gitit.cabal
@@ -1,6 +1,6 @@
 name:                gitit
-version:             0.11.1.1
-Cabal-version:       >= 1.6
+version:             0.12
+Cabal-version:       >= 1.8
 build-type:          Simple
 synopsis:            Wiki using happstack, git or darcs, and pandoc.
 description:         Gitit is a wiki backed by a git, darcs, or mercurial
@@ -114,46 +114,33 @@ Flag plugins
   default:           True
 
 Library
-  hs-source-dirs:    .
+  hs-source-dirs:    src
   exposed-modules:   Network.Gitit, Network.Gitit.ContentTransformer,
                      Network.Gitit.Types, Network.Gitit.Framework,
                      Network.Gitit.Initialize, Network.Gitit.Config,
                      Network.Gitit.Layout, Network.Gitit.Authentication,
-                     Network.Gitit.Authentication.Github
-  other-modules:     Network.Gitit.Cache, Network.Gitit.State,
-                     Paths_gitit, Network.Gitit.Server, Network.Gitit.Export,
-                     Network.Gitit.Util, Network.Gitit.Handlers,
+                     Network.Gitit.Authentication.Github,
+                     Network.Gitit.Util, Network.Gitit.Server
+                     Network.Gitit.Cache, Network.Gitit.State,
+                     Paths_gitit, Network.Gitit.Export,
+                     Network.Gitit.Handlers,
                      Network.Gitit.Plugins, Network.Gitit.Rpxnow,
                      Network.Gitit.Page, Network.Gitit.Feed,
                      Network.Gitit.Compat.Except
-  if flag(plugins)
-    exposed-modules: Network.Gitit.Interface
-    build-depends:   ghc, ghc-paths
-    cpp-options:     -D_PLUGINS
-  build-depends:     base >= 3, pandoc >= 1.12.4 && < 1.16,
-                     pandoc-types >= 1.12.3 && < 1.13, filepath, safe
-  extensions:        CPP
-  if impl(ghc >= 6.12)
-    ghc-options:     -Wall -fno-warn-unused-do-bind
-  else
-    ghc-options:     -Wall
-  ghc-prof-options:  -fprof-auto-exported -rtsopts
-
-Executable           gitit
-  hs-source-dirs:    .
-  main-is:           gitit.hs
-  build-depends:     base >=3 && < 5,
+  build-depends:     base >= 3 && < 5,
+                     filepath,
+                     safe,
                      parsec,
                      pretty,
                      xhtml,
                      containers,
-                     pandoc >= 1.12.4 && < 1.16,
-                     pandoc-types >= 1.12.3 && < 1.13,
                      process,
                      filepath,
                      directory,
                      mtl,
                      old-time,
+                     pandoc >= 1.12.4 && < 1.16,
+                     pandoc-types >= 1.12.3 && < 1.13,
                      highlighting-kate >= 0.5.0.1 && < 0.7,
                      bytestring,
                      text,
@@ -192,9 +179,31 @@ Executable           gitit
   else
     build-depends:   network >= 2 && < 2.6
   if flag(plugins)
+    exposed-modules: Network.Gitit.Interface
     build-depends:   ghc, ghc-paths
     cpp-options:     -D_PLUGINS
   extensions:        CPP
+  if impl(ghc >= 6.12)
+    ghc-options:     -Wall -fno-warn-unused-do-bind
+  else
+    ghc-options:     -Wall
+  ghc-prof-options:  -fprof-auto-exported -rtsopts
+
+Executable           gitit
+  hs-source-dirs:    .
+  main-is:           gitit.hs
+  build-depends:     base >=3 && < 5,
+                     gitit,
+                     mtl,
+                     hslogger,
+                     bytestring,
+                     utf8-string,
+                     directory
+  if flag(network-uri)
+    build-depends:   network-uri >= 2.6 && < 2.7, network >= 2.6
+  else
+    build-depends:   network >= 2 && < 2.6
+  extensions:        CPP
   if impl(ghc >= 6.12)
     ghc-options:     -Wall -threaded -fno-warn-unused-do-bind
   else
@@ -205,6 +214,10 @@ Executable           expireGititCache
   hs-source-dirs:    .
   main-is:           expireGititCache.hs
   build-depends:     base >=3 && < 5, HTTP, url, filepath
+  if flag(network-uri)
+    build-depends:   network-uri >= 2.6 && < 2.7, network >= 2.6
+  else
+    build-depends:   network >= 2 && < 2.6
   if impl(ghc >= 6.10)
     build-depends:   base >= 4, syb
   ghc-options:       -Wall

diff --git a/Network/Gitit.hs → src/Network/Gitit.hs b/Network/Gitit.hs → src/Network/Gitit.hs
diff --git a/Network/Gitit/Authentication.hs → src/Network/Gitit/Authentication.hs b/Network/Gitit/Authentication.hs → src/Network/Gitit/Authentication.hs
diff --git a/Network/Gitit/Authentication/Github.hs → src/Network/Gitit/Authentication/Github.hs b/Network/Gitit/Authentication/Github.hs → src/Network/Gitit/Authentication/Github.hs
diff --git a/Network/Gitit/Cache.hs → src/Network/Gitit/Cache.hs b/Network/Gitit/Cache.hs → src/Network/Gitit/Cache.hs
diff --git a/Network/Gitit/Compat/Except.hs → src/Network/Gitit/Compat/Except.hs b/Network/Gitit/Compat/Except.hs → src/Network/Gitit/Compat/Except.hs
diff --git a/Network/Gitit/Config.hs → src/Network/Gitit/Config.hs b/Network/Gitit/Config.hs → src/Network/Gitit/Config.hs
diff --git a/Network/Gitit/ContentTransformer.hs → src/Network/Gitit/ContentTransformer.hs b/Network/Gitit/ContentTransformer.hs → src/Network/Gitit/ContentTransformer.hs
diff --git a/Network/Gitit/Export.hs → src/Network/Gitit/Export.hs b/Network/Gitit/Export.hs → src/Network/Gitit/Export.hs
diff --git a/Network/Gitit/Feed.hs → src/Network/Gitit/Feed.hs b/Network/Gitit/Feed.hs → src/Network/Gitit/Feed.hs
diff --git a/Network/Gitit/Framework.hs → src/Network/Gitit/Framework.hs b/Network/Gitit/Framework.hs → src/Network/Gitit/Framework.hs
diff --git a/Network/Gitit/Handlers.hs → src/Network/Gitit/Handlers.hs b/Network/Gitit/Handlers.hs → src/Network/Gitit/Handlers.hs
diff --git a/Network/Gitit/Initialize.hs → src/Network/Gitit/Initialize.hs b/Network/Gitit/Initialize.hs → src/Network/Gitit/Initialize.hs
diff --git a/Network/Gitit/Interface.hs → src/Network/Gitit/Interface.hs b/Network/Gitit/Interface.hs → src/Network/Gitit/Interface.hs
diff --git a/Network/Gitit/Layout.hs → src/Network/Gitit/Layout.hs b/Network/Gitit/Layout.hs → src/Network/Gitit/Layout.hs
diff --git a/Network/Gitit/Page.hs → src/Network/Gitit/Page.hs b/Network/Gitit/Page.hs → src/Network/Gitit/Page.hs
diff --git a/Network/Gitit/Plugins.hs → src/Network/Gitit/Plugins.hs b/Network/Gitit/Plugins.hs → src/Network/Gitit/Plugins.hs
diff --git a/Network/Gitit/Rpxnow.hs → src/Network/Gitit/Rpxnow.hs b/Network/Gitit/Rpxnow.hs → src/Network/Gitit/Rpxnow.hs
diff --git a/Network/Gitit/Server.hs → src/Network/Gitit/Server.hs b/Network/Gitit/Server.hs → src/Network/Gitit/Server.hs
diff --git a/Network/Gitit/State.hs → src/Network/Gitit/State.hs b/Network/Gitit/State.hs → src/Network/Gitit/State.hs
diff --git a/Network/Gitit/Types.hs → src/Network/Gitit/Types.hs b/Network/Gitit/Types.hs → src/Network/Gitit/Types.hs
diff --git a/Network/Gitit/Util.hs → src/Network/Gitit/Util.hs b/Network/Gitit/Util.hs → src/Network/Gitit/Util.hs