Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
e31cb513
Commit
e31cb513
authored
Oct 30, 2016
by
Andrey Mokhov
Browse files
Rename src/Settings/Paths.hs -> src/Settings/Path.hs
parent
b42f4fdd
Changes
27
Hide whitespace changes
Inline
Side-by-side
hadrian.cabal
View file @
e31cb513
...
...
@@ -102,7 +102,7 @@ executable hadrian
, Settings.Packages.RunGhc
, Settings.Packages.Touchy
, Settings.Packages.Unlit
, Settings.Path
s
, Settings.Path
, Stage
, Target
, UserSettings
...
...
src/Main.hs
View file @
e31cb513
...
...
@@ -10,7 +10,7 @@ import qualified Rules.Oracles
import
qualified
Rules.SourceDist
import
qualified
Rules.Selftest
import
qualified
Rules.Test
import
qualified
Settings.Path
s
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
.
Path
s
.
shakeFilesPath
,
shakeFiles
=
Settings
.
Path
.
shakeFilesPath
,
shakeProgress
=
progressSimple
,
shakeTimings
=
True
}
src/Oracles/Dependencies.hs
View file @
e31cb513
...
...
@@ -11,7 +11,7 @@ import Expression
import
Oracles.PackageData
import
Settings
import
Settings.Builders.GhcCabal
import
Settings.Path
s
import
Settings.Path
newtype
ObjDepsKey
=
ObjDepsKey
(
FilePath
,
FilePath
)
deriving
(
Binary
,
Eq
,
Hashable
,
NFData
,
Show
,
Typeable
)
...
...
src/Oracles/ModuleFiles.hs
View file @
e31cb513
...
...
@@ -9,7 +9,7 @@ import Base
import
Context
import
Expression
import
Oracles.PackageData
import
Settings.Path
s
import
Settings.Path
newtype
ModuleFilesKey
=
ModuleFilesKey
(
Stage
,
Package
)
deriving
(
Binary
,
Eq
,
Hashable
,
NFData
,
Show
,
Typeable
)
...
...
src/Rules.hs
View file @
e31cb513
...
...
@@ -20,7 +20,7 @@ import qualified Rules.Program
import
qualified
Rules.Register
import
Settings
import
Settings.Packages.Rts
import
Settings.Path
s
import
Settings.Path
allStages
::
[
Stage
]
allStages
=
[
minBound
..
]
...
...
src/Rules/Actions.hs
View file @
e31cb513
...
...
@@ -20,7 +20,7 @@ import Oracles.DirectoryContent
import
Oracles.Path
import
Settings
import
Settings.Builders.Ar
import
Settings.Path
s
import
Settings.Path
import
Target
import
UserSettings
...
...
src/Rules/Cabal.hs
View file @
e31cb513
...
...
@@ -10,7 +10,7 @@ import Base
import
Expression
import
GHC
import
Settings
import
Settings.Path
s
import
Settings.Path
cabalRules
::
Rules
()
cabalRules
=
do
...
...
src/Rules/Clean.hs
View file @
e31cb513
...
...
@@ -4,7 +4,7 @@ import Base
import
Package
import
Rules.Actions
import
Settings
import
Settings.Path
s
import
Settings.Path
import
Stage
import
UserSettings
...
...
src/Rules/Compile.hs
View file @
e31cb513
...
...
@@ -8,7 +8,7 @@ import Expression
import
Oracles.Dependencies
import
Rules.Actions
import
Rules.Generate
import
Settings.Path
s
import
Settings.Path
import
Target
compilePackage
::
[(
Resource
,
Int
)]
->
Context
->
Rules
()
...
...
src/Rules/Data.hs
View file @
e31cb513
...
...
@@ -9,7 +9,7 @@ import Oracles.Dependencies
import
Rules.Actions
import
Rules.Generate
import
Rules.Libffi
import
Settings.Path
s
import
Settings.Path
import
Target
import
UserSettings
...
...
src/Rules/Dependencies.hs
View file @
e31cb513
...
...
@@ -7,7 +7,7 @@ import Context
import
Expression
import
Oracles.ModuleFiles
import
Rules.Actions
import
Settings.Path
s
import
Settings.Path
import
Target
buildPackageDependencies
::
[(
Resource
,
Int
)]
->
Context
->
Rules
()
...
...
src/Rules/Documentation.hs
View file @
e31cb513
...
...
@@ -9,7 +9,7 @@ import Oracles.ModuleFiles
import
Oracles.PackageData
import
Rules.Actions
import
Settings
import
Settings.Path
s
import
Settings.Path
import
Target
haddockHtmlLib
::
FilePath
...
...
src/Rules/Generate.hs
View file @
e31cb513
...
...
@@ -21,7 +21,7 @@ import Rules.Generators.GhcVersionH
import
Rules.Generators.VersionHs
import
Rules.Libffi
import
Settings.Packages.Rts
import
Settings.Path
s
import
Settings.Path
import
Target
import
UserSettings
...
...
src/Rules/Generators/ConfigHs.hs
View file @
e31cb513
...
...
@@ -8,7 +8,7 @@ import Oracles.Config.Flag
import
Oracles.Config.Setting
import
Rules.Generators.Common
import
Settings
import
Settings.Path
s
import
Settings.Path
import
UserSettings
generateConfigHs
::
Expr
String
...
...
src/Rules/Generators/GhcSplit.hs
View file @
e31cb513
...
...
@@ -4,7 +4,7 @@ import Base
import
Expression
import
Oracles.Config.Setting
import
Rules.Generators.Common
import
Settings.Path
s
import
Settings.Path
ghcSplitSource
::
FilePath
ghcSplitSource
=
"driver/split/ghc-split.prl"
...
...
src/Rules/Gmp.hs
View file @
e31cb513
...
...
@@ -7,7 +7,7 @@ import GHC
import
Oracles.Config.Setting
import
Rules.Actions
import
Settings.Packages.IntegerGmp
import
Settings.Path
s
import
Settings.Path
import
Target
import
UserSettings
...
...
src/Rules/Library.hs
View file @
e31cb513
...
...
@@ -12,7 +12,7 @@ import Oracles.ModuleFiles
import
Oracles.PackageData
import
Rules.Actions
import
Settings
import
Settings.Path
s
import
Settings.Path
import
Target
import
UserSettings
...
...
src/Rules/Program.hs
View file @
e31cb513
...
...
@@ -14,7 +14,7 @@ import Rules.Actions
import
Rules.Wrappers.Ghc
import
Rules.Wrappers.GhcPkg
import
Settings
import
Settings.Path
s
import
Settings.Path
import
Target
import
UserSettings
...
...
src/Rules/Register.hs
View file @
e31cb513
...
...
@@ -7,7 +7,7 @@ import GHC
import
Rules.Actions
import
Rules.Libffi
import
Settings.Packages.Rts
import
Settings.Path
s
import
Settings.Path
import
Target
import
UserSettings
...
...
src/Rules/Test.hs
View file @
e31cb513
...
...
@@ -10,7 +10,7 @@ import Oracles.Config.Setting
import
Oracles.Path
import
Rules.Actions
import
Settings
import
Settings.Path
s
import
Settings.Path
import
Target
-- TODO: clean up after testing
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment