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

hadrian.cabal

@@ -102,7 +102,7 @@ executable hadrian
                        , Settings.Packages.RunGhc
                        , Settings.Packages.Touchy
                        , Settings.Packages.Unlit
-                       , Settings.Paths
+                       , Settings.Path
                        , Stage
                        , Target
                        , UserSettings

src/Main.hs

@@ -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 }

src/Oracles/Dependencies.hs

@@ -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)

src/Oracles/ModuleFiles.hs

@@ -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)

src/Rules.hs

@@ -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 ..]

src/Rules/Actions.hs

@@ -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
 

src/Rules/Cabal.hs

@@ -10,7 +10,7 @@ import Base
 import Expression
 import GHC
 import Settings
-import Settings.Paths
+import Settings.Path
 
 cabalRules :: Rules ()
 cabalRules = do

src/Rules/Clean.hs

@@ -4,7 +4,7 @@ import Base
 import Package
 import Rules.Actions
 import Settings
-import Settings.Paths
+import Settings.Path
 import Stage
 import UserSettings
 

src/Rules/Compile.hs

@@ -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 ()

src/Rules/Data.hs

@@ -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
 

src/Rules/Dependencies.hs

@@ -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 ()

src/Rules/Documentation.hs

@@ -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

src/Rules/Generate.hs

@@ -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
 

src/Rules/Generators/ConfigHs.hs

@@ -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

src/Rules/Generators/GhcSplit.hs

@@ -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"

src/Rules/Gmp.hs

@@ -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
 

src/Rules/Library.hs

@@ -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
 

src/Rules/Program.hs

@@ -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
 

src/Rules/Register.hs

@@ -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
 

src/Rules/Test.hs

@@ -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