Commit e31cb513 authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Rename src/Settings/Paths.hs -> src/Settings/Path.hs

parent b42f4fdd
......@@ -102,7 +102,7 @@ executable hadrian
, Settings.Packages.RunGhc
, Settings.Packages.Touchy
, Settings.Packages.Unlit
, Settings.Paths
, Settings.Path
, Stage
, Target
, UserSettings
......
......@@ -10,7 +10,7 @@ import qualified Rules.Oracles
import qualified Rules.SourceDist
import qualified Rules.Selftest
import qualified Rules.Test
import qualified Settings.Paths
import qualified Settings.Path
main :: IO ()
main = shakeArgsWith options CmdLineFlag.cmdFlags $ \cmdLineFlags targets -> do
......@@ -32,6 +32,6 @@ main = shakeArgsWith options CmdLineFlag.cmdFlags $ \cmdLineFlags targets -> do
options :: ShakeOptions
options = shakeOptions
{ shakeChange = ChangeModtimeAndDigest
, shakeFiles = Settings.Paths.shakeFilesPath
, shakeFiles = Settings.Path.shakeFilesPath
, shakeProgress = progressSimple
, shakeTimings = True }
......@@ -11,7 +11,7 @@ import Expression
import Oracles.PackageData
import Settings
import Settings.Builders.GhcCabal
import Settings.Paths
import Settings.Path
newtype ObjDepsKey = ObjDepsKey (FilePath, FilePath)
deriving (Binary, Eq, Hashable, NFData, Show, Typeable)
......
......@@ -9,7 +9,7 @@ import Base
import Context
import Expression
import Oracles.PackageData
import Settings.Paths
import Settings.Path
newtype ModuleFilesKey = ModuleFilesKey (Stage, Package)
deriving (Binary, Eq, Hashable, NFData, Show, Typeable)
......
......@@ -20,7 +20,7 @@ import qualified Rules.Program
import qualified Rules.Register
import Settings
import Settings.Packages.Rts
import Settings.Paths
import Settings.Path
allStages :: [Stage]
allStages = [minBound ..]
......
......@@ -20,7 +20,7 @@ import Oracles.DirectoryContent
import Oracles.Path
import Settings
import Settings.Builders.Ar
import Settings.Paths
import Settings.Path
import Target
import UserSettings
......
......@@ -10,7 +10,7 @@ import Base
import Expression
import GHC
import Settings
import Settings.Paths
import Settings.Path
cabalRules :: Rules ()
cabalRules = do
......
......@@ -4,7 +4,7 @@ import Base
import Package
import Rules.Actions
import Settings
import Settings.Paths
import Settings.Path
import Stage
import UserSettings
......
......@@ -8,7 +8,7 @@ import Expression
import Oracles.Dependencies
import Rules.Actions
import Rules.Generate
import Settings.Paths
import Settings.Path
import Target
compilePackage :: [(Resource, Int)] -> Context -> Rules ()
......
......@@ -9,7 +9,7 @@ import Oracles.Dependencies
import Rules.Actions
import Rules.Generate
import Rules.Libffi
import Settings.Paths
import Settings.Path
import Target
import UserSettings
......
......@@ -7,7 +7,7 @@ import Context
import Expression
import Oracles.ModuleFiles
import Rules.Actions
import Settings.Paths
import Settings.Path
import Target
buildPackageDependencies :: [(Resource, Int)] -> Context -> Rules ()
......
......@@ -9,7 +9,7 @@ import Oracles.ModuleFiles
import Oracles.PackageData
import Rules.Actions
import Settings
import Settings.Paths
import Settings.Path
import Target
haddockHtmlLib :: FilePath
......
......@@ -21,7 +21,7 @@ import Rules.Generators.GhcVersionH
import Rules.Generators.VersionHs
import Rules.Libffi
import Settings.Packages.Rts
import Settings.Paths
import Settings.Path
import Target
import UserSettings
......
......@@ -8,7 +8,7 @@ import Oracles.Config.Flag
import Oracles.Config.Setting
import Rules.Generators.Common
import Settings
import Settings.Paths
import Settings.Path
import UserSettings
generateConfigHs :: Expr String
......
......@@ -4,7 +4,7 @@ import Base
import Expression
import Oracles.Config.Setting
import Rules.Generators.Common
import Settings.Paths
import Settings.Path
ghcSplitSource :: FilePath
ghcSplitSource = "driver/split/ghc-split.prl"
......
......@@ -7,7 +7,7 @@ import GHC
import Oracles.Config.Setting
import Rules.Actions
import Settings.Packages.IntegerGmp
import Settings.Paths
import Settings.Path
import Target
import UserSettings
......
......@@ -12,7 +12,7 @@ import Oracles.ModuleFiles
import Oracles.PackageData
import Rules.Actions
import Settings
import Settings.Paths
import Settings.Path
import Target
import UserSettings
......
......@@ -14,7 +14,7 @@ import Rules.Actions
import Rules.Wrappers.Ghc
import Rules.Wrappers.GhcPkg
import Settings
import Settings.Paths
import Settings.Path
import Target
import UserSettings
......
......@@ -7,7 +7,7 @@ import GHC
import Rules.Actions
import Rules.Libffi
import Settings.Packages.Rts
import Settings.Paths
import Settings.Path
import Target
import UserSettings
......
......@@ -10,7 +10,7 @@ import Oracles.Config.Setting
import Oracles.Path
import Rules.Actions
import Settings
import Settings.Paths
import Settings.Path
import Target
-- TODO: clean up after testing
......
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