diff options
author | Josh Meredith <joshmeredith2008@gmail.com> | 2019-12-16 20:43:44 +1100 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-12-17 07:25:17 -0500 |
commit | a8f7ecd54821493dc061c55ceebb7e271b17056e (patch) | |
tree | 2efac632787662cdbc2a1e737def9d4538297b6b | |
parent | 4374983a60d533768d7cc8a3b29a6e9a2e6babdb (diff) | |
download | haskell-a8f7ecd54821493dc061c55ceebb7e271b17056e.tar.gz |
Use *Mode suffix instead of *M
-rw-r--r-- | hadrian/src/Hadrian/Builder/Sphinx.hs | 10 | ||||
-rw-r--r-- | hadrian/src/Rules/Documentation.hs | 8 | ||||
-rw-r--r-- | hadrian/src/Settings/Default.hs | 16 |
3 files changed, 17 insertions, 17 deletions
diff --git a/hadrian/src/Hadrian/Builder/Sphinx.hs b/hadrian/src/Hadrian/Builder/Sphinx.hs index 7a56804cd5..f9e8990f59 100644 --- a/hadrian/src/Hadrian/Builder/Sphinx.hs +++ b/hadrian/src/Hadrian/Builder/Sphinx.hs @@ -18,7 +18,7 @@ import Hadrian.Utilities -- | Sphinx can be used in three different modes to convert reStructuredText -- documents into HTML, LaTeX or Man pages. -data SphinxMode = InfoM | HtmlM | LatexM | ManM deriving (Eq, Generic, Show) +data SphinxMode = InfoMode | HtmlMode | LatexMode | ManMode deriving (Eq, Generic, Show) instance Binary SphinxMode instance Hashable SphinxMode @@ -36,7 +36,7 @@ args mode = do , arg outPath ] where modeString = case mode of - InfoM -> "texinfo" - HtmlM -> "html" - LatexM -> "latex" - ManM -> "man" + InfoMode -> "texinfo" + HtmlMode -> "html" + LatexMode -> "latex" + ManMode -> "man" diff --git a/hadrian/src/Rules/Documentation.hs b/hadrian/src/Rules/Documentation.hs index 31026b6bb5..567f71b996 100644 --- a/hadrian/src/Rules/Documentation.hs +++ b/hadrian/src/Rules/Documentation.hs @@ -172,7 +172,7 @@ buildSphinxHtml path = do rstFilesDir = pathPath path rstFiles <- getDirectoryFiles rstFilesDir ["**/*.rst"] need (map (rstFilesDir -/-) rstFiles) - build $ target docContext (Sphinx HtmlM) [pathPath path] [dest] + build $ target docContext (Sphinx HtmlMode) [pathPath path] [dest] checkSphinxWarnings dest ------------------------------------ Haddock ----------------------------------- @@ -285,7 +285,7 @@ buildSphinxPdf path = do let rstFilesDir = pathPath path rstFiles <- getDirectoryFiles rstFilesDir ["**/*.rst"] need (map (rstFilesDir -/-) rstFiles) - build $ target docContext (Sphinx LatexM) [pathPath path] [dir] + build $ target docContext (Sphinx LatexMode) [pathPath path] [dir] checkSphinxWarnings dir build $ target docContext Xelatex [path <.> "tex"] [dir] copyFileUntracked (dir -/- path <.> "pdf") file @@ -302,7 +302,7 @@ buildSphinxInfoGuide = do let rstFilesDir = pathPath path rstFiles <- getDirectoryFiles rstFilesDir ["**/*.rst"] need (map (rstFilesDir -/-) rstFiles) - build $ target docContext (Sphinx InfoM) [pathPath path] [dir] + build $ target docContext (Sphinx InfoMode) [pathPath path] [dir] checkSphinxWarnings dir -- Sphinx outputs texinfo source and a makefile, the -- default target of which actually produces the target @@ -334,7 +334,7 @@ buildManPage = do root -/- manPageBuildPath %> \file -> do need ["docs/users_guide/ghc.rst"] withTempDir $ \dir -> do - build $ target docContext (Sphinx ManM) ["docs/users_guide"] [dir] + build $ target docContext (Sphinx ManMode) ["docs/users_guide"] [dir] checkSphinxWarnings dir copyFileUntracked (dir -/- "ghc.1") file diff --git a/hadrian/src/Settings/Default.hs b/hadrian/src/Settings/Default.hs index f2a73870d1..7279023e82 100644 --- a/hadrian/src/Settings/Default.hs +++ b/hadrian/src/Settings/Default.hs @@ -249,14 +249,14 @@ defaultBuilderArgs = mconcat , validateBuilderArgs , xelatexBuilderArgs -- Generic builders from the Hadrian library: - , builder (Ar Pack ) ? Hadrian.Builder.Ar.args Pack - , builder (Ar Unpack ) ? Hadrian.Builder.Ar.args Unpack - , builder (Sphinx HtmlM ) ? Hadrian.Builder.Sphinx.args HtmlM - , builder (Sphinx LatexM) ? Hadrian.Builder.Sphinx.args LatexM - , builder (Sphinx ManM ) ? Hadrian.Builder.Sphinx.args ManM - , builder (Sphinx InfoM ) ? Hadrian.Builder.Sphinx.args InfoM - , builder (Tar Create ) ? Hadrian.Builder.Tar.args Create - , builder (Tar Extract ) ? Hadrian.Builder.Tar.args Extract ] + , builder (Ar Pack ) ? Hadrian.Builder.Ar.args Pack + , builder (Ar Unpack ) ? Hadrian.Builder.Ar.args Unpack + , builder (Sphinx HtmlMode ) ? Hadrian.Builder.Sphinx.args HtmlMode + , builder (Sphinx LatexMode) ? Hadrian.Builder.Sphinx.args LatexMode + , builder (Sphinx ManMode ) ? Hadrian.Builder.Sphinx.args ManMode + , builder (Sphinx InfoMode ) ? Hadrian.Builder.Sphinx.args InfoMode + , builder (Tar Create ) ? Hadrian.Builder.Tar.args Create + , builder (Tar Extract ) ? Hadrian.Builder.Tar.args Extract ] -- | All 'Package'-dependent command line arguments. defaultPackageArgs :: Args |