Skip to content

Commit fbac79b

Browse files
authored
Merge pull request #100 from wilsoncg/master
get reference documentation output from build again
2 parents 9b608ff + 8e9b33b commit fbac79b

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

build.fsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,14 @@ Target "PublishNuget" (fun _ ->
138138
// Generate the documentation
139139

140140
Target "GenerateReferenceDocs" (fun _ ->
141-
if not <| executeFSIWithArgs "docs/tools" "generate.fsx" ["--define:RELEASE"; "--define:REFERENCE"] [] then
141+
if not <| executeFSIWithArgs "docs/tools" "generate.fsx" ["--define:RELEASE"; "--define:REFERENCE"; "--noframework"] [] then
142142
failwith "generating reference documentation failed"
143143
)
144144

145145
let generateHelp' fail debug =
146146
let args =
147-
if debug then ["--define:HELP"]
148-
else ["--define:RELEASE"; "--define:HELP"]
147+
if debug then ["--define:HELP"; "--noframework"]
148+
else ["--define:RELEASE"; "--define:HELP"; "--noframework"]
149149
if executeFSIWithArgs "docs/tools" "generate.fsx" args [] then
150150
traceImportant "Help generated"
151151
else

docs/tools/generate.fsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ let info =
2525
#load "../../packages/build/FSharp.Formatting/FSharp.Formatting.fsx"
2626
#r "../../packages/build/FAKE/tools/NuGet.Core.dll"
2727
#r "../../packages/build/FAKE/tools/FakeLib.dll"
28+
#r "../../packages/build/FAKE/tools/FSharp.Core.dll"
2829
open Fake
2930
open System.IO
3031
open Fake.FileHelper
@@ -40,7 +41,11 @@ let root = "file://" + (__SOURCE_DIRECTORY__ @@ "../output")
4041
#endif
4142

4243
// Paths with template/source/output locations
43-
let bin = __SOURCE_DIRECTORY__ @@ "../../bin"
44+
#if RELEASE
45+
let bin = __SOURCE_DIRECTORY__ @@ "../../src/FSharp.Control.AsyncSeq/bin/Release/net45"
46+
#else
47+
let bin = __SOURCE_DIRECTORY__ @@ "../../src/FSharp.Control.AsyncSeq/bin/Debug/net45"
48+
#endif
4449
let content = __SOURCE_DIRECTORY__ @@ "../content"
4550
let output = __SOURCE_DIRECTORY__ @@ "../output"
4651
let files = __SOURCE_DIRECTORY__ @@ "../files"

0 commit comments

Comments
 (0)