Skip to content

Commit a329cae

Browse files
Fixes to make the documentation generation work again
* migrated generate.fsx to FAKE 5 * use paket generate load scripts * keep FSharp.Formatting dependencies pinned to what they were for now
1 parent e582464 commit a329cae

File tree

3 files changed

+30
-17
lines changed

3 files changed

+30
-17
lines changed

docs/tools/generate.fsx

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,19 @@ let info =
1414
"project-github", githubLink
1515
"project-nuget", "http://www.nuget.org/packages/FSharp.Data.SqlClient" ]
1616

17-
#I "../../packages/FSharp.Formatting.2.4.1/lib/net40"
18-
#I "../../packages/RazorEngine.3.3.0/lib/net40"
19-
#I "../../packages/FSharp.Compiler.Service.0.0.36/lib/net40"
20-
#r "../../packages/Microsoft.AspNet.Razor.2.0.30506.0/lib/net40/System.Web.Razor.dll"
21-
#r "../../packages/FAKE/tools/FakeLib.dll"
22-
#r "RazorEngine.dll"
23-
#r "FSharp.Literate.dll"
24-
#r "FSharp.CodeFormat.dll"
25-
#r "FSharp.MetadataFormat.dll"
17+
#load "../../.paket/load/net46/Build/FSharp.Formatting.fsx"
18+
#load "../../.paket/load/net46/Build/FAKE.Lib.fsx"
19+
2620
open Fake
2721
open System.IO
28-
open Fake.FileHelper
22+
open Fake.IO.FileSystemOperators
2923
open FSharp.Literate
3024
open FSharp.MetadataFormat
3125

26+
// see https://github.com/fsharp/FAKE/issues/1579#issuecomment-306580820
27+
let execContext = Fake.Core.Context.FakeExecutionContext.Create false (Path.Combine(__SOURCE_DIRECTORY__, __SOURCE_FILE__)) []
28+
Fake.Core.Context.setExecutionContext (Fake.Core.Context.RuntimeContext.Fake execContext)
29+
3230
#if RELEASE
3331
let root = website
3432
#else
@@ -41,7 +39,7 @@ let content = __SOURCE_DIRECTORY__ @@ "../content"
4139
let output = __SOURCE_DIRECTORY__ @@ "../output"
4240
let files = __SOURCE_DIRECTORY__ @@ "../files"
4341
let templates = __SOURCE_DIRECTORY__ @@ "templates"
44-
let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/FSharp.Formatting.2.4.1/"
42+
let formatting = __SOURCE_DIRECTORY__ @@ "../../packages/Build/FSharp.Formatting/"
4543
let docTemplate = formatting @@ "templates/docpage.cshtml"
4644

4745
// Where to look for *.csproj templates (in this order)
@@ -51,14 +49,14 @@ let layoutRoots =
5149

5250
// Copy static files and CSS + JS from F# Formatting
5351
let copyFiles () =
54-
CopyRecursive files output true |> Log "Copying file: "
55-
ensureDirectory (output @@ "content")
56-
CopyRecursive (formatting @@ "styles") (output @@ "content") true
57-
|> Log "Copying styles and scripts: "
52+
Fake.IO.Shell.copyRecursive files output true |> Fake.Core.Trace.logItems "Copying file: "
53+
Fake.IO.Directory.ensure (output @@ "content")
54+
Fake.IO.Shell.copyRecursive (formatting @@ "styles") (output @@ "content") true
55+
|> Fake.Core.Trace.logItems "Copying styles and scripts: "
5856

5957
// Build API reference from XML comments
6058
let buildReference () =
61-
CleanDir (output @@ "reference")
59+
Fake.IO.Shell.cleanDir (output @@ "reference")
6260
for lib in referenceBinaries do
6361
MetadataFormat.Generate
6462
( bin @@ lib, output @@ "reference", layoutRoots,

paket.dependencies

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,14 @@ group Build
1414
framework: >= net40
1515
redirects: force
1616

17+
nuget FAKE = 5.0.0-rc014.167
18+
nuget Fake.Lib = 5.0.0-rc014.167
19+
20+
nuget FSharp.Formatting = 2.4.1
21+
nuget FSharp.Compiler.Service = 0.0.36
22+
nuget RazorEngine = 3.3.0
23+
1724
nuget NuGet.CommandLine
18-
nuget FAKE = 5.0.0-rc014.167
1925

2026
group Test
2127
source https://www.nuget.org/api/v2/

paket.lock

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,16 @@ RESTRICTION: >= net40
103103
NUGET
104104
remote: https://www.nuget.org/api/v2
105105
FAKE (5.0.0-rc014.167)
106+
FAKE.Lib (5.0.0-rc014.167)
107+
FSharp.Compiler.Service (0.0.36)
108+
FSharp.Formatting (2.4.1)
109+
FSharp.Compiler.Service (>= 0.0.32)
110+
Microsoft.AspNet.Razor (>= 2.0.30506)
111+
RazorEngine (>= 3.3)
112+
Microsoft.AspNet.Razor (3.2.6)
106113
NuGet.CommandLine (4.6.2)
114+
RazorEngine (3.3)
115+
Microsoft.AspNet.Razor (>= 2.0.30506)
107116

108117
GROUP Samples
109118
REDIRECTS: FORCE

0 commit comments

Comments
 (0)