Merge pull request #46 from sergey-tihon/master

Fixed tips generation - issue #45
fsprojects · Jan 24, 2014 · dd9abac · dd9abac
2 parents c970373 + 84a439b
commit dd9abac
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/docs/content/index.fsx b/docs/content/index.fsx
@@ -20,8 +20,6 @@ Documentation
   <div class="span1"></div>
 </div>
 
-<img src="img/logo.png" alt="F# Project" style="float:right;width:150px;margin:10px" />
-
 Example
 -------
 

diff --git a/docs/tools/generate.fsx b/docs/tools/generate.fsx
@@ -86,7 +86,31 @@ let buildDocumentation () =
       ( dir, docTemplate, output @@ sub, replacements = ("root", root)::info,
         layoutRoots = layoutRoots )
 
+// Remove `FSharp.Core` from `bin` directory.
+// Otherwise, version conflict can break code tips.
+let execute pipeline =
+    // Cache `FSharp.Core.*` files
+    let files = 
+        !! (bin @@ "FSharp.Core.*")
+        |> Seq.toArray
+        |> Array.map (fun file ->
+            (file, File.ReadAllBytes file))
+    if (files.Length > 0) then
+        TraceHelper.traceError "Consider setting CopyLocal to False for FSharp.Core in all *.fsproj files"
+    // Remove `FSharp.Core.*` files
+    files |> Seq.iter (fun (file,_) ->
+        TraceHelper.traceImportant <| sprintf  "Removing '%s'" file
+        File.Delete file)
+    // Execute document generation pipeline
+    pipeline()
+    // Restore `FSharp.Core.*` files
+    files |> Seq.iter (fun (file, bytes) ->
+        TraceHelper.traceImportant <| sprintf "Restoring '%s'" file
+        File.WriteAllBytes(file, bytes))
+
+
 // Generate
-copyFiles()
-buildDocumentation()
-buildReference()
+execute(
+  copyFiles 
+  >> buildDocumentation
+  >> buildReference)
diff --git a/docs/tools/templates/template.cshtml b/docs/tools/templates/template.cshtml
@@ -34,6 +34,7 @@
           @RenderBody()
         </div>
         <div class="span3">
+          <img src="img/logo.png" alt="F# Project" style="float:left;width:150px;margin:10px" />  
           <ul class="nav nav-list" id="menu">
             <li class="nav-header">@Properties["project-name"]</li>
             <li><a href="@Root/index.html">Home page</a></li>