Move src/ to lib/, put Init.hs in src/

jaspervdj · Jun 19, 2017 · 67ecff7 · 67ecff7
1 parent 2df3209
commit 67ecff7
Show file tree

Hide file tree

Showing 53 changed files with 21 additions and 1 deletion.
diff --git a/hakyll.cabal b/hakyll.cabal
@@ -96,7 +96,7 @@ Flag checkExternal
 
 Library
   Ghc-Options:    -Wall
-  Hs-Source-Dirs: src
+  Hs-Source-Dirs: lib
 
   Exposed-Modules:
     Hakyll
@@ -222,6 +222,25 @@ Test-suite hakyll-tests
   Main-is:        TestSuite.hs
   Ghc-options:    -Wall
 
+  Other-modules:
+    Hakyll.Core.Dependencies.Tests
+    Hakyll.Core.Identifier.Tests
+    Hakyll.Core.Provider.Metadata.Tests
+    Hakyll.Core.Provider.Tests
+    Hakyll.Core.Routes.Tests
+    Hakyll.Core.Rules.Tests
+    Hakyll.Core.Runtime.Tests
+    Hakyll.Core.Store.Tests
+    Hakyll.Core.UnixFilter.Tests
+    Hakyll.Core.Util.String.Tests
+    Hakyll.Web.CompressCss.Tests
+    Hakyll.Web.Html.RelativizeUrls.Tests
+    Hakyll.Web.Html.Tests
+    Hakyll.Web.Pandoc.FileType.Tests
+    Hakyll.Web.Template.Context.Tests
+    Hakyll.Web.Template.Tests
+    TestSuite.Util
+
   Build-Depends:
     hakyll,
     QuickCheck                 >= 2.8  && < 2.11,
@@ -289,6 +308,7 @@ Test-suite hakyll-tests
 
 Executable hakyll-init
   Ghc-options:    -Wall
+  Hs-source-dirs: src
   Main-is:        Init.hs
 
   Build-depends:

