[commit: ghc] wip/nfs-locking: Update comments. (7239000)
git at git.haskell.org
git at git.haskell.org
Fri Oct 27 00:12:37 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/nfs-locking
Link : http://ghc.haskell.org/trac/ghc/changeset/7239000ffaeada9c33343aeddc28e121c3366af4/ghc
>---------------------------------------------------------------
commit 7239000ffaeada9c33343aeddc28e121c3366af4
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Tue May 10 02:31:16 2016 +0100
Update comments.
[skip ci]
>---------------------------------------------------------------
7239000ffaeada9c33343aeddc28e121c3366af4
src/Oracles/ModuleFiles.hs | 4 ++--
src/Rules/Dependencies.hs | 8 ++++----
src/Rules/Library.hs | 4 ++--
src/Settings/Paths.hs | 8 ++++----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/Oracles/ModuleFiles.hs b/src/Oracles/ModuleFiles.hs
index 897b2e0..e77d2ba 100644
--- a/src/Oracles/ModuleFiles.hs
+++ b/src/Oracles/ModuleFiles.hs
@@ -45,10 +45,10 @@ encodeModule dir file
-- | Find the generator for a given 'Context' and a source file. For example:
-- findGenerator (Context Stage1 compiler vanilla)
--- ".build/stage1/compiler/build/Lexer.hs"
+-- "_build/stage1/compiler/build/Lexer.hs"
-- == Just ("compiler/parser/Lexer.x", Alex)
-- findGenerator (Context Stage1 base vanilla)
--- ".build/stage1/base/build/Prelude.hs"
+-- "_build/stage1/base/build/Prelude.hs"
-- == Nothing
findGenerator :: Context -> FilePath -> Action (Maybe (FilePath, Builder))
findGenerator Context {..} file = do
diff --git a/src/Rules/Dependencies.hs b/src/Rules/Dependencies.hs
index f5d781a..78f4d40 100644
--- a/src/Rules/Dependencies.hs
+++ b/src/Rules/Dependencies.hs
@@ -49,8 +49,8 @@ buildPackageDependencies rs context at Context {..} =
-- Given a 'Context' and a 'FilePath' to a source file, compute the 'FilePath'
-- to its dependencies. For example, in vanillaContext Stage1 rts:
--- * "Task.c" -> ".build/stage1/rts/Task.c.deps"
--- * ".build/stage1/rts/AutoApply.cmm" -> ".build/stage1/rts/AutoApply.cmm.deps"
+-- * "Task.c" -> "_build/stage1/rts/Task.c.deps"
+-- * "_build/stage1/rts/AutoApply.cmm" -> "_build/stage1/rts/AutoApply.cmm.deps"
src2dep :: Context -> FilePath -> FilePath
src2dep context src
| buildRootPath `isPrefixOf` src = src <.> "deps"
@@ -58,8 +58,8 @@ src2dep context src
-- Given a 'Context' and a 'FilePath' to a file with dependencies, compute the
-- 'FilePath' to the source file. For example, in vanillaContext Stage1 rts:
--- * ".build/stage1/rts/Task.c.deps" -> "Task.c"
--- * ".build/stage1/rts/AutoApply.cmm.deps" -> ".build/stage1/rts/AutoApply.cmm"
+-- * "_build/stage1/rts/Task.c.deps" -> "Task.c"
+-- * "_build/stage1/rts/AutoApply.cmm.deps" -> "_build/stage1/rts/AutoApply.cmm"
dep2src :: Context -> FilePath -> FilePath
dep2src context at Context {..} dep
| takeBaseName dep `elem` [ "AutoApply.cmm", "Evac_thr.c", "Scav_thr.c" ] = src
diff --git a/src/Rules/Library.hs b/src/Rules/Library.hs
index 0538e4e..a45b591 100644
--- a/src/Rules/Library.hs
+++ b/src/Rules/Library.hs
@@ -76,8 +76,8 @@ buildPackageGhciLibrary context at Context {..} = priority 2 $ do
-- TODO: Get rid of code duplication and simplify. See also src2dep.
-- Given a 'Context' and a 'FilePath' to a source file, compute the 'FilePath'
-- to its object file. For example, in Context Stage1 rts threaded:
--- * "Task.c" -> ".build/stage1/rts/Task.thr_o"
--- * ".build/stage1/rts/sm/Evac_thr.c" -> ".build/stage1/rts/sm/Evac_thr.thr_o"
+-- * "Task.c" -> "_build/stage1/rts/Task.thr_o"
+-- * "_build/stage1/rts/sm/Evac_thr.c" -> "_build/stage1/rts/sm/Evac_thr.thr_o"
objFile :: Context -> FilePath -> FilePath
objFile context at Context {..} src
| buildRootPath `isPrefixOf` src = src -<.> osuf way
diff --git a/src/Settings/Paths.hs b/src/Settings/Paths.hs
index 288544b..c39b12b 100644
--- a/src/Settings/Paths.hs
+++ b/src/Settings/Paths.hs
@@ -31,28 +31,28 @@ pkgDataFile :: Context -> FilePath
pkgDataFile context = buildPath context -/- "package-data.mk"
-- | Path to the haddock file of a given 'Context', e.g.:
--- ".build/stage1/libraries/array/doc/html/array/array.haddock".
+-- "_build/stage1/libraries/array/doc/html/array/array.haddock".
pkgHaddockFile :: Context -> FilePath
pkgHaddockFile context at Context {..} =
buildPath context -/- "doc/html" -/- name -/- name <.> "haddock"
where name = pkgNameString package
-- | Path to the library file of a given 'Context', e.g.:
--- ".build/stage1/libraries/array/build/libHSarray-0.5.1.0.a".
+-- "_build/stage1/libraries/array/build/libHSarray-0.5.1.0.a".
pkgLibraryFile :: Context -> Action FilePath
pkgLibraryFile context at Context {..} = do
extension <- libsuf way
pkgFile context "libHS" extension
-- | Path to the auxiliary library file of a given 'Context', e.g.:
--- ".build/stage1/compiler/build/libHSghc-8.1-0.a".
+-- "_build/stage1/compiler/build/libHSghc-8.1-0.a".
pkgLibraryFile0 :: Context -> Action FilePath
pkgLibraryFile0 context at Context {..} = do
extension <- libsuf way
pkgFile context "libHS" ("-0" ++ extension)
-- | Path to the GHCi library file of a given 'Context', e.g.:
--- ".build/stage1/libraries/array/build/HSarray-0.5.1.0.o".
+-- "_build/stage1/libraries/array/build/HSarray-0.5.1.0.o".
pkgGhciLibraryFile :: Context -> Action FilePath
pkgGhciLibraryFile context = pkgFile context "HS" ".o"
More information about the ghc-commits
mailing list