From 2d25327e0c0e9c62dc8fa73e274378e84db63084 Mon Sep 17 00:00:00 2001 From: Jared Hester Date: Tue, 21 Mar 2017 23:20:07 -0400 Subject: [PATCH] back to 'Rebuild' fix some paths --- build.fsx | 12 ++++++------ docs/content/evaluation.fsx | 8 ++++---- docs/content/literate.fsx | 6 ++++-- misc/literate/build.fsx | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/build.fsx b/build.fsx index d80e6e718..80bd460bb 100644 --- a/build.fsx +++ b/build.fsx @@ -101,7 +101,7 @@ Target "Build" (fun _ -> { BaseDirectory = __SOURCE_DIRECTORY__ Includes = ["FSharp.Formatting.sln"] Excludes = [] } - |> MSBuildRelease "" "Build" + |> MSBuildRelease "" "Rebuild" |> ignore ) @@ -137,31 +137,31 @@ Target "BuildTests" (fun _ -> { BaseDirectory = __SOURCE_DIRECTORY__ Includes = ["FSharp.Formatting.sln"] Excludes = [] } - |> MSBuildRelease "" "Build" + |> MSBuildRelease "" "Rebuild" |> ignore { BaseDirectory = __SOURCE_DIRECTORY__ Includes = ["tests/*/files/FsLib/FsLib.sln"] Excludes = [] } - |> MSBuildDebug "" "Build" + |> MSBuildDebug "" "Rebuild" |> ignore { BaseDirectory = __SOURCE_DIRECTORY__ Includes = ["tests/*/files/crefLib/crefLib.sln"] Excludes = [] } - |> MSBuildDebug "" "Build" + |> MSBuildDebug "" "Rebuild" |> ignore { BaseDirectory = __SOURCE_DIRECTORY__ Includes = ["tests/*/files/csharpSupport/csharpSupport.sln"] Excludes = [] } - |> MSBuildDebug "" "Build" + |> MSBuildDebug "" "Rebuild" |> ignore { BaseDirectory = __SOURCE_DIRECTORY__ Includes = ["tests/*/files/TestLib/TestLib.sln"] Excludes = [] } - |> MSBuildDebug "" "Build" + |> MSBuildDebug "" "Rebuild" |> ignore ) diff --git a/docs/content/evaluation.fsx b/docs/content/evaluation.fsx index 99e94820d..64cbdcee5 100644 --- a/docs/content/evaluation.fsx +++ b/docs/content/evaluation.fsx @@ -124,10 +124,10 @@ of the `commands` have decorated the code or text with some formatting, for exam with layout or content generation engines such as Jeykll, we sometimes need to emit plain text as declarations to said engines. This is where the `raw` command is useful. - (** - (*** raw ***) - Some raw text. - *) + (** + (*** raw ***) + Some raw text. + *) which would emit diff --git a/docs/content/literate.fsx b/docs/content/literate.fsx index 1cfa45b6d..84d3ab57f 100644 --- a/docs/content/literate.fsx +++ b/docs/content/literate.fsx @@ -193,9 +193,11 @@ let projInfo = "github-link", "https://github.com/tpetricek/FSharp.Formatting" "project-name", "F# Formatting" ] + + // Process all files and save results to 'output' directory Literate.ProcessDirectory - (source, projTemplate, source + "\\output", replacements = projInfo) + (source, outputDirectory=source + "\\output", replacements = projInfo) (** The sample template `template-project.html` has been used to generate this documentation @@ -220,7 +222,7 @@ let docTex = Path.Combine(source, "../docs/document.md") Literate.ProcessMarkdown(docTex, template, format = OutputKind.Latex) Literate.ProcessDirectory - ( source, texTemplate, source + "\\output", + ( source, outputDirectory=source + "\\output", format = OutputKind.Latex, replacements = projInfo) (** diff --git a/misc/literate/build.fsx b/misc/literate/build.fsx index 478ca2b88..81424eac8 100644 --- a/misc/literate/build.fsx +++ b/misc/literate/build.fsx @@ -1,6 +1,6 @@ // Given a typical setup (with 'FSharp.Formatting' referenced using NuGet), // the following will include binaries and load the literate script -#load "../../src/FSharp.Formatting.fsx" +#load "../../packages/FSharp.Formatting/FSharp.Formatting.fsx" open System.IO open FSharp.Literate open FSharp.Formatting.Razor