diff --git a/src/Data/List/Extended.hs → lib/Data/List/Extended.hs b/src/Data/List/Extended.hs → lib/Data/List/Extended.hs
diff --git a/src/Data/Yaml/Extended.hs → lib/Data/Yaml/Extended.hs b/src/Data/Yaml/Extended.hs → lib/Data/Yaml/Extended.hs
diff --git a/src/Hakyll.hs → lib/Hakyll.hs b/src/Hakyll.hs → lib/Hakyll.hs
diff --git a/src/Hakyll/Check.hs → lib/Hakyll/Check.hs b/src/Hakyll/Check.hs → lib/Hakyll/Check.hs
diff --git a/src/Hakyll/Commands.hs → lib/Hakyll/Commands.hs b/src/Hakyll/Commands.hs → lib/Hakyll/Commands.hs
diff --git a/src/Hakyll/Core/Compiler.hs → lib/Hakyll/Core/Compiler.hs b/src/Hakyll/Core/Compiler.hs → lib/Hakyll/Core/Compiler.hs
diff --git a/src/Hakyll/Core/Compiler/Internal.hs → lib/Hakyll/Core/Compiler/Internal.hs b/src/Hakyll/Core/Compiler/Internal.hs → lib/Hakyll/Core/Compiler/Internal.hs
diff --git a/src/Hakyll/Core/Compiler/Require.hs → lib/Hakyll/Core/Compiler/Require.hs b/src/Hakyll/Core/Compiler/Require.hs → lib/Hakyll/Core/Compiler/Require.hs
diff --git a/src/Hakyll/Core/Configuration.hs → lib/Hakyll/Core/Configuration.hs b/src/Hakyll/Core/Configuration.hs → lib/Hakyll/Core/Configuration.hs
diff --git a/src/Hakyll/Core/Dependencies.hs → lib/Hakyll/Core/Dependencies.hs b/src/Hakyll/Core/Dependencies.hs → lib/Hakyll/Core/Dependencies.hs
diff --git a/src/Hakyll/Core/File.hs → lib/Hakyll/Core/File.hs b/src/Hakyll/Core/File.hs → lib/Hakyll/Core/File.hs
diff --git a/src/Hakyll/Core/Identifier.hs → lib/Hakyll/Core/Identifier.hs b/src/Hakyll/Core/Identifier.hs → lib/Hakyll/Core/Identifier.hs
diff --git a/src/Hakyll/Core/Identifier/Pattern.hs → lib/Hakyll/Core/Identifier/Pattern.hs b/src/Hakyll/Core/Identifier/Pattern.hs → lib/Hakyll/Core/Identifier/Pattern.hs
diff --git a/src/Hakyll/Core/Item.hs → lib/Hakyll/Core/Item.hs b/src/Hakyll/Core/Item.hs → lib/Hakyll/Core/Item.hs
diff --git a/src/Hakyll/Core/Item/SomeItem.hs → lib/Hakyll/Core/Item/SomeItem.hs b/src/Hakyll/Core/Item/SomeItem.hs → lib/Hakyll/Core/Item/SomeItem.hs
diff --git a/src/Hakyll/Core/Logger.hs → lib/Hakyll/Core/Logger.hs b/src/Hakyll/Core/Logger.hs → lib/Hakyll/Core/Logger.hs
diff --git a/src/Hakyll/Core/Metadata.hs → lib/Hakyll/Core/Metadata.hs b/src/Hakyll/Core/Metadata.hs → lib/Hakyll/Core/Metadata.hs
diff --git a/src/Hakyll/Core/Provider.hs → lib/Hakyll/Core/Provider.hs b/src/Hakyll/Core/Provider.hs → lib/Hakyll/Core/Provider.hs
diff --git a/src/Hakyll/Core/Provider/Internal.hs → lib/Hakyll/Core/Provider/Internal.hs b/src/Hakyll/Core/Provider/Internal.hs → lib/Hakyll/Core/Provider/Internal.hs
diff --git a/src/Hakyll/Core/Provider/Metadata.hs → lib/Hakyll/Core/Provider/Metadata.hs b/src/Hakyll/Core/Provider/Metadata.hs → lib/Hakyll/Core/Provider/Metadata.hs
diff --git a/src/Hakyll/Core/Provider/MetadataCache.hs → lib/Hakyll/Core/Provider/MetadataCache.hs b/src/Hakyll/Core/Provider/MetadataCache.hs → lib/Hakyll/Core/Provider/MetadataCache.hs
diff --git a/src/Hakyll/Core/Routes.hs → lib/Hakyll/Core/Routes.hs b/src/Hakyll/Core/Routes.hs → lib/Hakyll/Core/Routes.hs
diff --git a/src/Hakyll/Core/Rules.hs → lib/Hakyll/Core/Rules.hs b/src/Hakyll/Core/Rules.hs → lib/Hakyll/Core/Rules.hs
diff --git a/src/Hakyll/Core/Rules/Internal.hs → lib/Hakyll/Core/Rules/Internal.hs b/src/Hakyll/Core/Rules/Internal.hs → lib/Hakyll/Core/Rules/Internal.hs
diff --git a/src/Hakyll/Core/Runtime.hs → lib/Hakyll/Core/Runtime.hs b/src/Hakyll/Core/Runtime.hs → lib/Hakyll/Core/Runtime.hs
diff --git a/src/Hakyll/Core/Store.hs → lib/Hakyll/Core/Store.hs b/src/Hakyll/Core/Store.hs → lib/Hakyll/Core/Store.hs
diff --git a/src/Hakyll/Core/UnixFilter.hs → lib/Hakyll/Core/UnixFilter.hs b/src/Hakyll/Core/UnixFilter.hs → lib/Hakyll/Core/UnixFilter.hs
diff --git a/src/Hakyll/Core/Util/File.hs → lib/Hakyll/Core/Util/File.hs b/src/Hakyll/Core/Util/File.hs → lib/Hakyll/Core/Util/File.hs
diff --git a/src/Hakyll/Core/Util/Parser.hs → lib/Hakyll/Core/Util/Parser.hs b/src/Hakyll/Core/Util/Parser.hs → lib/Hakyll/Core/Util/Parser.hs
diff --git a/src/Hakyll/Core/Util/String.hs → lib/Hakyll/Core/Util/String.hs b/src/Hakyll/Core/Util/String.hs → lib/Hakyll/Core/Util/String.hs
diff --git a/src/Hakyll/Core/Writable.hs → lib/Hakyll/Core/Writable.hs b/src/Hakyll/Core/Writable.hs → lib/Hakyll/Core/Writable.hs
diff --git a/src/Hakyll/Main.hs → lib/Hakyll/Main.hs b/src/Hakyll/Main.hs → lib/Hakyll/Main.hs
diff --git a/src/Hakyll/Preview/Poll.hs → lib/Hakyll/Preview/Poll.hs b/src/Hakyll/Preview/Poll.hs → lib/Hakyll/Preview/Poll.hs
diff --git a/src/Hakyll/Preview/Server.hs → lib/Hakyll/Preview/Server.hs b/src/Hakyll/Preview/Server.hs → lib/Hakyll/Preview/Server.hs
diff --git a/src/Hakyll/Web/CompressCss.hs → lib/Hakyll/Web/CompressCss.hs b/src/Hakyll/Web/CompressCss.hs → lib/Hakyll/Web/CompressCss.hs
diff --git a/src/Hakyll/Web/Feed.hs → lib/Hakyll/Web/Feed.hs b/src/Hakyll/Web/Feed.hs → lib/Hakyll/Web/Feed.hs
diff --git a/src/Hakyll/Web/Html.hs → lib/Hakyll/Web/Html.hs b/src/Hakyll/Web/Html.hs → lib/Hakyll/Web/Html.hs
diff --git a/src/Hakyll/Web/Html/RelativizeUrls.hs → lib/Hakyll/Web/Html/RelativizeUrls.hs b/src/Hakyll/Web/Html/RelativizeUrls.hs → lib/Hakyll/Web/Html/RelativizeUrls.hs
diff --git a/src/Hakyll/Web/Paginate.hs → lib/Hakyll/Web/Paginate.hs b/src/Hakyll/Web/Paginate.hs → lib/Hakyll/Web/Paginate.hs
diff --git a/src/Hakyll/Web/Pandoc.hs → lib/Hakyll/Web/Pandoc.hs b/src/Hakyll/Web/Pandoc.hs → lib/Hakyll/Web/Pandoc.hs
diff --git a/src/Hakyll/Web/Pandoc/Biblio.hs → lib/Hakyll/Web/Pandoc/Biblio.hs b/src/Hakyll/Web/Pandoc/Biblio.hs → lib/Hakyll/Web/Pandoc/Biblio.hs
diff --git a/src/Hakyll/Web/Pandoc/Binary.hs → lib/Hakyll/Web/Pandoc/Binary.hs b/src/Hakyll/Web/Pandoc/Binary.hs → lib/Hakyll/Web/Pandoc/Binary.hs
diff --git a/src/Hakyll/Web/Pandoc/FileType.hs → lib/Hakyll/Web/Pandoc/FileType.hs b/src/Hakyll/Web/Pandoc/FileType.hs → lib/Hakyll/Web/Pandoc/FileType.hs
diff --git a/src/Hakyll/Web/Redirect.hs → lib/Hakyll/Web/Redirect.hs b/src/Hakyll/Web/Redirect.hs → lib/Hakyll/Web/Redirect.hs
diff --git a/src/Hakyll/Web/Tags.hs → lib/Hakyll/Web/Tags.hs b/src/Hakyll/Web/Tags.hs → lib/Hakyll/Web/Tags.hs
diff --git a/src/Hakyll/Web/Template.hs → lib/Hakyll/Web/Template.hs b/src/Hakyll/Web/Template.hs → lib/Hakyll/Web/Template.hs
diff --git a/src/Hakyll/Web/Template/Context.hs → lib/Hakyll/Web/Template/Context.hs b/src/Hakyll/Web/Template/Context.hs → lib/Hakyll/Web/Template/Context.hs
diff --git a/src/Hakyll/Web/Template/Internal.hs → lib/Hakyll/Web/Template/Internal.hs b/src/Hakyll/Web/Template/Internal.hs → lib/Hakyll/Web/Template/Internal.hs
diff --git a/src/Hakyll/Web/Template/Internal/Element.hs → lib/Hakyll/Web/Template/Internal/Element.hs b/src/Hakyll/Web/Template/Internal/Element.hs → lib/Hakyll/Web/Template/Internal/Element.hs
diff --git a/src/Hakyll/Web/Template/Internal/Trim.hs → lib/Hakyll/Web/Template/Internal/Trim.hs b/src/Hakyll/Web/Template/Internal/Trim.hs → lib/Hakyll/Web/Template/Internal/Trim.hs
diff --git a/src/Hakyll/Web/Template/List.hs → lib/Hakyll/Web/Template/List.hs b/src/Hakyll/Web/Template/List.hs → lib/Hakyll/Web/Template/List.hs
diff --git a/Init.hs → src/Init.hs b/Init.hs → src/Init.hs