From 48b5033faf8bc9edd8171d21f56ed2164034aad4 Mon Sep 17 00:00:00 2001
From: Don Syme <donsyme@fastmail.fm>
Date: Wed, 4 Oct 2017 19:23:06 +0100
Subject: [PATCH] update FCS doc generation

---
 fcs/build.fsx                    |  4 ++--
 fcs/docsrc/tools/generate.fsx    |  8 ++++----
 fcs/docsrc/tools/generate.ja.fsx | 14 +++++---------
 fcs/paket.dependencies           |  2 +-
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/fcs/build.fsx b/fcs/build.fsx
index 08717a7ab0c..d3c850757e4 100644
--- a/fcs/build.fsx
+++ b/fcs/build.fsx
@@ -144,11 +144,11 @@ Target "Nuget.AddNetStd" (fun _ ->
 // Generate the documentation
 
 Target "GenerateDocsEn" (fun _ ->
-    executeFSIWithArgs "docsrc/tools" "generate.fsx" ["--define:RELEASE"] [] |> ignore
+    executeFSIWithArgs "docsrc/tools" "generate.fsx" [] [] |> ignore
 )
 
 Target "GenerateDocsJa" (fun _ ->
-    executeFSIWithArgs "docsrc/tools" "generate.ja.fsx" ["--define:RELEASE"] [] |> ignore
+    executeFSIWithArgs "docsrc/tools" "generate.ja.fsx" [] [] |> ignore
 )
 
 // --------------------------------------------------------------------------------------
diff --git a/fcs/docsrc/tools/generate.fsx b/fcs/docsrc/tools/generate.fsx
index b00ee478626..59bd10187af 100644
--- a/fcs/docsrc/tools/generate.fsx
+++ b/fcs/docsrc/tools/generate.fsx
@@ -42,7 +42,8 @@ let docTemplate = formatting @@ "templates/docpage.cshtml"
 
 // Where to look for *.csproj templates (in this order)
 let layoutRoots =
-  [ templates; formatting @@ "templates"
+  [ templates; 
+    formatting @@ "templates"
     formatting @@ "templates/reference" ]
 
 // Copy static files and CSS + JS from F# Formatting
@@ -84,12 +85,11 @@ let buildReference () =
 
 // Build documentation from `fsx` and `md` files in `docsrc/content`
 let buildDocumentation () =
-  let subdirs = Directory.EnumerateDirectories(content, "*", SearchOption.AllDirectories)
-  for dir in Seq.append [content] subdirs do
+  for dir in [content] do
     let sub = if dir.Length > content.Length then dir.Substring(content.Length + 1) else "."
     Literate.ProcessDirectory
       ( dir, docTemplate, output @@ sub, replacements = ("root", root)::info,
-        layoutRoots = layoutRoots, generateAnchors = true )
+        layoutRoots = layoutRoots, generateAnchors = true, processRecursive=false )
 
 // Generate
 copyFiles()
diff --git a/fcs/docsrc/tools/generate.ja.fsx b/fcs/docsrc/tools/generate.ja.fsx
index b7e9b25d009..8044db885d3 100644
--- a/fcs/docsrc/tools/generate.ja.fsx
+++ b/fcs/docsrc/tools/generate.ja.fsx
@@ -38,11 +38,7 @@ open FSharp.MetadataFormat
 
 // When called from 'build.fsx', use the public project URL as <root>
 // otherwise, use the current 'output' directory.
-#if RELEASE
-let root = website
-#else
-let root = "file://" + (__SOURCE_DIRECTORY__ @@ "../output/ja")
-#endif
+let root = "."
 
 // Paths with template/source/output locations
 let bin         = __SOURCE_DIRECTORY__ @@ "../../../Release/fcs/net45"
@@ -56,15 +52,15 @@ let docTemplate = formatting @@ "templates/docpage.cshtml"
 // Where to look for *.csproj templates (in this order)
 let layoutRoots =
   [ templates
-    formatting @@ "templates"]
+    formatting @@ "templates"
+    formatting @@ "templates/reference"]
 
 // Copy static files and CSS + JS from F# Formatting
 // Build documentation from `fsx` and `md` files in `docsrc/content`
 let buildDocumentation () =
-  let subdirs = Directory.EnumerateDirectories(content, "*", SearchOption.AllDirectories)
-                |> Seq.filter (fun x -> x.Contains "ja")
-  for dir in Seq.append [content] subdirs do
+  for dir in [content] do
     let sub = if dir.Length > content.Length then dir.Substring(content.Length + 1) else "."
+    printfn "root = %s" root
     Literate.ProcessDirectory
       ( dir, docTemplate, outputJa @@ sub, replacements = ("root", root)::info,
         layoutRoots = layoutRoots, generateAnchors = true )
diff --git a/fcs/paket.dependencies b/fcs/paket.dependencies
index e0071842a88..bfd298568f6 100644
--- a/fcs/paket.dependencies
+++ b/fcs/paket.dependencies
@@ -1,4 +1,4 @@
-frameworks: net45
+framework: net45
 
 source https://www.nuget.org/api/v2/