git.iko.soy/elk
on master help sign in
Remove Elm.Project.generateDocs for now
1265a9bEvan Czaplicki
builder/src/Elm/Diff.hs+2−2
compare with master
unifiedsplit
@@ -67,13 +67,13 @@ diff args =
67 CodeVsLatest ->
67 CodeVsLatest ->
68 do (summary, name, vsns) <- getPackageInfo
68 do (summary, name, vsns) <- getPackageInfo
69 oldDocs <- getDocs name vsns (maximum vsns)
69 oldDocs <- getDocs name vsns (maximum vsns)
70− newDocs <- Task.silently (Project.generateDocs summary)
70+ newDocs <- Task.silently (error "TODO Project.generateDocs summary" summary)
71 writeDiff oldDocs newDocs
71 writeDiff oldDocs newDocs
72
72
73 CodeVsExactly version ->
73 CodeVsExactly version ->
74 do (summary, name, vsns) <- getPackageInfo
74 do (summary, name, vsns) <- getPackageInfo
75 oldDocs <- getDocs name vsns version
75 oldDocs <- getDocs name vsns version
76− newDocs <- Task.silently (Project.generateDocs summary)
76+ newDocs <- Task.silently (error "TODO Project.generateDocs summary" summary)
77 writeDiff oldDocs newDocs
77 writeDiff oldDocs newDocs
78
78
79
79
builder/src/Elm/Project.hs+7−28
@@ -5,7 +5,6 @@ module Elm.Project
5 , getRootWithReplFallback
5 , getRootWithReplFallback
6 , compile
6 , compile
7 , compileForRepl
7 , compileForRepl
8− , generateDocs
9 )
8 )
10 where
9 where
11
10
@@ -13,10 +12,8 @@ module Elm.Project
13import qualified Data.ByteString as BS
12import qualified Data.ByteString as BS
14import Data.Map ((!))
13import Data.Map ((!))
15import qualified Data.Name as Name
14import qualified Data.Name as Name
16−import System.FilePath ((</>))
17
15
18import qualified Elm.Compiler as Compiler
16import qualified Elm.Compiler as Compiler
19−import qualified Elm.Docs as Docs
20import qualified Elm.Project.Json as Project
17import qualified Elm.Project.Json as Project
21import qualified Elm.Project.Root as Root
18import qualified Elm.Project.Root as Root
22import qualified Elm.Project.Summary as Summary
19import qualified Elm.Project.Summary as Summary
@@ -29,7 +26,6 @@ import qualified Generate.Artifacts as Artifacts
29import qualified Generate.Output as Output
26import qualified Generate.Output as Output
30import qualified Reporting.Render.Type.Localizer as L
27import qualified Reporting.Render.Type.Localizer as L
31import qualified Reporting.Task as Task
28import qualified Reporting.Task as Task
32−import qualified Stuff.Paths as Path
33
29
34
30
35
31
@@ -54,18 +50,17 @@ compile
54 :: Output.Mode
50 :: Output.Mode
55 -> Output.Target
51 -> Output.Target
56 -> Maybe Output.Output
52 -> Maybe Output.Output
57− -> Maybe FilePath
58 -> Summary
53 -> Summary
59 -> [FilePath]
54 -> [FilePath]
60 -> Task.Task ()
55 -> Task.Task ()
61−compile mode target maybeOutput docs summary@(Summary.Summary root project _ _ _) paths =
56+compile mode target maybeOutput summary@(Summary.Summary root project _ _ _) paths =
62 do Project.check project
57 do Project.check project
63 args <- Args.fromPaths summary paths
58 args <- Args.fromPaths summary paths
64 graph <- Crawl.crawl summary args
59 graph <- Crawl.crawl summary args
65− (dirty, ifaces) <- Plan.plan docs summary graph
60+ (dirty, ifaces) <- Plan.plan summary graph
66− answers <- Compile.compile project docs ifaces dirty
61+ answers <- Compile.compile project ifaces dirty
67 results <- Artifacts.write root answers
62 results <- Artifacts.write root answers
68− _ <- traverse (Artifacts.writeDocs results) docs
63+ -- _ <- traverse (Artifacts.writeDocs results) docs
69 Output.generate mode target maybeOutput summary graph results
64 Output.generate mode target maybeOutput summary graph results
70
65
71
66
@@ -78,24 +73,8 @@ compileForRepl noColors localizer source maybeName =
78 do summary@(Summary.Summary root project _ _ _) <- getRoot
73 do summary@(Summary.Summary root project _ _ _) <- getRoot
79 Project.check project
74 Project.check project
80 graph <- Crawl.crawlFromSource summary source
75 graph <- Crawl.crawlFromSource summary source
81− (dirty, ifaces) <- Plan.plan Nothing summary graph
76+ (dirty, ifaces) <- Plan.plan summary graph
82− answers <- Compile.compile project Nothing ifaces dirty
77+ answers <- Compile.compile project ifaces dirty
83 results <- Artifacts.write root answers
78 results <- Artifacts.write root answers
84− let (Compiler.Artifacts elmi _ _) = results ! Name.replModule
79+ let (Compiler.Artifacts elmi _) = results ! Name.replModule
85 traverse (Output.generateReplFile noColors localizer summary graph elmi) maybeName
80 traverse (Output.generateReplFile noColors localizer summary graph elmi) maybeName
86−
87−
88−
89−-- GENERATE DOCS
90−
91−
92−generateDocs :: Summary.Summary -> Task.Task Docs.Documentation
93−generateDocs summary@(Summary.Summary root project _ _ _) =
94− do let docsPath = root </> Path.docs
95− args <- Args.fromSummary summary
96− graph <- Crawl.crawl summary args
97− (dirty, ifaces) <- Plan.plan (Just docsPath) summary graph
98− answers <- Compile.compile project (Just docsPath) ifaces dirty
99− results <- Artifacts.write root answers
100− Output.noDebugUsesInPackage summary graph
101− Artifacts.writeDocs results docsPath
builder/src/Elm/Publish.hs+1−1
@@ -51,7 +51,7 @@ publish summary@(Summary.Summary root project _ _ _) =
51
51
52 verifyReadme root
52 verifyReadme root
53 verifyLicense root
53 verifyLicense root
54− docs <- Task.silently (Project.generateDocs summary)
54+ docs <- Task.silently (error "TODO Project.generateDocs summary" summary)
55 verifyVersion name version docs maybePublishedVersions
55 verifyVersion name version docs maybePublishedVersions
56 commitHash <- verifyTag name version
56 commitHash <- verifyTag name version
57 verifyNoChanges commitHash version
57 verifyNoChanges commitHash version