diff options
| -rw-r--r-- | cabal-helper.cabal | 9 | ||||
| -rw-r--r-- | lib/Distribution/Helper.hs (renamed from Distribution/Helper.hs) | 0 | ||||
| -rw-r--r-- | src/CabalHelper/Compiletime/Compat/Environment.hs (renamed from CabalHelper/Compiletime/Compat/Environment.hs) | 0 | ||||
| -rw-r--r-- | src/CabalHelper/Compiletime/Compat/Version.hs (renamed from CabalHelper/Compiletime/Compat/Version.hs) | 0 | ||||
| -rw-r--r-- | src/CabalHelper/Compiletime/Compile.hs (renamed from CabalHelper/Compiletime/Compile.hs) | 0 | ||||
| -rw-r--r-- | src/CabalHelper/Compiletime/Data.hs (renamed from CabalHelper/Compiletime/Data.hs) | 10 | ||||
| -rw-r--r-- | src/CabalHelper/Compiletime/GuessGhc.hs (renamed from CabalHelper/Compiletime/GuessGhc.hs) | 0 | ||||
| -rw-r--r-- | src/CabalHelper/Compiletime/Log.hs (renamed from CabalHelper/Compiletime/Log.hs) | 0 | ||||
| -rw-r--r-- | src/CabalHelper/Compiletime/Types.hs (renamed from CabalHelper/Compiletime/Types.hs) | 0 | ||||
| -rw-r--r-- | src/CabalHelper/Compiletime/Wrapper.hs (renamed from CabalHelper/Compiletime/Wrapper.hs) | 0 | ||||
| -rw-r--r-- | src/CabalHelper/Runtime/Licenses.hs (renamed from CabalHelper/Runtime/Licenses.hs) | 0 | ||||
| -rw-r--r-- | src/CabalHelper/Runtime/Main.hs (renamed from CabalHelper/Runtime/Main.hs) | 0 | ||||
| -rw-r--r-- | src/CabalHelper/Shared/Common.hs (renamed from CabalHelper/Shared/Common.hs) | 0 | ||||
| -rw-r--r-- | src/CabalHelper/Shared/InterfaceTypes.hs (renamed from CabalHelper/Shared/InterfaceTypes.hs) | 0 | ||||
| -rw-r--r-- | src/CabalHelper/Shared/Sandbox.hs (renamed from CabalHelper/Shared/Sandbox.hs) | 0 |
15 files changed, 11 insertions, 8 deletions
diff --git a/cabal-helper.cabal b/cabal-helper.cabal index 07aadb4..85998fc 100644 --- a/cabal-helper.cabal +++ b/cabal-helper.cabal @@ -33,7 +33,7 @@ category: Distribution build-type: Custom cabal-version: >=1.14 extra-source-files: README.md - CabalHelper/Runtime/*.hs + src/CabalHelper/Runtime/*.hs source-repository head type: git @@ -48,6 +48,7 @@ custom-setup library default-language: Haskell2010 default-extensions: NondecreasingIndentation + hs-source-dirs: lib, src exposed-modules: Distribution.Helper other-modules: CabalHelper.Shared.InterfaceTypes @@ -69,6 +70,7 @@ executable cabal-helper-wrapper default-extensions: NondecreasingIndentation other-extensions: TemplateHaskell main-is: CabalHelper/Compiletime/Wrapper.hs + hs-source-dirs: src other-modules: CabalHelper.Compiletime.Compat.Environment CabalHelper.Compiletime.Compat.Version @@ -105,7 +107,8 @@ test-suite compile-test default-language: Haskell2010 default-extensions: NondecreasingIndentation type: exitcode-stdio-1.0 - main-is: tests/CompileTest.hs + main-is: CompileTest.hs + hs-source-dirs: tests, src other-modules: CabalHelper.Compiletime.Compat.Environment CabalHelper.Compiletime.Compat.Version @@ -116,7 +119,6 @@ test-suite compile-test CabalHelper.Shared.Common CabalHelper.Shared.Sandbox Paths_cabal_helper - hs-source-dirs: . ghc-options: -Wall build-tools: cabal @@ -144,6 +146,7 @@ executable cabal-helper-main else buildable: False main-is: CabalHelper/Runtime/Main.hs + hs-source-dirs: src other-modules: CabalHelper.Runtime.Licenses CabalHelper.Shared.Common diff --git a/Distribution/Helper.hs b/lib/Distribution/Helper.hs index 73ad668..73ad668 100644 --- a/Distribution/Helper.hs +++ b/lib/Distribution/Helper.hs diff --git a/CabalHelper/Compiletime/Compat/Environment.hs b/src/CabalHelper/Compiletime/Compat/Environment.hs index 916f782..916f782 100644 --- a/CabalHelper/Compiletime/Compat/Environment.hs +++ b/src/CabalHelper/Compiletime/Compat/Environment.hs diff --git a/CabalHelper/Compiletime/Compat/Version.hs b/src/CabalHelper/Compiletime/Compat/Version.hs index 853aca5..853aca5 100644 --- a/CabalHelper/Compiletime/Compat/Version.hs +++ b/src/CabalHelper/Compiletime/Compat/Version.hs diff --git a/CabalHelper/Compiletime/Compile.hs b/src/CabalHelper/Compiletime/Compile.hs index 8cc565e..8cc565e 100644 --- a/CabalHelper/Compiletime/Compile.hs +++ b/src/CabalHelper/Compiletime/Compile.hs diff --git a/CabalHelper/Compiletime/Data.hs b/src/CabalHelper/Compiletime/Data.hs index 2842cfc..dce3570 100644 --- a/CabalHelper/Compiletime/Data.hs +++ b/src/CabalHelper/Compiletime/Data.hs @@ -78,9 +78,9 @@ withHelperSources mdir action = withDir mdir $ \dir -> do sourceFiles :: [(FilePath, String)] sourceFiles = - [ ("Runtime/Main.hs", $(LitE . StringL <$> runIO (UTF8.toString <$> BS.readFile "CabalHelper/Runtime/Main.hs"))) - , ("Runtime/Licenses.hs", $(LitE . StringL <$> runIO (UTF8.toString <$> BS.readFile "CabalHelper/Runtime/Licenses.hs"))) - , ("Shared/Common.hs", $(LitE . StringL <$> runIO (UTF8.toString <$> BS.readFile "CabalHelper/Shared/Common.hs"))) - , ("Shared/Sandbox.hs", $(LitE . StringL <$> runIO (UTF8.toString <$> BS.readFile "CabalHelper/Shared/Sandbox.hs"))) - , ("Shared/InterfaceTypes.hs", $(LitE . StringL <$> runIO (UTF8.toString <$> BS.readFile "CabalHelper/Shared/InterfaceTypes.hs"))) + [ ("Runtime/Main.hs", $(LitE . StringL <$> runIO (UTF8.toString <$> BS.readFile "src/CabalHelper/Runtime/Main.hs"))) + , ("Runtime/Licenses.hs", $(LitE . StringL <$> runIO (UTF8.toString <$> BS.readFile "src/CabalHelper/Runtime/Licenses.hs"))) + , ("Shared/Common.hs", $(LitE . StringL <$> runIO (UTF8.toString <$> BS.readFile "src/CabalHelper/Shared/Common.hs"))) + , ("Shared/Sandbox.hs", $(LitE . StringL <$> runIO (UTF8.toString <$> BS.readFile "src/CabalHelper/Shared/Sandbox.hs"))) + , ("Shared/InterfaceTypes.hs", $(LitE . StringL <$> runIO (UTF8.toString <$> BS.readFile "src/CabalHelper/Shared/InterfaceTypes.hs"))) ] diff --git a/CabalHelper/Compiletime/GuessGhc.hs b/src/CabalHelper/Compiletime/GuessGhc.hs index f4b33d5..f4b33d5 100644 --- a/CabalHelper/Compiletime/GuessGhc.hs +++ b/src/CabalHelper/Compiletime/GuessGhc.hs diff --git a/CabalHelper/Compiletime/Log.hs b/src/CabalHelper/Compiletime/Log.hs index a75f8b7..a75f8b7 100644 --- a/CabalHelper/Compiletime/Log.hs +++ b/src/CabalHelper/Compiletime/Log.hs diff --git a/CabalHelper/Compiletime/Types.hs b/src/CabalHelper/Compiletime/Types.hs index bfe9b7c..bfe9b7c 100644 --- a/CabalHelper/Compiletime/Types.hs +++ b/src/CabalHelper/Compiletime/Types.hs diff --git a/CabalHelper/Compiletime/Wrapper.hs b/src/CabalHelper/Compiletime/Wrapper.hs index 6713944..6713944 100644 --- a/CabalHelper/Compiletime/Wrapper.hs +++ b/src/CabalHelper/Compiletime/Wrapper.hs diff --git a/CabalHelper/Runtime/Licenses.hs b/src/CabalHelper/Runtime/Licenses.hs index a1794ea..a1794ea 100644 --- a/CabalHelper/Runtime/Licenses.hs +++ b/src/CabalHelper/Runtime/Licenses.hs diff --git a/CabalHelper/Runtime/Main.hs b/src/CabalHelper/Runtime/Main.hs index 86bf169..86bf169 100644 --- a/CabalHelper/Runtime/Main.hs +++ b/src/CabalHelper/Runtime/Main.hs diff --git a/CabalHelper/Shared/Common.hs b/src/CabalHelper/Shared/Common.hs index 239fe3c..239fe3c 100644 --- a/CabalHelper/Shared/Common.hs +++ b/src/CabalHelper/Shared/Common.hs diff --git a/CabalHelper/Shared/InterfaceTypes.hs b/src/CabalHelper/Shared/InterfaceTypes.hs index 5f4972f..5f4972f 100644 --- a/CabalHelper/Shared/InterfaceTypes.hs +++ b/src/CabalHelper/Shared/InterfaceTypes.hs diff --git a/CabalHelper/Shared/Sandbox.hs b/src/CabalHelper/Shared/Sandbox.hs index 4dd9705..4dd9705 100644 --- a/CabalHelper/Shared/Sandbox.hs +++ b/src/CabalHelper/Shared/Sandbox.hs |