[commit: ghc] wip/nfs-locking: Rename Rules.Config to Rules.Setup. (d5e2d92)
git at git.haskell.org
git at git.haskell.org
Fri Oct 27 00:00:33 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/nfs-locking
Link : http://ghc.haskell.org/trac/ghc/changeset/d5e2d9278d4590fa370fb73900447a573fc37e2f/ghc
>---------------------------------------------------------------
commit d5e2d9278d4590fa370fb73900447a573fc37e2f
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Mon Feb 8 23:19:35 2016 +0000
Rename Rules.Config to Rules.Setup.
See #204.
>---------------------------------------------------------------
d5e2d9278d4590fa370fb73900447a573fc37e2f
shaking-up-ghc.cabal | 2 +-
src/Main.hs | 4 ++--
src/Rules/{Config.hs => Setup.hs} | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/shaking-up-ghc.cabal b/shaking-up-ghc.cabal
index 0807ff3..254617d 100644
--- a/shaking-up-ghc.cabal
+++ b/shaking-up-ghc.cabal
@@ -42,7 +42,6 @@ executable ghc-shake
, Rules.Cabal
, Rules.Clean
, Rules.Compile
- , Rules.Config
, Rules.Data
, Rules.Dependencies
, Rules.Documentation
@@ -64,6 +63,7 @@ executable ghc-shake
, Rules.Program
, Rules.Register
, Rules.Resources
+ , Rules.Setup
, Rules.Wrappers.Ghc
, Rules.Wrappers.GhcPkg
, Selftest
diff --git a/src/Main.hs b/src/Main.hs
index 79601d8..544987d 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -8,12 +8,12 @@ import qualified Environment
import qualified Rules
import qualified Rules.Cabal
import qualified Rules.Clean
-import qualified Rules.Config
import qualified Rules.Generate
import qualified Rules.Gmp
import qualified Rules.Libffi
import qualified Rules.Oracles
import qualified Rules.Perl
+import qualified Rules.Setup
import qualified Selftest
import qualified Test
@@ -29,13 +29,13 @@ main = shakeArgsWith options CmdLineFlag.cmdFlags $ \cmdLineFlags targets -> do
rules = mconcat
[ Rules.Cabal.cabalRules
, Rules.Clean.cleanRules
- , Rules.Config.configRules
, Rules.Generate.generateRules
, Rules.Generate.copyRules
, Rules.Gmp.gmpRules
, Rules.Libffi.libffiRules
, Rules.Oracles.oracleRules
, Rules.Perl.perlScriptRules
+ , Rules.Setup.setupRules
, Rules.topLevelTargets
, Rules.packageRules
, Selftest.selftestRules
diff --git a/src/Rules/Config.hs b/src/Rules/Setup.hs
similarity index 93%
rename from src/Rules/Config.hs
rename to src/Rules/Setup.hs
index 1016be9..a88084c 100644
--- a/src/Rules/Config.hs
+++ b/src/Rules/Setup.hs
@@ -1,4 +1,4 @@
-module Rules.Config (configRules) where
+module Rules.Setup (setupRules) where
import qualified System.Info
@@ -7,8 +7,8 @@ import CmdLineFlag
import Rules.Actions
import Rules.Generators.GhcAutoconfH
-configRules :: Rules ()
-configRules = do
+setupRules :: Rules ()
+setupRules = do
-- We always rerun the configure script in this mode, because the flags
-- passed to it can affect the contents of system.config file.
[configFile, "settings", configH] &%> \[cfg, settings, cfgH] -> do
More information about the ghc-commits
mailing list