Commit ac5040d2 authored by Ben Gamari's avatar Ben Gamari 🐢

Expression: Don't re-export Base

The beginning of a long journey towards minimal re-exports
parent a9aa2ac5
......@@ -18,7 +18,6 @@ module Expression (
getInput, getOutput,
-- * Re-exports
module Base,
module Builder,
module Package,
module Stage,
......
{-# LANGUAGE DeriveDataTypeable, GeneralizedNewtypeDeriving #-}
module Oracles.ArgsHash (checkArgsHash, argsHashOracle) where
import Base
import Expression
import Settings
import Settings.Args
......
......@@ -6,6 +6,7 @@ module Predicates (
stage0, stage1, stage2, notStage0, notPackage, registerPackage, splitObjects
) where
import Base
import Expression
import GHC
import Oracles.Config.Flag
......
module Rules (generateTargets, packageRules) where
import Base
import Expression
import Rules.Install
import Rules.Package
......
module Rules.Actions (build, buildWithResources) where
import Base
import Expression
import Oracles.ArgsHash
import Settings
......
module Rules.Cabal (cabalRules) where
import Base
import Data.Version
import Distribution.Package as DP
import Distribution.PackageDescription
......
module Rules.Compile (compilePackage) where
import Base
import Expression
import Oracles
import Rules.Actions
......
module Rules.Data (buildPackageData) where
import Base
import Expression
import GHC
import Oracles
......
module Rules.Dependencies (buildPackageDependencies) where
import Base
import Expression
import Oracles
import Rules.Actions
......
module Rules.Documentation (buildPackageDocumentation) where
import Base
import Expression
import Oracles
import Rules.Actions
......
......@@ -3,6 +3,7 @@ module Rules.Generate (
derivedConstantsPath, generatedDependencies
) where
import Base
import Expression
import GHC
import Rules.Generators.ConfigHs
......
module Rules.Generators.ConfigHs (generateConfigHs) where
import Base
import Expression
import GHC
import Oracles
......
module Rules.Generators.GhcAutoconfH (generateGhcAutoconfH) where
import Base
import Expression
import Oracles
......
module Rules.Generators.GhcBootPlatformH (generateGhcBootPlatformH) where
import Base
import Expression
import Oracles
......
module Rules.Generators.GhcPlatformH (generateGhcPlatformH) where
import Base
import Expression
import Oracles
......
module Rules.Generators.VersionHs (generateVersionHs) where
import Base
import Expression
import Oracles
......
module Rules.Install (installTargets, installRules) where
import Base
import Expression
import GHC
import Rules.Generate
......
......@@ -2,6 +2,7 @@ module Rules.Library (buildPackageLibrary, cSources, hSources) where
import Data.Char
import Base
import Expression hiding (splitPath)
import GHC
import Oracles
......
......@@ -2,6 +2,7 @@ module Rules.Program (buildProgram) where
import Data.Char
import Base
import Expression hiding (splitPath)
import GHC hiding (ghci)
import Oracles
......
......@@ -7,6 +7,7 @@ module Settings (
getPackagePath, getTargetDirectory, getTargetPath, getPackageSources
) where
import Base
import Expression
import Oracles
import Oracles.ModuleFiles
......@@ -16,13 +17,13 @@ import Settings.User
import Settings.Ways
getPackagePath :: Expr FilePath
getPackagePath = liftM pkgPath getPackage
getPackagePath = pkgPath <$> getPackage
getTargetDirectory :: Expr FilePath
getTargetDirectory = liftM2 targetDirectory getStage getPackage
getTargetDirectory = targetDirectory <$> getStage <*> getPackage
getTargetPath :: Expr FilePath
getTargetPath = liftM2 targetPath getStage getPackage
getTargetPath = targetPath <$> getStage <*> getPackage
getPkgData :: (FilePath -> PackageData) -> Expr String
getPkgData key = lift . pkgData . key =<< getTargetPath
......
module Settings.Args (getArgs) where
import Data.Monoid
import Expression
import Settings.Builders.Alex
import Settings.Builders.Ar
......
module Settings.Builders.Ar (arArgs, arCmd) where
import Base
import Expression
import Oracles
import Predicates (builder)
......
......@@ -2,6 +2,7 @@ module Settings.Builders.DeriveConstants (
derivedConstantsPath, deriveConstantsArgs
) where
import Base
import Expression
import Oracles.Config.Flag
import Oracles.Config.Setting
......
module Settings.Builders.Gcc (gccArgs, gccMArgs) where
import Development.Shake.FilePath
import Expression
import GHC
import Oracles
import Base ((-/-))
import Predicates (package, stagedBuilder)
import Settings
......
module Settings.Builders.Ghc (ghcArgs, ghcMArgs, commonGhcArgs) where
import Base
import Expression
import Oracles
import GHC
......
......@@ -3,6 +3,20 @@ module Settings.Builders.GhcCabal (
customPackageArgs, ccArgs, cppArgs, ccWarnings, argStagedSettingList, needDll0
) where
import Data.Monoid
import Control.Monad.Trans.Class
import Control.Monad.Extra
import Development.Shake
import Development.Shake.FilePath
import Base ((-/-), bootPackageConstraints)
import Oracles.Config.Setting
import Oracles.Config.Flag
import GHC
import Package
import Way
import Builder
import Stage
import Expression
import Predicates hiding (stage)
import Settings
......
module Settings.Builders.GhcPkg (ghcPkgArgs) where
import Base
import Builder
import Expression
import Predicates
import Settings
......
module Settings.Builders.Haddock (haddockArgs) where
import Development.Shake.FilePath
import Base
import Package
import Expression
import Oracles
import Predicates hiding (file)
......
module Settings.Builders.Hsc2Hs (hsc2HsArgs) where
import Control.Monad.Trans.Class
import Control.Monad.Extra
import Base
import Expression
import Oracles
import Predicates (builder, stage0, notStage0)
......
module Settings.Packages (getPackages, knownPackages, findKnownPackage) where
import Base
import Expression
import Predicates
import Settings.User
......
......@@ -3,6 +3,7 @@ module Settings.TargetDirectory (
pkgGhciLibraryFile
) where
import Base
import Expression
import Settings.User
......
module Settings.Ways (getWays, getLibWays, getRtsWays) where
import Data.Monoid
import Expression
import Predicates
import Settings.User
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment